From 8362c218e4b398dceb8c3c41da0deabff49c3842 Mon Sep 17 00:00:00 2001 From: tianqiao Date: Mon, 13 Nov 2017 13:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E4=B9=89console=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=B0test=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0test?= =?UTF-8?q?=E4=B8=ADresource=E7=9A=84=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ql/util/express/console/Console.java | 6 +- .../ql/util/express/console/ConsoleFrame.java | 57 ++++++------------ .../util/express/console/ConsoleFrame2.java | 52 ++++++---------- .../util/express/console/ExampleDefine.java | 0 .../com/ql/util/express/console/FileTree.java | 15 ++--- .../ql/util/express/console/ReadExample.java | 9 ++- .../com/ql/util/express/console/closeFile.png | Bin 0 -> 183 bytes .../com/ql/util/express/console/help.png | Bin 0 -> 191 bytes .../com/ql/util/express/console/openFile.png | Bin 0 -> 189 bytes .../com/ql/util/express/console/run.png | Bin 0 -> 904 bytes 10 files changed, 50 insertions(+), 89 deletions(-) rename src/{main => test}/java/com/ql/util/express/console/Console.java (90%) rename src/{main => test}/java/com/ql/util/express/console/ConsoleFrame.java (84%) rename src/{main => test}/java/com/ql/util/express/console/ConsoleFrame2.java (87%) rename src/{main => test}/java/com/ql/util/express/console/ExampleDefine.java (100%) rename src/{main => test}/java/com/ql/util/express/console/FileTree.java (97%) rename src/{main => test}/java/com/ql/util/express/console/ReadExample.java (99%) create mode 100644 src/test/resources/com/ql/util/express/console/closeFile.png create mode 100644 src/test/resources/com/ql/util/express/console/help.png create mode 100644 src/test/resources/com/ql/util/express/console/openFile.png create mode 100644 src/test/resources/com/ql/util/express/console/run.png diff --git a/src/main/java/com/ql/util/express/console/Console.java b/src/test/java/com/ql/util/express/console/Console.java similarity index 90% rename from src/main/java/com/ql/util/express/console/Console.java rename to src/test/java/com/ql/util/express/console/Console.java index 85eae14..6692983 100644 --- a/src/main/java/com/ql/util/express/console/Console.java +++ b/src/test/java/com/ql/util/express/console/Console.java @@ -1,9 +1,7 @@ package com.ql.util.express.console; -import java.awt.Toolkit; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import java.awt.Dimension; +import javax.swing.*; +import java.awt.*; public class Console { boolean packFrame = false; diff --git a/src/main/java/com/ql/util/express/console/ConsoleFrame.java b/src/test/java/com/ql/util/express/console/ConsoleFrame.java similarity index 84% rename from src/main/java/com/ql/util/express/console/ConsoleFrame.java rename to src/test/java/com/ql/util/express/console/ConsoleFrame.java index e70ff3a..b1ca7ed 100644 --- a/src/main/java/com/ql/util/express/console/ConsoleFrame.java +++ b/src/test/java/com/ql/util/express/console/ConsoleFrame.java @@ -1,37 +1,18 @@ package com.ql.util.express.console; -import java.awt.BorderLayout; -import java.awt.Dimension; +import com.ql.util.express.DefaultContext; +import com.ql.util.express.ExpressRunner; +import com.ql.util.express.console.FileTree.PathNode; + +import javax.swing.*; +import javax.swing.tree.TreePath; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.StringWriter; +import java.io.*; import java.util.Map; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JSplitPane; -import javax.swing.JTabbedPane; -import javax.swing.JTextArea; -import javax.swing.JToolBar; -import javax.swing.tree.TreePath; - -import com.ql.util.express.DefaultContext; -import com.ql.util.express.ExpressRunner; -import com.ql.util.express.console.FileTree.PathNode; - public class ConsoleFrame extends JFrame { private static final long serialVersionUID = 1L; @@ -42,7 +23,7 @@ public class ConsoleFrame JMenuItem jMenuFileExit = new JMenuItem(); JToolBar jToolBar = new JToolBar(); JButton jButton1 = new JButton(); - ImageIcon image1 = new ImageIcon(com.ql.util.express.console.ConsoleFrame.class. + ImageIcon image1 = new ImageIcon(ConsoleFrame.class. getResource("run.png")); JLabel statusBar = new JLabel(); JTabbedPane jTabbedPaneContent = new JTabbedPane(); @@ -81,7 +62,7 @@ public class ConsoleFrame /** * Component initialization. * - * @throws java.lang.Exception + * @throws Exception */ private void jbInit() throws Exception { contentPane = (JPanel) getContentPane(); @@ -115,16 +96,16 @@ public class ConsoleFrame jButton1.setToolTipText("执行"); jToolBar.add(jButton1); contentPane.add(statusBar, BorderLayout.SOUTH); - jPanelResult.add(jScrollPaneResult, java.awt.BorderLayout.CENTER); - jPanelResult.add(jLabelResult, java.awt.BorderLayout.NORTH); + jPanelResult.add(jScrollPaneResult, BorderLayout.CENTER); + jPanelResult.add(jLabelResult, BorderLayout.NORTH); jSplitPaneRun.add(jSplitPaneS_C, JSplitPane.TOP); jScrollPaneResult.getViewport().add(jTextAreaResult); - jPanelScript.add(jLabelScript, java.awt.BorderLayout.NORTH); - jPanelScript.add(jScrollPaneScript, java.awt.BorderLayout.CENTER); + jPanelScript.add(jLabelScript, BorderLayout.NORTH); + jPanelScript.add(jScrollPaneScript, BorderLayout.CENTER); jScrollPaneScript.getViewport().add(jTextAreaScript); - jPanelContext.add(jLabelContext, java.awt.BorderLayout.NORTH); - jPanelContext.add(jScrollPaneContext, java.awt.BorderLayout.CENTER); + jPanelContext.add(jLabelContext, BorderLayout.NORTH); + jPanelContext.add(jScrollPaneContext, BorderLayout.CENTER); jSplitPaneS_C.add(jPanelScript, JSplitPane.LEFT); jScrollPaneContext.getViewport().add(jTextAreaContext); jSplitPaneS_C.setDividerSize(2); @@ -133,9 +114,9 @@ public class ConsoleFrame jSplitPaneS_C.setDividerLocation(500); jSplitPaneRun.add(jPanelResult, JSplitPane.RIGHT); jTabbedPaneContent.add(jPaneRunner, "\u6267\u884c\u4ee3\u7801"); - jPaneRunner.add(jSplitPaneRun, java.awt.BorderLayout.CENTER); - contentPane.add(jTabbedPaneContent, java.awt.BorderLayout.CENTER); - contentPane.add(jToolBar, java.awt.BorderLayout.NORTH); + jPaneRunner.add(jSplitPaneRun, BorderLayout.CENTER); + contentPane.add(jTabbedPaneContent, BorderLayout.CENTER); + contentPane.add(jToolBar, BorderLayout.NORTH); jSplitPaneRun.setDividerLocation(200); } diff --git a/src/main/java/com/ql/util/express/console/ConsoleFrame2.java b/src/test/java/com/ql/util/express/console/ConsoleFrame2.java similarity index 87% rename from src/main/java/com/ql/util/express/console/ConsoleFrame2.java rename to src/test/java/com/ql/util/express/console/ConsoleFrame2.java index 8e627aa..8e7d9aa 100644 --- a/src/main/java/com/ql/util/express/console/ConsoleFrame2.java +++ b/src/test/java/com/ql/util/express/console/ConsoleFrame2.java @@ -1,7 +1,12 @@ package com.ql.util.express.console; -import java.awt.BorderLayout; -import java.awt.Dimension; +import com.ql.util.express.DefaultContext; +import com.ql.util.express.ExpressRunner; +import com.ql.util.express.console.FileTree.PathNode; + +import javax.swing.*; +import javax.swing.tree.TreePath; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -10,25 +15,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.Map; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JSplitPane; -import javax.swing.JTabbedPane; -import javax.swing.JTextArea; -import javax.swing.JToolBar; -import javax.swing.tree.TreePath; - -import com.ql.util.express.DefaultContext; -import com.ql.util.express.ExpressRunner; -import com.ql.util.express.console.FileTree.PathNode; - public class ConsoleFrame2 extends JFrame { private static final long serialVersionUID = 1L; @@ -39,7 +25,7 @@ public class ConsoleFrame2 JMenuItem jMenuFileExit = new JMenuItem(); JToolBar jToolBar = new JToolBar(); JButton jButton1 = new JButton(); - ImageIcon image1 = new ImageIcon(com.ql.util.express.console.ConsoleFrame2.class. + ImageIcon image1 = new ImageIcon(ConsoleFrame2.class. getResource("run.png")); JLabel statusBar = new JLabel(); JSplitPane jSplitPaneMain = new JSplitPane(); @@ -86,7 +72,7 @@ public class ConsoleFrame2 /** * Component initialization. * - * @throws java.lang.Exception + * @throws Exception */ private void jbInit() throws Exception { contentPane = (JPanel) getContentPane(); @@ -125,21 +111,21 @@ public class ConsoleFrame2 jButton1.setToolTipText("执行"); jToolBar.add(jButton1); contentPane.add(statusBar, BorderLayout.SOUTH); - contentPane.add(jSplitPaneMain, java.awt.BorderLayout.CENTER); + contentPane.add(jSplitPaneMain, BorderLayout.CENTER); jTabbedPaneContent.add(jPaneRunner, "执行代码"); jTabbedPaneContent.add(jPanelHelp, "关键字"); jTabbedPaneContent.add(jPanel3, "帮助"); - jPaneRunner.add(jSplitPaneRun, java.awt.BorderLayout.CENTER); + jPaneRunner.add(jSplitPaneRun, BorderLayout.CENTER); jScrollPaneTree.getViewport().add(this.jTreeFileSelect); jScrollPaneContext.getViewport().add(jTextAreaContext); jScrollPaneResult.getViewport().add(jTextAreaResult); - jPanelResult.add(jScrollPaneResult, java.awt.BorderLayout.CENTER); - jPanelResult.add(jLabelResult, java.awt.BorderLayout.NORTH); - jPanelScript.add(jLabelScript, java.awt.BorderLayout.NORTH); - jPanelScript.add(jScrollPaneScript, java.awt.BorderLayout.CENTER); + jPanelResult.add(jScrollPaneResult, BorderLayout.CENTER); + jPanelResult.add(jLabelResult, BorderLayout.NORTH); + jPanelScript.add(jLabelScript, BorderLayout.NORTH); + jPanelScript.add(jScrollPaneScript, BorderLayout.CENTER); jScrollPaneScript.getViewport().add(jTextAreaScript); - jPanelContext.add(jLabelContext, java.awt.BorderLayout.NORTH); - jPanelContext.add(jScrollPaneContext, java.awt.BorderLayout.CENTER); + jPanelContext.add(jLabelContext, BorderLayout.NORTH); + jPanelContext.add(jScrollPaneContext, BorderLayout.CENTER); jSplitPaneS_C.setDividerSize(2); jSplitPaneS_C.setLastDividerLocation(200); jSplitPaneS_C.add(jPanelContext, JSplitPane.RIGHT); @@ -147,8 +133,8 @@ public class ConsoleFrame2 jSplitPaneS_C.setDividerLocation(500); jSplitPaneRun.add(jPanelResult, JSplitPane.RIGHT); jSplitPaneRun.add(jSplitPaneS_C, JSplitPane.TOP); - contentPane.add(jToolBar, java.awt.BorderLayout.NORTH); - contentPane.add(jScrollPaneTree, java.awt.BorderLayout.WEST); + contentPane.add(jToolBar, BorderLayout.NORTH); + contentPane.add(jScrollPaneTree, BorderLayout.WEST); jScrollPaneTree.getViewport().add(jTreeFileSelect); jSplitPaneRun.setDividerLocation(200); jSplitPaneMain.setDividerLocation(400); diff --git a/src/main/java/com/ql/util/express/console/ExampleDefine.java b/src/test/java/com/ql/util/express/console/ExampleDefine.java similarity index 100% rename from src/main/java/com/ql/util/express/console/ExampleDefine.java rename to src/test/java/com/ql/util/express/console/ExampleDefine.java diff --git a/src/main/java/com/ql/util/express/console/FileTree.java b/src/test/java/com/ql/util/express/console/FileTree.java similarity index 97% rename from src/main/java/com/ql/util/express/console/FileTree.java rename to src/test/java/com/ql/util/express/console/FileTree.java index 54947dd..59b7bd2 100644 --- a/src/main/java/com/ql/util/express/console/FileTree.java +++ b/src/test/java/com/ql/util/express/console/FileTree.java @@ -1,18 +1,15 @@ package com.ql.util.express.console; -import java.awt.Component; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; - -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.JTree; +import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreePath; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.File; + /** *

Description: 系统目录树，动态生成，解决载入慢的问题

*/ diff --git a/src/main/java/com/ql/util/express/console/ReadExample.java b/src/test/java/com/ql/util/express/console/ReadExample.java similarity index 99% rename from src/main/java/com/ql/util/express/console/ReadExample.java rename to src/test/java/com/ql/util/express/console/ReadExample.java index f72be72..d418d6d 100644 --- a/src/main/java/com/ql/util/express/console/ReadExample.java +++ b/src/test/java/com/ql/util/express/console/ReadExample.java @@ -1,16 +1,15 @@ package com.ql.util.express.console; -import java.io.FileInputStream; -import java.io.InputStream; +import org.w3c.dom.Document; +import org.w3c.dom.Node; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; +import java.io.FileInputStream; +import java.io.InputStream; public class ReadExample { public static void main(String[] args) throws Exception { diff --git a/src/test/resources/com/ql/util/express/console/closeFile.png b/src/test/resources/com/ql/util/express/console/closeFile.png new file mode 100644 index 0000000000000000000000000000000000000000..81cc1a6c45da1598a05e92a5b6784a04a911a346 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b)GJcAr-fh1vpOq^XD*rz^uUf zgW)2Z#%j$5Ln~<&`|N9L{+~Q~vY_WOt3j{9Sp(*O|M#;WmuQ=ieBl58Y{52x$E-Pe z4ZB-rIJlTG^zHX|mT=%$e7h@&!HS{PB22n)Cxh&PoQ%A@V;g2_h#wH`*~PG?LExBV g?~WX|;|g0DW_@z~EbL+52XqO8r>mdKI;Vst0Bxf|yZ`_I literal 0 HcmV?d00001 diff --git a/src/test/resources/com/ql/util/express/console/help.png b/src/test/resources/com/ql/util/express/console/help.png new file mode 100644 index 0000000000000000000000000000000000000000..d7a33f878e5c61eb434de1150697d087e85d2a34 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ZJsWUAr-fh6ArL1TJ`_1;Yo%S znWuKXFYuY=7;skRs<)v*V)F%)|Nr-k^>IqKxEk+rG_bo9eZ)fgu4qc;u?>=W3{#qY zm3K+_eEwhUID>70bW8^P~docZ0~{a ze-EVRJ=E6Ok-^g1snQ#mlbOt7q2scIuVb3p*S!}0nip+S+4n7$ literal 0 HcmV?d00001 diff --git a/src/test/resources/com/ql/util/express/console/run.png b/src/test/resources/com/ql/util/express/console/run.png new file mode 100644 index 0000000000000000000000000000000000000000..98972efa79d1715832a1e5a0763ee490f642c4dc GIT binary patch literal 904 zcmV;319$w1P)?wAGMYINzFN$&058pwYk~KNzJAu zXF5eU*4C&c)`5WvYz77sIOu7qDJe?mNVrq(kQ3$Sad>bC$FIQ!;^g3-d+xbc-+Qjn zj_>yV=lOm=ukZWwem>t-|4h3Pa`_)8iOb&AA}J|FENW3hS~MyUQSnqVV$Etq(kda= zBny%91mgAQHSx;Ys93lDRUu-KnCd${oM@e4NB6(xS9JSip2{1*E*ih0+l~ z)1iM_#~sk|%;@-Lb^H=IE`j6oamwME5mXHdntX{)iW+;l(lyKcB6N&~xjUxOCDl8r zNvMW(&klhjD+d%hv}5+nh2vu zA+y*?<}XfcJ^hK0y_F8!Q$c#EZ+Pbt84F0SFmt z^+-tvF_|psKD z7DplblngcErA2Yn-^$&xD+ZTE`L>?=SI%>^}xLbt9Xfnhs!Y%;IRn zZjN0uamMxopVe$;Ltb(ma_Q!6wj8Wsr}-+m${^WQZuVCW@M&c#=Q>JI+D~G!7gE)B zT!QvfZaYSn@;+(#&(hXcABPmyHe&wOvGU2Vz5FG%mcGEd#p~Eyw3c1fZ%}4E%AUFm zQuChS&cN0GGqGH5=3q$^bvIlz*nQmUo1)h@hkqu>!v&2+`DS7R_F6#-pIhD`_50^2 zP|g~F