diff --git a/src/Gui/AskBook.java b/src/gui/AskBook.java similarity index 96% rename from src/Gui/AskBook.java rename to src/gui/AskBook.java index b2991fd..c0b5fa2 100644 --- a/src/Gui/AskBook.java +++ b/src/gui/AskBook.java @@ -23,10 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; -import SeSim.Exchange.*; -import SeSim.Order.*; +import sesim.Exchange.*; +import sesim.Order.*; import java.util.ArrayList; /** diff --git a/src/Gui/BidBook.java b/src/gui/BidBook.java similarity index 96% rename from src/Gui/BidBook.java rename to src/gui/BidBook.java index f4628e2..b730460 100644 --- a/src/Gui/BidBook.java +++ b/src/gui/BidBook.java @@ -23,10 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; -import SeSim.Exchange.*; -import SeSim.Order.*; +import sesim.Exchange.*; +import sesim.Order.*; import java.util.ArrayList; /** diff --git a/src/Gui/CandlestickDemo.java b/src/gui/CandlestickDemo.java similarity index 99% rename from src/Gui/CandlestickDemo.java rename to src/gui/CandlestickDemo.java index 6c9aa43..17e59b7 100644 --- a/src/Gui/CandlestickDemo.java +++ b/src/gui/CandlestickDemo.java @@ -1,4 +1,4 @@ -package Gui; +package gui; import org.jfree.chart.*; import org.jfree.chart.axis.*; diff --git a/src/Gui/Chart.form b/src/gui/Chart.form similarity index 100% rename from src/Gui/Chart.form rename to src/gui/Chart.form diff --git a/src/Gui/Chart.java b/src/gui/Chart.java similarity index 99% rename from src/Gui/Chart.java rename to src/gui/Chart.java index 94b58c5..f7d6f57 100644 --- a/src/Gui/Chart.java +++ b/src/gui/Chart.java @@ -23,10 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; -import SeSim.Exchange.*; -import SeSim.*; +import sesim.Exchange; +import sesim.Exchange.*; import java.awt.Color; import java.awt.Dimension; import java.io.BufferedReader; @@ -53,7 +53,7 @@ import org.jfree.data.xy.DefaultOHLCDataset; import org.jfree.data.xy.OHLCDataItem; import org.jfree.data.xy.XYDataset; -import SeSim.Quote; +import sesim.Quote; import java.util.SortedSet; import java.util.TreeSet; diff --git a/src/Gui/ControlPanel.form b/src/gui/ControlPanel.form similarity index 100% rename from src/Gui/ControlPanel.form rename to src/gui/ControlPanel.form diff --git a/src/Gui/ControlPanel.java b/src/gui/ControlPanel.java similarity index 99% rename from src/Gui/ControlPanel.java rename to src/gui/ControlPanel.java index e369494..e29de67 100644 --- a/src/Gui/ControlPanel.java +++ b/src/gui/ControlPanel.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; /** * diff --git a/src/Gui/MainWin.form b/src/gui/MainWin.form similarity index 96% rename from src/Gui/MainWin.form rename to src/gui/MainWin.form index 63e4cde..5de2c7a 100644 --- a/src/Gui/MainWin.form +++ b/src/gui/MainWin.form @@ -80,21 +80,21 @@ - + - + - + @@ -102,4 +102,4 @@ - + \ No newline at end of file diff --git a/src/Gui/MainWin.java b/src/gui/MainWin.java similarity index 93% rename from src/Gui/MainWin.java rename to src/gui/MainWin.java index 1cb1874..5e67809 100644 --- a/src/Gui/MainWin.java +++ b/src/gui/MainWin.java @@ -23,14 +23,15 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; -import SeSim.Exchange; -import SeSim.BuyOrder; +import traders.RandomTraderConfig; +import sesim.Account; +import sesim.AutoTraderLIst; +import sesim.Exchange; +import sesim.BuyOrder; import javax.swing.UIManager; import javax.swing.*; -import SeSim.*; -import Traders.*; /** @@ -39,9 +40,9 @@ import Traders.*; */ public class MainWin extends javax.swing.JFrame { - static SeSim.Exchange se; - static SeSim.Account myAccount; - static Traders.ManTrader myTrader; + static sesim.Exchange se; + static sesim.Account myAccount; + static traders.ManTrader myTrader; /** * Creates new form MainWin @@ -65,9 +66,9 @@ public class MainWin extends javax.swing.JFrame { jButton1 = new javax.swing.JButton(); jMenuItem1 = new javax.swing.JMenuItem(); - controlPanel2 = new Gui.ControlPanel(); - orderBookPanel1 = new Gui.OrderBookPanel(); - zZChart1 = new Gui.Chart(); + controlPanel2 = new gui.ControlPanel(); + orderBookPanel1 = new gui.OrderBookPanel(); + zZChart1 = new gui.Chart(); MainMenu = new javax.swing.JMenuBar(); FileMenu = new javax.swing.JMenu(); FileNew = new javax.swing.JMenuItem(); @@ -139,7 +140,7 @@ public class MainWin extends javax.swing.JFrame { se = new Exchange(); myAccount = new Account(se,1000,100000000.0); - myTrader = new Traders.ManTrader(myAccount,null); + myTrader = new traders.ManTrader(myAccount,null); /* Account otherAccount = new Account(se,1000,1000); Traders.ManTrader otherTrader = new Traders.ManTrader(otherAccount); @@ -209,11 +210,11 @@ public class MainWin extends javax.swing.JFrame { private javax.swing.JMenuItem FileNew; private javax.swing.JMenuItem FileRun; private javax.swing.JMenuBar MainMenu; - private Gui.ControlPanel controlPanel2; + private gui.ControlPanel controlPanel2; private javax.swing.JButton jButton1; private javax.swing.JMenu jMenu2; private javax.swing.JMenuItem jMenuItem1; - private Gui.OrderBookPanel orderBookPanel1; - private Gui.Chart zZChart1; + private gui.OrderBookPanel orderBookPanel1; + private gui.Chart zZChart1; // End of variables declaration//GEN-END:variables } diff --git a/src/Gui/NewPanel.form b/src/gui/NewPanel.form similarity index 97% rename from src/Gui/NewPanel.form rename to src/gui/NewPanel.form index 5feb4f8..a965931 100644 --- a/src/Gui/NewPanel.form +++ b/src/gui/NewPanel.form @@ -1,6 +1,6 @@ -
+ diff --git a/src/Gui/NewPanel.java b/src/gui/NewPanel.java similarity index 99% rename from src/Gui/NewPanel.java rename to src/gui/NewPanel.java index 60f58bb..2521ee4 100644 --- a/src/Gui/NewPanel.java +++ b/src/gui/NewPanel.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; //import static Gui.SimpleJFreeDemo.createDemoPanel; import javax.swing.JPanel; diff --git a/src/Gui/OrderBook.form b/src/gui/OrderBook.form similarity index 100% rename from src/Gui/OrderBook.form rename to src/gui/OrderBook.form diff --git a/src/Gui/OrderBook.java b/src/gui/OrderBook.java similarity index 98% rename from src/Gui/OrderBook.java rename to src/gui/OrderBook.java index 74f1d74..cf7e198 100644 --- a/src/Gui/OrderBook.java +++ b/src/gui/OrderBook.java @@ -23,9 +23,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; -import SeSim.Exchange; +import sesim.Exchange; import java.util.ArrayList; import java.util.Formatter; import javax.swing.table.AbstractTableModel; @@ -145,15 +145,15 @@ public abstract class OrderBook extends javax.swing.JPanel implements Exchange.B @Override public Object getValueAt(int r, int c) { - SeSim.Order o; + sesim.Order o; int s = list.size(); //System.out.print("Looking for Value at" + r + ":" + c + " w size:" + s + "\n"); if (!getDesc()) { - o = (SeSim.Order) list.get(r); + o = (sesim.Order) list.get(r); } else { - o = (SeSim.Order) list.get(list.size() - r - 1); + o = (sesim.Order) list.get(list.size() - r - 1); } Formatter f = new Formatter(); switch (c) { diff --git a/src/Gui/OrderBookPanel.form b/src/gui/OrderBookPanel.form similarity index 98% rename from src/Gui/OrderBookPanel.form rename to src/gui/OrderBookPanel.form index cb1664a..e8f99f7 100644 --- a/src/Gui/OrderBookPanel.form +++ b/src/gui/OrderBookPanel.form @@ -19,7 +19,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -456,4 +456,4 @@ - + \ No newline at end of file diff --git a/src/Gui/OrderBookPanel.java b/src/gui/OrderBookPanel.java similarity index 93% rename from src/Gui/OrderBookPanel.java rename to src/gui/OrderBookPanel.java index 0029c48..da9fe9f 100644 --- a/src/Gui/OrderBookPanel.java +++ b/src/gui/OrderBookPanel.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; //import SeSim.*; import static java.lang.Thread.sleep; @@ -39,7 +39,7 @@ import static java.lang.Thread.sleep; */ public class OrderBookPanel extends javax.swing.JPanel { - SeSim.Exchange se; + sesim.Exchange se; public OrderBookPanel() { this.se = MainWin.se; @@ -63,9 +63,9 @@ public class OrderBookPanel extends javax.swing.JPanel { private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; - askBook1 = new Gui.AskBook(); - bidBook1 = new Gui.BidBook(); - quotePanel2 = new Gui.QuotePanel(); + askBook1 = new gui.AskBook(); + bidBook1 = new gui.BidBook(); + quotePanel2 = new gui.QuotePanel(); setPreferredSize(new java.awt.Dimension(220, 262)); java.awt.GridBagLayout layout = new java.awt.GridBagLayout(); @@ -104,8 +104,8 @@ public class OrderBookPanel extends javax.swing.JPanel { // Variables declaration - do not modify//GEN-BEGIN:variables - private Gui.AskBook askBook1; - private Gui.BidBook bidBook1; - private Gui.QuotePanel quotePanel2; + private gui.AskBook askBook1; + private gui.BidBook bidBook1; + private gui.QuotePanel quotePanel2; // End of variables declaration//GEN-END:variables } diff --git a/src/Gui/QuotePanel.form b/src/gui/QuotePanel.form similarity index 100% rename from src/Gui/QuotePanel.form rename to src/gui/QuotePanel.form diff --git a/src/Gui/QuotePanel.java b/src/gui/QuotePanel.java similarity index 97% rename from src/Gui/QuotePanel.java rename to src/gui/QuotePanel.java index ee2b892..b49b3ab 100644 --- a/src/Gui/QuotePanel.java +++ b/src/gui/QuotePanel.java @@ -23,9 +23,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; -import SeSim.Quote; +import sesim.Quote; import java.awt.Color; import javax.swing.SwingUtilities; import java.util.*; @@ -34,7 +34,7 @@ import java.util.*; * * @author 7u83 <7u83@mail.ru> */ -public class QuotePanel extends javax.swing.JPanel implements SeSim.Exchange.QuoteReceiver{ +public class QuotePanel extends javax.swing.JPanel implements sesim.Exchange.QuoteReceiver{ /** * Creates new form QuotePanel diff --git a/src/Gui/test.java b/src/gui/test.java similarity index 99% rename from src/Gui/test.java rename to src/gui/test.java index 6ebb95b..4d604c4 100644 --- a/src/Gui/test.java +++ b/src/gui/test.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Gui; +package gui; import java.util.*; diff --git a/src/SeSim/Account.java b/src/sesim/Account.java similarity index 99% rename from src/SeSim/Account.java rename to src/sesim/Account.java index bdfb448..332c2e7 100644 --- a/src/SeSim/Account.java +++ b/src/sesim/Account.java @@ -1,4 +1,4 @@ -package SeSim; +package sesim; import java.util.*; diff --git a/src/SeSim/AutoTrader.java b/src/sesim/AutoTrader.java similarity index 99% rename from src/SeSim/AutoTrader.java rename to src/sesim/AutoTrader.java index 4405404..d98e667 100644 --- a/src/SeSim/AutoTrader.java +++ b/src/sesim/AutoTrader.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package SeSim; +package sesim; import static java.lang.Thread.sleep; diff --git a/src/SeSim/AutoTraderLIst.java b/src/sesim/AutoTraderLIst.java similarity index 99% rename from src/SeSim/AutoTraderLIst.java rename to src/sesim/AutoTraderLIst.java index 53fc8af..9d8f0f4 100644 --- a/src/SeSim/AutoTraderLIst.java +++ b/src/sesim/AutoTraderLIst.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package SeSim; +package sesim; /** * diff --git a/src/SeSim/BuyOrder.java b/src/sesim/BuyOrder.java similarity index 89% rename from src/SeSim/BuyOrder.java rename to src/sesim/BuyOrder.java index 849a1fe..a706ccf 100644 --- a/src/SeSim/BuyOrder.java +++ b/src/sesim/BuyOrder.java @@ -1,4 +1,4 @@ -package SeSim; +package sesim; public class BuyOrder extends Order implements Comparable { diff --git a/src/SeSim/Exchange.java b/src/sesim/Exchange.java similarity index 99% rename from src/SeSim/Exchange.java rename to src/sesim/Exchange.java index 81444e3..305d125 100644 --- a/src/SeSim/Exchange.java +++ b/src/sesim/Exchange.java @@ -1,10 +1,10 @@ -package SeSim; +package sesim; import java.util.*; import java.util.concurrent.*; -import SeSim.Order.OrderStatus; -import SeSim.Order.OrderType; +import sesim.Order.OrderStatus; +import sesim.Order.OrderType; /** * diff --git a/src/SeSim/Locker.java b/src/sesim/Locker.java similarity index 99% rename from src/SeSim/Locker.java rename to src/sesim/Locker.java index 78f2477..6cd2a83 100644 --- a/src/SeSim/Locker.java +++ b/src/sesim/Locker.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package SeSim; +package sesim; import java.util.concurrent.Semaphore; diff --git a/src/SeSim/Logger.java b/src/sesim/Logger.java similarity index 96% rename from src/SeSim/Logger.java rename to src/sesim/Logger.java index 096da42..ad0beae 100644 --- a/src/SeSim/Logger.java +++ b/src/sesim/Logger.java @@ -1,4 +1,4 @@ -package SeSim; +package sesim; public class Logger { diff --git a/src/SeSim/Order.java b/src/sesim/Order.java similarity index 99% rename from src/SeSim/Order.java rename to src/sesim/Order.java index 40098d8..ffed02a 100644 --- a/src/SeSim/Order.java +++ b/src/sesim/Order.java @@ -1,4 +1,4 @@ -package SeSim; +package sesim; public abstract class Order implements Comparable { diff --git a/src/SeSim/Quote.java b/src/sesim/Quote.java similarity index 99% rename from src/SeSim/Quote.java rename to src/sesim/Quote.java index d42a523..3f973b8 100644 --- a/src/SeSim/Quote.java +++ b/src/sesim/Quote.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package SeSim; +package sesim; /** * diff --git a/src/SeSim/SellOrder.java b/src/sesim/SellOrder.java similarity index 87% rename from src/SeSim/SellOrder.java rename to src/sesim/SellOrder.java index d11f77a..e6a9c29 100644 --- a/src/SeSim/SellOrder.java +++ b/src/sesim/SellOrder.java @@ -1,4 +1,4 @@ -package SeSim; +package sesim; public class SellOrder extends Order { diff --git a/src/SeSim/Trader.java b/src/sesim/Trader.java similarity index 99% rename from src/SeSim/Trader.java rename to src/sesim/Trader.java index 542fe53..9816941 100644 --- a/src/SeSim/Trader.java +++ b/src/sesim/Trader.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package SeSim; +package sesim; import static java.lang.Thread.sleep; diff --git a/src/SeSim/TraderConfig.java b/src/sesim/TraderConfig.java similarity index 99% rename from src/SeSim/TraderConfig.java rename to src/sesim/TraderConfig.java index d12871a..a63aae9 100644 --- a/src/SeSim/TraderConfig.java +++ b/src/sesim/TraderConfig.java @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package SeSim; +package sesim; /** * diff --git a/src/Traders/ManTrader.java b/src/traders/ManTrader.java similarity index 93% rename from src/Traders/ManTrader.java rename to src/traders/ManTrader.java index 4052840..3113e77 100644 --- a/src/Traders/ManTrader.java +++ b/src/traders/ManTrader.java @@ -23,12 +23,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Traders; +package traders; -import SeSim.Account; -import SeSim.Trader; -import SeSim.TraderConfig; -import SeSim.BuyOrder; +import sesim.Account; +import sesim.Trader; +import sesim.TraderConfig; +import sesim.BuyOrder; diff --git a/src/Traders/RandomTrader.java b/src/traders/RandomTrader.java similarity index 98% rename from src/Traders/RandomTrader.java rename to src/traders/RandomTrader.java index afd3a17..7db13f8 100644 --- a/src/Traders/RandomTrader.java +++ b/src/traders/RandomTrader.java @@ -23,13 +23,13 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Traders; +package traders; -import SeSim.Account; -import SeSim.Order; +import sesim.Account; +import sesim.Order; import java.util.Random; -import SeSim.AutoTrader; -import SeSim.TraderConfig; +import sesim.AutoTrader; +import sesim.TraderConfig; public class RandomTrader extends AutoTrader { diff --git a/src/Traders/RandomTraderConfig.java b/src/traders/RandomTraderConfig.java similarity index 95% rename from src/Traders/RandomTraderConfig.java rename to src/traders/RandomTraderConfig.java index 34d2dbf..d582ecc 100644 --- a/src/Traders/RandomTraderConfig.java +++ b/src/traders/RandomTraderConfig.java @@ -23,9 +23,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Traders; +package traders; -import SeSim.*; +import sesim.Account; +import sesim.TraderConfig; +import sesim.Exchange; +import sesim.AutoTrader; /** * diff --git a/src/Traders/SwitchingTrader.java b/src/traders/SwitchingTrader.java similarity index 97% rename from src/Traders/SwitchingTrader.java rename to src/traders/SwitchingTrader.java index 984e8d9..2417734 100644 --- a/src/Traders/SwitchingTrader.java +++ b/src/traders/SwitchingTrader.java @@ -23,10 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Traders; +package traders; -import SeSim.Account; -import SeSim.TraderConfig; +import sesim.Account; +import sesim.TraderConfig; /** * diff --git a/src/Traders/SwitchingTraderConfig.java b/src/traders/SwitchingTraderConfig.java similarity index 96% rename from src/Traders/SwitchingTraderConfig.java rename to src/traders/SwitchingTraderConfig.java index f5e18fb..0971d7e 100644 --- a/src/Traders/SwitchingTraderConfig.java +++ b/src/traders/SwitchingTraderConfig.java @@ -23,11 +23,11 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package Traders; +package traders; -import SeSim.Account; -import SeSim.AutoTrader; -import SeSim.Exchange; +import sesim.Account; +import sesim.AutoTrader; +import sesim.Exchange; /** *