Author: rozagh
Date: 2012-05-01 11:52:17 -0700 (Tue, 01 May 2012)
New Revision: 29058
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BoundedHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java
Log:
Changed the setting for the tunables GUI and the layout setting dialog.
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -30,6 +30,7 @@
package org.cytoscape.internal.layout.ui;
+import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
@@ -309,6 +310,7 @@
// Create our main panel
mainPanel = new JPanel();
mainPanel.setLayout(new BoxLayout(mainPanel,
BoxLayout.PAGE_AXIS));
+ mainPanel.setAutoscrolls(true);
// Create a panel for the list of algorithms
JPanel algorithmSelectorPanel = new JPanel();
@@ -324,7 +326,8 @@
mainPanel.add(algorithmSelectorPanel);
// Create a panel for algorithm's content
- this.algorithmPanel = new JPanel();
+ this.algorithmPanel = new JPanel(new BorderLayout(10, 10));
+ algorithmPanel.setAutoscrolls(true);
mainPanel.add(algorithmPanel);
// Create a panel for our button box
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BooleanHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -8,11 +8,13 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import org.cytoscape.work.Tunable;
+import org.cytoscape.work.internal.tunables.utils.GUIDefaults;
import org.cytoscape.work.swing.AbstractGUITunableHandler;
@@ -46,11 +48,12 @@
private void init() {
//setup GUI
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
checkBox = new JCheckBox();
checkBox.setSelected(getBoolean());
JLabel label = new JLabel(getDescription());
label.setFont(new Font(null, Font.PLAIN, 12));
+ label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
checkBox.addActionListener(this);
if (horizontal) {
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BoundedHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BoundedHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/BoundedHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -9,6 +9,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
@@ -16,6 +17,7 @@
import org.cytoscape.work.Tunable;
import org.cytoscape.work.swing.AbstractGUITunableHandler;
+import org.cytoscape.work.internal.tunables.utils.GUIDefaults;
import org.cytoscape.work.internal.tunables.utils.myBoundedSwing;
import org.cytoscape.work.internal.tunables.utils.mySlider;
import org.cytoscape.work.util.AbstractBounded;
@@ -72,13 +74,14 @@
private void init() {
final String title = getDescription();
useSlider = getParams().getProperty("slider",
"false").equalsIgnoreCase("true");
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
try {
final T bounded = getBounded();
if (useSlider) {
JLabel label = new JLabel(title);
label.setFont(new Font(null, Font.PLAIN,12));
+
label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
panel.add(label,BorderLayout.WEST);
slider = new mySlider(title,
(Number)bounded.getLowerBound(), (Number)bounded.getUpperBound(),
(Number)bounded.getValue(), bounded.isLowerBoundStrict(),
bounded.isUpperBoundStrict());
@@ -89,6 +92,7 @@
new JLabel(title + " (max: " +
bounded.getLowerBound().toString()
+ " min: " +
bounded.getUpperBound().toString() + ")" );
label.setFont(new Font(null, Font.PLAIN,12));
+
label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
boundedField = new
myBoundedSwing((Number)bounded.getValue(), (Number)bounded.getLowerBound(),
(Number)bounded.getUpperBound(), bounded.isLowerBoundStrict(),
bounded.isUpperBoundStrict());
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -63,9 +63,10 @@
//set Gui
textField = new JFormattedTextField(d.toString());
textField.setPreferredSize(GUIDefaults.TEXT_BOX_DIMENSION);
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
JLabel label = new JLabel(getDescription());
label.setFont(new Font(null, Font.PLAIN,12));
+ label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
textField.setHorizontalAlignment(JTextField.RIGHT);
textField.addActionListener(this);
if (horizontal) {
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.List;
+import javax.swing.BorderFactory;
import javax.swing.GroupLayout;
import javax.swing.ImageIcon;
import javax.swing.JButton;
@@ -147,6 +148,7 @@
private void setGui() {
//titleSeparator = new JSeparator();
titleLabel = new JLabel();
+ titleLabel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5,
5));
image = new
ImageIcon(getClass().getResource("/images/ximian/stock_open.png"));
fileTextField = new JTextField();
fileTextField.setName("fileTextField");
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -53,9 +53,10 @@
textField = new JFormattedTextField(new DecimalFormat());
textField.setValue(f);
textField.setPreferredSize(GUIDefaults.TEXT_BOX_DIMENSION);
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
JLabel label = new JLabel(getDescription());
label.setFont(new Font(null, Font.PLAIN, 12));
+ label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
textField.setHorizontalAlignment(JTextField.RIGHT);
textField.addActionListener(this);
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -10,6 +10,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import javax.swing.BorderFactory;
import javax.swing.JFormattedTextField;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
@@ -60,7 +61,7 @@
}
//set GUI
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
JLabel label = new JLabel(getDescription());
label.setFont(new Font(null, Font.PLAIN,12));
textField = new JFormattedTextField();
@@ -68,6 +69,7 @@
textField.setValue(i.toString());
textField.setHorizontalAlignment(JTextField.RIGHT);
textField.addActionListener(this);
+ label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
if (horizontal) {
panel.add(label, BorderLayout.NORTH);
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -19,6 +19,7 @@
import javax.swing.event.ListSelectionListener;
import org.cytoscape.work.Tunable;
+import org.cytoscape.work.internal.tunables.utils.GUIDefaults;
import org.cytoscape.work.swing.AbstractGUITunableHandler;
import org.cytoscape.work.util.ListMultipleSelection;
@@ -69,7 +70,7 @@
return;
}
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
JTextArea jta = new JTextArea(getDescription());
jta.setLineWrap(true);
jta.setWrapStyleWord(true);
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -5,6 +5,7 @@
import javax.swing.*;
import org.cytoscape.work.Tunable;
+import org.cytoscape.work.internal.tunables.utils.GUIDefaults;
import org.cytoscape.work.swing.AbstractGUITunableHandler;
import org.cytoscape.work.util.ListSingleSelection;
@@ -67,9 +68,9 @@
}
//set Gui
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
final JLabel textArea = new JLabel(getDescription());
- textArea.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+ textArea.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
textArea.setFont(LABEL_FONT);
textArea.setPreferredSize(DEF_LABEL_SIZE);
textArea.setVerticalTextPosition(SwingConstants.CENTER);
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -50,9 +50,10 @@
textField = new JFormattedTextField(new DecimalFormat());
textField.setPreferredSize(GUIDefaults.TEXT_BOX_DIMENSION);
textField.setValue(getLong());
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
JLabel label = new JLabel(getDescription());
label.setFont(new Font(null, Font.PLAIN,12));
+ label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
textField.setHorizontalAlignment(JTextField.RIGHT);
textField.addActionListener(this);
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/StringHandler.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -57,10 +57,11 @@
//set Gui
textField = new JFormattedTextField(s);
textField.setPreferredSize(GUIDefaults.TEXT_BOX_DIMENSION);
- panel = new JPanel(new BorderLayout());
+ panel = new JPanel(new BorderLayout(GUIDefaults.hGap,
GUIDefaults.vGap));
final JLabel label = new JLabel(getDescription());
label.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
label.setFont(LABEL_FONT);
+ label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
textField.setFont(TEXT_FONT);
textField.setHorizontalAlignment(JTextField.LEFT);
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java
2012-05-01 17:16:28 UTC (rev 29057)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java
2012-05-01 18:52:17 UTC (rev 29058)
@@ -1,5 +1,6 @@
package org.cytoscape.work.internal.tunables.utils;
+import java.awt.BorderLayout;
import java.awt.Dimension;
/**
@@ -12,4 +13,7 @@
private static final int TEXT_BOX_WIDTH = 150;
private static final int TEXT_BOX_HEIGHT = 12;
public static final Dimension TEXT_BOX_DIMENSION = new
Dimension(TEXT_BOX_WIDTH, TEXT_BOX_HEIGHT);
+
+ public static final int hGap = 10;
+ public static final int vGap = 10;
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
