diff --git a/.classpath b/.classpath deleted file mode 100644 index bef8b47..0000000 --- a/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 1b575cf..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Cknife - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 4824b80..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7341ab1..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/lib/substance.jar b/lib/substance.jar deleted file mode 100644 index a5dc282..0000000 Binary files a/lib/substance.jar and /dev/null differ diff --git a/lib/trident.jar b/lib/trident.jar deleted file mode 100644 index 729a771..0000000 Binary files a/lib/trident.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..bd63240 --- /dev/null +++ b/pom.xml @@ -0,0 +1,66 @@ + + 4.0.0 + com.ms509 + Cknife + jar + 1.0 + Cknife + http://maven.apache.org + + + org.pushing-pixels + radiance-substance + 1.0.2 + + + junit + junit + 3.8.1 + test + + + org.pushing-pixels + radiance-trident + 1.0.2 + + + org.xerial + sqlite-jdbc + 3.41.2.2 + + + org.pushing-pixels + radiance-neon + 1.0.2 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + com.ms509.ui.Cknife + + + + jar-with-dependencies + + + + + + diff --git a/lib/sqlite-jdbc-3.7.2.jar b/release/Cknife-1.0-jar-with-dependencies.jar similarity index 61% rename from lib/sqlite-jdbc-3.7.2.jar rename to release/Cknife-1.0-jar-with-dependencies.jar index f03e626..c64d942 100644 Binary files a/lib/sqlite-jdbc-3.7.2.jar and b/release/Cknife-1.0-jar-with-dependencies.jar differ diff --git a/src/com/ms509/images/data.png b/src/main/java/com/ms509/images/data.png similarity index 100% rename from src/com/ms509/images/data.png rename to src/main/java/com/ms509/images/data.png diff --git a/src/com/ms509/images/database.png b/src/main/java/com/ms509/images/database.png similarity index 100% rename from src/com/ms509/images/database.png rename to src/main/java/com/ms509/images/database.png diff --git a/src/com/ms509/images/drive.png b/src/main/java/com/ms509/images/drive.png similarity index 100% rename from src/com/ms509/images/drive.png rename to src/main/java/com/ms509/images/drive.png diff --git a/src/com/ms509/images/file.png b/src/main/java/com/ms509/images/file.png similarity index 100% rename from src/com/ms509/images/file.png rename to src/main/java/com/ms509/images/file.png diff --git a/src/com/ms509/images/folder.png b/src/main/java/com/ms509/images/folder.png similarity index 100% rename from src/com/ms509/images/folder.png rename to src/main/java/com/ms509/images/folder.png diff --git a/src/com/ms509/images/logo.png b/src/main/java/com/ms509/images/logo.png similarity index 100% rename from src/com/ms509/images/logo.png rename to src/main/java/com/ms509/images/logo.png diff --git a/src/com/ms509/images/main.png b/src/main/java/com/ms509/images/main.png similarity index 100% rename from src/com/ms509/images/main.png rename to src/main/java/com/ms509/images/main.png diff --git a/src/com/ms509/images/table.png b/src/main/java/com/ms509/images/table.png similarity index 100% rename from src/com/ms509/images/table.png rename to src/main/java/com/ms509/images/table.png diff --git a/src/com/ms509/model/DatabaseTableModel.java b/src/main/java/com/ms509/model/DatabaseTableModel.java similarity index 100% rename from src/com/ms509/model/DatabaseTableModel.java rename to src/main/java/com/ms509/model/DatabaseTableModel.java diff --git a/src/com/ms509/model/DatabaseTreeCellRenderer.java b/src/main/java/com/ms509/model/DatabaseTreeCellRenderer.java similarity index 85% rename from src/com/ms509/model/DatabaseTreeCellRenderer.java rename to src/main/java/com/ms509/model/DatabaseTreeCellRenderer.java index 1bc19cc..2d89679 100644 --- a/src/com/ms509/model/DatabaseTreeCellRenderer.java +++ b/src/main/java/com/ms509/model/DatabaseTreeCellRenderer.java @@ -26,10 +26,10 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, ImageIcon icon = null; switch (data.nodetype) { case DataType.DATABASE: - icon = new ImageIcon(getClass().getResource("/com/ms509/images/database.png")); + icon = new ImageIcon(getClass().getResource("/database.png")); break; case DataType.TABLE: - icon = new ImageIcon(getClass().getResource("/com/ms509/images/table.png")); + icon = new ImageIcon(getClass().getResource("/table.png")); break; } this.setIcon(icon); diff --git a/src/com/ms509/model/ExtendedDefaultTreeCellRenderer.java b/src/main/java/com/ms509/model/ExtendedDefaultTreeCellRenderer.java similarity index 86% rename from src/com/ms509/model/ExtendedDefaultTreeCellRenderer.java rename to src/main/java/com/ms509/model/ExtendedDefaultTreeCellRenderer.java index 52dfd88..7eaf4dd 100644 --- a/src/com/ms509/model/ExtendedDefaultTreeCellRenderer.java +++ b/src/main/java/com/ms509/model/ExtendedDefaultTreeCellRenderer.java @@ -29,10 +29,10 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, } if(df.getUserObject().equals("/") || al.contains(df.getUserObject())) { - this.setIcon(new ImageIcon(getClass().getResource("/com/ms509/images/drive.png"))); + this.setIcon(new ImageIcon(getClass().getResource("/drive.png"))); } else { - this.setIcon(new ImageIcon(getClass().getResource("/com/ms509/images/folder.png"))); + this.setIcon(new ImageIcon(getClass().getResource("/folder.png"))); } return this; } diff --git a/src/com/ms509/model/ExtendedTableCellRenderer.java b/src/main/java/com/ms509/model/ExtendedTableCellRenderer.java similarity index 80% rename from src/com/ms509/model/ExtendedTableCellRenderer.java rename to src/main/java/com/ms509/model/ExtendedTableCellRenderer.java index 7ccaf19..cad2c45 100644 --- a/src/com/ms509/model/ExtendedTableCellRenderer.java +++ b/src/main/java/com/ms509/model/ExtendedTableCellRenderer.java @@ -30,10 +30,10 @@ public void paintComponent(Graphics g) { // TODO Auto-generated method stub if(this.name.equals("isdict")) { - g.drawImage(new ImageIcon(getClass().getResource("/com/ms509/images/folder.png")).getImage(),0,0,null); + g.drawImage(new ImageIcon(getClass().getResource("/folder.png")).getImage(),0,0,null); }else { - g.drawImage(new ImageIcon(getClass().getResource("/com/ms509/images/file.png")).getImage(),0,0,null); + g.drawImage(new ImageIcon(getClass().getResource("/file.png")).getImage(),0,0,null); } } } diff --git a/src/com/ms509/model/ExtendedTreeCellRenderer.java b/src/main/java/com/ms509/model/ExtendedTreeCellRenderer.java similarity index 87% rename from src/com/ms509/model/ExtendedTreeCellRenderer.java rename to src/main/java/com/ms509/model/ExtendedTreeCellRenderer.java index aff0077..d64ba31 100644 --- a/src/com/ms509/model/ExtendedTreeCellRenderer.java +++ b/src/main/java/com/ms509/model/ExtendedTreeCellRenderer.java @@ -41,11 +41,11 @@ public void paintComponent(Graphics g) { // g.setColor(fore); if(name.equals("/")) { - g.drawImage(new ImageIcon(getClass().getResource("/com/ms509/images/drive.png")).getImage(),1,2,null); + g.drawImage(new ImageIcon(getClass().getResource("/drive.png")).getImage(),1,2,null); }else { - g.drawImage(new ImageIcon(getClass().getResource("/com/ms509/images/folder.png")).getImage(),1,2,null); + g.drawImage(new ImageIcon(getClass().getResource("/folder.png")).getImage(),1,2,null); } g.drawString(this.name,20,14); diff --git a/src/com/ms509/model/ResultSetTableModel.java b/src/main/java/com/ms509/model/ResultSetTableModel.java similarity index 100% rename from src/com/ms509/model/ResultSetTableModel.java rename to src/main/java/com/ms509/model/ResultSetTableModel.java diff --git a/src/com/ms509/model/RightTableModel.java b/src/main/java/com/ms509/model/RightTableModel.java similarity index 98% rename from src/com/ms509/model/RightTableModel.java rename to src/main/java/com/ms509/model/RightTableModel.java index c2dde7c..52643b8 100644 --- a/src/com/ms509/model/RightTableModel.java +++ b/src/main/java/com/ms509/model/RightTableModel.java @@ -76,7 +76,7 @@ public RightTableModel(String[] filedicts) { if (name.charAt(s[0].length() - 1) == '/') { // data.add("isdict"); data.add(new ImageIcon(getClass().getResource( - "/com/ms509/images/folder.png"))); + "/folder.png"))); data.add(name.substring(0, name.length() - 1)); data.add(s[1]); data.add(s[2]); @@ -84,7 +84,7 @@ public RightTableModel(String[] filedicts) { } else { // data.add("isfile"); data.add(new ImageIcon(getClass().getResource( - "/com/ms509/images/file.png"))); + "/file.png"))); data.add(name); data.add(s[1]); data.add(s[2]); diff --git a/src/com/ms509/ui/AboutDialog.java b/src/main/java/com/ms509/ui/AboutDialog.java similarity index 97% rename from src/com/ms509/ui/AboutDialog.java rename to src/main/java/com/ms509/ui/AboutDialog.java index 9cf206c..a4cfa84 100644 --- a/src/com/ms509/ui/AboutDialog.java +++ b/src/main/java/com/ms509/ui/AboutDialog.java @@ -44,7 +44,7 @@ private void setComponent() { img_label = new JLabel(); try { - icon = new ImageIcon(getClass().getResource("/com/ms509/images/logo.png")); + icon = new ImageIcon(getClass().getResource("/logo.png")); } catch (Exception e1) { e1.printStackTrace(); } diff --git a/src/com/ms509/ui/AddDialog.java b/src/main/java/com/ms509/ui/AddDialog.java similarity index 100% rename from src/com/ms509/ui/AddDialog.java rename to src/main/java/com/ms509/ui/AddDialog.java diff --git a/src/com/ms509/ui/Cknife.java b/src/main/java/com/ms509/ui/Cknife.java similarity index 76% rename from src/com/ms509/ui/Cknife.java rename to src/main/java/com/ms509/ui/Cknife.java index d5fe46b..6caad39 100644 --- a/src/com/ms509/ui/Cknife.java +++ b/src/main/java/com/ms509/ui/Cknife.java @@ -6,10 +6,10 @@ import javax.swing.JFrame; import javax.swing.UIManager; -import org.pushingpixels.substance.api.SubstanceLookAndFeel; -import org.pushingpixels.substance.internal.fonts.DefaultGnomeFontPolicy; -import org.pushingpixels.substance.internal.fonts.DefaultKDEFontPolicy; -import org.pushingpixels.substance.internal.fonts.DefaultMacFontPolicy; +import org.pushingpixels.neon.internal.font.DefaultMacFontPolicy; +import org.pushingpixels.neon.internal.font.DefaultKDEFontPolicy; +import org.pushingpixels.substance.api.SubstanceCortex; + import com.ms509.util.Configuration; import com.ms509.util.InitConfig; @@ -45,14 +45,15 @@ public static void setLookFeel() { // 不带LookAndFeel结尾的皮肤使用SubstanceLookAndFeel.setSkin // SubstanceLookAndFeel.setSkin(new GraphiteSkin()); - SubstanceLookAndFeel.setSkin("org.pushingpixels.substance.api.skin.GraphiteSkin"); + + SubstanceCortex.GlobalScope.setSkin("org.pushingpixels.substance.api.skin.GraphiteSkin"); String os = System.getProperty("os.name"); if(os.startsWith("Mac")) { - SubstanceLookAndFeel.setFontPolicy(new DefaultMacFontPolicy()); + SubstanceCortex.GlobalScope.setFontPolicy(new DefaultMacFontPolicy()); } else if(os.startsWith("Linux")) { - SubstanceLookAndFeel.setFontPolicy(new DefaultKDEFontPolicy()); + SubstanceCortex.GlobalScope.setFontPolicy(new DefaultKDEFontPolicy()); } } } catch (Exception e) { diff --git a/src/com/ms509/ui/ConfigDialog.java b/src/main/java/com/ms509/ui/ConfigDialog.java similarity index 100% rename from src/com/ms509/ui/ConfigDialog.java rename to src/main/java/com/ms509/ui/ConfigDialog.java diff --git a/src/com/ms509/ui/MainFrame.java b/src/main/java/com/ms509/ui/MainFrame.java similarity index 86% rename from src/com/ms509/ui/MainFrame.java rename to src/main/java/com/ms509/ui/MainFrame.java index 9c26384..65bbd80 100644 --- a/src/com/ms509/ui/MainFrame.java +++ b/src/main/java/com/ms509/ui/MainFrame.java @@ -11,7 +11,7 @@ public MainFrame() { Toolkit t = Toolkit.getDefaultToolkit(); Dimension d = t.getScreenSize(); main = new JFrame("Cknife 1.0 Release"); - main.setIconImage(new ImageIcon(getClass().getResource("/com/ms509/images/main.png")).getImage()); + main.setIconImage(new ImageIcon(getClass().getResource("/main.png")).getImage()); main.setSize(900, 480); main.setLocation((d.width - main.getWidth()) / 2, (d.height - main.getHeight()) / 2); diff --git a/src/com/ms509/ui/MessageDialog.java b/src/main/java/com/ms509/ui/MessageDialog.java similarity index 100% rename from src/com/ms509/ui/MessageDialog.java rename to src/main/java/com/ms509/ui/MessageDialog.java diff --git a/src/com/ms509/ui/SetDBDialog.java b/src/main/java/com/ms509/ui/SetDBDialog.java similarity index 100% rename from src/com/ms509/ui/SetDBDialog.java rename to src/main/java/com/ms509/ui/SetDBDialog.java diff --git a/src/com/ms509/ui/TabFrame.java b/src/main/java/com/ms509/ui/TabFrame.java similarity index 100% rename from src/com/ms509/ui/TabFrame.java rename to src/main/java/com/ms509/ui/TabFrame.java diff --git a/src/com/ms509/ui/config/panel/ProxyPanel.java b/src/main/java/com/ms509/ui/config/panel/ProxyPanel.java similarity index 100% rename from src/com/ms509/ui/config/panel/ProxyPanel.java rename to src/main/java/com/ms509/ui/config/panel/ProxyPanel.java diff --git a/src/com/ms509/ui/config/panel/RequestPanel.java b/src/main/java/com/ms509/ui/config/panel/RequestPanel.java similarity index 100% rename from src/com/ms509/ui/config/panel/RequestPanel.java rename to src/main/java/com/ms509/ui/config/panel/RequestPanel.java diff --git a/src/com/ms509/ui/menu/DBPopMenu.java b/src/main/java/com/ms509/ui/menu/DBPopMenu.java similarity index 98% rename from src/com/ms509/ui/menu/DBPopMenu.java rename to src/main/java/com/ms509/ui/menu/DBPopMenu.java index 5b3820a..df9cb86 100644 --- a/src/com/ms509/ui/menu/DBPopMenu.java +++ b/src/main/java/com/ms509/ui/menu/DBPopMenu.java @@ -370,7 +370,7 @@ private void UpdateData(String result) { Vector vector = new Vector(); for (int m = 0; m < cols.length; m++) { if (m == 0) { - vector.add(new ImageIcon(getClass().getResource("/com/ms509/images/data.png"))); + vector.add(new ImageIcon(getClass().getResource("/data.png"))); } vector.add(cols[m].replace("\t", "")); @@ -452,7 +452,7 @@ public static void showtable() { Vector vector = new Vector(); for (int m = 0; m < columns; m++) { if (m == 0) { - vector.add(new ImageIcon("".getClass().getResource("/com/ms509/images/data.png"))); + vector.add(new ImageIcon("".getClass().getResource("/data.png"))); } // 添加到向量vector中，后续加入到table里面显示 vector.add(cols[m].replace("\t", "")); diff --git a/src/com/ms509/ui/menu/FileManagerPopMenu.java b/src/main/java/com/ms509/ui/menu/FileManagerPopMenu.java similarity index 99% rename from src/com/ms509/ui/menu/FileManagerPopMenu.java rename to src/main/java/com/ms509/ui/menu/FileManagerPopMenu.java index 44ec5b5..af7c829 100644 --- a/src/com/ms509/ui/menu/FileManagerPopMenu.java +++ b/src/main/java/com/ms509/ui/menu/FileManagerPopMenu.java @@ -291,7 +291,7 @@ public void run() { case "文件夹": Vector vector = new Vector<>(); vector.add(new ImageIcon(getClass().getResource( - "/com/ms509/images/folder.png"))); + "folder.png"))); vector.add("newFolder"); vector.add(Common.getTime()); vector.add("0"); diff --git a/src/com/ms509/ui/menu/ListPopMenu.java b/src/main/java/com/ms509/ui/menu/ListPopMenu.java similarity index 100% rename from src/com/ms509/ui/menu/ListPopMenu.java rename to src/main/java/com/ms509/ui/menu/ListPopMenu.java diff --git a/src/com/ms509/ui/menu/ShellPopMenu.java b/src/main/java/com/ms509/ui/menu/ShellPopMenu.java similarity index 100% rename from src/com/ms509/ui/menu/ShellPopMenu.java rename to src/main/java/com/ms509/ui/menu/ShellPopMenu.java diff --git a/src/com/ms509/ui/panel/DatabasePanel.java b/src/main/java/com/ms509/ui/panel/DatabasePanel.java similarity index 99% rename from src/com/ms509/ui/panel/DatabasePanel.java rename to src/main/java/com/ms509/ui/panel/DatabasePanel.java index 7a55300..7f66f9b 100644 --- a/src/com/ms509/ui/panel/DatabasePanel.java +++ b/src/main/java/com/ms509/ui/panel/DatabasePanel.java @@ -479,7 +479,7 @@ private void UpdateData(String result) { Vector vector = new Vector(); for (int m = 0; m < cols.length; m++) { if (m == 0) { - vector.add(new ImageIcon(getClass().getResource("/com/ms509/images/data.png"))); + vector.add(new ImageIcon(getClass().getResource("/data.png"))); } vector.add(cols[m].replace("\t", "")); diff --git a/src/com/ms509/ui/panel/FileManagerPanel.java b/src/main/java/com/ms509/ui/panel/FileManagerPanel.java similarity index 99% rename from src/com/ms509/ui/panel/FileManagerPanel.java rename to src/main/java/com/ms509/ui/panel/FileManagerPanel.java index 6e10fec..1597a57 100644 --- a/src/com/ms509/ui/panel/FileManagerPanel.java +++ b/src/main/java/com/ms509/ui/panel/FileManagerPanel.java @@ -14,7 +14,7 @@ import com.ms509.util.GBC; import com.ms509.util.Safe; import com.ms509.util.TreeMethod; -import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils.Text; + import java.awt.Dimension; import java.awt.GridBagLayout; diff --git a/src/com/ms509/ui/panel/HeadPanel.java b/src/main/java/com/ms509/ui/panel/HeadPanel.java similarity index 100% rename from src/com/ms509/ui/panel/HeadPanel.java rename to src/main/java/com/ms509/ui/panel/HeadPanel.java diff --git a/src/com/ms509/ui/panel/ListPanel.java b/src/main/java/com/ms509/ui/panel/ListPanel.java similarity index 100% rename from src/com/ms509/ui/panel/ListPanel.java rename to src/main/java/com/ms509/ui/panel/ListPanel.java diff --git a/src/com/ms509/ui/panel/ShellPanel.java b/src/main/java/com/ms509/ui/panel/ShellPanel.java similarity index 100% rename from src/com/ms509/ui/panel/ShellPanel.java rename to src/main/java/com/ms509/ui/panel/ShellPanel.java diff --git a/src/com/ms509/ui/panel/TextPanel.java b/src/main/java/com/ms509/ui/panel/TextPanel.java similarity index 100% rename from src/com/ms509/ui/panel/TextPanel.java rename to src/main/java/com/ms509/ui/panel/TextPanel.java diff --git a/src/com/ms509/util/BasicAuthenticator.java b/src/main/java/com/ms509/util/BasicAuthenticator.java similarity index 100% rename from src/com/ms509/util/BasicAuthenticator.java rename to src/main/java/com/ms509/util/BasicAuthenticator.java diff --git a/src/com/ms509/util/Common.java b/src/main/java/com/ms509/util/Common.java similarity index 100% rename from src/com/ms509/util/Common.java rename to src/main/java/com/ms509/util/Common.java diff --git a/src/com/ms509/util/Configuration.java b/src/main/java/com/ms509/util/Configuration.java similarity index 100% rename from src/com/ms509/util/Configuration.java rename to src/main/java/com/ms509/util/Configuration.java diff --git a/src/com/ms509/util/DataBase.java b/src/main/java/com/ms509/util/DataBase.java similarity index 100% rename from src/com/ms509/util/DataBase.java rename to src/main/java/com/ms509/util/DataBase.java diff --git a/src/com/ms509/util/DbDao.java b/src/main/java/com/ms509/util/DbDao.java similarity index 100% rename from src/com/ms509/util/DbDao.java rename to src/main/java/com/ms509/util/DbDao.java diff --git a/src/com/ms509/util/FileManager.java b/src/main/java/com/ms509/util/FileManager.java similarity index 100% rename from src/com/ms509/util/FileManager.java rename to src/main/java/com/ms509/util/FileManager.java diff --git a/src/com/ms509/util/GBC.java b/src/main/java/com/ms509/util/GBC.java similarity index 100% rename from src/com/ms509/util/GBC.java rename to src/main/java/com/ms509/util/GBC.java diff --git a/src/com/ms509/util/InitConfig.java b/src/main/java/com/ms509/util/InitConfig.java similarity index 100% rename from src/com/ms509/util/InitConfig.java rename to src/main/java/com/ms509/util/InitConfig.java diff --git a/src/com/ms509/util/NodeData.java b/src/main/java/com/ms509/util/NodeData.java similarity index 95% rename from src/com/ms509/util/NodeData.java rename to src/main/java/com/ms509/util/NodeData.java index 78b586c..d152a95 100644 --- a/src/com/ms509/util/NodeData.java +++ b/src/main/java/com/ms509/util/NodeData.java @@ -1,21 +1,21 @@ -package com.ms509.util; - -public class NodeData -{ - public int nodetype; - public String nodedata; - public NodeData(int nodetype,String nodedata) - { - this.nodetype = nodetype; - this.nodedata = nodedata; - } - public String toString() { - return this.nodedata; - } - public class DataType - { - public final static int DATABASE = 1; - public final static int TABLE = 2; - public final static int COLUMN = 3; - } -} +package com.ms509.util; + +public class NodeData +{ + public int nodetype; + public String nodedata; + public NodeData(int nodetype,String nodedata) + { + this.nodetype = nodetype; + this.nodedata = nodedata; + } + public String toString() { + return this.nodedata; + } + public class DataType + { + public final static int DATABASE = 1; + public final static int TABLE = 2; + public final static int COLUMN = 3; + } +} diff --git a/src/com/ms509/util/Request.java b/src/main/java/com/ms509/util/Request.java similarity index 96% rename from src/com/ms509/util/Request.java rename to src/main/java/com/ms509/util/Request.java index 5ee0190..cb116e1 100644 --- a/src/com/ms509/util/Request.java +++ b/src/main/java/com/ms509/util/Request.java @@ -1,355 +1,355 @@ -package com.ms509.util; - -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.PrintWriter; -import java.net.Authenticator; -import java.net.HttpURLConnection; -import java.net.InetAddress; -import java.net.Proxy; -import java.net.Socket; -import java.net.URL; -import java.net.URLConnection; -import java.security.SecureRandom; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Scanner; -import java.util.Set; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - -import sun.net.www.protocol.http.AuthCacheImpl; -import sun.net.www.protocol.http.AuthCacheValue; - -public class Request { - public static String doPost(String url, String param, String code) { - String data = ""; - HttpURLConnection huc; - try { - URL u = new URL(url); - if (isHttps(url)) { - TrustManager[] tm = { new MyX509TrustManager() }; - SSLContext sslContext = SSLContext.getInstance("SSL"); // 可以是TLS、TLSV1、TLSV1.1、TLSV1.2、SSL、SSLV3 - sslContext.init(null, tm, new SecureRandom()); - SSLSocketFactory sf = sslContext.getSocketFactory(); - if (Safe.PROXY_STATUS.equals("1")) { - Proxy proxy = new Proxy(Common.ProxyType(), - Common.ProxySocketAddress()); - AuthCacheValue.setAuthCache(new AuthCacheImpl()); - Authenticator.setDefault(new BasicAuthenticator( - Safe.PROXY_USER, Safe.PROXY_PASS)); - huc = (HttpsURLConnection) u.openConnection(proxy); - } else { - huc = (HttpsURLConnection) u.openConnection(); - } - ((HttpsURLConnection) huc).setSSLSocketFactory(sf); - ((HttpsURLConnection) huc) - .setHostnameVerifier(new MyHostnameVerifier()); - } else { - if (Safe.PROXY_STATUS.equals("1")) { - Proxy proxy = new Proxy(Common.ProxyType(), - Common.ProxySocketAddress()); - AuthCacheValue.setAuthCache(new AuthCacheImpl()); - Authenticator.setDefault(new BasicAuthenticator( - Safe.PROXY_USER, Safe.PROXY_PASS)); - huc = (HttpURLConnection) u.openConnection(proxy); - } else { - huc = (HttpURLConnection) u.openConnection(); - } - } - if (Safe.REQUEST_STATUS.equals("1")) { - Common.RequestHeader(huc); - } - huc.setConnectTimeout(10000); - huc.setReadTimeout(10000); - huc.setDoOutput(true); - PrintWriter out = new PrintWriter(huc.getOutputStream()); - out.write(param); - out.flush(); - out.close(); - boolean normal = (huc.getResponseCode() == 200); - InputStream is = normal ? huc.getInputStream() : huc - .getErrorStream(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len = -1; - byte[] b = new byte[1024]; - while ((len = is.read(b)) != -1) { - baos.write(b, 0, len); - } - data = new String(baos.toByteArray(), code); - Map map = huc.getHeaderFields(); - Set set = map.entrySet(); - String head = ""; - for (Map.Entry entry : set) { - List list = (List) entry.getValue(); - if (entry.getKey() == null) { - for (String str : list) { - head += str + System.lineSeparator(); - } - } else { - for (String str : list) { - head += entry.getKey() + ": " + str - + System.lineSeparator(); - } - } - } - data = head + System.lineSeparator() + data; - } catch (Exception e) { - data = e.getMessage(); - } - return data; - } - - public static byte[] doPost(String url, String param) { - ByteArrayOutputStream baos = null; - HttpURLConnection huc; - try { - URL u = new URL(url); - if (isHttps(url)) { - TrustManager[] tm = { new MyX509TrustManager() }; - SSLContext sslContext = SSLContext.getInstance("SSL"); // 可以是TLS、TLSV1、TLSV1.1、TLSV1.2、SSL、SSLV3 - sslContext.init(null, tm, new SecureRandom()); - SSLSocketFactory sf = sslContext.getSocketFactory(); - if (Safe.PROXY_STATUS.equals("1")) { - Proxy proxy = new Proxy(Common.ProxyType(), - Common.ProxySocketAddress()); - AuthCacheValue.setAuthCache(new AuthCacheImpl()); - Authenticator.setDefault(new BasicAuthenticator( - Safe.PROXY_USER, Safe.PROXY_PASS)); - huc = (HttpsURLConnection) u.openConnection(proxy); - } else { - huc = (HttpsURLConnection) u.openConnection(); - } - ((HttpsURLConnection) huc).setSSLSocketFactory(sf); - ((HttpsURLConnection) huc) - .setHostnameVerifier(new MyHostnameVerifier()); - } else { - if (Safe.PROXY_STATUS.equals("1")) { - Proxy proxy = new Proxy(Common.ProxyType(), - Common.ProxySocketAddress()); - AuthCacheValue.setAuthCache(new AuthCacheImpl()); - Authenticator.setDefault(new BasicAuthenticator( - Safe.PROXY_USER, Safe.PROXY_PASS)); - huc = (HttpURLConnection) u.openConnection(proxy); - } else { - huc = (HttpURLConnection) u.openConnection(); - } - } - if (Safe.REQUEST_STATUS.equals("1")) { - Common.RequestHeader(huc); - } - huc.setConnectTimeout(10000); - huc.setReadTimeout(10000); - huc.setDoOutput(true); - PrintWriter out = new PrintWriter(huc.getOutputStream()); - out.write(param); - out.flush(); - out.close(); - InputStream is = huc.getInputStream(); - baos = new ByteArrayOutputStream(); - int len = -1; - byte[] b = new byte[1024]; - while ((len = is.read(b)) != -1) { - baos.write(b, 0, len); - } - } catch (Exception e) { - } - return baos.toByteArray(); - } - - public static boolean isHttps(String url) { - String sub = url.substring(0, 5); - if (sub.equalsIgnoreCase("https")) { - return true; - } else { - return false; - } - } - - public static String doGet(String url, HashMap advance) { - String data = ""; - HttpURLConnection huc; - try { - URL u = new URL(url); - if (isHttps(url)) { - TrustManager[] tm = { new MyX509TrustManager() }; - SSLContext sslContext = SSLContext.getInstance("SSL"); // 可以是TLS、TLSV1、TLSV1.1、TLSV1.2、SSL、SSLV3 - sslContext.init(null, tm, new SecureRandom()); - SSLSocketFactory sf = sslContext.getSocketFactory(); - huc = (HttpsURLConnection) u.openConnection(); - ((HttpsURLConnection) huc).setSSLSocketFactory(sf); - ((HttpsURLConnection) huc) - .setHostnameVerifier(new MyHostnameVerifier()); - } else { - huc = (HttpURLConnection) u.openConnection(); - } - if (advance != null) { - Set> headers = advance.entrySet(); - for (Map.Entry header : headers) { - huc.setRequestProperty(header.getKey(), header.getValue()); - } - } - boolean normal = (huc.getResponseCode() == 200); - InputStream is = normal ? huc.getInputStream() : huc - .getErrorStream(); - Scanner scanner = new Scanner(is); - while (scanner.hasNextLine()) { - data += scanner.nextLine() + "\r\n"; - } - } catch (Exception e) { - data = "error"; - } - return data; - } - - public static String doPost(String url, String param, - HashMap advance) { - String data = ""; - HttpURLConnection huc; - try { - URL u = new URL(url); - if (isHttps(url)) { - TrustManager[] tm = { new MyX509TrustManager() }; - SSLContext sslContext = SSLContext.getInstance("SSL"); - sslContext.init(null, tm, new SecureRandom()); - SSLSocketFactory sf = sslContext.getSocketFactory(); - huc = (HttpsURLConnection) u.openConnection(); - ((HttpsURLConnection) huc).setSSLSocketFactory(sf); - ((HttpsURLConnection) huc) - .setHostnameVerifier(new MyHostnameVerifier()); - } else { - huc = (HttpURLConnection) u.openConnection(); - } - if (advance != null) { - Set> headers = advance.entrySet(); - for (Map.Entry header : headers) { - huc.setRequestProperty(header.getKey(), header.getValue()); - } - } - huc.setDoOutput(true); - PrintWriter out = new PrintWriter(huc.getOutputStream()); - out.write(param); - out.flush(); - out.close(); - boolean normal = (huc.getResponseCode() == 200); - InputStream is = normal ? huc.getInputStream() : huc - .getErrorStream(); - Scanner scanner = new Scanner(is); - while (scanner.hasNextLine()) { - data += scanner.nextLine() + "\r\n"; - } - } catch (Exception e) { - data = "error"; - } - return data; - } - - public static String getResponse(String url, String data, - HashMap advance) { - Map> header = null; - Map headers = new HashMap<>(); - HttpURLConnection huc; - try { - URL u = new URL(url); - if (isHttps(url)) { - TrustManager[] tm = { new MyX509TrustManager() }; - SSLContext sslContext = SSLContext.getInstance("SSL"); - sslContext.init(null, tm, new SecureRandom()); - SSLSocketFactory sf = sslContext.getSocketFactory(); - huc = (HttpsURLConnection) u.openConnection(); - ((HttpsURLConnection) huc).setSSLSocketFactory(sf); - ((HttpsURLConnection) huc) - .setHostnameVerifier(new MyHostnameVerifier()); - } else { - huc = (HttpURLConnection) u.openConnection(); - } - if (advance != null) { - Set> rheaders = advance.entrySet(); - for (Map.Entry rheader : rheaders) { - huc.setRequestProperty(rheader.getKey(), rheader.getValue()); - } - } - header = huc.getHeaderFields(); - for (Map.Entry> entry : header.entrySet()) { - String key = entry.getKey(); - if (key == null) { - key = "Code"; - } - for (String value : entry.getValue()) { - headers.put(key, value); - } - } - } catch (Exception e) { - data = "error"; - } - return headers.get(data); - } - - public static String doSocket(String host, int port, String path, - boolean isHttps) { - try { - Socket s; - String ip = InetAddress.getByName(host).getHostAddress(); - if (isHttps) { - TrustManager[] tm = { new MyX509TrustManager() }; - SSLContext sslContext = SSLContext.getInstance("SSL"); - sslContext.init(null, tm, new SecureRandom()); - SSLSocketFactory factory = sslContext.getSocketFactory(); - s = factory.createSocket(ip, port); - } else { - s = new Socket(ip, port); - } - s.setSoTimeout(1000 * 5); - PrintWriter out = new PrintWriter(s.getOutputStream()); - StringBuffer sb = new StringBuffer(); - sb.append("GET " + path + " HTTP/1.1\r\n"); - sb.append("Host: " + host + "\r\n"); - // 必须加上Connection: close。 - // 不然在读取完内容后会阻塞一段时间，因为还在等待输出流，如果不加上默认为keep-alive - sb.append("Connection: close" + "\r\n\r\n"); - out.write(sb.toString()); - out.flush(); - InputStream in = s.getInputStream(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len = -1; - byte[] b = new byte[1024]; - while ((len = in.read(b)) != -1) { - baos.write(b, 0, len); - } - return baos.toString(); - } catch (Exception e) { - return "error"; - } - } -} - -class MyHostnameVerifier implements HostnameVerifier { - - public boolean verify(String hostname, SSLSession session) { - return true; - } -} - -class MyX509TrustManager implements X509TrustManager { - - public void checkClientTrusted(X509Certificate[] chain, String authType) - throws CertificateException { - } - - public void checkServerTrusted(X509Certificate[] chain, String authType) - throws CertificateException { - } - - public X509Certificate[] getAcceptedIssuers() { - return null; - } +package com.ms509.util; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.Authenticator; +import java.net.HttpURLConnection; +import java.net.InetAddress; +import java.net.Proxy; +import java.net.Socket; +import java.net.URL; +import java.net.URLConnection; +import java.security.SecureRandom; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.util.Set; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import sun.net.www.protocol.http.AuthCacheImpl; +import sun.net.www.protocol.http.AuthCacheValue; + +public class Request { + public static String doPost(String url, String param, String code) { + String data = ""; + HttpURLConnection huc; + try { + URL u = new URL(url); + if (isHttps(url)) { + TrustManager[] tm = { new MyX509TrustManager() }; + SSLContext sslContext = SSLContext.getInstance("SSL"); // 可以是TLS、TLSV1、TLSV1.1、TLSV1.2、SSL、SSLV3 + sslContext.init(null, tm, new SecureRandom()); + SSLSocketFactory sf = sslContext.getSocketFactory(); + if (Safe.PROXY_STATUS.equals("1")) { + Proxy proxy = new Proxy(Common.ProxyType(), + Common.ProxySocketAddress()); + AuthCacheValue.setAuthCache(new AuthCacheImpl()); + Authenticator.setDefault(new BasicAuthenticator( + Safe.PROXY_USER, Safe.PROXY_PASS)); + huc = (HttpsURLConnection) u.openConnection(proxy); + } else { + huc = (HttpsURLConnection) u.openConnection(); + } + ((HttpsURLConnection) huc).setSSLSocketFactory(sf); + ((HttpsURLConnection) huc) + .setHostnameVerifier(new MyHostnameVerifier()); + } else { + if (Safe.PROXY_STATUS.equals("1")) { + Proxy proxy = new Proxy(Common.ProxyType(), + Common.ProxySocketAddress()); + AuthCacheValue.setAuthCache(new AuthCacheImpl()); + Authenticator.setDefault(new BasicAuthenticator( + Safe.PROXY_USER, Safe.PROXY_PASS)); + huc = (HttpURLConnection) u.openConnection(proxy); + } else { + huc = (HttpURLConnection) u.openConnection(); + } + } + if (Safe.REQUEST_STATUS.equals("1")) { + Common.RequestHeader(huc); + } + huc.setConnectTimeout(10000); + huc.setReadTimeout(10000); + huc.setDoOutput(true); + PrintWriter out = new PrintWriter(huc.getOutputStream()); + out.write(param); + out.flush(); + out.close(); + boolean normal = (huc.getResponseCode() == 200); + InputStream is = normal ? huc.getInputStream() : huc + .getErrorStream(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int len = -1; + byte[] b = new byte[1024]; + while ((len = is.read(b)) != -1) { + baos.write(b, 0, len); + } + data = new String(baos.toByteArray(), code); + Map map = huc.getHeaderFields(); + Set set = map.entrySet(); + String head = ""; + for (Map.Entry entry : set) { + List list = (List) entry.getValue(); + if (entry.getKey() == null) { + for (String str : list) { + head += str + System.lineSeparator(); + } + } else { + for (String str : list) { + head += entry.getKey() + ": " + str + + System.lineSeparator(); + } + } + } + data = head + System.lineSeparator() + data; + } catch (Exception e) { + data = e.getMessage(); + } + return data; + } + + public static byte[] doPost(String url, String param) { + ByteArrayOutputStream baos = null; + HttpURLConnection huc; + try { + URL u = new URL(url); + if (isHttps(url)) { + TrustManager[] tm = { new MyX509TrustManager() }; + SSLContext sslContext = SSLContext.getInstance("SSL"); // 可以是TLS、TLSV1、TLSV1.1、TLSV1.2、SSL、SSLV3 + sslContext.init(null, tm, new SecureRandom()); + SSLSocketFactory sf = sslContext.getSocketFactory(); + if (Safe.PROXY_STATUS.equals("1")) { + Proxy proxy = new Proxy(Common.ProxyType(), + Common.ProxySocketAddress()); + AuthCacheValue.setAuthCache(new AuthCacheImpl()); + Authenticator.setDefault(new BasicAuthenticator( + Safe.PROXY_USER, Safe.PROXY_PASS)); + huc = (HttpsURLConnection) u.openConnection(proxy); + } else { + huc = (HttpsURLConnection) u.openConnection(); + } + ((HttpsURLConnection) huc).setSSLSocketFactory(sf); + ((HttpsURLConnection) huc) + .setHostnameVerifier(new MyHostnameVerifier()); + } else { + if (Safe.PROXY_STATUS.equals("1")) { + Proxy proxy = new Proxy(Common.ProxyType(), + Common.ProxySocketAddress()); + AuthCacheValue.setAuthCache(new AuthCacheImpl()); + Authenticator.setDefault(new BasicAuthenticator( + Safe.PROXY_USER, Safe.PROXY_PASS)); + huc = (HttpURLConnection) u.openConnection(proxy); + } else { + huc = (HttpURLConnection) u.openConnection(); + } + } + if (Safe.REQUEST_STATUS.equals("1")) { + Common.RequestHeader(huc); + } + huc.setConnectTimeout(10000); + huc.setReadTimeout(10000); + huc.setDoOutput(true); + PrintWriter out = new PrintWriter(huc.getOutputStream()); + out.write(param); + out.flush(); + out.close(); + InputStream is = huc.getInputStream(); + baos = new ByteArrayOutputStream(); + int len = -1; + byte[] b = new byte[1024]; + while ((len = is.read(b)) != -1) { + baos.write(b, 0, len); + } + } catch (Exception e) { + } + return baos.toByteArray(); + } + + public static boolean isHttps(String url) { + String sub = url.substring(0, 5); + if (sub.equalsIgnoreCase("https")) { + return true; + } else { + return false; + } + } + + public static String doGet(String url, HashMap advance) { + String data = ""; + HttpURLConnection huc; + try { + URL u = new URL(url); + if (isHttps(url)) { + TrustManager[] tm = { new MyX509TrustManager() }; + SSLContext sslContext = SSLContext.getInstance("SSL"); // 可以是TLS、TLSV1、TLSV1.1、TLSV1.2、SSL、SSLV3 + sslContext.init(null, tm, new SecureRandom()); + SSLSocketFactory sf = sslContext.getSocketFactory(); + huc = (HttpsURLConnection) u.openConnection(); + ((HttpsURLConnection) huc).setSSLSocketFactory(sf); + ((HttpsURLConnection) huc) + .setHostnameVerifier(new MyHostnameVerifier()); + } else { + huc = (HttpURLConnection) u.openConnection(); + } + if (advance != null) { + Set> headers = advance.entrySet(); + for (Map.Entry header : headers) { + huc.setRequestProperty(header.getKey(), header.getValue()); + } + } + boolean normal = (huc.getResponseCode() == 200); + InputStream is = normal ? huc.getInputStream() : huc + .getErrorStream(); + Scanner scanner = new Scanner(is); + while (scanner.hasNextLine()) { + data += scanner.nextLine() + "\r\n"; + } + } catch (Exception e) { + data = "error"; + } + return data; + } + + public static String doPost(String url, String param, + HashMap advance) { + String data = ""; + HttpURLConnection huc; + try { + URL u = new URL(url); + if (isHttps(url)) { + TrustManager[] tm = { new MyX509TrustManager() }; + SSLContext sslContext = SSLContext.getInstance("SSL"); + sslContext.init(null, tm, new SecureRandom()); + SSLSocketFactory sf = sslContext.getSocketFactory(); + huc = (HttpsURLConnection) u.openConnection(); + ((HttpsURLConnection) huc).setSSLSocketFactory(sf); + ((HttpsURLConnection) huc) + .setHostnameVerifier(new MyHostnameVerifier()); + } else { + huc = (HttpURLConnection) u.openConnection(); + } + if (advance != null) { + Set> headers = advance.entrySet(); + for (Map.Entry header : headers) { + huc.setRequestProperty(header.getKey(), header.getValue()); + } + } + huc.setDoOutput(true); + PrintWriter out = new PrintWriter(huc.getOutputStream()); + out.write(param); + out.flush(); + out.close(); + boolean normal = (huc.getResponseCode() == 200); + InputStream is = normal ? huc.getInputStream() : huc + .getErrorStream(); + Scanner scanner = new Scanner(is); + while (scanner.hasNextLine()) { + data += scanner.nextLine() + "\r\n"; + } + } catch (Exception e) { + data = "error"; + } + return data; + } + + public static String getResponse(String url, String data, + HashMap advance) { + Map> header = null; + Map headers = new HashMap<>(); + HttpURLConnection huc; + try { + URL u = new URL(url); + if (isHttps(url)) { + TrustManager[] tm = { new MyX509TrustManager() }; + SSLContext sslContext = SSLContext.getInstance("SSL"); + sslContext.init(null, tm, new SecureRandom()); + SSLSocketFactory sf = sslContext.getSocketFactory(); + huc = (HttpsURLConnection) u.openConnection(); + ((HttpsURLConnection) huc).setSSLSocketFactory(sf); + ((HttpsURLConnection) huc) + .setHostnameVerifier(new MyHostnameVerifier()); + } else { + huc = (HttpURLConnection) u.openConnection(); + } + if (advance != null) { + Set> rheaders = advance.entrySet(); + for (Map.Entry rheader : rheaders) { + huc.setRequestProperty(rheader.getKey(), rheader.getValue()); + } + } + header = huc.getHeaderFields(); + for (Map.Entry> entry : header.entrySet()) { + String key = entry.getKey(); + if (key == null) { + key = "Code"; + } + for (String value : entry.getValue()) { + headers.put(key, value); + } + } + } catch (Exception e) { + data = "error"; + } + return headers.get(data); + } + + public static String doSocket(String host, int port, String path, + boolean isHttps) { + try { + Socket s; + String ip = InetAddress.getByName(host).getHostAddress(); + if (isHttps) { + TrustManager[] tm = { new MyX509TrustManager() }; + SSLContext sslContext = SSLContext.getInstance("SSL"); + sslContext.init(null, tm, new SecureRandom()); + SSLSocketFactory factory = sslContext.getSocketFactory(); + s = factory.createSocket(ip, port); + } else { + s = new Socket(ip, port); + } + s.setSoTimeout(1000 * 5); + PrintWriter out = new PrintWriter(s.getOutputStream()); + StringBuffer sb = new StringBuffer(); + sb.append("GET " + path + " HTTP/1.1\r\n"); + sb.append("Host: " + host + "\r\n"); + // 必须加上Connection: close。 + // 不然在读取完内容后会阻塞一段时间，因为还在等待输出流，如果不加上默认为keep-alive + sb.append("Connection: close" + "\r\n\r\n"); + out.write(sb.toString()); + out.flush(); + InputStream in = s.getInputStream(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int len = -1; + byte[] b = new byte[1024]; + while ((len = in.read(b)) != -1) { + baos.write(b, 0, len); + } + return baos.toString(); + } catch (Exception e) { + return "error"; + } + } +} + +class MyHostnameVerifier implements HostnameVerifier { + + public boolean verify(String hostname, SSLSession session) { + return true; + } +} + +class MyX509TrustManager implements X509TrustManager { + + public void checkClientTrusted(X509Certificate[] chain, String authType) + throws CertificateException { + } + + public void checkServerTrusted(X509Certificate[] chain, String authType) + throws CertificateException { + } + + public X509Certificate[] getAcceptedIssuers() { + return null; + } } \ No newline at end of file diff --git a/src/com/ms509/util/Safe.java b/src/main/java/com/ms509/util/Safe.java similarity index 100% rename from src/com/ms509/util/Safe.java rename to src/main/java/com/ms509/util/Safe.java diff --git a/src/com/ms509/util/Shell.java b/src/main/java/com/ms509/util/Shell.java similarity index 100% rename from src/com/ms509/util/Shell.java rename to src/main/java/com/ms509/util/Shell.java diff --git a/src/com/ms509/util/TreeMethod.java b/src/main/java/com/ms509/util/TreeMethod.java similarity index 100% rename from src/com/ms509/util/TreeMethod.java rename to src/main/java/com/ms509/util/TreeMethod.java diff --git a/src/main/resources/data.png b/src/main/resources/data.png new file mode 100644 index 0000000..6b4cb21 Binary files /dev/null and b/src/main/resources/data.png differ diff --git a/src/main/resources/database.png b/src/main/resources/database.png new file mode 100644 index 0000000..a5a5af5 Binary files /dev/null and b/src/main/resources/database.png differ diff --git a/src/main/resources/drive.png b/src/main/resources/drive.png new file mode 100644 index 0000000..2529c48 Binary files /dev/null and b/src/main/resources/drive.png differ diff --git a/src/main/resources/file.png b/src/main/resources/file.png new file mode 100644 index 0000000..f3ce089 Binary files /dev/null and b/src/main/resources/file.png differ diff --git a/src/main/resources/folder.png b/src/main/resources/folder.png new file mode 100644 index 0000000..31019e4 Binary files /dev/null and b/src/main/resources/folder.png differ diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png new file mode 100644 index 0000000..a43b1ec Binary files /dev/null and b/src/main/resources/logo.png differ diff --git a/src/main/resources/main.png b/src/main/resources/main.png new file mode 100644 index 0000000..8c5c876 Binary files /dev/null and b/src/main/resources/main.png differ diff --git a/src/main/resources/table.png b/src/main/resources/table.png new file mode 100644 index 0000000..3a5b09a Binary files /dev/null and b/src/main/resources/table.png differ diff --git a/src/test/java/com/ms509/AppTest.java b/src/test/java/com/ms509/AppTest.java new file mode 100644 index 0000000..f28ef7d --- /dev/null +++ b/src/test/java/com/ms509/AppTest.java @@ -0,0 +1,38 @@ +package com.ms509; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +}