Revision: 5985
http://sourceforge.net/p/jump-pilot/code/5985
Author: ma15569
Date: 2018-10-30 13:34:49 +0000 (Tue, 30 Oct 2018)
Log Message:
-----------
Method to add a vertical space with defined height and color
Modified Paths:
--------------
core/trunk/src/org/saig/core/gui/swing/sldeditor/util/FormUtils.java
Modified: core/trunk/src/org/saig/core/gui/swing/sldeditor/util/FormUtils.java
===================================================================
--- core/trunk/src/org/saig/core/gui/swing/sldeditor/util/FormUtils.java
2018-10-30 09:56:00 UTC (rev 5984)
+++ core/trunk/src/org/saig/core/gui/swing/sldeditor/util/FormUtils.java
2018-10-30 13:34:49 UTC (rev 5985)
@@ -72,6 +72,7 @@
import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
+import javax.swing.Box;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JComboBox;
@@ -107,13 +108,14 @@
return defaultInsets;
}
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JComponent component ) {
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JComponent component) {
addRowInGBL(parent, row, startCol, component, true, true);
}
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JComponent component,
- boolean fillRow, boolean insets ) {
- GridBagConstraints gridBagConstraints = new GridBagConstraints();
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JComponent component, boolean fillRow, boolean insets) {
+ final GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
@@ -130,10 +132,11 @@
parent.add(component, gridBagConstraints);
}
-
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JComponent component,
- boolean fillRow, boolean lastComponentInRow, boolean insets ) {
- GridBagConstraints gridBagConstraints = new GridBagConstraints();
+
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JComponent component, boolean fillRow, boolean lastComponentInRow,
+ boolean insets) {
+ final GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
gridBagConstraints.fill = GridBagConstraints.NONE;
@@ -143,8 +146,7 @@
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
}
- if(lastComponentInRow)
- {
+ if (lastComponentInRow) {
gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER;
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
@@ -157,8 +159,8 @@
parent.add(component, gridBagConstraints);
}
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JLabel label,
- JComponent component ) {
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JLabel label, JComponent component) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
@@ -175,9 +177,9 @@
gridBagConstraints.insets = getDefaultInsets();
parent.add(component, gridBagConstraints);
}
-
- public static void addRowInGBL( JComponent parent, int row, int startCol,
String label,
- JComponent component ) {
+
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ String label, JComponent component) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
@@ -195,8 +197,8 @@
parent.add(component, gridBagConstraints);
}
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JLabel label,
- JComponent component, boolean lastRowComponent ) {
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JLabel label, JComponent component, boolean lastRowComponent) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
@@ -207,14 +209,11 @@
gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol + 1;
gridBagConstraints.gridy = row;
- if(lastRowComponent)
- {
+ if (lastRowComponent) {
gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER;
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
- }
- else
- {
+ } else {
gridBagConstraints.fill = GridBagConstraints.NONE;
}
gridBagConstraints.anchor = GridBagConstraints.WEST;
@@ -221,9 +220,9 @@
gridBagConstraints.insets = getDefaultInsets();
parent.add(component, gridBagConstraints);
}
-
- public static void addRowInGBL( JComponent parent, int row, int startCol,
String label,
- JComponent component, boolean lastRowComponent ) {
+
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ String label, JComponent component, boolean lastRowComponent) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
@@ -234,14 +233,11 @@
gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol + 1;
gridBagConstraints.gridy = row;
- if(lastRowComponent)
- {
+ if (lastRowComponent) {
gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER;
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
- }
- else
- {
+ } else {
gridBagConstraints.fill = GridBagConstraints.NONE;
}
gridBagConstraints.anchor = GridBagConstraints.WEST;
@@ -249,14 +245,13 @@
parent.add(component, gridBagConstraints);
}
-
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JComponent label,
- JComponent component ) {
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JComponent label, JComponent component) {
addRowInGBL(parent, row, startCol, label, component, 0.0, true);
}
-
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JComponent label,
- JComponent component, boolean lastRowComponent ) {
+
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JComponent label, JComponent component, boolean lastRowComponent) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
@@ -267,14 +262,11 @@
gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol + 1;
gridBagConstraints.gridy = row;
- if(lastRowComponent)
- {
+ if (lastRowComponent) {
gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER;
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
- }
- else
- {
+ } else {
gridBagConstraints.fill = GridBagConstraints.NONE;
}
gridBagConstraints.anchor = GridBagConstraints.WEST;
@@ -281,10 +273,10 @@
gridBagConstraints.insets = getDefaultInsets();
parent.add(component, gridBagConstraints);
}
-
-
- public static void addRowInGBL( JComponent parent, int row, int startCol,
JComponent label,
- JComponent component, double weigthy, boolean insets ) {
+
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ JComponent label, JComponent component, double weigthy,
+ boolean insets) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
@@ -320,18 +312,18 @@
parent.add(component, gridBagConstraints);
}
- //2015_03_11 Giuseppe Aruta: Add Icon to row
- public static void addRowInGBL( JComponent parent, int row, int startCol,
Icon icon,
- JComponent component ) {
+ // 2015_03_11 Giuseppe Aruta: Add Icon to row
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ Icon icon, JComponent component) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
gridBagConstraints.anchor = GridBagConstraints.WEST;
gridBagConstraints.insets = getDefaultInsets();
- JLabel iconlabel = new JLabel();
+ final JLabel iconlabel = new JLabel();
iconlabel.setIcon(icon);
parent.add(iconlabel, gridBagConstraints);
- // parent.add(label, gridBagConstraints);
+ // parent.add(label, gridBagConstraints);
gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol + 1;
@@ -342,20 +334,19 @@
gridBagConstraints.insets = getDefaultInsets();
parent.add(component, gridBagConstraints);
}
-
-
- //2015_03_11 Giuseppe Aruta: Add Icon to row
- public static void addRowInGBL( JComponent parent, int row, int startCol,
Icon icon,
- JComponent component, JComponent component2 ) {
+
+ // 2015_03_11 Giuseppe Aruta: Add Icon to row
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ Icon icon, JComponent component, JComponent component2) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
gridBagConstraints.anchor = GridBagConstraints.WEST;
gridBagConstraints.insets = getDefaultInsets();
- JLabel iconlabel = new JLabel();
+ final JLabel iconlabel = new JLabel();
iconlabel.setIcon(icon);
parent.add(iconlabel, gridBagConstraints);
- // parent.add(label, gridBagConstraints);
+ // parent.add(label, gridBagConstraints);
gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol + 1;
@@ -375,19 +366,20 @@
gridBagConstraints.insets = getDefaultInsets();
parent.add(component2, gridBagConstraints);
}
-
- //2015_03_11 Giuseppe Aruta: Add Icon to row
- public static void addRowInGBL( JComponent parent, int row, int startCol,
Icon icon,
- JLabel label, JComponent component, JLabel label2, JComponent
component2 ) {
+
+ // 2015_03_11 Giuseppe Aruta: Add Icon to row
+ public static void addRowInGBL(JComponent parent, int row, int startCol,
+ Icon icon, JLabel label, JComponent component, JLabel label2,
+ JComponent component2) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol;
gridBagConstraints.gridy = row;
gridBagConstraints.anchor = GridBagConstraints.WEST;
gridBagConstraints.insets = getDefaultInsets();
- JLabel iconlabel = new JLabel();
+ final JLabel iconlabel = new JLabel();
iconlabel.setIcon(icon);
parent.add(iconlabel, gridBagConstraints);
- // parent.add(label, gridBagConstraints);
+ // parent.add(label, gridBagConstraints);
gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = startCol + 1;
@@ -407,7 +399,7 @@
gridBagConstraints.insets = getDefaultInsets();
parent.add(component, gridBagConstraints);
gridBagConstraints = new GridBagConstraints();
-
+
gridBagConstraints.gridx = startCol + 3;
gridBagConstraints.gridy = row;
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
@@ -424,10 +416,10 @@
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = getDefaultInsets();
parent.add(component2, gridBagConstraints);
- }
-
- public static void addColInGBL( JComponent parent, int row, int startCol,
JComponent label,
- JComponent component ) {
+ }
+
+ public static void addColInGBL(JComponent parent, int row, int startCol,
+ JComponent label, JComponent component) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.fill = GridBagConstraints.BOTH;
gridBagConstraints.gridx = startCol;
@@ -449,9 +441,29 @@
parent.add(component, gridBagConstraints);
}
- public static void addFiller( JComponent parent, int row, int col,
JComponent component,
- double weight, boolean insets ) {
- GridBagConstraints gridBagConstraints = new GridBagConstraints();
+ /**
+ * Add a vertical space with defined height
+ *
+ * @param parent
+ * @param row
+ * @param startCol
+ * @param height
+ * @param color
+ */
+ public static void addSpacerInGBL(JComponent parent, int row, int startCol,
+ int height, Color color) {
+ final Component separator = Box.createHorizontalStrut(height);
+ final JPanel pan = new JPanel();
+
+ pan.setBackground(color);
+ pan.setForeground(color);
+ pan.add(separator);
+ addRowInGBL(parent, row, startCol, pan, true, true);
+ }
+
+ public static void addFiller(JComponent parent, int row, int col,
+ JComponent component, double weight, boolean insets) {
+ final GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = col;
gridBagConstraints.gridy = row;
gridBagConstraints.fill = GridBagConstraints.BOTH;
@@ -467,20 +479,22 @@
parent.add(component, gridBagConstraints);
}
- public static void addFiller( JComponent parent, int row, int col,
JComponent component ) {
+ public static void addFiller(JComponent parent, int row, int col,
+ JComponent component) {
addFiller(parent, row, col, component, 1000.0, true);
}
- public static void addFiller( JComponent parent, int row, int col,
JComponent component,
- boolean insets ) {
+ public static void addFiller(JComponent parent, int row, int col,
+ JComponent component, boolean insets) {
addFiller(parent, row, col, component, 1000.0, insets);
}
- public static void addFiller( JComponent parent, int row, int col ) {
+ public static void addFiller(JComponent parent, int row, int col) {
addFiller(parent, row, col, new JLabel(), false);
}
- public static void addSingleRowWestComponent( JComponent parent, int row,
JComponent component ) {
+ public static void addSingleRowWestComponent(JComponent parent, int row,
+ JComponent component) {
GridBagConstraints gridBagConstraints = new GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = row;
@@ -500,16 +514,16 @@
public static Dimension getButtonDimension() {
if (buttonDimension == null) {
- JLabel label = new JLabel("w"); //$NON-NLS-1$
+ final JLabel label = new JLabel("w"); //$NON-NLS-1$
buttonDimension = label.getPreferredSize();
- buttonDimension.width = buttonDimension.height = (int)
(Math.max(buttonDimension.width,
- buttonDimension.height) * 1.3);
+ buttonDimension.width = buttonDimension.height = (int) (Math.max(
+ buttonDimension.width, buttonDimension.height) * 1.3);
}
return buttonDimension;
}
- public static void forceButtonDimension( JButton button ) {
+ public static void forceButtonDimension(JButton button) {
button.setPreferredSize(getButtonDimension());
button.setMinimumSize(getButtonDimension());
button.setMaximumSize(getButtonDimension());
@@ -517,10 +531,10 @@
public static Dimension getColorButtonDimension() {
if (colorButtonDimension == null) {
- JLabel label = new JLabel("w"); //$NON-NLS-1$
+ final JLabel label = new JLabel("w"); //$NON-NLS-1$
colorButtonDimension = label.getPreferredSize();
- colorButtonDimension.height = (int)
(Math.max(colorButtonDimension.width,
- colorButtonDimension.height) * 1.3);
+ colorButtonDimension.height = (int) (Math.max(
+ colorButtonDimension.width, colorButtonDimension.height) *
1.3);
colorButtonDimension.width = getComboDimension().width;
}
@@ -529,7 +543,8 @@
public static Dimension getSpinnerDimension() {
if (spinnerDimension == null) {
- JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, 0, 1000,
0.1));
+ final JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, 0,
+ 1000, 0.1));
spinnerDimension = spinner.getPreferredSize();
spinnerDimension.width = getComboDimension().width;
}
@@ -539,8 +554,9 @@
public static Dimension getComboDimension() {
if (comboDimension == null) {
- JComboBox combo = new JComboBox(new String[]{"abcdefg"});
//$NON-NLS-1$
- JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, 0, 1000,
0.1));
+ final JComboBox combo = new JComboBox(new String[] { "abcdefg" });
//$NON-NLS-1$
+ final JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, 0,
+ 1000, 0.1));
comboDimension = combo.getPreferredSize();
}
@@ -547,8 +563,9 @@
return comboDimension;
}
- public static void show( JComponent component ) {
- JFrame frame = new JFrame("Testing component: " +
component.getClass().getName()); //$NON-NLS-1$
+ public static void show(JComponent component) {
+ final JFrame frame = new JFrame(
+ "Testing component: " + component.getClass().getName());
//$NON-NLS-1$
frame.setContentPane(component);
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.pack();
@@ -555,7 +572,7 @@
frame.show();
}
- public static void show( JFrame frame ) {
+ public static void show(JFrame frame) {
frame.setTitle("Testing component: " + frame.getClass().getName());
//$NON-NLS-1$
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.pack();
@@ -562,12 +579,12 @@
frame.show();
}
- public static Dimension getMaxDimension( Dimension d1, Dimension d2 ) {
- return new Dimension((int) Math.max(d1.width, d2.width), (int)
Math.max(d1.height,
+ public static Dimension getMaxDimension(Dimension d1, Dimension d2) {
+ return new Dimension(Math.max(d1.width, d2.width), Math.max(d1.height,
d2.height));
}
- public static Window getWindowForComponent( Component parentComponent ) {
+ public static Window getWindowForComponent(Component parentComponent) {
if (parentComponent == null) {
return JOptionPane.getRootFrame();
}
@@ -583,22 +600,24 @@
return getWindowForComponent(parentComponent.getParent());
}
- public static JLabel getTitleLabel( String title ) {
- JLabel label = new JLabel(title);
- label.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0,
Color.BLACK));
+ public static JLabel getTitleLabel(String title) {
+ final JLabel label = new JLabel(title);
+ label.setBorder(BorderFactory
+ .createMatteBorder(0, 0, 1, 0, Color.BLACK));
return label;
}
- public static JComponent getExpandableTitleLabel( String title,
- final JComponent[] managedComponents, boolean collapsed ) {
+ public static JComponent getExpandableTitleLabel(String title,
+ final JComponent[] managedComponents, boolean collapsed) {
// create label and button
- JLabel label = new JLabel(title);
+ final JLabel label = new JLabel(title);
final Icon expandedIcon = (Icon) UIManager.get("Tree.expandedIcon");
//$NON-NLS-1$
final Icon collapsedIcon = (Icon) UIManager.get("Tree.collapsedIcon");
//$NON-NLS-1$
- final JButton button = new JButton(collapsed ? collapsedIcon :
expandedIcon);
+ final JButton button = new JButton(collapsed ? collapsedIcon
+ : expandedIcon);
//
button.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(3,0,3,3),
// BorderFactory.createLineBorder(Color.BLACK)));
@@ -609,13 +628,14 @@
button.setFocusPainted(false);
// hide managed components
- for( int i = 0; i < managedComponents.length; i++ ) {
- managedComponents[i].setVisible(!collapsed);
+ for (final JComponent managedComponent : managedComponents) {
+ managedComponent.setVisible(!collapsed);
}
// setup expand/collapse logic
- button.addActionListener(new ActionListener(){
- public void actionPerformed( ActionEvent e ) {
+ button.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
boolean visible = true;
if (button.getIcon() == expandedIcon) {
@@ -625,8 +645,8 @@
button.setIcon(expandedIcon);
}
- for( int i = 0; i < managedComponents.length; i++ ) {
- managedComponents[i].setVisible(visible);
+ for (final JComponent managedComponent : managedComponents) {
+ managedComponent.setVisible(visible);
}
getWindowForComponent(button).pack();
@@ -634,8 +654,9 @@
});
// create the title panel
- JPanel panel = new JPanel();
- panel.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0,
Color.BLACK));
+ final JPanel panel = new JPanel();
+ panel.setBorder(BorderFactory
+ .createMatteBorder(0, 0, 1, 0, Color.BLACK));
panel.setLayout(new BorderLayout());
panel.add(button, BorderLayout.WEST);
panel.add(label);
@@ -643,16 +664,16 @@
return panel;
}
- public static void repackParentWindow( Component component ) {
- Window window = getWindowForComponent(component);
- Dimension preferred = window.getPreferredSize();
- Dimension actual = window.getSize();
- Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
- Dimension newSize = new Dimension(actual);
- Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(
+ public static void repackParentWindow(Component component) {
+ final Window window = getWindowForComponent(component);
+ final Dimension preferred = window.getPreferredSize();
+ final Dimension actual = window.getSize();
+ final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+ final Dimension newSize = new Dimension(actual);
+ final Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(
window.getGraphicsConfiguration());
- Dimension freeScreen = new Dimension(screen.width - insets.left -
insets.right,
- screen.height - insets.top - insets.bottom);
+ final Dimension freeScreen = new Dimension(screen.width - insets.left
+ - insets.right, screen.height - insets.top - insets.bottom);
if (actual.width < preferred.width) {
if (preferred.width > freeScreen.width) {
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
