Author: kono
Date: 2010-09-27 16:47:56 -0700 (Mon, 27 Sep 2010)
New Revision: 22079
Added:
core3/ding-presentation-impl/branches/
core3/ding-presentation-impl/branches/vp-tree/
Modified:
core3/ding-presentation-impl/branches/vp-tree/pom.xml
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Refactored version of visual property tree. Tree structure is now managed in
wrapper object VisualLexiconNode.
Copied: core3/ding-presentation-impl/branches/vp-tree (from rev 21982,
core3/ding-presentation-impl/trunk)
Modified: core3/ding-presentation-impl/branches/vp-tree/pom.xml
===================================================================
--- core3/ding-presentation-impl/trunk/pom.xml 2010-09-22 22:15:10 UTC (rev
21982)
+++ core3/ding-presentation-impl/branches/vp-tree/pom.xml 2010-09-27
23:47:56 UTC (rev 22079)
@@ -168,6 +168,27 @@
<artifactId>phoebe.dnd</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>presentation-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -39,8 +39,8 @@
public class AnchorTwoDVisualProperty extends AbstractVisualProperty<Anchor> {
- public AnchorTwoDVisualProperty(final String ot, final Anchor def,
final String id, final String name) {
- super(ot,def,id,name);
+ public AnchorTwoDVisualProperty(final Anchor def, final String id,
final String name) {
+ super(def,id,name);
}
public String toSerializableString(final Anchor value) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -40,8 +40,8 @@
public class ArrowShapeTwoDVisualProperty extends
AbstractVisualProperty<ArrowShape> {
- public ArrowShapeTwoDVisualProperty(final String ot, final ArrowShape
def, final String id, final String name) {
- super(ot,def,id,name);
+ public ArrowShapeTwoDVisualProperty(final ArrowShape def, final String
id, final String name) {
+ super(def,id,name);
}
public String toSerializableString(final ArrowShape value) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -1,6 +1,13 @@
/*
- Copyright (c) 2006, 2007, 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
+ The Cytoscape Consortium is:
+ - Institute for Systems Biology
+ - University of California San Diego
+ - Memorial Sloan-Kettering Cancer Center
+ - Institut Pasteur
+ - Agilent Technologies
+
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -27,8 +34,6 @@
*/
package org.cytoscape.ding.impl;
-import static org.cytoscape.model.CyTableEntry.NODE;
-
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -46,7 +51,6 @@
import java.awt.print.PageFormat;
import java.awt.print.Printable;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -67,11 +71,11 @@
import org.cytoscape.graph.render.immed.GraphGraphics;
import org.cytoscape.graph.render.stateful.GraphLOD;
import org.cytoscape.graph.render.stateful.GraphRenderer;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.model.subnetwork.CySubNetwork;
@@ -86,20 +90,20 @@
import org.cytoscape.util.intr.IntHash;
import org.cytoscape.util.intr.IntStack;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.EdgeViewChangeMicroListener;
-import org.cytoscape.view.model.NetworkViewChangeMicroListener;
-import org.cytoscape.view.model.NodeViewChangeMicroListener;
-import org.cytoscape.view.model.RootVisualLexicon;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.events.EdgeViewChangeMicroListener;
import org.cytoscape.view.model.events.FitContentEvent;
import org.cytoscape.view.model.events.FitContentEventListener;
import org.cytoscape.view.model.events.FitSelectedEvent;
import org.cytoscape.view.model.events.FitSelectedEventListener;
+import org.cytoscape.view.model.events.NetworkViewChangeMicroListener;
+import org.cytoscape.view.model.events.NodeViewChangeMicroListener;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.TunableInterceptor;
import org.cytoscape.work.undo.UndoSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -107,7 +111,6 @@
import phoebe.PhoebeCanvasDropListener;
import phoebe.PhoebeCanvasDroppable;
-
/**
* DING implementation of the GINY view.
*
@@ -340,6 +343,7 @@
Map<EdgeViewTaskFactory, Map> edgeViewTFs;
Map<NetworkViewTaskFactory, Map> emptySpaceTFs;
+ TunableInterceptor interceptor;
TaskManager manager;
// Will be injected.
@@ -348,7 +352,6 @@
// This is the view model. This should be immutable.
final CyNetworkView cyNetworkView;
- private final RootVisualLexicon rootLexicon;
/**
* Creates a new DGraphView object.
@@ -357,15 +360,15 @@
* The graph model that we'll be creating a view for.
*/
public DGraphView(final CyNetworkView view, CyTableFactory dataFactory,
- CyRootNetworkFactory cyRoot, UndoSupport undo,
- SpacialIndex2DFactory spacialFactory,
RootVisualLexicon vpc,
- VisualLexicon dingLexicon,
- Map<NodeViewTaskFactory, Map> nodeViewTFs,
- Map<EdgeViewTaskFactory, Map> edgeViewTFs,
- Map<NetworkViewTaskFactory, Map> emptySpaceTFs,
- TaskManager manager, CyEventHelper eventHelper,
- CyTableManager tableMgr)
- {
+ CyRootNetworkFactory cyRoot, UndoSupport undo,
+ SpacialIndex2DFactory spacialFactory,
+ VisualLexicon dingLexicon,
+ Map<NodeViewTaskFactory, Map> nodeViewTFs,
+ Map<EdgeViewTaskFactory, Map> edgeViewTFs,
+ Map<NetworkViewTaskFactory, Map> emptySpaceTFs,
+ TaskManager manager, CyEventHelper eventHelper,
+ CyTableManager tableMgr) {
+
if (view == null)
throw new IllegalArgumentException(
"Network View Model cannot be null.");
@@ -383,7 +386,6 @@
logger.debug("Phase 2: service registered: time = "
+ (System.currentTimeMillis() - start));
- rootLexicon = vpc;
this.dingLexicon = dingLexicon;
this.nodeViewTFs = nodeViewTFs;
@@ -764,13 +766,13 @@
// read in visual properties from view obj
// FIXME TODO: this process is not necessary
- final Collection<VisualProperty<?>> nodeVPs = rootLexicon
- .getVisualProperties(NODE);
+// final Collection<VisualProperty<?>> nodeVPs = rootLexicon
+// .getVisualProperties(NODE);
+//
+// for (VisualProperty<?> vp : nodeVPs)
+// nodeVisualPropertySet(nodeViewModel, vp,
+// nodeViewModel.getVisualProperty(vp));
- for (VisualProperty<?> vp : nodeVPs)
- nodeVisualPropertySet(nodeViewModel, vp,
- nodeViewModel.getVisualProperty(vp));
-
return dNodeView;
}
@@ -2775,7 +2777,7 @@
public Image createImage(int width, int height) {
// TODO Auto-generated method stub
- return createImage(width,height,1.0);
+ return null;
}
public VisualLexicon getVisualLexicon() {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -66,8 +66,6 @@
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Ding implementation of node presentation.
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -34,22 +34,21 @@
*/
package org.cytoscape.ding.impl;
-import static org.cytoscape.model.CyTableEntry.EDGE;
-import static org.cytoscape.model.CyTableEntry.NETWORK;
-import static org.cytoscape.model.CyTableEntry.NODE;
-
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Font;
-import java.awt.Paint;
import java.awt.Stroke;
import org.cytoscape.ding.ArrowShape;
import org.cytoscape.ding.NodeShape;
+import org.cytoscape.view.model.NullDataType;
+import org.cytoscape.view.model.VisualLexiconNodeFactory;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.property.BooleanVisualProperty;
-import org.cytoscape.view.presentation.property.ColorVisualProperty;
+import
org.cytoscape.view.presentation.property.DefaultVisualizableVisualProperty;
import org.cytoscape.view.presentation.property.DoubleVisualProperty;
+import org.cytoscape.view.presentation.property.NullVisualProperty;
+import org.cytoscape.view.presentation.property.PaintVisualProperty;
import org.cytoscape.view.presentation.property.StringVisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
@@ -58,144 +57,149 @@
private static final int DEF_FONT_SIZE = 10;
private static final double DEF_BORDER_WIDTH = 0.0d;
+
+ // Root of Ding's VP tree.
+ public static final VisualProperty<NullDataType> DING_ROOT = new
NullVisualProperty(
+ "DING_RENDERING_ENGINE_ROOT", "Ding Rndering Engine
Root Visual Property");
+
public static final VisualProperty<Boolean> NETWORK_NODE_SELECTION =
new BooleanVisualProperty(
- NETWORK, Boolean.TRUE, "NETWORK_NODE_SELECTION",
- "Network Node Selection");
+ Boolean.TRUE, "NETWORK_NODE_SELECTION", "Network Node
Selection");
public static final VisualProperty<Boolean> NETWORK_EDGE_SELECTION =
new BooleanVisualProperty(
- NETWORK, Boolean.TRUE, "NETWORK_EDGE_SELECTION",
- "Network Edge Selection");
+ Boolean.TRUE, "NETWORK_EDGE_SELECTION", "Network Edge
Selection");
public static final VisualProperty<NodeShape> NODE_SHAPE = new
NodeShapeTwoDVisualProperty(
- NODE, NodeShape.ROUND_RECT, "NODE_SHAPE", "Node Shape");
+ NodeShape.ROUND_RECT, "NODE_SHAPE", "Node Shape");
- public static final VisualProperty<? extends Paint> NODE_SELECTED_PAINT
= new ColorVisualProperty(
- NODE, Color.YELLOW, "NODE_SELECTED_PAINT", "Node
Selected Paint");
+ public static final VisualProperty<Color> NODE_SELECTED_PAINT = new
PaintVisualProperty<Color>(
+ Color.YELLOW, "NODE_SELECTED_PAINT", "Node Selected
Paint");
- public static final VisualProperty<? extends Paint> NODE_BORDER_PAINT =
new ColorVisualProperty(
- NODE, Color.BLACK, "NODE_BORDER_PAINT", "Node Border
Paint");
+ public static final VisualProperty<Color> NODE_BORDER_PAINT = new
PaintVisualProperty<Color>(
+ Color.BLACK, "NODE_BORDER_PAINT", "Node Border Paint");
public static final VisualProperty<Double> NODE_BORDER_WIDTH = new
DoubleVisualProperty(
- NODE, DEF_BORDER_WIDTH, "NODE_BORDER_WIDTH", "Node
Border Width");
+ DEF_BORDER_WIDTH, "NODE_BORDER_WIDTH", "Node Border
Width");
public static final VisualProperty<? extends Stroke> NODE_BORDER_STROKE
= new StrokeTwoDVisualProperty(
- NODE, new BasicStroke(), "NODE_BORDER_STROKE", "Node
Border Stroke");
+ new BasicStroke(), "NODE_BORDER_STROKE", "Node Border
Stroke");
public static final VisualProperty<String> NODE_TOOLTIP = new
StringVisualProperty(
- NODE, "", "NODE_TOOLTIP", "Node Tooltip");
+ "", "NODE_TOOLTIP", "Node Tooltip");
public static final VisualProperty<Font> NODE_LABEL_FONT_FACE = new
FontTwoDVisualProperty(
- NODE, new Font("SansSerif", Font.PLAIN, DEF_FONT_SIZE),
+ new Font("SansSerif", Font.PLAIN, DEF_FONT_SIZE),
"NODE_LABEL_FONT_FACE", "Node Label Font Face");
+
public static final VisualProperty<Integer> NODE_LABEL_FONT_SIZE = new
IntegerTwoDVisualProperty(
- NODE, DEF_FONT_SIZE, "NODE_LABEL_FONT_SIZE", "Node
Label Font Size");
+ DEF_FONT_SIZE, "NODE_LABEL_FONT_SIZE", "Node Label Font
Size");
public static final VisualProperty<Anchor> NODE_LABEL_TEXT_ANCHOR = new
AnchorTwoDVisualProperty(
- NODE, Anchor.SOUTHEAST, "NODE_LABEL_TEXT_ANCHOR",
+ Anchor.SOUTHEAST, "NODE_LABEL_TEXT_ANCHOR",
"Node Label Text Anchor");
public static final VisualProperty<Anchor> NODE_LABEL_NODE_ANCHOR = new
AnchorTwoDVisualProperty(
- NODE, Anchor.SOUTHEAST, "NODE_LABEL_NODE_ANCHOR",
+ Anchor.SOUTHEAST, "NODE_LABEL_NODE_ANCHOR",
"Node Label Node Anchor");
public static final VisualProperty<Double> NODE_LABEL_ANCHOR_X_OFFSET =
new DoubleVisualProperty(
- NODE, 0.0, "NODE_LABEL_ANCHOR_X_OFFSET",
+ 0.0, "NODE_LABEL_ANCHOR_X_OFFSET",
"Node Label Anchor X Offset");
public static final VisualProperty<Double> NODE_LABEL_ANCHOR_Y_OFFSET =
new DoubleVisualProperty(
- NODE, 0.0, "NODE_LABEL_ANCHOR_Y_OFFSET",
+ 0.0, "NODE_LABEL_ANCHOR_Y_OFFSET",
"Node Label Anchor Y Offset");
public static final VisualProperty<Justify> NODE_LABEL_JUSTIFY = new
JustifyTwoDVisualProperty(
- NODE, Justify.LEFT, "NODE_LABEL_JUSTIFY", "Node Label
Justify");
+ Justify.LEFT, "NODE_LABEL_JUSTIFY", "Node Label
Justify");
+
public static final VisualProperty<Integer> NODE_TRANSPARENCY = new
IntegerTwoDVisualProperty(
- NODE, 200, "NODE_TRANSPARENCY", "Node Transparency");
+ 200, "NODE_TRANSPARENCY", "Node Transparency");
- public static final VisualProperty<? extends Paint> EDGE_SELECTED_PAINT
= new ColorVisualProperty(
- EDGE, Color.RED, "EDGE_SELECTED_PAINT", "Edge Selected
Paint");
+ public static final VisualProperty<Color> EDGE_SELECTED_PAINT = new
PaintVisualProperty<Color>(
+ Color.RED, "EDGE_SELECTED_PAINT", "Edge Selected
Paint");
+
public static final VisualProperty<? extends Stroke> EDGE_STROKE = new
StrokeTwoDVisualProperty(
- EDGE, new BasicStroke(), "EDGE_STROKE", "Edge Stroke");
+ new BasicStroke(), "EDGE_STROKE", "Edge Stroke");
- public static final VisualProperty<Double> EDGE_WIDTH = new
DoubleVisualProperty(
- EDGE, 2.0, "EDGE_WIDTH", "Edge Width");
-
- public static final VisualProperty<? extends Paint>
EDGE_SOURCE_ARROW_SELECTED_PAINT = new ColorVisualProperty(
- EDGE, Color.YELLOW, "EDGE_SOURCE_ARROW_SELECTED_PAINT",
- "Edge Source Arrow Selected Paint");
- public static final VisualProperty<? extends Paint>
EDGE_TARGET_ARROW_SELECTED_PAINT = new ColorVisualProperty(
- EDGE, Color.YELLOW, "EDGE_TARGET_ARROW_SELECTED_PAINT",
+ public static final VisualProperty<Color>
EDGE_SOURCE_ARROW_SELECTED_PAINT = new PaintVisualProperty<Color>(
+ Color.YELLOW, "EDGE_SOURCE_ARROW_SELECTED_PAINT", "Edge
Source Arrow Selected Paint");
+ public static final VisualProperty<Color>
EDGE_TARGET_ARROW_SELECTED_PAINT = new PaintVisualProperty<Color>(
+ Color.YELLOW, "EDGE_TARGET_ARROW_SELECTED_PAINT",
"Edge Target Arrow Selected Paint");
- public static final VisualProperty<? extends Paint>
EDGE_SOURCE_ARROW_UNSELECTED_PAINT = new ColorVisualProperty(
- EDGE, Color.BLACK, "EDGE_SOURCE_ARROW_UNSELECTED_PAINT",
+ public static final VisualProperty<Color>
EDGE_SOURCE_ARROW_UNSELECTED_PAINT = new PaintVisualProperty<Color>(
+ Color.BLACK, "EDGE_SOURCE_ARROW_UNSELECTED_PAINT",
"Edge Source Arrow Unselected Paint");
- public static final VisualProperty<? extends Paint>
EDGE_TARGET_ARROW_UNSELECTED_PAINT = new ColorVisualProperty(
- EDGE, Color.BLACK, "EDGE_TARGET_ARROW_UNSELECTED_PAINT",
+ public static final VisualProperty<Color>
EDGE_TARGET_ARROW_UNSELECTED_PAINT = new PaintVisualProperty<Color>(
+ Color.BLACK, "EDGE_TARGET_ARROW_UNSELECTED_PAINT",
"Edge Target Arrow Unselected Paint");
public static final VisualProperty<ArrowShape> EDGE_SOURCE_ARROW_SHAPE
= new ArrowShapeTwoDVisualProperty(
- EDGE, ArrowShape.NONE, "EDGE_SOURCE_ARROW_SHAPE",
+ ArrowShape.NONE, "EDGE_SOURCE_ARROW_SHAPE",
"Edge Source Arrow Shape");
public static final VisualProperty<ArrowShape> EDGE_TARGET_ARROW_SHAPE
= new ArrowShapeTwoDVisualProperty(
- EDGE, ArrowShape.NONE, "EDGE_TARGET_ARROW_SHAPE",
+ ArrowShape.NONE, "EDGE_TARGET_ARROW_SHAPE",
"Edge Target Arrow Shape");
public static final VisualProperty<String> EDGE_TOOLTIP = new
StringVisualProperty(
- EDGE, "", "EDGE_TOOLTIP", "Edge Tooltip");
+ "", "EDGE_TOOLTIP", "Edge Tooltip");
public static final VisualProperty<Anchor> EDGE_LABEL_TEXT_ANCHOR = new
AnchorTwoDVisualProperty(
- EDGE, Anchor.CENTER, "EDGE_LABEL_TEXT_ANCHOR",
+ Anchor.CENTER, "EDGE_LABEL_TEXT_ANCHOR",
"Edge Label Text Anchor");
public static final VisualProperty<Anchor> EDGE_LABEL_EDGE_ANCHOR = new
AnchorTwoDVisualProperty(
- EDGE, Anchor.CENTER, "EDGE_LABEL_EDGE_ANCHOR",
+ Anchor.CENTER, "EDGE_LABEL_EDGE_ANCHOR",
"Edge Label Edge Anchor");
public static final VisualProperty<Double> EDGE_LABEL_ANCHOR_X_OFFSET =
new DoubleVisualProperty(
- EDGE, 0.0, "EDGE_LABEL_ANCHOR_X_OFFSET",
+ 0.0, "EDGE_LABEL_ANCHOR_X_OFFSET",
"Edge Label Anchor X Offset");
public static final VisualProperty<Double> EDGE_LABEL_ANCHOR_Y_OFFSET =
new DoubleVisualProperty(
- EDGE, 0.0, "EDGE_LABEL_ANCHOR_Y_OFFSET",
+ 0.0, "EDGE_LABEL_ANCHOR_Y_OFFSET",
"Edge Label Anchor Y Offset");
public static final VisualProperty<Font> EDGE_LABEL_FONT_FACE = new
FontTwoDVisualProperty(
- EDGE, new Font("SansSerif", Font.PLAIN, 10),
+ new Font("SansSerif", Font.PLAIN, 10),
"EDGE_LABEL_FONT_FACE", "Edge Label Font Face");
public static final VisualProperty<Integer> EDGE_LABEL_FONT_SIZE = new
IntegerTwoDVisualProperty(
- EDGE, 10, "EDGE_LABEL_FONT_SIZE", "Edge Label Font
Size");
+ 10, "EDGE_LABEL_FONT_SIZE", "Edge Label Font Size");
public static final VisualProperty<Justify> EDGE_LABEL_JUSTIFY = new
JustifyTwoDVisualProperty(
- EDGE, Justify.LEFT, "EDGE_LABEL_JUSTIFY", "Edge Label
Justify");
+ Justify.LEFT, "EDGE_LABEL_JUSTIFY", "Edge Label
Justify");
- public DVisualLexicon() {
- super();
-
- visualPropertySet.add(NODE_LABEL_JUSTIFY);
- visualPropertySet.add(NODE_LABEL_ANCHOR_Y_OFFSET);
- visualPropertySet.add(NODE_LABEL_ANCHOR_X_OFFSET);
- visualPropertySet.add(NODE_LABEL_NODE_ANCHOR);
- visualPropertySet.add(NODE_LABEL_TEXT_ANCHOR);
- visualPropertySet.add(NODE_LABEL_FONT_SIZE);
- visualPropertySet.add(NODE_LABEL_FONT_FACE);
- visualPropertySet.add(NODE_TOOLTIP);
- visualPropertySet.add(NETWORK_NODE_SELECTION);
- visualPropertySet.add(NETWORK_EDGE_SELECTION);
- visualPropertySet.add(NODE_SHAPE);
- visualPropertySet.add(NODE_SELECTED_PAINT);
- visualPropertySet.add(NODE_BORDER_PAINT);
- visualPropertySet.add(NODE_BORDER_WIDTH);
- visualPropertySet.add(NODE_BORDER_STROKE);
- visualPropertySet.add(NODE_TRANSPARENCY);
- visualPropertySet.add(EDGE_SELECTED_PAINT);
- visualPropertySet.add(EDGE_STROKE);
- visualPropertySet.add(EDGE_WIDTH);
- visualPropertySet.add(EDGE_SOURCE_ARROW_SELECTED_PAINT);
- visualPropertySet.add(EDGE_TARGET_ARROW_SELECTED_PAINT);
- visualPropertySet.add(EDGE_SOURCE_ARROW_UNSELECTED_PAINT);
- visualPropertySet.add(EDGE_TARGET_ARROW_UNSELECTED_PAINT);
- visualPropertySet.add(EDGE_SOURCE_ARROW_SHAPE);
- visualPropertySet.add(EDGE_TARGET_ARROW_SHAPE);
- visualPropertySet.add(EDGE_TOOLTIP);
- visualPropertySet.add(EDGE_LABEL_TEXT_ANCHOR);
- visualPropertySet.add(EDGE_LABEL_EDGE_ANCHOR);
- visualPropertySet.add(EDGE_LABEL_ANCHOR_X_OFFSET);
- visualPropertySet.add(EDGE_LABEL_ANCHOR_Y_OFFSET);
- visualPropertySet.add(EDGE_LABEL_FONT_FACE);
- visualPropertySet.add(EDGE_LABEL_FONT_SIZE);
- visualPropertySet.add(EDGE_LABEL_JUSTIFY);
+ public DVisualLexicon(final VisualLexiconNodeFactory nodeFactory) {
+ super(DING_ROOT, nodeFactory);
+
+ addVisualProperty(NODE_BORDER_PAINT, NODE_PAINT);
+
+ addVisualProperty(NODE_TOOLTIP, NODE_TEXT);
+
+ addVisualProperty(NODE_LABEL_FONT_SIZE, NODE_SIZE);
+
+ addVisualProperty(NODE_LABEL_JUSTIFY, NODE);
+ addVisualProperty(NODE_LABEL_ANCHOR_Y_OFFSET, NODE);
+ addVisualProperty(NODE_LABEL_ANCHOR_X_OFFSET, NODE);
+ addVisualProperty(NODE_LABEL_NODE_ANCHOR, NODE);
+ addVisualProperty(NODE_LABEL_TEXT_ANCHOR, NODE);
+ addVisualProperty(NODE_LABEL_FONT_FACE, NODE);
+ addVisualProperty(NETWORK_NODE_SELECTION, NETWORK);
+ addVisualProperty(NETWORK_EDGE_SELECTION, NETWORK);
+ addVisualProperty(NODE_SHAPE, NODE);
+ addVisualProperty(NODE_SELECTED_PAINT, NODE_PAINT);
+ addVisualProperty(NODE_BORDER_WIDTH, NODE);
+ addVisualProperty(NODE_BORDER_STROKE, NODE);
+ addVisualProperty(NODE_TRANSPARENCY, NODE);
+
+ addVisualProperty(EDGE_SELECTED_PAINT, EDGE_PAINT);
+ addVisualProperty(EDGE_STROKE, EDGE);
+ addVisualProperty(EDGE_SOURCE_ARROW_SELECTED_PAINT, EDGE_PAINT);
+ addVisualProperty(EDGE_TARGET_ARROW_SELECTED_PAINT, EDGE_PAINT);
+ addVisualProperty(EDGE_SOURCE_ARROW_UNSELECTED_PAINT,
EDGE_PAINT);
+ addVisualProperty(EDGE_TARGET_ARROW_UNSELECTED_PAINT,
EDGE_PAINT);
+ addVisualProperty(EDGE_SOURCE_ARROW_SHAPE, EDGE);
+ addVisualProperty(EDGE_TARGET_ARROW_SHAPE, EDGE);
+ addVisualProperty(EDGE_TOOLTIP, EDGE_TEXT);
+ addVisualProperty(EDGE_LABEL_TEXT_ANCHOR, EDGE);
+ addVisualProperty(EDGE_LABEL_EDGE_ANCHOR, EDGE);
+ addVisualProperty(EDGE_LABEL_ANCHOR_X_OFFSET, EDGE);
+ addVisualProperty(EDGE_LABEL_ANCHOR_Y_OFFSET, EDGE);
+ addVisualProperty(EDGE_LABEL_FONT_FACE, EDGE);
+ addVisualProperty(EDGE_LABEL_FONT_SIZE, EDGE);
+ addVisualProperty(EDGE_LABEL_JUSTIFY, EDGE);
}
}
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -1,15 +1,11 @@
package org.cytoscape.ding.impl;
-import java.awt.Component;
import java.util.HashMap;
import java.util.Map;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -18,7 +14,6 @@
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.RootVisualLexicon;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.events.NetworkViewChangedEvent;
@@ -46,7 +41,6 @@
private CyRootNetworkFactory rootNetworkFactory;
private SpacialIndex2DFactory spacialFactory;
private UndoSupport undo;
- private RootVisualLexicon rootLexicon;
private VisualLexicon dingLexicon;
private CyServiceRegistrar registrar;
@@ -59,17 +53,17 @@
private TaskManager tm;
private CyTableManager tableMgr;
- public DingNavigationRenderingEngineFactory(CyTableFactory
dataTableFactory,
- CyRootNetworkFactory
rootNetworkFactory, UndoSupport undo,
- SpacialIndex2DFactory
spacialFactory, RootVisualLexicon vpc,
- VisualLexicon dingLexicon,
TaskManager tm,
- CyServiceRegistrar
registrar, CyTableManager tableMgr)
- {
+ public DingNavigationRenderingEngineFactory(
+ CyTableFactory dataTableFactory,
+ CyRootNetworkFactory rootNetworkFactory, UndoSupport
undo,
+ SpacialIndex2DFactory spacialFactory,
+ VisualLexicon dingLexicon, TaskManager tm,
+ CyServiceRegistrar registrar, CyTableManager tableMgr) {
+
this.dataTableFactory = dataTableFactory;
this.rootNetworkFactory = rootNetworkFactory;
this.spacialFactory = spacialFactory;
this.undo = undo;
- this.rootLexicon = vpc;
this.dingLexicon = dingLexicon;
this.tm = tm;
this.registrar = registrar;
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -1,6 +1,5 @@
package org.cytoscape.ding.impl;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -10,8 +9,8 @@
import javax.swing.JInternalFrame;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -20,7 +19,6 @@
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NodeViewTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.RootVisualLexicon;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.events.NetworkViewChangedEvent;
@@ -32,42 +30,39 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+public class DingRenderingEngineFactory implements
+ RenderingEngineFactory<CyNetwork>, NetworkViewChangedListener {
-public class DingRenderingEngineFactory implements
RenderingEngineFactory<CyNetwork>, NetworkViewChangedListener {
-
- private static final Logger logger =
LoggerFactory.getLogger(DingRenderingEngineFactory.class);
+ private static final Logger logger = LoggerFactory
+ .getLogger(DingRenderingEngineFactory.class);
private CyTableFactory dataTableFactory;
private CyRootNetworkFactory rootNetworkFactory;
private SpacialIndex2DFactory spacialFactory;
private UndoSupport undo;
- private RootVisualLexicon rootLexicon;
private VisualLexicon dingLexicon;
private CyServiceRegistrar registrar;
-
+
private Map<CyNetworkView, DGraphView> viewMap;
- private Map<NodeViewTaskFactory,Map> nodeViewTFs;
- private Map<EdgeViewTaskFactory,Map> edgeViewTFs;
- private Map<NetworkViewTaskFactory,Map> emptySpaceTFs;
+ private Map<NodeViewTaskFactory, Map> nodeViewTFs;
+ private Map<EdgeViewTaskFactory, Map> edgeViewTFs;
+ private Map<NetworkViewTaskFactory, Map> emptySpaceTFs;
private TaskManager tm;
private final CyTableManager tableMgr;
private final CyEventHelper eventHelper;
-
- public DingRenderingEngineFactory(CyTableFactory dataTableFactory,
- CyRootNetworkFactory
rootNetworkFactory,
- UndoSupport undo,
SpacialIndex2DFactory spacialFactory,
- RootVisualLexicon vpc, VisualLexicon
dingLexicon,
- TaskManager tm, CyServiceRegistrar
registrar,
- CyTableManager tableMgr,
CyEventHelper eventHelper)
- {
+ public DingRenderingEngineFactory(
+ CyTableFactory dataTableFactory,
+ CyRootNetworkFactory rootNetworkFactory, UndoSupport
undo,
+ SpacialIndex2DFactory spacialFactory, VisualLexicon
dingLexicon,
+ TaskManager tm, CyServiceRegistrar registrar,
+ CyTableManager tableMgr, CyEventHelper eventHelper) {
this.dataTableFactory = dataTableFactory;
this.rootNetworkFactory = rootNetworkFactory;
this.spacialFactory = spacialFactory;
this.undo = undo;
- this.rootLexicon = vpc;
this.dingLexicon = dingLexicon;
this.tm = tm;
this.registrar = registrar;
@@ -75,66 +70,76 @@
this.eventHelper = eventHelper;
viewMap = new HashMap<CyNetworkView, DGraphView>();
- nodeViewTFs = new HashMap<NodeViewTaskFactory,Map>();
- edgeViewTFs = new HashMap<EdgeViewTaskFactory,Map>();
- emptySpaceTFs = new HashMap<NetworkViewTaskFactory,Map>();
+ nodeViewTFs = new HashMap<NodeViewTaskFactory, Map>();
+ edgeViewTFs = new HashMap<EdgeViewTaskFactory, Map>();
+ emptySpaceTFs = new HashMap<NetworkViewTaskFactory, Map>();
}
/**
* Render given view model by Ding rendering engine.
*
*/
- public RenderingEngine<CyNetwork> render(Object presentationContainer,
View<CyNetwork> view) {
-
- if ( view == null )
- throw new IllegalArgumentException("Cannot create
presentation for null view model.");
-
- if ( view instanceof CyNetworkView == false )
- throw new IllegalArgumentException("Ding accepts
CyNetworkView only.");
-
+ public RenderingEngine<CyNetwork> render(Object presentationContainer,
+ View<CyNetwork> view) {
+
+ if (view == null)
+ throw new IllegalArgumentException(
+ "Cannot create presentation for null
view model.");
+
+ if (view instanceof CyNetworkView == false)
+ throw new IllegalArgumentException(
+ "Ding accepts CyNetworkView only.");
+
final CyNetworkView targetView = (CyNetworkView) view;
DGraphView dgv = null;
- if ( presentationContainer instanceof JComponent ) {
-
- logger.debug("Start rendering presentation by Ding: " +
targetView.getSUID());
- dgv = new DGraphView(targetView,
dataTableFactory,rootNetworkFactory,undo,spacialFactory,
- rootLexicon, dingLexicon,
nodeViewTFs, edgeViewTFs, emptySpaceTFs,
- tm, eventHelper,tableMgr);
- logger.info("DGraphView created as a presentation for
view model: " + targetView.getSUID());
+ if (presentationContainer instanceof JComponent) {
+
+ logger.debug("Start rendering presentation by Ding: "
+ + targetView.getSUID());
+ dgv = new DGraphView(targetView, dataTableFactory,
+ rootNetworkFactory, undo,
spacialFactory, dingLexicon,
+ nodeViewTFs, edgeViewTFs,
emptySpaceTFs, tm, eventHelper,
+ tableMgr);
+ logger.info("DGraphView created as a presentation for
view model: "
+ + targetView.getSUID());
viewMap.put(targetView, dgv);
-
- if(presentationContainer instanceof JInternalFrame) {
- JInternalFrame inFrame =
(JInternalFrame)presentationContainer;
+
+ if (presentationContainer instanceof JInternalFrame) {
+ JInternalFrame inFrame = (JInternalFrame)
presentationContainer;
JDesktopPane desktopPane =
inFrame.getDesktopPane();
-
+
// TODO - not sure this layered pane bit is
optimal
- inFrame.setContentPane(
dgv.getContainer(inFrame.getLayeredPane()) );
+ inFrame.setContentPane(dgv.getContainer(inFrame
+ .getLayeredPane()));
dgv.addTransferComponent(desktopPane);
} else {
JComponent component = (JComponent)
presentationContainer;
component.add(dgv.getComponent());
}
-
- } else
- throw new IllegalArgumentException("frame object is not
of type JInternalFrame, which is invalid for this implementation of
PresentationFactory");
+ } else {
+ throw new IllegalArgumentException(
+ "frame object is not of type
JInternalFrame, which is invalid for this implementation of
PresentationFactory");
+ }
+
registrar.registerAllServices(dgv, new Properties());
- registrar.registerAllServices(new AddDeleteHandler(dgv), new
Properties());
-
+ registrar.registerAllServices(new AddDeleteHandler(dgv),
+ new Properties());
+
return dgv;
}
-
/**
- * This method simply redraw the canvas, NOT updating the view model.
- * To apply and draw the new view model, you need to call this after
apply.
+ * This method simply redraw the canvas, NOT updating the view model. To
+ * apply and draw the new view model, you need to call this after apply.
*
*/
@Override
public void handleEvent(NetworkViewChangedEvent nvce) {
DGraphView gv = viewMap.get(nvce.getSource());
- logger.debug("NetworkViewChangedEvent listener got view update
request: " + nvce.getSource().getSUID());
- if ( gv != null )
+ logger.debug("NetworkViewChangedEvent listener got view update
request: "
+ + nvce.getSource().getSUID());
+ if (gv != null)
gv.updateView();
}
@@ -143,42 +148,43 @@
}
public void addNodeViewTaskFactory(NodeViewTaskFactory nvtf, Map props)
{
- if ( nvtf == null )
+ if (nvtf == null)
return;
- nodeViewTFs.put(nvtf,props);
+ nodeViewTFs.put(nvtf, props);
}
public void removeNodeViewTaskFactory(NodeViewTaskFactory nvtf, Map
props) {
- if ( nvtf == null )
+ if (nvtf == null)
return;
nodeViewTFs.remove(nvtf);
}
public void addEdgeViewTaskFactory(EdgeViewTaskFactory evtf, Map props)
{
- if ( evtf == null )
+ if (evtf == null)
return;
- edgeViewTFs.put(evtf,props);
+ edgeViewTFs.put(evtf, props);
}
public void removeEdgeViewTaskFactory(EdgeViewTaskFactory evtf, Map
props) {
- if ( evtf == null )
+ if (evtf == null)
return;
edgeViewTFs.remove(evtf);
}
public void addNetworkViewTaskFactory(NetworkViewTaskFactory evtf, Map
props) {
- if ( evtf == null )
+ if (evtf == null)
return;
- emptySpaceTFs.put(evtf,props);
+ emptySpaceTFs.put(evtf, props);
}
- public void removeNetworkViewTaskFactory(NetworkViewTaskFactory evtf,
Map props) {
- if ( evtf == null )
+ public void removeNetworkViewTaskFactory(NetworkViewTaskFactory evtf,
+ Map props) {
+ if (evtf == null)
return;
emptySpaceTFs.remove(evtf);
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -36,12 +36,13 @@
package org.cytoscape.ding.impl;
import java.awt.Font;
+
import org.cytoscape.view.model.AbstractVisualProperty;
public class FontTwoDVisualProperty extends AbstractVisualProperty<Font> {
- public FontTwoDVisualProperty(final String ot, final Font def, final
String id, final String name) {
- super(ot,def,id,name);
+ public FontTwoDVisualProperty(final Font def, final String id, final
String name) {
+ super(def,id,name);
}
public String toSerializableString(final Font value) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -39,8 +39,8 @@
public class IntegerTwoDVisualProperty extends AbstractVisualProperty<Integer>
{
- public IntegerTwoDVisualProperty(final String ot, final Integer def,
final String id, final String name) {
- super(ot,def,id,name);
+ public IntegerTwoDVisualProperty(final Integer def, final String id,
final String name) {
+ super(def,id,name);
}
public String toSerializableString(final Integer value) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -41,8 +41,8 @@
public class JustifyTwoDVisualProperty extends AbstractVisualProperty<Justify>
{
- public JustifyTwoDVisualProperty(final String ot, final Justify def,
final String id, final String name) {
- super(ot,def,id,name);
+ public JustifyTwoDVisualProperty(final Justify def, final String id,
final String name) {
+ super(def,id,name);
}
public String toSerializableString(final Justify value) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -1,4 +1,3 @@
-
/*
Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
@@ -32,18 +31,19 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
package org.cytoscape.ding.impl;
import org.cytoscape.ding.NodeShape;
import org.cytoscape.view.model.AbstractVisualProperty;
-public class NodeShapeTwoDVisualProperty extends
AbstractVisualProperty<NodeShape> {
+public class NodeShapeTwoDVisualProperty extends
+ AbstractVisualProperty<NodeShape> {
- public NodeShapeTwoDVisualProperty(final String ot, final NodeShape
def, final String id, final String name) {
- super(ot,def,id,name);
+ public NodeShapeTwoDVisualProperty(final NodeShape def, final String
id, final String name) {
+ super(def, id, name);
}
-
+
public String toSerializableString(final NodeShape value) {
return value.toString();
}
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
2010-09-27 23:47:56 UTC (rev 22079)
@@ -36,12 +36,13 @@
package org.cytoscape.ding.impl;
import java.awt.Stroke;
+
import org.cytoscape.view.model.AbstractVisualProperty;
public class StrokeTwoDVisualProperty extends AbstractVisualProperty<Stroke> {
- public StrokeTwoDVisualProperty(final String ot, final Stroke def,
final String id, final String name) {
- super(ot,def,id,name);
+ public StrokeTwoDVisualProperty(final Stroke def, final String id,
final String name) {
+ super(def,id,name);
}
public String toSerializableString(final Stroke value) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-27 23:47:56 UTC (rev 22079)
@@ -20,10 +20,6 @@
interface="org.cytoscape.spacial.SpacialIndex2DFactory">
</osgi:reference>
- <osgi:reference id="rootVisualLexiconServiceRef"
- interface="org.cytoscape.view.model.RootVisualLexicon">
- </osgi:reference>
-
<osgi:reference id="taskManagerServiceRef"
interface="org.cytoscape.work.TaskManager">
</osgi:reference>
@@ -38,9 +34,12 @@
<osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper">
</osgi:reference>
+
+ <osgi:reference id="visualLexiconNodeFactoryServiceRef"
interface="org.cytoscape.view.model.VisualLexiconNodeFactory">
+ </osgi:reference>
<!-- Individual Service -->
- <osgi:service id="dingPresentationFactoryService"
ref="dingPresentationFactory">
+ <osgi:service id="dingRenderingEngineFactoryService"
ref="dingRenderingEngineFactory">
<osgi:interfaces>
<value>org.cytoscape.view.presentation.RenderingEngineFactory</value>
<value>org.cytoscape.view.model.events.NetworkViewChangedListener
@@ -52,7 +51,7 @@
</osgi:service-properties>
</osgi:service>
- <osgi:service id="dingNavigationPresentationFactoryService"
ref="dingNavigationPresentationFactory">
+ <osgi:service id="dingNavigationRenderingEngineFactoryService"
ref="dingNavigationRenderingEngineFactory">
<osgi:interfaces>
<value>org.cytoscape.view.presentation.RenderingEngineFactory</value>
<value>org.cytoscape.view.model.events.NetworkViewChangedListener
@@ -72,19 +71,19 @@
<osgi:set id="nodeViewTaskFactorySet"
interface="org.cytoscape.task.NodeViewTaskFactory"
cardinality="0..N">
<osgi:listener bind-method="addNodeViewTaskFactory"
- unbind-method="removeNodeViewTaskFactory"
ref="dingPresentationFactory" />
+ unbind-method="removeNodeViewTaskFactory"
ref="dingRenderingEngineFactory" />
</osgi:set>
<osgi:set id="edgeViewTaskFactorySet"
interface="org.cytoscape.task.EdgeViewTaskFactory"
cardinality="0..N">
<osgi:listener bind-method="addEdgeViewTaskFactory"
- unbind-method="removeEdgeViewTaskFactory"
ref="dingPresentationFactory" />
+ unbind-method="removeEdgeViewTaskFactory"
ref="dingRenderingEngineFactory" />
</osgi:set>
<osgi:set id="emptySpaceTaskFactorySet"
interface="org.cytoscape.task.NetworkViewTaskFactory"
cardinality="0..N">
<osgi:listener bind-method="addNetworkViewTaskFactory"
- unbind-method="removeNetworkViewTaskFactory"
ref="dingPresentationFactory" />
+ unbind-method="removeNetworkViewTaskFactory"
ref="dingRenderingEngineFactory" />
</osgi:set>
</beans>
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-09-22 22:15:10 UTC (rev 21982)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
2010-09-27 23:47:56 UTC (rev 22079)
@@ -13,18 +13,20 @@
http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
+
<import resource="bundle-context-osgi.xml" />
<context:annotation-config />
- <bean id="dVisualLexicon"
class="org.cytoscape.ding.impl.DVisualLexicon" />
+ <bean id="dVisualLexicon"
class="org.cytoscape.ding.impl.DVisualLexicon">
+ <constructor-arg ref="visualLexiconNodeFactoryServiceRef" />
+ </bean>
- <bean id="dingPresentationFactory"
class="org.cytoscape.ding.impl.DingRenderingEngineFactory">
+ <bean id="dingRenderingEngineFactory"
class="org.cytoscape.ding.impl.DingRenderingEngineFactory">
<constructor-arg ref="cyDataTableFactoryServiceRef" />
<constructor-arg ref="cyRootNetworkFactoryServiceRef" />
<constructor-arg ref="undoSupportServiceRef" />
<constructor-arg ref="spacialIndex2DFactoryServiceRef" />
- <constructor-arg ref="rootVisualLexiconServiceRef" />
<constructor-arg ref="dVisualLexicon" />
<constructor-arg ref="taskManagerServiceRef" />
<constructor-arg ref="cyServiceRegistrarRef" />
@@ -32,13 +34,12 @@
<constructor-arg ref="cyEventHelperServiceRef" />
</bean>
- <bean id="dingNavigationPresentationFactory"
+ <bean id="dingNavigationRenderingEngineFactory"
class="org.cytoscape.ding.impl.DingNavigationRenderingEngineFactory">
<constructor-arg ref="cyDataTableFactoryServiceRef" />
<constructor-arg ref="cyRootNetworkFactoryServiceRef" />
<constructor-arg ref="undoSupportServiceRef" />
<constructor-arg ref="spacialIndex2DFactoryServiceRef" />
- <constructor-arg ref="rootVisualLexiconServiceRef" />
<constructor-arg ref="dVisualLexicon" />
<constructor-arg ref="taskManagerServiceRef" />
<constructor-arg ref="cyServiceRegistrarRef" />
--
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.
