halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add TitledSeperators to PropertySheetPanel

Browse Source
This commit is contained in:
Fabian Becker 2015-12-15 09:38:22 +01:00
parent 97fcc1c3d0
commit ee92cc009a
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/eva2/gui/PropertySheetPanel.java
View File

@ -187,8 +187,8 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
*/ */
public synchronized void setTarget(Object targ) { public synchronized void setTarget(Object targ) {
propertyTableModel = new DefaultTableModel(); propertyTableModel = new DefaultTableModel();
propertyTableModel.addColumn("Attribute"); propertyTableModel.addColumn("Property");
propertyTableModel.addColumn("Setting"); propertyTableModel.addColumn("Value");
propertyTable = new ToolTipTable(propertyTableModel); propertyTable = new ToolTipTable(propertyTableModel);
propertyTable.setDefaultRenderer(Object.class, new PropertyCellRenderer()); propertyTable.setDefaultRenderer(Object.class, new PropertyCellRenderer());
propertyTable.setDefaultEditor(Object.class, new PropertyCellEditor()); propertyTable.setDefaultEditor(Object.class, new PropertyCellEditor());
@ -215,6 +215,7 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
GridBagConstraints gbConstraints = new GridBagConstraints(); GridBagConstraints gbConstraints = new GridBagConstraints();
gbConstraints.fill = GridBagConstraints.BOTH; gbConstraints.fill = GridBagConstraints.BOTH;
gbConstraints.ipady = 10;
Description description = targ.getClass().getAnnotation(Description.class); Description description = targ.getClass().getAnnotation(Description.class);
if (description != null) { if (description != null) {
@ -225,9 +226,11 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
gbConstraints.gridy = 0; gbConstraints.gridy = 0;
gbConstraints.fill = GridBagConstraints.HORIZONTAL; gbConstraints.fill = GridBagConstraints.HORIZONTAL;
gbConstraints.anchor = GridBagConstraints.PAGE_START; gbConstraints.anchor = GridBagConstraints.PAGE_START;
add(infoPanel, gbConstraints);
add(buildTitledSeperator("Info"), gbConstraints);
gbConstraints.gridy = 1; gbConstraints.gridy = 1;
add(new JSeparator(JSeparator.HORIZONTAL), gbConstraints); add(infoPanel, gbConstraints);
} }
} }
@ -305,9 +308,15 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
propertyTable.setToolTips(toolTips); propertyTable.setToolTips(toolTips);
gbConstraints.gridy = 2;
add(buildTitledSeperator("Properties"), gbConstraints);
JScrollPane scrollableTable = new JScrollPane(propertyTable, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); JScrollPane scrollableTable = new JScrollPane(propertyTable, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
gbConstraints.gridx = 0; gbConstraints.gridx = 0;
gbConstraints.gridy = 2; gbConstraints.gridy = 3;
gbConstraints.weightx = 1.0; gbConstraints.weightx = 1.0;
gbConstraints.weighty = 1.0; gbConstraints.weighty = 1.0;
gbConstraints.fill = GridBagConstraints.BOTH; gbConstraints.fill = GridBagConstraints.BOTH;
@ -318,6 +327,24 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
setVisible(true); setVisible(true);
} }
private static JPanel buildTitledSeperator(String title) {
JPanel titledSeperator = new JPanel(new GridBagLayout());
GridBagConstraints gbConstraints = new GridBagConstraints();
gbConstraints.gridx = 0;
gbConstraints.gridy = 0;
titledSeperator.add(new JLabel("<html><b>" + title), gbConstraints);
gbConstraints.gridx = 1;
gbConstraints.gridy = 0;
gbConstraints.weightx = 1.0;
gbConstraints.fill = GridBagConstraints.HORIZONTAL;
titledSeperator.add(new JSeparator(JSeparator.HORIZONTAL), gbConstraints);
return titledSeperator;
}
public static PropertyDescriptor[] getProperties(Object target) { public static PropertyDescriptor[] getProperties(Object target) {
BeanInfo bi; BeanInfo bi;
try { try {
@ -499,21 +526,15 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
return i; return i;
} }
} }
System.err.println("Error, property not found: " + string); LOGGER.warning("Error, property not found: " + string);
return -1; return -1;
} }
private JPanel makeInfoPanel(String infoText, Object targ, int rowHeight) { private JPanel makeInfoPanel(String infoText, Object targ, int rowHeight) {
className = targ.getClass().getName(); className = targ.getClass().getName();
helpButton = new JButton("?"); helpButton = new JButton();
helpButton.setToolTipText("More information about " + className); helpButton.setToolTipText("More information about " + className);
helpButton.addActionListener(new ActionListener() { helpButton.addActionListener(event -> openHelpFrame());
@Override
public void actionPerformed(ActionEvent event) {
openHelpFrame();
}
});
helpButton.putClientProperty("JButton.buttonType", "help"); helpButton.putClientProperty("JButton.buttonType", "help");
JTextArea infoTextArea = new JTextArea(); JTextArea infoTextArea = new JTextArea();
@ -523,10 +544,8 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
infoTextArea.setLineWrap(true); infoTextArea.setLineWrap(true);
infoTextArea.setWrapStyleWord(true); infoTextArea.setWrapStyleWord(true);
infoTextArea.setBackground(getBackground()); infoTextArea.setBackground(getBackground());
//infoTextArea.setSize(infoTextArea.getPreferredSize());
JPanel infoPanel = new JPanel(); JPanel infoPanel = new JPanel();
infoPanel.setBorder(BorderFactory.createTitledBorder("Info"));
infoPanel.setLayout(new BorderLayout()); infoPanel.setLayout(new BorderLayout());
infoPanel.add(infoTextArea, BorderLayout.CENTER); infoPanel.add(infoTextArea, BorderLayout.CENTER);
@ -1056,7 +1075,7 @@ final class PropertyCellEditor extends AbstractCellEditor implements TableCellEd
int selectedColumn = sourceTable.getSelectedColumn(); int selectedColumn = sourceTable.getSelectedColumn();
String columnName = sourceTable.getColumnName(selectedColumn); String columnName = sourceTable.getColumnName(selectedColumn);
/* If the columnName equals Key it holds the keys */ /* If the columnName equals Key it holds the keys */
return !"Attribute".equals(columnName); return !"Property".equals(columnName);
} }
} }