From: <cpm...@us...> - 2008-02-24 21:18:12
|
Revision: 5324 http://pcgen.svn.sourceforge.net/pcgen/?rev=5324&view=rev Author: cpmeister Date: 2008-02-24 13:18:13 -0800 (Sun, 24 Feb 2008) Log Message: ----------- corrected ui behavior Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.form branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.java branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java Modified: branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.form 2008-02-24 21:08:37 UTC (rev 5323) +++ branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.form 2008-02-24 21:18:13 UTC (rev 5324) @@ -33,7 +33,37 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> <SubComponents> - <Component class="pcgen.gui.util.JTreeViewTable" name="jTreeViewTable1"> + <Component class="pcgen.gui.util.JTableEx" name="jTableEx1"> + <Properties> + <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor"> + <Table columnCount="4" rowCount="4"> + <Column editable="true" title="Title 1" type="java.lang.Object"> + <Data value="sdfa"/> + <Data value="ghjd"/> + <Data value="null"/> + <Data value="dfg"/> + </Column> + <Column editable="true" title="Title 2" type="java.lang.Object"> + <Data value="tegh"/> + <Data value="asdf"/> + <Data value="asdrj"/> + <Data value="cbnc"/> + </Column> + <Column editable="true" title="Title 3" type="java.lang.Object"> + <Data value="wvczs"/> + <Data value="trtw"/> + <Data value="kjffs"/> + <Data value="mnvx"/> + </Column> + <Column editable="true" title="Title 4" type="java.lang.Object"> + <Data value="yuue"/> + <Data value="sfdgj"/> + <Data value="sfgj"/> + <Data value="xssd"/> + </Column> + </Table> + </Property> + </Properties> </Component> </SubComponents> </Container> Modified: branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.java 2008-02-24 21:08:37 UTC (rev 5323) +++ branches/cdomui/code/src/java/pcgen/gui/proto/editor/PlayerCharacterEditor.java 2008-02-24 21:18:13 UTC (rev 5324) @@ -25,11 +25,22 @@ private void initComponents() { jScrollPane1 = new javax.swing.JScrollPane(); - jTreeViewTable1 = new pcgen.gui.util.JTreeViewTable(); + jTableEx1 = new pcgen.gui.util.JTableEx(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); - jScrollPane1.setViewportView(jTreeViewTable1); + jTableEx1.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {"sdfa", "tegh", "wvczs", "yuue"}, + {"ghjd", "asdf", "trtw", "sfdgj"}, + {null, "asdrj", "kjffs", "sfgj"}, + {"dfg", "cbnc", "mnvx", "xssd"} + }, + new String [] { + "Title 1", "Title 2", "Title 3", "Title 4" + } + )); + jScrollPane1.setViewportView(jTableEx1); getContentPane().add(jScrollPane1, java.awt.BorderLayout.CENTER); @@ -48,7 +59,7 @@ } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JScrollPane jScrollPane1; - private pcgen.gui.util.JTreeViewTable jTreeViewTable1; + private pcgen.gui.util.JTableEx jTableEx1; // End of variables declaration//GEN-END:variables } Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java 2008-02-24 21:08:37 UTC (rev 5323) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java 2008-02-24 21:18:13 UTC (rev 5324) @@ -130,7 +130,7 @@ public void mouseClicked(MouseEvent e) { - if (getResizingColumn() == null) + if (getCursor() == Cursor.getDefaultCursor()) { sorter.toggleSort(trackedColumn.getModelIndex()); repaint(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |