From 1006c20a0e17e08ada43fd5bc8baec4d48ba1f32 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@maiol.ru> Date: Sun, 19 Mar 2017 21:58:49 +0100 Subject: [PATCH] switched to ant build --- build.xml | 114 ++++++++++++++++++ endless.php | 15 --- ivy.xml | 16 +++ ivysettings.xml | 18 +++ manifest.mf | 3 + nb-configuration.xml | 19 --- nbactions-release-profile.xml | 84 ------------- nbactions.xml | 47 -------- pom.xml | 88 -------------- src/{main/java => }/chart/Chart.form | 0 src/{main/java => }/chart/Chart.java | 0 src/{main/java => }/chart/FullChart.form | 0 src/{main/java => }/chart/FullChart.java | 0 src/{main/java => }/chart/Legend.form | 0 src/{main/java => }/chart/Legend.java | 0 .../java => }/chart/NewJInternalFrame.form | 0 .../java => }/chart/NewJInternalFrame.java | 0 src/{main/java => }/chart/NewJPanel.form | 0 src/{main/java => }/chart/NewJPanel.java | 0 src/{main/java => }/chart/NewJPanel1.form | 0 src/{main/java => }/chart/NewJPanel1.java | 0 src/{main/java => }/chart/OHLCChart.java | 0 src/{main/java => }/gui/AboutDialog.form | 0 src/{main/java => }/gui/AboutDialog.java | 0 src/{main/java => }/gui/AskBook.java | 0 src/{main/java => }/gui/BidBook.java | 0 src/{main/java => }/gui/ChartPanel.form | 0 src/{main/java => }/gui/ChartPanel.java | 0 src/{main/java => }/gui/Clock.form | 0 src/{main/java => }/gui/Clock.java | 0 src/{main/java => }/gui/ClockDialog.form | 0 src/{main/java => }/gui/ClockDialog.java | 0 src/{main/java => }/gui/ControlPanel.form | 0 src/{main/java => }/gui/ControlPanel.java | 0 .../java => }/gui/EditAutoTraderList.form | 0 .../java => }/gui/EditAutoTraderList.java | 0 .../gui/EditAutoTraderListDialog.form | 0 .../gui/EditAutoTraderListDialog.java | 0 .../java => }/gui/EditExchangeDialog.form | 0 .../java => }/gui/EditExchangeDialog.java | 0 .../java => }/gui/EditPreferencesDialog.form | 0 .../java => }/gui/EditPreferencesDialog.java | 0 src/{main/java => }/gui/EditStrategies.form | 0 src/{main/java => }/gui/EditStrategies.java | 0 src/{main/java => }/gui/EscDialog.form | 0 src/{main/java => }/gui/EscDialog.java | 0 src/{main/java => }/gui/Globals.java | 0 src/{main/java => }/gui/LoggerDialog.form | 0 src/{main/java => }/gui/LoggerDialog.java | 0 src/{main/java => }/gui/MainWin.form | 0 src/{main/java => }/gui/MainWin.java | 0 .../java => }/gui/NewMDIApplication.form | 6 +- .../java => }/gui/NewMDIApplication.java | 6 +- .../java => }/gui/NewStrategyDialog.form | 0 .../java => }/gui/NewStrategyDialog.java | 0 src/{main/java => }/gui/OderBookPanelNew.form | 0 src/{main/java => }/gui/OderBookPanelNew.java | 0 src/{main/java => }/gui/OpenOrdersList.form | 0 src/{main/java => }/gui/OpenOrdersList.java | 0 src/{main/java => }/gui/OrderBook.form | 0 src/{main/java => }/gui/OrderBook.java | 0 src/{main/java => }/gui/OrderBookDialog.form | 0 src/{main/java => }/gui/OrderBookDialog.java | 0 src/{main/java => }/gui/OrderBookPanel.form | 0 src/{main/java => }/gui/OrderBookPanel.java | 0 src/{main/java => }/gui/QuotePanel.form | 0 src/{main/java => }/gui/QuotePanel.java | 0 src/gui/Statistics.form | 35 ++++++ src/gui/Statistics.java | 67 ++++++++++ src/{main/java => }/gui/StatisticsDialog.form | 0 src/{main/java => }/gui/StatisticsDialog.java | 0 src/{main/java => }/gui/StatisticsPanel.form | 0 src/{main/java => }/gui/StatisticsPanel.java | 0 .../java => }/gui/StrategySaveDialog.form | 0 .../java => }/gui/StrategySaveDialog.java | 0 src/{main/java => }/gui/TraderListDialog.form | 0 src/{main/java => }/gui/TraderListDialog.java | 0 src/{main/java => }/gui/TraderListPanel.form | 0 src/{main/java => }/gui/TraderListPanel.java | 0 src/{main/java => }/gui/WaitBox.form | 0 src/{main/java => }/gui/WaitBox.java | 0 src/{main/java => }/gui/ZZZ.form | 0 src/{main/java => }/gui/ZZZ.java | 0 .../java => }/gui/orderbook/OrderBook.form | 0 .../java => }/gui/orderbook/OrderBook.java | 0 .../gui/orderbook/OrderBookDialog.form | 0 .../gui/orderbook/OrderBookDialog.java | 0 .../gui/orderbook/OrderBooksHorizontal.form | 0 .../gui/orderbook/OrderBooksHorizontal.java | 0 .../gui/orderbook/QuoteVertical.form | 0 .../gui/orderbook/QuoteVertical.java | 0 .../gui/orderbook/QutoesHorizontal.form | 0 .../gui/orderbook/QutoesHorizontal.java | 0 src/{main/java => }/gui/test.java | 0 .../gui/tools/NummericCellRenderer.java | 0 src/{main => }/resources/icons/pause.gif | Bin src/{main => }/resources/icons/run.gif | Bin src/{main => }/resources/icons/stop.gif | Bin src/{main/java => }/sesim/AutoTraderBase.java | 0 .../java => }/sesim/AutoTraderConfig.java | 0 .../java => }/sesim/AutoTraderConfigBase.java | 0 src/{main/java => }/sesim/AutoTraderGui.java | 0 .../java => }/sesim/AutoTraderInterface.java | 0 src/{main/java => }/sesim/AutoTraderList.java | 0 .../java => }/sesim/AutoTraderLoader.java | 51 ++++---- .../java => }/sesim/AutoTraderRunConfig.java | 0 src/{main/java => }/sesim/Clock.java | 0 src/{main/java => }/sesim/Exchange.java | 0 src/{main/java => }/sesim/IDGenerator.java | 0 src/{main/java => }/sesim/Locker.java | 0 src/{main/java => }/sesim/Logger.java | 0 src/{main/java => }/sesim/MinMax.java | 0 src/{main/java => }/sesim/NewJPanel.form | 0 src/{main/java => }/sesim/NewJPanel.java | 0 src/{main/java => }/sesim/OHLCData.java | 0 src/{main/java => }/sesim/OHLCDataItem.java | 0 src/{main/java => }/sesim/OldAutoTrader.java | 0 src/{main/java => }/sesim/Order.java | 0 src/{main/java => }/sesim/OrderData.java | 0 src/{main/java => }/sesim/Quote.java | 0 src/{main/java => }/sesim/Scheduler.java | 0 .../traders/ManTrader/AccountBalance.form | 0 .../traders/ManTrader/AccountBalance.java | 0 .../traders/ManTrader/CreateOrderDialog.form | 0 .../traders/ManTrader/CreateOrderDialog.java | 0 .../traders/ManTrader/ManTrader.java | 0 .../traders/ManTrader/ManTraderConsole.form | 0 .../traders/ManTrader/ManTraderConsole.java | 0 .../ManTrader/ManTraderConsoleDialog.form | 0 .../ManTrader/ManTraderConsoleDialog.java | 0 .../java => }/traders/RandomTraderA.java | 0 .../java => }/traders/RandomTraderB.java | 0 .../java => }/traders/RandomTraderConfig.java | 0 .../java => }/traders/RandomTraderGuiA.form | 0 .../java => }/traders/RandomTraderGuiA.java | 0 {src/test/java => test}/sesim/Test.java | 0 136 files changed, 282 insertions(+), 287 deletions(-) create mode 100644 build.xml delete mode 100644 endless.php create mode 100644 ivy.xml create mode 100644 ivysettings.xml create mode 100644 manifest.mf delete mode 100644 nb-configuration.xml delete mode 100644 nbactions-release-profile.xml delete mode 100644 nbactions.xml delete mode 100644 pom.xml rename src/{main/java => }/chart/Chart.form (100%) rename src/{main/java => }/chart/Chart.java (100%) rename src/{main/java => }/chart/FullChart.form (100%) rename src/{main/java => }/chart/FullChart.java (100%) rename src/{main/java => }/chart/Legend.form (100%) rename src/{main/java => }/chart/Legend.java (100%) rename src/{main/java => }/chart/NewJInternalFrame.form (100%) rename src/{main/java => }/chart/NewJInternalFrame.java (100%) rename src/{main/java => }/chart/NewJPanel.form (100%) rename src/{main/java => }/chart/NewJPanel.java (100%) rename src/{main/java => }/chart/NewJPanel1.form (100%) rename src/{main/java => }/chart/NewJPanel1.java (100%) rename src/{main/java => }/chart/OHLCChart.java (100%) rename src/{main/java => }/gui/AboutDialog.form (100%) rename src/{main/java => }/gui/AboutDialog.java (100%) rename src/{main/java => }/gui/AskBook.java (100%) rename src/{main/java => }/gui/BidBook.java (100%) rename src/{main/java => }/gui/ChartPanel.form (100%) rename src/{main/java => }/gui/ChartPanel.java (100%) rename src/{main/java => }/gui/Clock.form (100%) rename src/{main/java => }/gui/Clock.java (100%) rename src/{main/java => }/gui/ClockDialog.form (100%) rename src/{main/java => }/gui/ClockDialog.java (100%) rename src/{main/java => }/gui/ControlPanel.form (100%) rename src/{main/java => }/gui/ControlPanel.java (100%) rename src/{main/java => }/gui/EditAutoTraderList.form (100%) rename src/{main/java => }/gui/EditAutoTraderList.java (100%) rename src/{main/java => }/gui/EditAutoTraderListDialog.form (100%) rename src/{main/java => }/gui/EditAutoTraderListDialog.java (100%) rename src/{main/java => }/gui/EditExchangeDialog.form (100%) rename src/{main/java => }/gui/EditExchangeDialog.java (100%) rename src/{main/java => }/gui/EditPreferencesDialog.form (100%) rename src/{main/java => }/gui/EditPreferencesDialog.java (100%) rename src/{main/java => }/gui/EditStrategies.form (100%) rename src/{main/java => }/gui/EditStrategies.java (100%) rename src/{main/java => }/gui/EscDialog.form (100%) rename src/{main/java => }/gui/EscDialog.java (100%) rename src/{main/java => }/gui/Globals.java (100%) rename src/{main/java => }/gui/LoggerDialog.form (100%) rename src/{main/java => }/gui/LoggerDialog.java (100%) rename src/{main/java => }/gui/MainWin.form (100%) rename src/{main/java => }/gui/MainWin.java (100%) rename src/{main/java => }/gui/NewMDIApplication.form (99%) rename src/{main/java => }/gui/NewMDIApplication.java (99%) rename src/{main/java => }/gui/NewStrategyDialog.form (100%) rename src/{main/java => }/gui/NewStrategyDialog.java (100%) rename src/{main/java => }/gui/OderBookPanelNew.form (100%) rename src/{main/java => }/gui/OderBookPanelNew.java (100%) rename src/{main/java => }/gui/OpenOrdersList.form (100%) rename src/{main/java => }/gui/OpenOrdersList.java (100%) rename src/{main/java => }/gui/OrderBook.form (100%) rename src/{main/java => }/gui/OrderBook.java (100%) rename src/{main/java => }/gui/OrderBookDialog.form (100%) rename src/{main/java => }/gui/OrderBookDialog.java (100%) rename src/{main/java => }/gui/OrderBookPanel.form (100%) rename src/{main/java => }/gui/OrderBookPanel.java (100%) rename src/{main/java => }/gui/QuotePanel.form (100%) rename src/{main/java => }/gui/QuotePanel.java (100%) create mode 100644 src/gui/Statistics.form create mode 100644 src/gui/Statistics.java rename src/{main/java => }/gui/StatisticsDialog.form (100%) rename src/{main/java => }/gui/StatisticsDialog.java (100%) rename src/{main/java => }/gui/StatisticsPanel.form (100%) rename src/{main/java => }/gui/StatisticsPanel.java (100%) rename src/{main/java => }/gui/StrategySaveDialog.form (100%) rename src/{main/java => }/gui/StrategySaveDialog.java (100%) rename src/{main/java => }/gui/TraderListDialog.form (100%) rename src/{main/java => }/gui/TraderListDialog.java (100%) rename src/{main/java => }/gui/TraderListPanel.form (100%) rename src/{main/java => }/gui/TraderListPanel.java (100%) rename src/{main/java => }/gui/WaitBox.form (100%) rename src/{main/java => }/gui/WaitBox.java (100%) rename src/{main/java => }/gui/ZZZ.form (100%) rename src/{main/java => }/gui/ZZZ.java (100%) rename src/{main/java => }/gui/orderbook/OrderBook.form (100%) rename src/{main/java => }/gui/orderbook/OrderBook.java (100%) rename src/{main/java => }/gui/orderbook/OrderBookDialog.form (100%) rename src/{main/java => }/gui/orderbook/OrderBookDialog.java (100%) rename src/{main/java => }/gui/orderbook/OrderBooksHorizontal.form (100%) rename src/{main/java => }/gui/orderbook/OrderBooksHorizontal.java (100%) rename src/{main/java => }/gui/orderbook/QuoteVertical.form (100%) rename src/{main/java => }/gui/orderbook/QuoteVertical.java (100%) rename src/{main/java => }/gui/orderbook/QutoesHorizontal.form (100%) rename src/{main/java => }/gui/orderbook/QutoesHorizontal.java (100%) rename src/{main/java => }/gui/test.java (100%) rename src/{main/java => }/gui/tools/NummericCellRenderer.java (100%) rename src/{main => }/resources/icons/pause.gif (100%) rename src/{main => }/resources/icons/run.gif (100%) rename src/{main => }/resources/icons/stop.gif (100%) rename src/{main/java => }/sesim/AutoTraderBase.java (100%) rename src/{main/java => }/sesim/AutoTraderConfig.java (100%) rename src/{main/java => }/sesim/AutoTraderConfigBase.java (100%) rename src/{main/java => }/sesim/AutoTraderGui.java (100%) rename src/{main/java => }/sesim/AutoTraderInterface.java (100%) rename src/{main/java => }/sesim/AutoTraderList.java (100%) rename src/{main/java => }/sesim/AutoTraderLoader.java (90%) rename src/{main/java => }/sesim/AutoTraderRunConfig.java (100%) rename src/{main/java => }/sesim/Clock.java (100%) rename src/{main/java => }/sesim/Exchange.java (100%) rename src/{main/java => }/sesim/IDGenerator.java (100%) rename src/{main/java => }/sesim/Locker.java (100%) rename src/{main/java => }/sesim/Logger.java (100%) rename src/{main/java => }/sesim/MinMax.java (100%) rename src/{main/java => }/sesim/NewJPanel.form (100%) rename src/{main/java => }/sesim/NewJPanel.java (100%) rename src/{main/java => }/sesim/OHLCData.java (100%) rename src/{main/java => }/sesim/OHLCDataItem.java (100%) rename src/{main/java => }/sesim/OldAutoTrader.java (100%) rename src/{main/java => }/sesim/Order.java (100%) rename src/{main/java => }/sesim/OrderData.java (100%) rename src/{main/java => }/sesim/Quote.java (100%) rename src/{main/java => }/sesim/Scheduler.java (100%) rename src/{main/java => }/traders/ManTrader/AccountBalance.form (100%) rename src/{main/java => }/traders/ManTrader/AccountBalance.java (100%) rename src/{main/java => }/traders/ManTrader/CreateOrderDialog.form (100%) rename src/{main/java => }/traders/ManTrader/CreateOrderDialog.java (100%) rename src/{main/java => }/traders/ManTrader/ManTrader.java (100%) rename src/{main/java => }/traders/ManTrader/ManTraderConsole.form (100%) rename src/{main/java => }/traders/ManTrader/ManTraderConsole.java (100%) rename src/{main/java => }/traders/ManTrader/ManTraderConsoleDialog.form (100%) rename src/{main/java => }/traders/ManTrader/ManTraderConsoleDialog.java (100%) rename src/{main/java => }/traders/RandomTraderA.java (100%) rename src/{main/java => }/traders/RandomTraderB.java (100%) rename src/{main/java => }/traders/RandomTraderConfig.java (100%) rename src/{main/java => }/traders/RandomTraderGuiA.form (100%) rename src/{main/java => }/traders/RandomTraderGuiA.java (100%) rename {src/test/java => test}/sesim/Test.java (100%) diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..2694d54 --- /dev/null +++ b/build.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + Builds, tests, and runs the project AntSeSim. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/endless.php b/endless.php deleted file mode 100644 index 68acd0e..0000000 --- a/endless.php +++ /dev/null @@ -1,15 +0,0 @@ - "world" -); - -for ($i=0; $i + + + + + + + + + + + + + + + diff --git a/ivysettings.xml b/ivysettings.xml new file mode 100644 index 0000000..c1e2302 --- /dev/null +++ b/ivysettings.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/manifest.mf b/manifest.mf new file mode 100644 index 0000000..328e8e5 --- /dev/null +++ b/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +X-COMMENT: Main-Class will be added automatically by build + diff --git a/nb-configuration.xml b/nb-configuration.xml deleted file mode 100644 index 4320ac0..0000000 --- a/nb-configuration.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - bsd - false - - diff --git a/nbactions-release-profile.xml b/nbactions-release-profile.xml deleted file mode 100644 index 9a7ec06..0000000 --- a/nbactions-release-profile.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - run - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - - - -classpath %classpath gui.NewMDIApplication - java - - - - debug - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - - - -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath gui.NewMDIApplication - java - true - - - - profile - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - - - -classpath %classpath gui.NewMDIApplication - java - - - - build - - * - - - webstart:jnlp-single - - - - sesim - true - true - sesimj - true - - - - - - rebuild - - * - - - nbm:standalone-zip - - - - sesim - true - true - sesim - true - SeSim - SeSim - - - diff --git a/nbactions.xml b/nbactions.xml deleted file mode 100644 index 29021cf..0000000 --- a/nbactions.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - run - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - - - -classpath %classpath gui.NewMDIApplication - java - - - - debug - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - - - -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath gui.NewMDIApplication - java - true - - - - profile - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - - - -classpath %classpath gui.NewMDIApplication - java - - - - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 3a83ad5..0000000 --- a/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - 4.0.0 - com.cauwersin - SeSim - 0.01 - jar - - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.json - json - 20160810 - - - net.java.linoleum - jlfgr - 1_0 - - - com.github.arnabk - pgslookandfeel - 1.1.4 - - - org.codehaus.mojo - keytool-api-1.7 - 1.5 - - - org.jdesktop - beansbinding - 1.2.1 - - - unknown.binary - AbsoluteLayout - SNAPSHOT - - - org.codehaus.mojo - webstart-maven-plugin - 1.0-beta-7 - - - - UTF-8 - 1.8 - 1.8 - - SeSim - - - unknown-jars-temp-repo - A temporary repository created by NetBeans for libraries and jars it could not identify. Please replace the dependencies in this repository with correct ones and delete this repository. - file:${project.basedir}/lib - - - - - - - 1.0-beta-7 - webstart-maven-plugin - - - - com.cauwersin.SeSim.gui.NewMDIApplication - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/chart/Chart.form b/src/chart/Chart.form similarity index 100% rename from src/main/java/chart/Chart.form rename to src/chart/Chart.form diff --git a/src/main/java/chart/Chart.java b/src/chart/Chart.java similarity index 100% rename from src/main/java/chart/Chart.java rename to src/chart/Chart.java diff --git a/src/main/java/chart/FullChart.form b/src/chart/FullChart.form similarity index 100% rename from src/main/java/chart/FullChart.form rename to src/chart/FullChart.form diff --git a/src/main/java/chart/FullChart.java b/src/chart/FullChart.java similarity index 100% rename from src/main/java/chart/FullChart.java rename to src/chart/FullChart.java diff --git a/src/main/java/chart/Legend.form b/src/chart/Legend.form similarity index 100% rename from src/main/java/chart/Legend.form rename to src/chart/Legend.form diff --git a/src/main/java/chart/Legend.java b/src/chart/Legend.java similarity index 100% rename from src/main/java/chart/Legend.java rename to src/chart/Legend.java diff --git a/src/main/java/chart/NewJInternalFrame.form b/src/chart/NewJInternalFrame.form similarity index 100% rename from src/main/java/chart/NewJInternalFrame.form rename to src/chart/NewJInternalFrame.form diff --git a/src/main/java/chart/NewJInternalFrame.java b/src/chart/NewJInternalFrame.java similarity index 100% rename from src/main/java/chart/NewJInternalFrame.java rename to src/chart/NewJInternalFrame.java diff --git a/src/main/java/chart/NewJPanel.form b/src/chart/NewJPanel.form similarity index 100% rename from src/main/java/chart/NewJPanel.form rename to src/chart/NewJPanel.form diff --git a/src/main/java/chart/NewJPanel.java b/src/chart/NewJPanel.java similarity index 100% rename from src/main/java/chart/NewJPanel.java rename to src/chart/NewJPanel.java diff --git a/src/main/java/chart/NewJPanel1.form b/src/chart/NewJPanel1.form similarity index 100% rename from src/main/java/chart/NewJPanel1.form rename to src/chart/NewJPanel1.form diff --git a/src/main/java/chart/NewJPanel1.java b/src/chart/NewJPanel1.java similarity index 100% rename from src/main/java/chart/NewJPanel1.java rename to src/chart/NewJPanel1.java diff --git a/src/main/java/chart/OHLCChart.java b/src/chart/OHLCChart.java similarity index 100% rename from src/main/java/chart/OHLCChart.java rename to src/chart/OHLCChart.java diff --git a/src/main/java/gui/AboutDialog.form b/src/gui/AboutDialog.form similarity index 100% rename from src/main/java/gui/AboutDialog.form rename to src/gui/AboutDialog.form diff --git a/src/main/java/gui/AboutDialog.java b/src/gui/AboutDialog.java similarity index 100% rename from src/main/java/gui/AboutDialog.java rename to src/gui/AboutDialog.java diff --git a/src/main/java/gui/AskBook.java b/src/gui/AskBook.java similarity index 100% rename from src/main/java/gui/AskBook.java rename to src/gui/AskBook.java diff --git a/src/main/java/gui/BidBook.java b/src/gui/BidBook.java similarity index 100% rename from src/main/java/gui/BidBook.java rename to src/gui/BidBook.java diff --git a/src/main/java/gui/ChartPanel.form b/src/gui/ChartPanel.form similarity index 100% rename from src/main/java/gui/ChartPanel.form rename to src/gui/ChartPanel.form diff --git a/src/main/java/gui/ChartPanel.java b/src/gui/ChartPanel.java similarity index 100% rename from src/main/java/gui/ChartPanel.java rename to src/gui/ChartPanel.java diff --git a/src/main/java/gui/Clock.form b/src/gui/Clock.form similarity index 100% rename from src/main/java/gui/Clock.form rename to src/gui/Clock.form diff --git a/src/main/java/gui/Clock.java b/src/gui/Clock.java similarity index 100% rename from src/main/java/gui/Clock.java rename to src/gui/Clock.java diff --git a/src/main/java/gui/ClockDialog.form b/src/gui/ClockDialog.form similarity index 100% rename from src/main/java/gui/ClockDialog.form rename to src/gui/ClockDialog.form diff --git a/src/main/java/gui/ClockDialog.java b/src/gui/ClockDialog.java similarity index 100% rename from src/main/java/gui/ClockDialog.java rename to src/gui/ClockDialog.java diff --git a/src/main/java/gui/ControlPanel.form b/src/gui/ControlPanel.form similarity index 100% rename from src/main/java/gui/ControlPanel.form rename to src/gui/ControlPanel.form diff --git a/src/main/java/gui/ControlPanel.java b/src/gui/ControlPanel.java similarity index 100% rename from src/main/java/gui/ControlPanel.java rename to src/gui/ControlPanel.java diff --git a/src/main/java/gui/EditAutoTraderList.form b/src/gui/EditAutoTraderList.form similarity index 100% rename from src/main/java/gui/EditAutoTraderList.form rename to src/gui/EditAutoTraderList.form diff --git a/src/main/java/gui/EditAutoTraderList.java b/src/gui/EditAutoTraderList.java similarity index 100% rename from src/main/java/gui/EditAutoTraderList.java rename to src/gui/EditAutoTraderList.java diff --git a/src/main/java/gui/EditAutoTraderListDialog.form b/src/gui/EditAutoTraderListDialog.form similarity index 100% rename from src/main/java/gui/EditAutoTraderListDialog.form rename to src/gui/EditAutoTraderListDialog.form diff --git a/src/main/java/gui/EditAutoTraderListDialog.java b/src/gui/EditAutoTraderListDialog.java similarity index 100% rename from src/main/java/gui/EditAutoTraderListDialog.java rename to src/gui/EditAutoTraderListDialog.java diff --git a/src/main/java/gui/EditExchangeDialog.form b/src/gui/EditExchangeDialog.form similarity index 100% rename from src/main/java/gui/EditExchangeDialog.form rename to src/gui/EditExchangeDialog.form diff --git a/src/main/java/gui/EditExchangeDialog.java b/src/gui/EditExchangeDialog.java similarity index 100% rename from src/main/java/gui/EditExchangeDialog.java rename to src/gui/EditExchangeDialog.java diff --git a/src/main/java/gui/EditPreferencesDialog.form b/src/gui/EditPreferencesDialog.form similarity index 100% rename from src/main/java/gui/EditPreferencesDialog.form rename to src/gui/EditPreferencesDialog.form diff --git a/src/main/java/gui/EditPreferencesDialog.java b/src/gui/EditPreferencesDialog.java similarity index 100% rename from src/main/java/gui/EditPreferencesDialog.java rename to src/gui/EditPreferencesDialog.java diff --git a/src/main/java/gui/EditStrategies.form b/src/gui/EditStrategies.form similarity index 100% rename from src/main/java/gui/EditStrategies.form rename to src/gui/EditStrategies.form diff --git a/src/main/java/gui/EditStrategies.java b/src/gui/EditStrategies.java similarity index 100% rename from src/main/java/gui/EditStrategies.java rename to src/gui/EditStrategies.java diff --git a/src/main/java/gui/EscDialog.form b/src/gui/EscDialog.form similarity index 100% rename from src/main/java/gui/EscDialog.form rename to src/gui/EscDialog.form diff --git a/src/main/java/gui/EscDialog.java b/src/gui/EscDialog.java similarity index 100% rename from src/main/java/gui/EscDialog.java rename to src/gui/EscDialog.java diff --git a/src/main/java/gui/Globals.java b/src/gui/Globals.java similarity index 100% rename from src/main/java/gui/Globals.java rename to src/gui/Globals.java diff --git a/src/main/java/gui/LoggerDialog.form b/src/gui/LoggerDialog.form similarity index 100% rename from src/main/java/gui/LoggerDialog.form rename to src/gui/LoggerDialog.form diff --git a/src/main/java/gui/LoggerDialog.java b/src/gui/LoggerDialog.java similarity index 100% rename from src/main/java/gui/LoggerDialog.java rename to src/gui/LoggerDialog.java diff --git a/src/main/java/gui/MainWin.form b/src/gui/MainWin.form similarity index 100% rename from src/main/java/gui/MainWin.form rename to src/gui/MainWin.form diff --git a/src/main/java/gui/MainWin.java b/src/gui/MainWin.java similarity index 100% rename from src/main/java/gui/MainWin.java rename to src/gui/MainWin.java diff --git a/src/main/java/gui/NewMDIApplication.form b/src/gui/NewMDIApplication.form similarity index 99% rename from src/main/java/gui/NewMDIApplication.form rename to src/gui/NewMDIApplication.form index 1070f5b..c566573 100644 --- a/src/main/java/gui/NewMDIApplication.form +++ b/src/gui/NewMDIApplication.form @@ -340,7 +340,7 @@ - + @@ -359,7 +359,7 @@ - + @@ -374,7 +374,7 @@ - + diff --git a/src/main/java/gui/NewMDIApplication.java b/src/gui/NewMDIApplication.java similarity index 99% rename from src/main/java/gui/NewMDIApplication.java rename to src/gui/NewMDIApplication.java index 4c5750b..85db321 100644 --- a/src/main/java/gui/NewMDIApplication.java +++ b/src/gui/NewMDIApplication.java @@ -210,7 +210,7 @@ public class NewMDIApplication extends javax.swing.JFrame { setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setMinimumSize(new java.awt.Dimension(640, 480)); - stopButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/toolbarButtonGraphics/general/Stop24.gif"))); // NOI18N + stopButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resources/icons/stop.gif"))); // NOI18N stopButton.setText("Stop"); stopButton.setFocusable(false); stopButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); @@ -222,7 +222,7 @@ public class NewMDIApplication extends javax.swing.JFrame { }); runButton.setFont(runButton.getFont()); - runButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/run.gif"))); // NOI18N + runButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resources/icons/run.gif"))); // NOI18N runButton.setText("Run sim!"); runButton.setToolTipText("Run the simmulation"); runButton.setFocusable(false); @@ -234,7 +234,7 @@ public class NewMDIApplication extends javax.swing.JFrame { } }); - jButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/pause.gif"))); // NOI18N + jButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resources/icons/pause.gif"))); // NOI18N jButton2.setText("Pause"); jButton2.setFocusable(false); jButton2.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); diff --git a/src/main/java/gui/NewStrategyDialog.form b/src/gui/NewStrategyDialog.form similarity index 100% rename from src/main/java/gui/NewStrategyDialog.form rename to src/gui/NewStrategyDialog.form diff --git a/src/main/java/gui/NewStrategyDialog.java b/src/gui/NewStrategyDialog.java similarity index 100% rename from src/main/java/gui/NewStrategyDialog.java rename to src/gui/NewStrategyDialog.java diff --git a/src/main/java/gui/OderBookPanelNew.form b/src/gui/OderBookPanelNew.form similarity index 100% rename from src/main/java/gui/OderBookPanelNew.form rename to src/gui/OderBookPanelNew.form diff --git a/src/main/java/gui/OderBookPanelNew.java b/src/gui/OderBookPanelNew.java similarity index 100% rename from src/main/java/gui/OderBookPanelNew.java rename to src/gui/OderBookPanelNew.java diff --git a/src/main/java/gui/OpenOrdersList.form b/src/gui/OpenOrdersList.form similarity index 100% rename from src/main/java/gui/OpenOrdersList.form rename to src/gui/OpenOrdersList.form diff --git a/src/main/java/gui/OpenOrdersList.java b/src/gui/OpenOrdersList.java similarity index 100% rename from src/main/java/gui/OpenOrdersList.java rename to src/gui/OpenOrdersList.java diff --git a/src/main/java/gui/OrderBook.form b/src/gui/OrderBook.form similarity index 100% rename from src/main/java/gui/OrderBook.form rename to src/gui/OrderBook.form diff --git a/src/main/java/gui/OrderBook.java b/src/gui/OrderBook.java similarity index 100% rename from src/main/java/gui/OrderBook.java rename to src/gui/OrderBook.java diff --git a/src/main/java/gui/OrderBookDialog.form b/src/gui/OrderBookDialog.form similarity index 100% rename from src/main/java/gui/OrderBookDialog.form rename to src/gui/OrderBookDialog.form diff --git a/src/main/java/gui/OrderBookDialog.java b/src/gui/OrderBookDialog.java similarity index 100% rename from src/main/java/gui/OrderBookDialog.java rename to src/gui/OrderBookDialog.java diff --git a/src/main/java/gui/OrderBookPanel.form b/src/gui/OrderBookPanel.form similarity index 100% rename from src/main/java/gui/OrderBookPanel.form rename to src/gui/OrderBookPanel.form diff --git a/src/main/java/gui/OrderBookPanel.java b/src/gui/OrderBookPanel.java similarity index 100% rename from src/main/java/gui/OrderBookPanel.java rename to src/gui/OrderBookPanel.java diff --git a/src/main/java/gui/QuotePanel.form b/src/gui/QuotePanel.form similarity index 100% rename from src/main/java/gui/QuotePanel.form rename to src/gui/QuotePanel.form diff --git a/src/main/java/gui/QuotePanel.java b/src/gui/QuotePanel.java similarity index 100% rename from src/main/java/gui/QuotePanel.java rename to src/gui/QuotePanel.java diff --git a/src/gui/Statistics.form b/src/gui/Statistics.form new file mode 100644 index 0000000..8b754e1 --- /dev/null +++ b/src/gui/Statistics.form @@ -0,0 +1,35 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/gui/Statistics.java b/src/gui/Statistics.java new file mode 100644 index 0000000..96d59aa --- /dev/null +++ b/src/gui/Statistics.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2017, 7u83 <7u83@mail.ru> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package gui; + +/** + * + * @author 7u83 <7u83@mail.ru> + */ +public class Statistics extends javax.swing.JPanel { + + /** + * Creates new form Statistics + */ + public Statistics() { + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + setBorder(javax.swing.BorderFactory.createTitledBorder("")); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 380, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 280, Short.MAX_VALUE) + ); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables +} diff --git a/src/main/java/gui/StatisticsDialog.form b/src/gui/StatisticsDialog.form similarity index 100% rename from src/main/java/gui/StatisticsDialog.form rename to src/gui/StatisticsDialog.form diff --git a/src/main/java/gui/StatisticsDialog.java b/src/gui/StatisticsDialog.java similarity index 100% rename from src/main/java/gui/StatisticsDialog.java rename to src/gui/StatisticsDialog.java diff --git a/src/main/java/gui/StatisticsPanel.form b/src/gui/StatisticsPanel.form similarity index 100% rename from src/main/java/gui/StatisticsPanel.form rename to src/gui/StatisticsPanel.form diff --git a/src/main/java/gui/StatisticsPanel.java b/src/gui/StatisticsPanel.java similarity index 100% rename from src/main/java/gui/StatisticsPanel.java rename to src/gui/StatisticsPanel.java diff --git a/src/main/java/gui/StrategySaveDialog.form b/src/gui/StrategySaveDialog.form similarity index 100% rename from src/main/java/gui/StrategySaveDialog.form rename to src/gui/StrategySaveDialog.form diff --git a/src/main/java/gui/StrategySaveDialog.java b/src/gui/StrategySaveDialog.java similarity index 100% rename from src/main/java/gui/StrategySaveDialog.java rename to src/gui/StrategySaveDialog.java diff --git a/src/main/java/gui/TraderListDialog.form b/src/gui/TraderListDialog.form similarity index 100% rename from src/main/java/gui/TraderListDialog.form rename to src/gui/TraderListDialog.form diff --git a/src/main/java/gui/TraderListDialog.java b/src/gui/TraderListDialog.java similarity index 100% rename from src/main/java/gui/TraderListDialog.java rename to src/gui/TraderListDialog.java diff --git a/src/main/java/gui/TraderListPanel.form b/src/gui/TraderListPanel.form similarity index 100% rename from src/main/java/gui/TraderListPanel.form rename to src/gui/TraderListPanel.form diff --git a/src/main/java/gui/TraderListPanel.java b/src/gui/TraderListPanel.java similarity index 100% rename from src/main/java/gui/TraderListPanel.java rename to src/gui/TraderListPanel.java diff --git a/src/main/java/gui/WaitBox.form b/src/gui/WaitBox.form similarity index 100% rename from src/main/java/gui/WaitBox.form rename to src/gui/WaitBox.form diff --git a/src/main/java/gui/WaitBox.java b/src/gui/WaitBox.java similarity index 100% rename from src/main/java/gui/WaitBox.java rename to src/gui/WaitBox.java diff --git a/src/main/java/gui/ZZZ.form b/src/gui/ZZZ.form similarity index 100% rename from src/main/java/gui/ZZZ.form rename to src/gui/ZZZ.form diff --git a/src/main/java/gui/ZZZ.java b/src/gui/ZZZ.java similarity index 100% rename from src/main/java/gui/ZZZ.java rename to src/gui/ZZZ.java diff --git a/src/main/java/gui/orderbook/OrderBook.form b/src/gui/orderbook/OrderBook.form similarity index 100% rename from src/main/java/gui/orderbook/OrderBook.form rename to src/gui/orderbook/OrderBook.form diff --git a/src/main/java/gui/orderbook/OrderBook.java b/src/gui/orderbook/OrderBook.java similarity index 100% rename from src/main/java/gui/orderbook/OrderBook.java rename to src/gui/orderbook/OrderBook.java diff --git a/src/main/java/gui/orderbook/OrderBookDialog.form b/src/gui/orderbook/OrderBookDialog.form similarity index 100% rename from src/main/java/gui/orderbook/OrderBookDialog.form rename to src/gui/orderbook/OrderBookDialog.form diff --git a/src/main/java/gui/orderbook/OrderBookDialog.java b/src/gui/orderbook/OrderBookDialog.java similarity index 100% rename from src/main/java/gui/orderbook/OrderBookDialog.java rename to src/gui/orderbook/OrderBookDialog.java diff --git a/src/main/java/gui/orderbook/OrderBooksHorizontal.form b/src/gui/orderbook/OrderBooksHorizontal.form similarity index 100% rename from src/main/java/gui/orderbook/OrderBooksHorizontal.form rename to src/gui/orderbook/OrderBooksHorizontal.form diff --git a/src/main/java/gui/orderbook/OrderBooksHorizontal.java b/src/gui/orderbook/OrderBooksHorizontal.java similarity index 100% rename from src/main/java/gui/orderbook/OrderBooksHorizontal.java rename to src/gui/orderbook/OrderBooksHorizontal.java diff --git a/src/main/java/gui/orderbook/QuoteVertical.form b/src/gui/orderbook/QuoteVertical.form similarity index 100% rename from src/main/java/gui/orderbook/QuoteVertical.form rename to src/gui/orderbook/QuoteVertical.form diff --git a/src/main/java/gui/orderbook/QuoteVertical.java b/src/gui/orderbook/QuoteVertical.java similarity index 100% rename from src/main/java/gui/orderbook/QuoteVertical.java rename to src/gui/orderbook/QuoteVertical.java diff --git a/src/main/java/gui/orderbook/QutoesHorizontal.form b/src/gui/orderbook/QutoesHorizontal.form similarity index 100% rename from src/main/java/gui/orderbook/QutoesHorizontal.form rename to src/gui/orderbook/QutoesHorizontal.form diff --git a/src/main/java/gui/orderbook/QutoesHorizontal.java b/src/gui/orderbook/QutoesHorizontal.java similarity index 100% rename from src/main/java/gui/orderbook/QutoesHorizontal.java rename to src/gui/orderbook/QutoesHorizontal.java diff --git a/src/main/java/gui/test.java b/src/gui/test.java similarity index 100% rename from src/main/java/gui/test.java rename to src/gui/test.java diff --git a/src/main/java/gui/tools/NummericCellRenderer.java b/src/gui/tools/NummericCellRenderer.java similarity index 100% rename from src/main/java/gui/tools/NummericCellRenderer.java rename to src/gui/tools/NummericCellRenderer.java diff --git a/src/main/resources/icons/pause.gif b/src/resources/icons/pause.gif similarity index 100% rename from src/main/resources/icons/pause.gif rename to src/resources/icons/pause.gif diff --git a/src/main/resources/icons/run.gif b/src/resources/icons/run.gif similarity index 100% rename from src/main/resources/icons/run.gif rename to src/resources/icons/run.gif diff --git a/src/main/resources/icons/stop.gif b/src/resources/icons/stop.gif similarity index 100% rename from src/main/resources/icons/stop.gif rename to src/resources/icons/stop.gif diff --git a/src/main/java/sesim/AutoTraderBase.java b/src/sesim/AutoTraderBase.java similarity index 100% rename from src/main/java/sesim/AutoTraderBase.java rename to src/sesim/AutoTraderBase.java diff --git a/src/main/java/sesim/AutoTraderConfig.java b/src/sesim/AutoTraderConfig.java similarity index 100% rename from src/main/java/sesim/AutoTraderConfig.java rename to src/sesim/AutoTraderConfig.java diff --git a/src/main/java/sesim/AutoTraderConfigBase.java b/src/sesim/AutoTraderConfigBase.java similarity index 100% rename from src/main/java/sesim/AutoTraderConfigBase.java rename to src/sesim/AutoTraderConfigBase.java diff --git a/src/main/java/sesim/AutoTraderGui.java b/src/sesim/AutoTraderGui.java similarity index 100% rename from src/main/java/sesim/AutoTraderGui.java rename to src/sesim/AutoTraderGui.java diff --git a/src/main/java/sesim/AutoTraderInterface.java b/src/sesim/AutoTraderInterface.java similarity index 100% rename from src/main/java/sesim/AutoTraderInterface.java rename to src/sesim/AutoTraderInterface.java diff --git a/src/main/java/sesim/AutoTraderList.java b/src/sesim/AutoTraderList.java similarity index 100% rename from src/main/java/sesim/AutoTraderList.java rename to src/sesim/AutoTraderList.java diff --git a/src/main/java/sesim/AutoTraderLoader.java b/src/sesim/AutoTraderLoader.java similarity index 90% rename from src/main/java/sesim/AutoTraderLoader.java rename to src/sesim/AutoTraderLoader.java index d020f2a..d504be8 100644 --- a/src/main/java/sesim/AutoTraderLoader.java +++ b/src/sesim/AutoTraderLoader.java @@ -43,25 +43,23 @@ import java.util.jar.JarInputStream; import java.util.logging.Level; import java.util.logging.Logger; - - - /** * * @author 7u83 <7u83@mail.ru> */ public class AutoTraderLoader { - /** * Check if a given class can instaciated as AutoTrader. + * * @param cls Class to check * @return true if it is an AutoTrader, otherwise false */ - public boolean isAutoTrader(Class cls){ - if (Modifier.isAbstract(cls.getModifiers())) + public boolean isAutoTrader(Class cls) { + if (Modifier.isAbstract(cls.getModifiers())) { return false; - + } + do { for (Class i : cls.getInterfaces()) { if (i.equals(AutoTraderInterface.class)) { @@ -69,11 +67,10 @@ public class AutoTraderLoader { } } - }while ((cls=cls.getSuperclass())!=null); + } while ((cls = cls.getSuperclass()) != null); return false; } - Class loadAutoTraderClass(String filename, String classname) { String clnam = classname.substring(1, classname.length() - 6).replace('/', '.'); @@ -93,10 +90,10 @@ public class AutoTraderLoader { try { Class cls = cl.loadClass(clnam); - System.out.printf("Check Class: %s\n",cls.getCanonicalName()); - if (isAutoTrader(cls)){ + System.out.printf("Check Class: %s\n", cls.getCanonicalName()); + if (isAutoTrader(cls)) { return (Class) cls; - + } } catch (ClassNotFoundException ex) { // something wnet wrong, but we ignore it @@ -105,12 +102,11 @@ public class AutoTraderLoader { } + ArrayList> traders_cache = null; - ArrayList> traders_cache=null; - public ArrayList> getTraders() { - - if (traders_cache!=null){ + + if (traders_cache != null) { return traders_cache; } @@ -141,8 +137,7 @@ public class AutoTraderLoader { while ((entry = is.getNextJarEntry()) != null) { if (entry.getName().endsWith(".class")) { - // System.out.printf("Entry: %s\n", entry.getDisplayName()); - + // System.out.printf("Entry: %s\n", entry.getDisplayName()); } } } catch (IOException ex) { @@ -169,7 +164,7 @@ public class AutoTraderLoader { } } - traders_cache=traders; + traders_cache = traders; return traders; } @@ -182,9 +177,9 @@ public class AutoTraderLoader { for (int i = 0; i < trclasses.size(); i++) { try { - + AutoTraderInterface ac = trclasses.get(i).newInstance(); - if (ac.getDevelStatus() && devel==false){ + if (ac.getDevelStatus() && devel == false) { continue; } ret.add(ac.getClass().getCanonicalName()); @@ -197,7 +192,7 @@ public class AutoTraderLoader { return ret; } - + public ArrayList getDefaultStrategyNames() { return this.getDefaultStrategyNames(true); } @@ -208,13 +203,13 @@ public class AutoTraderLoader { try { AutoTraderInterface ac = traders.get(i).newInstance(); - System.out.printf("Looking for in %s == %s\n", ac.getClass().getCanonicalName(),name); - - if (ac.getClass().getCanonicalName().equals(name)){ + System.out.printf("Looking for in %s == %s\n", ac.getClass().getCanonicalName(), name); + + if (ac.getClass().getCanonicalName().equals(name)) { return ac; - - // if (ac.getDisplayName().equals(name)) { - // return ac;} + + // if (ac.getDisplayName().equals(name)) { + // return ac;} } } catch (Exception ex) { } diff --git a/src/main/java/sesim/AutoTraderRunConfig.java b/src/sesim/AutoTraderRunConfig.java similarity index 100% rename from src/main/java/sesim/AutoTraderRunConfig.java rename to src/sesim/AutoTraderRunConfig.java diff --git a/src/main/java/sesim/Clock.java b/src/sesim/Clock.java similarity index 100% rename from src/main/java/sesim/Clock.java rename to src/sesim/Clock.java diff --git a/src/main/java/sesim/Exchange.java b/src/sesim/Exchange.java similarity index 100% rename from src/main/java/sesim/Exchange.java rename to src/sesim/Exchange.java diff --git a/src/main/java/sesim/IDGenerator.java b/src/sesim/IDGenerator.java similarity index 100% rename from src/main/java/sesim/IDGenerator.java rename to src/sesim/IDGenerator.java diff --git a/src/main/java/sesim/Locker.java b/src/sesim/Locker.java similarity index 100% rename from src/main/java/sesim/Locker.java rename to src/sesim/Locker.java diff --git a/src/main/java/sesim/Logger.java b/src/sesim/Logger.java similarity index 100% rename from src/main/java/sesim/Logger.java rename to src/sesim/Logger.java diff --git a/src/main/java/sesim/MinMax.java b/src/sesim/MinMax.java similarity index 100% rename from src/main/java/sesim/MinMax.java rename to src/sesim/MinMax.java diff --git a/src/main/java/sesim/NewJPanel.form b/src/sesim/NewJPanel.form similarity index 100% rename from src/main/java/sesim/NewJPanel.form rename to src/sesim/NewJPanel.form diff --git a/src/main/java/sesim/NewJPanel.java b/src/sesim/NewJPanel.java similarity index 100% rename from src/main/java/sesim/NewJPanel.java rename to src/sesim/NewJPanel.java diff --git a/src/main/java/sesim/OHLCData.java b/src/sesim/OHLCData.java similarity index 100% rename from src/main/java/sesim/OHLCData.java rename to src/sesim/OHLCData.java diff --git a/src/main/java/sesim/OHLCDataItem.java b/src/sesim/OHLCDataItem.java similarity index 100% rename from src/main/java/sesim/OHLCDataItem.java rename to src/sesim/OHLCDataItem.java diff --git a/src/main/java/sesim/OldAutoTrader.java b/src/sesim/OldAutoTrader.java similarity index 100% rename from src/main/java/sesim/OldAutoTrader.java rename to src/sesim/OldAutoTrader.java diff --git a/src/main/java/sesim/Order.java b/src/sesim/Order.java similarity index 100% rename from src/main/java/sesim/Order.java rename to src/sesim/Order.java diff --git a/src/main/java/sesim/OrderData.java b/src/sesim/OrderData.java similarity index 100% rename from src/main/java/sesim/OrderData.java rename to src/sesim/OrderData.java diff --git a/src/main/java/sesim/Quote.java b/src/sesim/Quote.java similarity index 100% rename from src/main/java/sesim/Quote.java rename to src/sesim/Quote.java diff --git a/src/main/java/sesim/Scheduler.java b/src/sesim/Scheduler.java similarity index 100% rename from src/main/java/sesim/Scheduler.java rename to src/sesim/Scheduler.java diff --git a/src/main/java/traders/ManTrader/AccountBalance.form b/src/traders/ManTrader/AccountBalance.form similarity index 100% rename from src/main/java/traders/ManTrader/AccountBalance.form rename to src/traders/ManTrader/AccountBalance.form diff --git a/src/main/java/traders/ManTrader/AccountBalance.java b/src/traders/ManTrader/AccountBalance.java similarity index 100% rename from src/main/java/traders/ManTrader/AccountBalance.java rename to src/traders/ManTrader/AccountBalance.java diff --git a/src/main/java/traders/ManTrader/CreateOrderDialog.form b/src/traders/ManTrader/CreateOrderDialog.form similarity index 100% rename from src/main/java/traders/ManTrader/CreateOrderDialog.form rename to src/traders/ManTrader/CreateOrderDialog.form diff --git a/src/main/java/traders/ManTrader/CreateOrderDialog.java b/src/traders/ManTrader/CreateOrderDialog.java similarity index 100% rename from src/main/java/traders/ManTrader/CreateOrderDialog.java rename to src/traders/ManTrader/CreateOrderDialog.java diff --git a/src/main/java/traders/ManTrader/ManTrader.java b/src/traders/ManTrader/ManTrader.java similarity index 100% rename from src/main/java/traders/ManTrader/ManTrader.java rename to src/traders/ManTrader/ManTrader.java diff --git a/src/main/java/traders/ManTrader/ManTraderConsole.form b/src/traders/ManTrader/ManTraderConsole.form similarity index 100% rename from src/main/java/traders/ManTrader/ManTraderConsole.form rename to src/traders/ManTrader/ManTraderConsole.form diff --git a/src/main/java/traders/ManTrader/ManTraderConsole.java b/src/traders/ManTrader/ManTraderConsole.java similarity index 100% rename from src/main/java/traders/ManTrader/ManTraderConsole.java rename to src/traders/ManTrader/ManTraderConsole.java diff --git a/src/main/java/traders/ManTrader/ManTraderConsoleDialog.form b/src/traders/ManTrader/ManTraderConsoleDialog.form similarity index 100% rename from src/main/java/traders/ManTrader/ManTraderConsoleDialog.form rename to src/traders/ManTrader/ManTraderConsoleDialog.form diff --git a/src/main/java/traders/ManTrader/ManTraderConsoleDialog.java b/src/traders/ManTrader/ManTraderConsoleDialog.java similarity index 100% rename from src/main/java/traders/ManTrader/ManTraderConsoleDialog.java rename to src/traders/ManTrader/ManTraderConsoleDialog.java diff --git a/src/main/java/traders/RandomTraderA.java b/src/traders/RandomTraderA.java similarity index 100% rename from src/main/java/traders/RandomTraderA.java rename to src/traders/RandomTraderA.java diff --git a/src/main/java/traders/RandomTraderB.java b/src/traders/RandomTraderB.java similarity index 100% rename from src/main/java/traders/RandomTraderB.java rename to src/traders/RandomTraderB.java diff --git a/src/main/java/traders/RandomTraderConfig.java b/src/traders/RandomTraderConfig.java similarity index 100% rename from src/main/java/traders/RandomTraderConfig.java rename to src/traders/RandomTraderConfig.java diff --git a/src/main/java/traders/RandomTraderGuiA.form b/src/traders/RandomTraderGuiA.form similarity index 100% rename from src/main/java/traders/RandomTraderGuiA.form rename to src/traders/RandomTraderGuiA.form diff --git a/src/main/java/traders/RandomTraderGuiA.java b/src/traders/RandomTraderGuiA.java similarity index 100% rename from src/main/java/traders/RandomTraderGuiA.java rename to src/traders/RandomTraderGuiA.java diff --git a/src/test/java/sesim/Test.java b/test/sesim/Test.java similarity index 100% rename from src/test/java/sesim/Test.java rename to test/sesim/Test.java