From dcb88d24d7201d768ae54d5ffc566241e6b87ef0 Mon Sep 17 00:00:00 2001 From: 00fly Date: Tue, 5 Nov 2024 18:14:44 +0800 Subject: [PATCH] 1. use switch case 2. add GB18030 support --- .../src/main/java/com/fly/code/ToolMain.java" | 44 ++++++++----------- .../java/com/fly/code/panel/EncodePanel.java" | 4 +- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git "a/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/ToolMain.java" "b/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/ToolMain.java" index 4f80f9f..a6fddc5 100644 --- "a/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/ToolMain.java" +++ "b/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/ToolMain.java" @@ -162,34 +162,26 @@ public class ToolMain extends JFrame { if (e.getSource() == jtp) { + encodePanel.setVisible(false); + clearPanel.setVisible(false); + toFtlPanel.setVisible(false); + toUnixPanel.setVisible(false); int i = ((JTabbedPane)e.getSource()).getSelectedIndex(); - if (i == 0) + switch (i) { - encodePanel.setVisible(true); - clearPanel.setVisible(false); - toFtlPanel.setVisible(false); - toUnixPanel.setVisible(false); - } - else if (i == 1) - { - encodePanel.setVisible(false); - clearPanel.setVisible(true); - toFtlPanel.setVisible(false); - toUnixPanel.setVisible(false); - } - else if (i == 2) - { - encodePanel.setVisible(false); - clearPanel.setVisible(false); - toFtlPanel.setVisible(true); - toUnixPanel.setVisible(false); - } - else - { - encodePanel.setVisible(false); - clearPanel.setVisible(false); - toFtlPanel.setVisible(false); - toUnixPanel.setVisible(true); + case 0: + encodePanel.setVisible(true); + break; + case 1: + clearPanel.setVisible(true); + break; + case 2: + toFtlPanel.setVisible(true); + break; + case 3: + default: + toUnixPanel.setVisible(true); + break; } } } diff --git "a/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/panel/EncodePanel.java" "b/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/panel/EncodePanel.java" index c06d4a7..cbf9a39 100644 --- "a/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/panel/EncodePanel.java" +++ "b/00fly-Java\351\241\271\347\233\256\347\274\226\347\240\201\350\275\254\346\215\242\345\267\245\345\205\267\345\217\212\345\205\266\344\273\226/src/main/java/com/fly/code/panel/EncodePanel.java" @@ -197,6 +197,7 @@ public class EncodePanel extends JPanel oldEncode.setBounds(120, 130, 70, 20); oldEncode.addItem("UTF-8"); oldEncode.addItem("GB2312"); + oldEncode.addItem("GB18030"); oldEncode.addItem("GBK"); add(oldEncode); @@ -205,6 +206,7 @@ public class EncodePanel extends JPanel newEncode.setBounds(250, 130, 70, 20); newEncode.addItem("UTF-8"); newEncode.addItem("GB2312"); + newEncode.addItem("GB18030"); newEncode.addItem("GBK"); newEncode.setSelectedIndex(2); add(newEncode); @@ -288,7 +290,7 @@ public class EncodePanel extends JPanel @Override public void run() { - Collection files = FileUtils.listFiles(new File(sourcePath), (String[])list.toArray(new String[0]), true); + Collection files = FileUtils.listFiles(new File(sourcePath), list.toArray(new String[0]), true); String dirName = new File(sourcePath).getName(); String newPath = bakPath + dirName + "\\"; for (File file : files) -- Gitee