From 924a9c059c0a8e8c41cde4724fc1564c81230c6c Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@maiol.ru> Date: Tue, 21 Mar 2017 07:53:06 +0100 Subject: [PATCH] work on webstart --- nbproject/private/config.properties | 1 - nbproject/private/private.properties | 2 + nbproject/project.properties | 12 +- src/gui/AboutDialog.java | 2 +- src/gui/EditStrategies.java | 13 + src/gui/Globals.java | 63 ++-- src/gui/LoggerDialog.form | 16 +- src/gui/LoggerDialog.java | 12 +- src/gui/MainWin.form | 152 -------- src/gui/MainWin.java | 335 ------------------ src/gui/NewMDIApplication.java | 18 +- ...BookPanel.form => OrderBookPanel_old.form} | 2 +- ...BookPanel.java => OrderBookPanel_old.java} | 4 +- src/gui/TraderListDialog.java | 2 +- 14 files changed, 79 insertions(+), 555 deletions(-) delete mode 100644 src/gui/MainWin.form delete mode 100644 src/gui/MainWin.java rename src/gui/{OrderBookPanel.form => OrderBookPanel_old.form} (99%) rename src/gui/{OrderBookPanel.java => OrderBookPanel_old.java} (97%) diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties index 272d89a..e69de29 100644 --- a/nbproject/private/config.properties +++ b/nbproject/private/config.properties @@ -1 +0,0 @@ -config=JWS_generated diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 2cf1a1a..5782d12 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -3,5 +3,7 @@ do.depend=false do.jar=true javac.debug=true javadoc.preview=true +jnlp.signing.keypass=123456 +jnlp.signing.storepass=123456 user.properties.file=/home/tube/.netbeans/8.1/build.properties ivy.home=/usr/share/java/ diff --git a/nbproject/project.properties b/nbproject/project.properties index af021ac..570584d 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Mon, 20 Mar 2017 08:20:11 +0100 +#Tue, 21 Mar 2017 02:08:14 +0100 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= @@ -33,7 +33,7 @@ endorsed.classpath= excludes= includes=** jar.archive.disabled=${jnlp.enabled} -jar.compress=false +jar.compress=true jar.index=${jnlp.enabled} javac.classpath=${ivy.classpath} # Space-separated list of extra javac options @@ -58,16 +58,16 @@ javadoc.version=false javadoc.windowtitle= jnlp.applet.height=300 jnlp.applet.width=300 -jnlp.codebase.type=local +jnlp.codebase.type=no.codebase jnlp.descriptor=application -jnlp.enabled=false +jnlp.enabled=true jnlp.icon= jnlp.mixed.code=default jnlp.offline-allowed=false jnlp.signed=true -jnlp.signing=generated +jnlp.signing=key jnlp.signing.alias=SeSim -jnlp.signing.keystore= +jnlp.signing.keystore=/home/tube/jkeystore main.class=gui.NewMDIApplication # Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found. manifest.custom.application.library.allowable.codebase= diff --git a/src/gui/AboutDialog.java b/src/gui/AboutDialog.java index d029247..1205389 100644 --- a/src/gui/AboutDialog.java +++ b/src/gui/AboutDialog.java @@ -37,7 +37,7 @@ public class AboutDialog extends javax.swing.JDialog { public AboutDialog(java.awt.Frame parent, boolean modal) { super(parent, modal); initComponents(); - this.setLocationRelativeTo(MainWin.instance); + // this.setLocationRelativeTo(MainWin.instance); } /** diff --git a/src/gui/EditStrategies.java b/src/gui/EditStrategies.java index 3f902f0..7f6916f 100644 --- a/src/gui/EditStrategies.java +++ b/src/gui/EditStrategies.java @@ -25,6 +25,7 @@ */ package gui; +import static gui.Globals.LOGGER; import java.awt.Frame; import java.util.ArrayList; import java.util.HashMap; @@ -72,9 +73,21 @@ public final class EditStrategies extends javax.swing.JDialog { public EditStrategies(java.awt.Frame parent, boolean modal) { super(parent, modal); initComponents(); + + + String dp = new java.io.File(NewMDIApplication.class.getProtectionDomain() + .getCodeSource() + .getLocation() + .getPath()).toString(); + + LOGGER.info(String.format("Path %s",dp)); + + this.setLocationRelativeTo(this.getParent()); initComboBox(); + + } diff --git a/src/gui/Globals.java b/src/gui/Globals.java index 971b6c6..acc0347 100644 --- a/src/gui/Globals.java +++ b/src/gui/Globals.java @@ -29,6 +29,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.TreeMap; import java.util.logging.Level; @@ -46,49 +47,48 @@ import sesim.AutoTraderLoader; * @author 7u83 <7u83@mail.ru> */ public class Globals { - - public interface CfgListener{ + + public interface CfgListener { + void cfgChanged(); } - - static ArrayList cfg_listeners = new ArrayList<>(); - public static void notifyCfgListeners(){ - for (CfgListener l : cfg_listeners){ + + static ArrayList cfg_listeners = new ArrayList<>(); + + public static void notifyCfgListeners() { + for (CfgListener l : cfg_listeners) { l.cfgChanged(); } } - - public static void addCfgListener(CfgListener l){ + + public static void addCfgListener(CfgListener l) { cfg_listeners.add(l); } - + public static JFrame frame; static final String STRATEGYPREFS = "Strategies"; static final String TRADERPREFS = "Traders"; - + static final String DEVELSTATUS = "devel_status"; public static final String GODMODE = "godmode"; static public sesim.Exchange se; static public Preferences prefs; - - - public static class CfgStrings{ - public static final String GODMODE = "godmode"; + + public static class CfgStrings { + + public static final String GODMODE = "godmode"; } - - - public static String DEFAULT_EXCHANGE_CFG = - "{" + + public static String DEFAULT_EXCHANGE_CFG + = "{" + " money_decimals: 2," + " shares_decimals: 0" + "}"; - - //CfgStrings - + //CfgStrings static void setLookAndFeel(String selected) { try { @@ -113,9 +113,26 @@ public class Globals { } } - static AutoTraderLoader tloader = new AutoTraderLoader(); + static AutoTraderLoader tloader; - static final Logger LOGGER = Logger.getLogger("com.cauwersin.sesim"); + static void initGlobals() { + String[] a = System.getProperty("java.class.path").split(System.getProperty("path.separator")); + ArrayList pathlist = new ArrayList<>(Arrays.asList(a)); + System.out.printf("Init tloader\n"); + + pathlist = new ArrayList<>(); + String dp = new java.io.File(NewMDIApplication.class.getProtectionDomain() + .getCodeSource() + .getLocation() + .getPath()).toString(); + + pathlist.add(dp); + LOGGER.info(String.format("Path %s",dp)); + tloader = new AutoTraderLoader(pathlist); + + } + + static public final Logger LOGGER = Logger.getLogger("com.cauwersin.sesim"); static public final JSONArray getTraders() { String traders_json = Globals.prefs.get(TRADERPREFS, "[]"); diff --git a/src/gui/LoggerDialog.form b/src/gui/LoggerDialog.form index 20a1a39..1257c0f 100644 --- a/src/gui/LoggerDialog.form +++ b/src/gui/LoggerDialog.form @@ -24,21 +24,11 @@ - - - - - - - - - - - + @@ -59,7 +49,5 @@ - - - \ No newline at end of file + diff --git a/src/gui/LoggerDialog.java b/src/gui/LoggerDialog.java index fc4681e..74a032f 100644 --- a/src/gui/LoggerDialog.java +++ b/src/gui/LoggerDialog.java @@ -85,7 +85,6 @@ public class LoggerDialog extends javax.swing.JDialog { jScrollPane1 = new javax.swing.JScrollPane(); logArea = new javax.swing.JTextArea(); - orderBookNew1 = new gui.orderbook.OrderBook(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); @@ -99,18 +98,10 @@ public class LoggerDialog extends javax.swing.JDialog { layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 586, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addGap(63, 63, 63) - .addComponent(orderBookNew1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 160, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(orderBookNew1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 9, Short.MAX_VALUE)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 465, Short.MAX_VALUE) ); pack(); @@ -161,6 +152,5 @@ public class LoggerDialog extends javax.swing.JDialog { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTextArea logArea; - private gui.orderbook.OrderBook orderBookNew1; // End of variables declaration//GEN-END:variables } diff --git a/src/gui/MainWin.form b/src/gui/MainWin.form deleted file mode 100644 index e3feeb3..0000000 --- a/src/gui/MainWin.form +++ /dev/null @@ -1,152 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/MainWin.java b/src/gui/MainWin.java deleted file mode 100644 index 23dc082..0000000 --- a/src/gui/MainWin.java +++ /dev/null @@ -1,335 +0,0 @@ -/* - * Copyright (c) 2016, 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; - -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; - -import sesim.Exchange; -import traders.*; - - -/** - * - * @author 7u83 <7u83@mail.ru> - */ -public class MainWin extends javax.swing.JFrame { - - static MainWin instance; - //static public sesim.Exchange se; - //static sesim.Account_old myAccount; - - - /** - * Creates new form MainWin - */ - public MainWin() { - - initComponents(); - this.setLocationRelativeTo(this); - - - double aid1 = Globals.se.createAccount(100, 100); - double aid2 = Globals.se.createAccount(1000, 100); - - /* AccountData a1 = se.getAccountData(aid1); - AccountData a2 = se.getAccountData(aid2); - se.createOrder(aid2, Exchange.OrderType.ASK, 20, 11.9); - se.createOrder(aid2, Exchange.OrderType.ASK, 20, 11); - se.createOrder(aid2, Exchange.OrderType.ASK, 10, 10); - se.createOrder(aid2, Exchange.OrderType.ASK, 10, 9); - se.createOrder(aid1, Exchange.OrderType.BID, 50, 11); -*/ - - /* - System.out.print("Exec Orders\n"); - se.executeOrders(); - System.out.print("Executed Orders\n"); - - a1 = se.getAccountData(aid1); - a2 = se.getAccountData(aid2); - */ - - - -/* - AutoTraderLIst at = new AutoTraderLIst(); -// RandomTraderConfig_old rcfg = new RandomTraderConfig_old(); - SwitchingTraderConfig rcfg = new SwitchingTraderConfig(); - at.add(1000, rcfg, se, 100, 0); - at.add(1000, rcfg, se, 0, 10000); - - - SwitchingTraderConfig scfg = new SwitchingTraderConfig(); - at.add(1, scfg, se, 1000000, 0); - */ - - } - - /** - * 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() { - - jButton1 = new javax.swing.JButton(); - jMenuItem1 = new javax.swing.JMenuItem(); - controlPanel2 = new gui.ControlPanel(); - orderBookPanel1 = new gui.OrderBookPanel(); - fullChart2 = new chart.FullChart(); - MainMenu = new javax.swing.JMenuBar(); - FileMenu = new javax.swing.JMenu(); - FileNew = new javax.swing.JMenuItem(); - FileRun = new javax.swing.JMenuItem(); - editjMenu = new javax.swing.JMenu(); - editPrefernces = new javax.swing.JMenuItem(); - viewMenu = new javax.swing.JMenu(); - traderList = new javax.swing.JMenuItem(); - helpMenu = new javax.swing.JMenu(); - helpAbout = new javax.swing.JMenuItem(); - - jButton1.setText("jButton1"); - jButton1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton1ActionPerformed(evt); - } - }); - - jMenuItem1.setText("jMenuItem1"); - - setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); - setMinimumSize(new java.awt.Dimension(640, 480)); - getContentPane().add(controlPanel2, java.awt.BorderLayout.LINE_END); - getContentPane().add(orderBookPanel1, java.awt.BorderLayout.LINE_START); - getContentPane().add(fullChart2, java.awt.BorderLayout.CENTER); - - FileMenu.setBackground(new java.awt.Color(254, 203, 1)); - FileMenu.setText("File"); - - FileNew.setText("New"); - FileNew.setBorder(null); - FileNew.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - FileNewActionPerformed(evt); - } - }); - FileMenu.add(FileNew); - - FileRun.setText("Run"); - FileRun.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - FileRunActionPerformed(evt); - } - }); - FileMenu.add(FileRun); - - MainMenu.add(FileMenu); - - editjMenu.setMnemonic('e'); - editjMenu.setText("Edit"); - - editPrefernces.setMnemonic('p'); - editPrefernces.setText("Preferences"); - editPrefernces.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - editPreferncesActionPerformed(evt); - } - }); - editjMenu.add(editPrefernces); - - MainMenu.add(editjMenu); - - viewMenu.setMnemonic('v'); - viewMenu.setText("View"); - - traderList.setMnemonic('t'); - traderList.setText("Traders"); - traderList.setToolTipText(""); - traderList.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - traderListActionPerformed(evt); - } - }); - viewMenu.add(traderList); - - MainMenu.add(viewMenu); - - helpMenu.setText("Help"); - - helpAbout.setMnemonic('a'); - helpAbout.setText("About"); - helpAbout.setToolTipText("About this Software"); - helpAbout.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - helpAboutActionPerformed(evt); - } - }); - helpMenu.add(helpAbout); - - MainMenu.add(helpMenu); - - setJMenuBar(MainMenu); - - pack(); - }// //GEN-END:initComponents - - private void FileNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_FileNewActionPerformed - - - }//GEN-LAST:event_FileNewActionPerformed - - private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_jButton1ActionPerformed - - private void FileRunActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_FileRunActionPerformed - Globals.se.timer.start(); - }//GEN-LAST:event_FileRunActionPerformed - - private void helpAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_helpAboutActionPerformed - AboutDialog d=new AboutDialog(this,true); - d.show(); - }//GEN-LAST:event_helpAboutActionPerformed - - private void traderListActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_traderListActionPerformed - TraderListDialog tl = new TraderListDialog(this,false); - tl.setVisible(true); - }//GEN-LAST:event_traderListActionPerformed - - private void editPreferncesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editPreferncesActionPerformed - EditPreferencesDialog d = new EditPreferencesDialog(this,true); - d.setVisible(true); - }//GEN-LAST:event_editPreferncesActionPerformed - - /** - * @param args the command line arguments - */ - public static void main(String args[]) { - - Globals.se = new Exchange(); - //se.timer.start(); - - - //RandomTraderConfig rcfg = new RandomTraderConfig(); - //RandomTrader rt = rcfg.createTrader(se, 1000, 100); - //rt.start(); - - // SwitchingTraderConfig rcfg1 = new SwitchingTraderConfig(); - // SwitchingTraderConfig rcfg1 = new SwitchingTraderConfig(); - RandomTraderConfig rcfg1 = new RandomTraderConfig(); - // rcfg1.sell_limit[0]=-1; - // rcfg1.sell_limit[1]=1; - - /* - AutoTrader rt1 = rcfg1.createTrader(Globals.se,0,"", null, 1000000, 1000000); - Globals.se.traders.add(rt1); - rt1.setName("Alice"); - rt1.start(); - - - //AutoTrader rt2 = rcfg1.createTrader(se, 1, 100); - //rt2.start(); - - - // SwitchingTraderConfig cfg = new SwitchingTraderConfig(); - RandomTraderConfig cfg= new RandomTraderConfig(); - * - for (int i=0; i<30; i++){ - AutoTrader randt = cfg.createTrader(Globals.se,null, 100000, 100000); - - Globals.se.traders.add(randt); - randt.setName("Bob"); - randt.start(); - } - - */ - - - - - // at.add(10, rcfg, se, 1000000, 0); - - -/* try { - // Set cross-platform Java L&F (also called "Metal") - UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel"); - } catch (UnsupportedLookAndFeelException | ClassNotFoundException | - InstantiationException | IllegalAccessException e) { - } - */ - /* Set the Nimbus look and feel */ - // - /* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel. - * For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html - */ - /* try { - for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) { - if ("Motif".equals(info.getDisplayName())) { - javax.swing.UIManager.setLookAndFeel(info.getClassName()); - break; - } - } - } catch (ClassNotFoundException ex) { - java.util.logging.Logger.getLogger(MainWin.class.getDisplayName()).log(java.util.logging.Level.SEVERE, null, ex); - } catch (InstantiationException ex) { - java.util.logging.Logger.getLogger(MainWin.class.getDisplayName()).log(java.util.logging.Level.SEVERE, null, ex); - } catch (IllegalAccessException ex) { - java.util.logging.Logger.getLogger(MainWin.class.getDisplayName()).log(java.util.logging.Level.SEVERE, null, ex); - } catch (javax.swing.UnsupportedLookAndFeelException ex) { - java.util.logging.Logger.getLogger(MainWin.class.getDisplayName()).log(java.util.logging.Level.SEVERE, null, ex); - } - */ - // - - /* Create and display the form */ - java.awt.EventQueue.invokeLater(() -> { - MainWin.instance=new MainWin(); - MainWin.instance.setVisible(true); - - }); - } - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JMenu FileMenu; - private javax.swing.JMenuItem FileNew; - private javax.swing.JMenuItem FileRun; - private javax.swing.JMenuBar MainMenu; - private gui.ControlPanel controlPanel2; - private javax.swing.JMenuItem editPrefernces; - private javax.swing.JMenu editjMenu; - private chart.FullChart fullChart2; - private javax.swing.JMenuItem helpAbout; - private javax.swing.JMenu helpMenu; - private javax.swing.JButton jButton1; - private javax.swing.JMenuItem jMenuItem1; - private gui.OrderBookPanel orderBookPanel1; - private javax.swing.JMenuItem traderList; - private javax.swing.JMenu viewMenu; - // End of variables declaration//GEN-END:variables -} diff --git a/src/gui/NewMDIApplication.java b/src/gui/NewMDIApplication.java index 85db321..3023185 100644 --- a/src/gui/NewMDIApplication.java +++ b/src/gui/NewMDIApplication.java @@ -68,7 +68,7 @@ public class NewMDIApplication extends javax.swing.JFrame { } AutoTraderInterface createTraderNew(Exchange se, long id, String name, double money, double shares, JSONObject cfg) { - + String base = cfg.getString("base"); AutoTraderInterface ac = Globals.tloader.getStrategyBase(base); if (ac == null) { @@ -127,10 +127,9 @@ public class NewMDIApplication extends javax.swing.JFrame { Globals.se.fairValue = moneyTotal / sharesTotal; - // Globals.se.fairValue = 1.0; - System.out.printf("Failr Value is %f\n", Globals.se.fairValue); - - + // Globals.se.fairValue = 1.0; + System.out.printf("Failr Value is %f\n", Globals.se.fairValue); + for (int i = 0; i < Globals.se.traders.size(); i++) { Globals.se.traders.get(i).start(); } @@ -739,9 +738,7 @@ public class NewMDIApplication extends javax.swing.JFrame { */ public static void main(String args[]) throws IllegalAccessException, InstantiationException { - sesim.AutoTraderLoader tl = new sesim.AutoTraderLoader(); - tl.getTraders(); - + Globals.initGlobals(); //System.exit(0); Globals.se = new Exchange(); @@ -753,6 +750,11 @@ public class NewMDIApplication extends javax.swing.JFrame { java.awt.EventQueue.invokeLater(new Runnable() { @Override public void run() { + String x = new java.io.File(NewMDIApplication.class.getProtectionDomain() + .getCodeSource() + .getLocation() + .getPath()).toString(); //.getName(); + new NewMDIApplication().setVisible(true); } }); diff --git a/src/gui/OrderBookPanel.form b/src/gui/OrderBookPanel_old.form similarity index 99% rename from src/gui/OrderBookPanel.form rename to src/gui/OrderBookPanel_old.form index e8f99f7..4b11b03 100644 --- a/src/gui/OrderBookPanel.form +++ b/src/gui/OrderBookPanel_old.form @@ -456,4 +456,4 @@ - \ No newline at end of file + diff --git a/src/gui/OrderBookPanel.java b/src/gui/OrderBookPanel_old.java similarity index 97% rename from src/gui/OrderBookPanel.java rename to src/gui/OrderBookPanel_old.java index db5b3b0..6fecd22 100644 --- a/src/gui/OrderBookPanel.java +++ b/src/gui/OrderBookPanel_old.java @@ -37,11 +37,11 @@ import static java.lang.Thread.sleep; * * @author 7u83 <7u83@mail.ru> */ -public class OrderBookPanel extends javax.swing.JPanel { +public class OrderBookPanel_old extends javax.swing.JPanel { sesim.Exchange se; - public OrderBookPanel() { + public OrderBookPanel_old() { this.se = Globals.se; initComponents(); diff --git a/src/gui/TraderListDialog.java b/src/gui/TraderListDialog.java index 31b7b64..e9b8eea 100644 --- a/src/gui/TraderListDialog.java +++ b/src/gui/TraderListDialog.java @@ -40,7 +40,7 @@ public class TraderListDialog extends javax.swing.JDialog { public TraderListDialog(java.awt.Frame parent, boolean modal) { super(parent, modal); initComponents(); - this.setLocationRelativeTo(MainWin.instance); + // this.setLocationRelativeTo(MainWin.instance); } /**