Author: kono
Date: 2010-09-27 18:43:53 -0700 (Mon, 27 Sep 2010)
New Revision: 22083
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/CopyStyleAction.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
Log:
Modified to support new lexicon API.
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/CopyStyleAction.java
===================================================================
---
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/CopyStyleAction.java
2010-09-28 01:33:30 UTC (rev 22082)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/CopyStyleAction.java
2010-09-28 01:43:53 UTC (rev 22083)
@@ -64,23 +64,24 @@
* DOCUMENT ME!
*/
public void actionPerformed(ActionEvent e) {
+ //FIXME
// Pick currently selected visual style in the combobox.
- final VisualStyle currentStyle = this.vizMapperMainPanel
- .getSelectedVisualStyle();
-
- // Copy-to
- final VisualStyle clone = vmm.copyVisualStyle(currentStyle);
-
- final String newName =
vizMapperUtil.getStyleName(vizMapperMainPanel,
- clone);
-
- if ((newName == null) || (newName.trim().length() == 0)) {
- return;
- }
-
- clone.setTitle(newName);
-
- final Component defPanel = defViewEditor.getDefaultView(clone);
+// final VisualStyle currentStyle = this.vizMapperMainPanel
+// .getSelectedVisualStyle();
+//
+// // Copy-to
+// final VisualStyle clone = vmm.copyVisualStyle(currentStyle);
+//
+// final String newName =
vizMapperUtil.getStyleName(vizMapperMainPanel,
+// clone);
+//
+// if ((newName == null) || (newName.trim().length() == 0)) {
+// return;
+// }
+//
+// clone.setTitle(newName);
+//
+// final Component defPanel = defViewEditor.getDefaultView(clone);
//FIXME
// final CyNetworkView view = ((DefaultViewEditor)
defPanel).getView();
// final Dimension panelSize = vizMapperMainPanel.getDefaultPanel()
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
===================================================================
---
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
2010-09-28 01:33:30 UTC (rev 22082)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
2010-09-28 01:43:53 UTC (rev 22083)
@@ -44,13 +44,17 @@
import javax.swing.JMenuItem;
import org.cytoscape.model.CyEdge;
-import org.cytoscape.view.model.VisualLexiconManager;
+import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
class EdgeBypass extends VizMapBypass {
- EdgeBypass(EditorManager ef, VisualLexiconManager vpCatalog) {
- super(ef, vpCatalog);
+
+ EdgeBypass(EditorManager ef, VisualLexicon lexicon) {
+ super(ef, lexicon);
+ this.visualProperties = lexicon
+ .getAllDescendants(TwoDVisualLexicon.EDGE);
}
JMenuItem addMenu(CyEdge e) {
@@ -62,7 +66,7 @@
// horrible, horrible hack
BypassHack.setCurrentObject(e);
- for (VisualProperty<?> vp :
rootVisualLexicon.getVisualProperties(EDGE))
+ for (VisualProperty<?> vp : visualProperties)
// FIXME: pass in network instance so that it will be
limited to
// that
addMenuItem(menu, vp);
@@ -75,7 +79,7 @@
protected List<String> getBypassNames() {
List<String> l = new ArrayList<String>();
- for (VisualProperty<?> vp :
rootVisualLexicon.getVisualProperties(EDGE))
+ for (VisualProperty<?> vp : visualProperties)
l.add(vp.getDisplayName());
return l;
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
===================================================================
---
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
2010-09-28 01:33:30 UTC (rev 22082)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
2010-09-28 01:43:53 UTC (rev 22083)
@@ -44,14 +44,16 @@
import javax.swing.JMenuItem;
import org.cytoscape.model.CyNode;
-import org.cytoscape.view.model.VisualLexiconManager;
+import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
class NodeBypass extends VizMapBypass {
- NodeBypass(EditorManager ef, VisualLexiconManager vpCatalog) {
- super(ef, vpCatalog);
+ NodeBypass(EditorManager ef, VisualLexicon lexicon) {
+ super(ef, lexicon);
+ this.visualProperties =
lexicon.getAllDescendants(TwoDVisualLexicon.NODE);
}
JMenuItem addMenu(CyNode n) {
@@ -62,8 +64,7 @@
// horrible, horrible hack
BypassHack.setCurrentObject(n);
- for (VisualProperty<?> type : rootVisualLexicon
- .getVisualProperties(NODE))
+ for (VisualProperty<?> type : visualProperties)
addMenuItem(menu, type);
menu.addSeparator();
@@ -76,7 +77,7 @@
protected List<String> getBypassNames() {
List<String> l = new ArrayList<String>();
- for (VisualProperty<?> vp :
rootVisualLexicon.getVisualProperties(NODE))
+ for (VisualProperty<?> vp : visualProperties)
l.add(vp.getDisplayName());
return l;
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
===================================================================
---
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-09-28 01:33:30 UTC (rev 22082)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-09-28 01:43:53 UTC (rev 22083)
@@ -37,6 +37,7 @@
package org.cytoscape.view.vizmap.gui.internal.bypass;
import java.awt.event.ActionEvent;
+import java.util.Collection;
import java.util.List;
import javax.swing.AbstractAction;
@@ -46,7 +47,7 @@
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.view.model.VisualLexiconManager;
+import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
@@ -57,17 +58,20 @@
* and Edge bypass classes.
*/
abstract class VizMapBypass {
+
+ protected Collection<VisualProperty<?>> visualProperties;
+
protected VisualMappingManager vmm;
protected CyTableEntry graphObj = null;
abstract protected List<String> getBypassNames();
protected EditorManager editorFactory;
- protected VisualLexiconManager rootVisualLexicon;
+ protected VisualLexicon lexicon;
- VizMapBypass(EditorManager editorFactory, VisualLexiconManager
vpCatalog) {
+ VizMapBypass(EditorManager editorFactory, VisualLexicon lexicon) {
this.editorFactory = editorFactory;
- this.rootVisualLexicon = vpCatalog;
+ this.lexicon = lexicon;
}
protected void addResetAllMenuItem(JMenu menu) {
Modified:
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2010-09-28 01:33:30 UTC (rev 22082)
+++
core3/vizmap-gui-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2010-09-28 01:43:53 UTC (rev 22083)
@@ -37,11 +37,10 @@
import java.awt.Color;
import javax.swing.Icon;
-import javax.swing.JLabel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
-import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.CyTable;
import org.cytoscape.view.model.VisualProperty;
import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.GradientEditorPanel;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyColorPropertyEditor;
@@ -56,11 +55,11 @@
/**
* Constructor. Should instantiate one editor per VisualProperty.
*/
- public ColorVisualPropertyEditor(VisualProperty<Color> vp,
CyTableManager tm) {
+ public ColorVisualPropertyEditor(VisualProperty<Color> vp, CyTable
attr) {
super(vp);
tableCellRenderer = new DefaultTableCellRenderer();
//FIXME
- continuousEditor = new GradientEditorPanel(this.vp, null, tm);
+ continuousEditor = new GradientEditorPanel(this.vp, null, attr);
propertyEditor = new CyColorPropertyEditor();
}
--
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.
