Browse Source

Fixed bug where java 1.6 gave an exception when clicking on path table header.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@469 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Mark Kattenbelt 18 years ago
parent
commit
a5cd6a4b56
  1. 15
      prism/src/userinterface/util/GUIGroupedTable.java
  2. 8
      prism/src/userinterface/util/GUIGroupedTableHeader.java

15
prism/src/userinterface/util/GUIGroupedTable.java

@ -112,11 +112,18 @@ public class GUIGroupedTable extends JTable
@Override
protected JTableHeader createDefaultTableHeader() {
GUIGroupedTableHeader header = null;
if (columnModel != null && columnModel instanceof GUIGroupedTableColumnModel)
{
return new GUIGroupedTableHeader((GUIGroupedTableColumnModel)columnModel, (GUIGroupedTableModel)this.getModel());
}
return new GUIGroupedTableHeader(new GUIGroupedTableColumnModel(), (GUIGroupedTableModel)this.getModel());
header = new GUIGroupedTableHeader((GUIGroupedTableColumnModel)columnModel, (GUIGroupedTableModel)this.getModel(), this);
else
header = new GUIGroupedTableHeader(new GUIGroupedTableColumnModel(), (GUIGroupedTableModel)this.getModel(), this);
header.setTable(this);
return header;
}
}

8
prism/src/userinterface/util/GUIGroupedTableHeader.java

@ -50,7 +50,7 @@ public class GUIGroupedTableHeader extends JTableHeader implements TableColumnMo
* Creates a new GUIGroupedTableHeader.
* @param model The column model that is the basis of this table header (must be grouped).
*/
public GUIGroupedTableHeader(GUIGroupedTableColumnModel model, GUIGroupedTableModel tableModel)
public GUIGroupedTableHeader(GUIGroupedTableColumnModel model, GUIGroupedTableModel tableModel, GUIGroupedTable table)
{
super();
removeAll();
@ -63,6 +63,7 @@ public class GUIGroupedTableHeader extends JTableHeader implements TableColumnMo
topHeader.setReorderingAllowed(false);
final TableCellRenderer renderer = topHeader.getDefaultRenderer();
topHeader.setDefaultRenderer(new TableCellRenderer() {
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
@ -76,6 +77,9 @@ public class GUIGroupedTableHeader extends JTableHeader implements TableColumnMo
bottomHeader = new JTableHeader(model);
bottomHeader.setReorderingAllowed(false);
topHeader.setTable(table);
bottomHeader.setTable(table);
setLayout(new GridLayout(2,1));
add(topHeader);
@ -119,7 +123,7 @@ public class GUIGroupedTableHeader extends JTableHeader implements TableColumnMo
});
bottomHeader.addMouseMotionListener(new MouseMotionAdapter()
{
private TableColumn lastColumn;
private TableColumn lastColumn;
public void mouseMoved(MouseEvent e)
{

Loading…
Cancel
Save