diff --git a/src/main/java/gui/OrdersList.form b/src/main/java/gui/OpenOrdersList.form
similarity index 100%
rename from src/main/java/gui/OrdersList.form
rename to src/main/java/gui/OpenOrdersList.form
diff --git a/src/main/java/gui/OrdersList.java b/src/main/java/gui/OpenOrdersList.java
similarity index 98%
rename from src/main/java/gui/OrdersList.java
rename to src/main/java/gui/OpenOrdersList.java
index e6e4687..38f6e7b 100644
--- a/src/main/java/gui/OrdersList.java
+++ b/src/main/java/gui/OpenOrdersList.java
@@ -43,7 +43,7 @@ import traders.ManTrader.CreateOrderDialog;
*
* @author tobias
*/
-public class OrdersList extends javax.swing.JPanel {
+public class OpenOrdersList extends javax.swing.JPanel {
private Account account;
DefaultTableModel model;
@@ -82,7 +82,7 @@ public class OrdersList extends javax.swing.JPanel {
/**
* Creates new form OrdersList
*/
- public OrdersList() {
+ public OpenOrdersList() {
initComponents();
model = (DefaultTableModel) table.getModel();
model.setRowCount(0);
@@ -186,7 +186,6 @@ public class OrdersList extends javax.swing.JPanel {
}// //GEN-END:initComponents
private void tableMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_tableMousePressed
-
Point point = evt.getPoint();
int currentRow = table.rowAtPoint(point);
@@ -201,7 +200,7 @@ public class OrdersList extends javax.swing.JPanel {
int button = evt.getButton();
if (!evt.isPopupTrigger()) {
return;
- };
+ }
this.ctxMenu.show(this, evt.getX(), evt.getY());
@@ -229,10 +228,10 @@ public class OrdersList extends javax.swing.JPanel {
private void ctxMenuCancelOrderActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ctxMenuCancelOrderActionPerformed
int r = table.getSelectedRow();
Long id = (Long) model.getValueAt(r, 0);
-
+
System.out.printf("Should cancel %d\n", id);
Globals.se.cancelOrder(account.getID(), id);
-
+
}//GEN-LAST:event_ctxMenuCancelOrderActionPerformed
diff --git a/src/main/java/traders/ManTrader/ManTrader.java b/src/main/java/traders/ManTrader/ManTrader.java
index 7449168..7f4fefc 100644
--- a/src/main/java/traders/ManTrader/ManTrader.java
+++ b/src/main/java/traders/ManTrader/ManTrader.java
@@ -26,7 +26,7 @@
package traders.ManTrader;
import gui.Globals;
-import gui.OrdersList;
+import gui.OpenOrdersList;
import javax.swing.JDialog;
import org.json.JSONObject;
@@ -75,7 +75,7 @@ public class ManTrader extends AutoTraderBase implements AccountListener {
@Override
public long timerTask() {
-// OrdersList ol = this.consoleDialog.getConsole().getOrderListPanel();
+// OpenOrdersList ol = this.consoleDialog.getConsole().getOrderListPanel();
// ol.updateModel();
return 1000;
}
diff --git a/src/main/java/traders/ManTrader/ManTraderConsole.form b/src/main/java/traders/ManTrader/ManTraderConsole.form
index 75cd173..8671d54 100644
--- a/src/main/java/traders/ManTrader/ManTraderConsole.form
+++ b/src/main/java/traders/ManTrader/ManTraderConsole.form
@@ -153,7 +153,7 @@
-
+
@@ -165,4 +165,4 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/traders/ManTrader/ManTraderConsole.java b/src/main/java/traders/ManTrader/ManTraderConsole.java
index 50dd904..872abe2 100644
--- a/src/main/java/traders/ManTrader/ManTraderConsole.java
+++ b/src/main/java/traders/ManTrader/ManTraderConsole.java
@@ -25,7 +25,7 @@
*/
package traders.ManTrader;
-import gui.OrdersList;
+import gui.OpenOrdersList;
import sesim.Exchange;
@@ -37,7 +37,7 @@ public class ManTraderConsole extends javax.swing.JPanel {
public ManTrader trader;
- public OrdersList getOrderListPanel(){
+ public OpenOrdersList getOrderListPanel(){
return this.ordersList;
}
@@ -71,7 +71,7 @@ public class ManTraderConsole extends javax.swing.JPanel {
moneyText = new javax.swing.JLabel();
stopLossButton = new javax.swing.JButton();
jTabbedPane1 = new javax.swing.JTabbedPane();
- ordersList = new gui.OrdersList();
+ ordersList = new gui.OpenOrdersList();
limitSpinner.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, null, 1.0d));
@@ -213,7 +213,7 @@ public class ManTraderConsole extends javax.swing.JPanel {
private javax.swing.JTabbedPane jTabbedPane1;
private javax.swing.JSpinner limitSpinner;
private javax.swing.JLabel moneyText;
- private gui.OrdersList ordersList;
+ private gui.OpenOrdersList ordersList;
private javax.swing.JButton sellButton;
private javax.swing.JButton stopLossButton;
private javax.swing.JSpinner volumeSpinner;
diff --git a/src/main/java/traders/ManTrader/ManTraderConsoleDialog.form b/src/main/java/traders/ManTrader/ManTraderConsoleDialog.form
index eca98f7..905bc0a 100644
--- a/src/main/java/traders/ManTrader/ManTraderConsoleDialog.form
+++ b/src/main/java/traders/ManTrader/ManTraderConsoleDialog.form
@@ -53,7 +53,7 @@
-
+
@@ -67,4 +67,4 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/traders/ManTrader/ManTraderConsoleDialog.java b/src/main/java/traders/ManTrader/ManTraderConsoleDialog.java
index e131495..396fa12 100644
--- a/src/main/java/traders/ManTrader/ManTraderConsoleDialog.java
+++ b/src/main/java/traders/ManTrader/ManTraderConsoleDialog.java
@@ -44,7 +44,7 @@ public class ManTraderConsoleDialog extends javax.swing.JDialog {
this.setTitle(account.getOwner().getName()+" - Trading Console");
}
- public gui.OrdersList getOrderList(){
+ public gui.OpenOrdersList getOrderList(){
return this.ordersList;
}
@@ -68,7 +68,7 @@ public class ManTraderConsoleDialog extends javax.swing.JDialog {
private void initComponents() {
jTabbedPane1 = new javax.swing.JTabbedPane();
- ordersList = new gui.OrdersList();
+ ordersList = new gui.OpenOrdersList();
accountBalance1 = new traders.ManTrader.AccountBalance();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -147,6 +147,6 @@ public class ManTraderConsoleDialog extends javax.swing.JDialog {
// Variables declaration - do not modify//GEN-BEGIN:variables
private traders.ManTrader.AccountBalance accountBalance1;
private javax.swing.JTabbedPane jTabbedPane1;
- private gui.OrdersList ordersList;
+ private gui.OpenOrdersList ordersList;
// End of variables declaration//GEN-END:variables
}