From 03f3f9138d7554ee205f0e946bcfa1c660b0fa01 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Fri, 3 Mar 2017 19:06:36 +0100 Subject: [PATCH] Some improvements --- src/main/java/gui/NewMDIApplication.form | 12 ++++++++++++ src/main/java/gui/NewMDIApplication.java | 5 +++++ src/main/java/gui/TraderListDialog.form | 4 ++-- src/main/java/gui/TraderListDialog.java | 2 +- src/main/java/gui/tools/NummericCellRenderer.java | 8 +++++++- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/gui/NewMDIApplication.form b/src/main/java/gui/NewMDIApplication.form index 133151b..2b65116 100644 --- a/src/main/java/gui/NewMDIApplication.form +++ b/src/main/java/gui/NewMDIApplication.form @@ -491,6 +491,18 @@ + + + + + + + + + + + + diff --git a/src/main/java/gui/NewMDIApplication.java b/src/main/java/gui/NewMDIApplication.java index e431769..411774a 100644 --- a/src/main/java/gui/NewMDIApplication.java +++ b/src/main/java/gui/NewMDIApplication.java @@ -163,6 +163,7 @@ public class NewMDIApplication extends javax.swing.JFrame { jChartScrollPane = new javax.swing.JScrollPane(); chart = new chart.Chart(); quoteVertical1 = new gui.orderbook.QuoteVertical(); + jSplitPane5 = new javax.swing.JSplitPane(); menuBar = new javax.swing.JMenuBar(); fileMenu = new javax.swing.JMenu(); jMenuItem1 = new javax.swing.JMenuItem(); @@ -314,6 +315,9 @@ public class NewMDIApplication extends javax.swing.JFrame { jSplitPane3.setRightComponent(jSplitPane4); jSplitPane3.setLeftComponent(quoteVertical1); + jSplitPane5.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); + jSplitPane3.setLeftComponent(jSplitPane5); + getContentPane().add(jSplitPane3, java.awt.BorderLayout.CENTER); fileMenu.setMnemonic('f'); @@ -775,6 +779,7 @@ public class NewMDIApplication extends javax.swing.JFrame { private javax.swing.JSplitPane jSplitPane2; private javax.swing.JSplitPane jSplitPane3; private javax.swing.JSplitPane jSplitPane4; + private javax.swing.JSplitPane jSplitPane5; private javax.swing.JTextArea jTextArea1; private javax.swing.JMenuBar menuBar; private javax.swing.JMenuItem openMenuItem; diff --git a/src/main/java/gui/TraderListDialog.form b/src/main/java/gui/TraderListDialog.form index 406d9c1..44b6f0d 100644 --- a/src/main/java/gui/TraderListDialog.form +++ b/src/main/java/gui/TraderListDialog.form @@ -24,7 +24,7 @@ - + @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/src/main/java/gui/TraderListDialog.java b/src/main/java/gui/TraderListDialog.java index 801ea77..31b7b64 100644 --- a/src/main/java/gui/TraderListDialog.java +++ b/src/main/java/gui/TraderListDialog.java @@ -61,7 +61,7 @@ public class TraderListDialog extends javax.swing.JDialog { getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(traderListPanel22, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 574, Short.MAX_VALUE) + .addComponent(traderListPanel22, javax.swing.GroupLayout.DEFAULT_SIZE, 922, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/src/main/java/gui/tools/NummericCellRenderer.java b/src/main/java/gui/tools/NummericCellRenderer.java index 371f9a6..9cc6a72 100644 --- a/src/main/java/gui/tools/NummericCellRenderer.java +++ b/src/main/java/gui/tools/NummericCellRenderer.java @@ -58,7 +58,13 @@ public class NummericCellRenderer extends DefaultTableCellRenderer { JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - // First format the cell value as required + + if (!(value instanceof Double)) { + return super.getTableCellRendererComponent( + table, value, isSelected, hasFocus, row, column); + } + + // Format the cell value as required value = formatter.format((Number) value); // And pass it on to parent class