From 0128940b544b6f9a193a79101b08a71c14a14a8a Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@maiol.ru> Date: Mon, 26 Dec 2016 04:20:02 +0100 Subject: [PATCH] Playing around with designer --- nbproject/private/private.xml | 28 +- nbproject/project.properties | 3 +- src/Gui/MainWin.form | 29 +- src/Gui/MainWin.java | 49 ++-- src/Gui/OrderBook.form | 482 ++++++++++++++++++++++++++++++++-- src/Gui/OrderBook.java | 79 ++++-- 6 files changed, 586 insertions(+), 84 deletions(-) diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index ceb8027..3003fd8 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,20 +3,22 @@ - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/Account.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/BuyOrder.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/ThreadedTrader.java - file:/home/tube/NetBeansProjects/SeSim/README.md - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/Exchange.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/RandomTrader.java - file:/home/tube/NetBeansProjects/SeSim/src/sesim/SeSim.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/SellOrder.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/Logger.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/Order.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/TraderRun.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Trader.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/TraderRun.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/MTrader.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Order.java + file:/home/tube/NetBeansProjects/SeSim/src/Gui/MainWin.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/RandomTrader.java + file:/home/tube/NetBeansProjects/SeSim/src/Gui/OrderBook.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/ThreadedTrader.java file:/home/tube/NetBeansProjects/SeSim/manifest.mf - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/Trader.java - file:/home/tube/NetBeansProjects/SeSim/src/StockExchange/MTrader.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Account.java + file:/home/tube/NetBeansProjects/SeSim/nbproject/build-impl.xml + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Exchange.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/BuyOrder.java + file:/home/tube/NetBeansProjects/SeSim/README.md + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Logger.java + file:/home/tube/NetBeansProjects/SeSim/src/SeSim/SellOrder.java diff --git a/nbproject/project.properties b/nbproject/project.properties index cfd288f..0ff22e5 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -32,7 +32,8 @@ excludes= includes=** jar.compress=false javac.classpath=\ - ${libs.absolutelayout.classpath} + ${libs.absolutelayout.classpath}:\ + ${libs.beans-binding.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/src/Gui/MainWin.form b/src/Gui/MainWin.form index c9613bc..920b57f 100644 --- a/src/Gui/MainWin.form +++ b/src/Gui/MainWin.form @@ -35,19 +35,21 @@ - + + + - + - + - + @@ -62,9 +64,12 @@ + + + - + @@ -78,17 +83,15 @@ - + - + + + + - - - - - - + diff --git a/src/Gui/MainWin.java b/src/Gui/MainWin.java index b629a6c..a33f0d8 100644 --- a/src/Gui/MainWin.java +++ b/src/Gui/MainWin.java @@ -29,15 +29,15 @@ public class MainWin extends javax.swing.JFrame { @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; jScrollPane1 = new javax.swing.JScrollPane(); jList1 = new javax.swing.JList<>(); jButton1 = new javax.swing.JButton(); - orderBook2 = new Gui.OrderBook(); - jMenuBar1 = new javax.swing.JMenuBar(); - jMenu1 = new javax.swing.JMenu(); - jMenuItem1 = new javax.swing.JMenuItem(); + orderBook1 = new Gui.OrderBook(); + orderBook = new Gui.OrderBook(); + MainMenu = new javax.swing.JMenuBar(); + FileMenu = new javax.swing.JMenu(); + FileNew = new javax.swing.JMenuItem(); jMenu2 = new javax.swing.JMenu(); jList1.setModel(new javax.swing.AbstractListModel() { @@ -55,38 +55,34 @@ public class MainWin extends javax.swing.JFrame { }); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); - getContentPane().setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; - getContentPane().add(orderBook2, gridBagConstraints); + setMinimumSize(new java.awt.Dimension(400, 200)); + getContentPane().setLayout(new java.awt.GridLayout()); + getContentPane().add(orderBook); - jMenu1.setText("File"); + FileMenu.setText("File"); - jMenuItem1.setText("New"); - jMenuItem1.addActionListener(new java.awt.event.ActionListener() { + FileNew.setText("New"); + FileNew.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - jMenuItem1ActionPerformed(evt); + FileNewActionPerformed(evt); } }); - jMenu1.add(jMenuItem1); + FileMenu.add(FileNew); - jMenuBar1.add(jMenu1); + MainMenu.add(FileMenu); jMenu2.setText("Edit"); - jMenuBar1.add(jMenu2); + MainMenu.add(jMenu2); - setJMenuBar(jMenuBar1); + setJMenuBar(MainMenu); pack(); }// //GEN-END:initComponents - private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed + private void FileNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_FileNewActionPerformed System.out.print("Menu 0 called\n"); - }//GEN-LAST:event_jMenuItem1ActionPerformed + }//GEN-LAST:event_FileNewActionPerformed private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed // TODO add your handling code here: @@ -132,13 +128,14 @@ public class MainWin extends javax.swing.JFrame { } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JMenu FileMenu; + private javax.swing.JMenuItem FileNew; + private javax.swing.JMenuBar MainMenu; private javax.swing.JButton jButton1; private javax.swing.JList jList1; - private javax.swing.JMenu jMenu1; private javax.swing.JMenu jMenu2; - private javax.swing.JMenuBar jMenuBar1; - private javax.swing.JMenuItem jMenuItem1; private javax.swing.JScrollPane jScrollPane1; - private Gui.OrderBook orderBook2; + private Gui.OrderBook orderBook; + private Gui.OrderBook orderBook1; // End of variables declaration//GEN-END:variables } diff --git a/src/Gui/OrderBook.form b/src/Gui/OrderBook.form index 76200d0..a18c8c0 100644 --- a/src/Gui/OrderBook.form +++ b/src/Gui/OrderBook.form @@ -1,6 +1,6 @@ -
+ @@ -11,34 +11,486 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/Gui/OrderBook.java b/src/Gui/OrderBook.java index dd5ac20..6701ee3 100644 --- a/src/Gui/OrderBook.java +++ b/src/Gui/OrderBook.java @@ -26,31 +26,78 @@ public class OrderBook extends javax.swing.JPanel { @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; + jLabel1 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); jScrollPane1 = new javax.swing.JScrollPane(); - jTable1 = new javax.swing.JTable(); + BidList = new javax.swing.JList<>(); + jScrollPane2 = new javax.swing.JScrollPane(); + jList2 = new javax.swing.JList<>(); - setLayout(new java.awt.GridLayout()); + java.awt.GridBagLayout layout = new java.awt.GridBagLayout(); + layout.columnWidths = new int[] {0, 5, 0, 5, 0, 5, 0}; + layout.rowHeights = new int[] {0, 5, 0}; + setLayout(layout); - jTable1.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {null, null, null, null}, - {null, null, null, null}, - {null, null, null, null}, - {null, null, null, null} - }, - new String [] { - "Title 1", "Title 2", "Title 3", "Title 4" - } - )); - jScrollPane1.setViewportView(jTable1); + jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); + jLabel1.setText("Bid"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST; + add(jLabel1, gridBagConstraints); - add(jScrollPane1); + jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); + jLabel3.setText("Ask"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 0; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + add(jLabel3, gridBagConstraints); + + BidList.setModel(new javax.swing.AbstractListModel() { + String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" }; + public int getSize() { return strings.length; } + public String getElementAt(int i) { return strings[i]; } + }); + BidList.setMinimumSize(new java.awt.Dimension(52, 200)); + BidList.setName(""); // NOI18N + jScrollPane1.setViewportView(BidList); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + add(jScrollPane1, gridBagConstraints); + + jList2.setModel(new javax.swing.AbstractListModel() { + String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" }; + public int getSize() { return strings.length; } + public String getElementAt(int i) { return strings[i]; } + }); + jList2.setMinimumSize(new java.awt.Dimension(52, 200)); + jList2.setName(""); // NOI18N + jScrollPane2.setViewportView(jList2); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + add(jScrollPane2, gridBagConstraints); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JList BidList; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel3; + private javax.swing.JList jList2; private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTable jTable1; + private javax.swing.JScrollPane jScrollPane2; // End of variables declaration//GEN-END:variables }