Author: kono
Date: 2010-06-01 16:44:22 -0700 (Tue, 01 Jun 2010)
New Revision: 20400
Modified:
cytoscape/trunk/src/cytoscape/visual/mappings/PassThroughMapping.java
cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
cytoscape/trunk/src/cytoscape/visual/ui/ValueSelectDialog.java
Log:
UI component size tweaked.
Modified: cytoscape/trunk/src/cytoscape/visual/mappings/PassThroughMapping.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/mappings/PassThroughMapping.java
2010-06-01 23:37:35 UTC (rev 20399)
+++ cytoscape/trunk/src/cytoscape/visual/mappings/PassThroughMapping.java
2010-06-01 23:44:22 UTC (rev 20400)
@@ -118,7 +118,6 @@
public PassThroughMapping(final Class<V> rangeClass, final String
attrName) {
super(rangeClass, attrName);
this.acceptedClasses = ACCEPTED_CLASS;
- System.out.println("@@@@@ PTh Mapping created: " + attrName);
}
/**
Modified: cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
2010-06-01 23:37:35 UTC (rev 20399)
+++ cytoscape/trunk/src/cytoscape/visual/ui/DefaultAppearenceBuilder.java
2010-06-01 23:44:22 UTC (rev 20400)
@@ -34,23 +34,6 @@
*/
package cytoscape.visual.ui;
-import cytoscape.Cytoscape;
-
-import cytoscape.logger.CyLogger;
-import cytoscape.util.CyColorChooser;
-
-import cytoscape.visual.GlobalAppearanceCalculator;
-import cytoscape.visual.NodeAppearanceCalculator;
-import cytoscape.visual.VisualPropertyType;
-import cytoscape.visual.VisualPropertyDependency;
-import cytoscape.visual.VisualPropertyDependency.Definition;
-import static cytoscape.visual.VisualPropertyType.*;
-
-import cytoscape.visual.ui.icon.VisualPropertyIcon;
-
-import org.jdesktop.swingx.JXList;
-import org.jdesktop.swingx.border.DropShadowBorder;
-
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Component;
@@ -65,19 +48,43 @@
import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.geom.Point2D;
-
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import java.util.Map;
-import java.util.HashMap;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.DefaultListModel;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.SwingConstants;
+import javax.swing.WindowConstants;
import javax.swing.border.LineBorder;
+import org.jdesktop.swingx.JXList;
+import org.jdesktop.swingx.border.DropShadowBorder;
+import cytoscape.Cytoscape;
+import cytoscape.logger.CyLogger;
+import cytoscape.util.CyColorChooser;
+import cytoscape.visual.GlobalAppearanceCalculator;
+import cytoscape.visual.VisualPropertyDependency;
+import cytoscape.visual.VisualPropertyType;
+import cytoscape.visual.VisualPropertyDependency.Definition;
+import cytoscape.visual.ui.icon.VisualPropertyIcon;
+
+
/**
* Dialog for editing default visual property values.<br>
* This is a modal dialog.
@@ -96,8 +103,14 @@
* @author kono
*/
public class DefaultAppearenceBuilder extends JDialog {
+
+ private static final Dimension PANEL_SIZE = new Dimension(500, 27);
+
+ private static final long serialVersionUID = 596165395462496156L;
+
private static final Set<VisualPropertyType> EDGE_PROPS;
private static final Set<VisualPropertyType> NODE_PROPS;
+
private static CyLogger logger =
CyLogger.getLogger(DefaultAppearenceBuilder.class);
// This editor should be a singleton.
@@ -138,7 +151,7 @@
dab = new DefaultAppearenceBuilder(parent, true);
dab.setLocationRelativeTo(parent);
- dab.setSize(900, 400);
+ dab.setSize(900, 450);
dab.buildList();
@@ -229,8 +242,8 @@
jXTitledPanel1.setTitle("Default Visual Properties");
jXTitledPanel1.setTitleFont(new java.awt.Font("SansSerif", 1,
12));
- jXTitledPanel1.setMinimumSize(new java.awt.Dimension(300, 27));
- jXTitledPanel1.setPreferredSize(new java.awt.Dimension(300,
27));
+ jXTitledPanel1.setMinimumSize(PANEL_SIZE);
+ jXTitledPanel1.setPreferredSize(PANEL_SIZE);
defaultObjectTabbedPane.setTabPlacement(JTabbedPane.BOTTOM);
nodeScrollPane.setViewportView(nodeList);
@@ -291,7 +304,7 @@
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jXTitledPanel1,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
198, Short.MAX_VALUE)
+
350, Short.MAX_VALUE)
.add(12, 12, 12)));
jXPanel1Layout.setVerticalGroup(jXPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(org.jdesktop.layout.GroupLayout.TRAILING,
Modified: cytoscape/trunk/src/cytoscape/visual/ui/ValueSelectDialog.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/ValueSelectDialog.java
2010-06-01 23:37:35 UTC (rev 20399)
+++ cytoscape/trunk/src/cytoscape/visual/ui/ValueSelectDialog.java
2010-06-01 23:44:22 UTC (rev 20400)
@@ -136,11 +136,7 @@
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("Select New Value");
-// mainPanel.setTitlePainter(new BasicGradientPainter(new
Point2D.Double(.2d, 0),
-// new
Color(Color.gray.getRed(),
-//
Color.gray.getGreen(),
-//
Color.gray.getBlue(), 100),
-// new
Point2D.Double(.8d, 0), Color.WHITE));
+
mainPanel.setTitle(type.getName());
mainPanel.setTitleFont(new java.awt.Font("SansSerif", 1, 14));
@@ -178,13 +174,13 @@
.addContainerGap())
.add(iconListScrollPane,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
- 291,
Short.MAX_VALUE));
+ 300,
Short.MAX_VALUE));
mainPanelLayout.setVerticalGroup(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(org.jdesktop.layout.GroupLayout.TRAILING,
mainPanelLayout.createSequentialGroup()
.add(iconListScrollPane,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-
312,
+
550,
Short.MAX_VALUE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
--
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.
