Author: kono
Date: 2012-04-02 16:59:15 -0700 (Mon, 02 Apr 2012)
New Revision: 28718
Added:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/EdgeBendVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Bend.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/BendFactory.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Handle.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexicon2.java
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualPropertyDependency.java
Removed:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Bend.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/BendFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Handle.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/HandleFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BasicVisualLexicon.java
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/BasicVisualLexiconTest.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DVisualLexicon.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/EdgeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/EdgeBendIcon.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendFactoryImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendCellRenderer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendEditor.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendPropertyEditor.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
core3/impl/trunk/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
Log:
Edge Bend is now part of public API in presentation-api bundle.
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BasicVisualLexicon.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BasicVisualLexicon.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BasicVisualLexicon.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -21,6 +21,7 @@
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.Visualizable;
import org.cytoscape.view.presentation.property.values.ArrowShape;
+import org.cytoscape.view.presentation.property.values.BendFactory;
import org.cytoscape.view.presentation.property.values.LineType;
import org.cytoscape.view.presentation.property.values.NodeShape;
import org.slf4j.Logger;
@@ -233,6 +234,9 @@
ArrowShapeVisualProperty.NONE,
"EDGE_SOURCE_ARROW_SHAPE", "Edge Source Arrow Shape", CyEdge.class);
public static final VisualProperty<ArrowShape> EDGE_TARGET_ARROW_SHAPE
= new ArrowShapeVisualProperty(
ArrowShapeVisualProperty.NONE,
"EDGE_TARGET_ARROW_SHAPE", "Edge Target Arrow Shape", CyEdge.class);
+
+ public static final EdgeBendVisualProperty EDGE_BEND = new
EdgeBendVisualProperty(
+ EdgeBendVisualProperty.DEFAULT_EDGE_BEND, "EDGE_BEND",
"Edge Bend");
/**
* Constructor for VisualLexicon. The parameters are required for all
@@ -253,9 +257,13 @@
this.identifierLookup.put(CyNode.class, new HashMap<String,
VisualProperty<?>>());
this.identifierLookup.put(CyEdge.class, new HashMap<String,
VisualProperty<?>>());
this.identifierLookup.put(CyNetwork.class, new HashMap<String,
VisualProperty<?>>());
-
+
addVisualProperties(rootVisualProperty);
}
+
+ public void addBendFactory(final BendFactory bendFactory, final Map
props) {
+ EDGE_BEND.setBendFactory(bendFactory);
+ }
private void addVisualProperties(final VisualProperty<NullDataType>
root) {
addVisualProperty(NETWORK, root);
@@ -336,6 +344,8 @@
addVisualProperty(EDGE_SOURCE_ARROW_SHAPE, EDGE);
addVisualProperty(EDGE_TARGET_ARROW_SHAPE, EDGE);
+
+ addVisualProperty(EDGE_BEND, EDGE);
createLookupMap();
}
@@ -411,6 +421,8 @@
addIdentifierMapping(CyEdge.class, "edgeSourceArrowShape",
EDGE_SOURCE_ARROW_SHAPE);
addIdentifierMapping(CyEdge.class, "edgeTargetArrowShape",
EDGE_TARGET_ARROW_SHAPE);
+ addIdentifierMapping(CyEdge.class, "edgeBend", EDGE_BEND);
+
// TODO add more mappings!
}
Copied:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/EdgeBendVisualProperty.java
(from rev 28609,
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java)
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/EdgeBendVisualProperty.java
(rev 0)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/EdgeBendVisualProperty.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -0,0 +1,83 @@
+package org.cytoscape.view.presentation.property;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.view.model.AbstractVisualProperty;
+import org.cytoscape.view.model.ContinuousRange;
+import org.cytoscape.view.model.Range;
+import org.cytoscape.view.presentation.property.values.Bend;
+import org.cytoscape.view.presentation.property.values.BendFactory;
+import org.cytoscape.view.presentation.property.values.Handle;
+
+public class EdgeBendVisualProperty extends AbstractVisualProperty<Bend> {
+
+ private static final Range<Bend> EDGE_BEND_RANGE;
+ public static final Bend DEFAULT_EDGE_BEND = new EmptyBendImpl();
+
+ static {
+ EDGE_BEND_RANGE = new ContinuousRange<Bend>(Bend.class,
DEFAULT_EDGE_BEND, DEFAULT_EDGE_BEND, true, true);
+ }
+
+ private BendFactory bendFactory;
+
+ public EdgeBendVisualProperty(Bend defaultValue, String id, String
displayName) {
+ super(defaultValue, EDGE_BEND_RANGE, id, displayName,
CyEdge.class);
+ }
+
+ public void setBendFactory(final BendFactory bendFactory) {
+ this.bendFactory = bendFactory;
+ }
+
+ @Override
+ public String toSerializableString(final Bend value) {
+ return value.getSerializableString();
+ }
+
+ @Override
+ public Bend parseSerializableString(String value) {
+ if(value == null)
+ return DEFAULT_EDGE_BEND;
+ else
+ return bendFactory.parseSerializableString(value);
+ }
+
+
+ /**
+ * Immutable default Bend object w/no handle.
+ */
+ private static final class EmptyBendImpl implements Bend {
+
+ @Override
+ public List<Handle> getAllHandles() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void insertHandleAt(int index, Handle handle) {
+ throw new UnsupportedOperationException("This is a
default immutable Bend object.");
+ }
+
+ @Override
+ public void removeHandleAt(int handleIndex) {
+ throw new UnsupportedOperationException("This is a
default immutable Bend object.");
+ }
+
+ @Override
+ public void removeAllHandles() {
+ throw new UnsupportedOperationException("This is a
default immutable Bend object.");
+ }
+
+ @Override
+ public int getIndex(Handle handle) {
+ throw new UnsupportedOperationException("This is a
default immutable Bend object.");
+ }
+
+ @Override
+ public String getSerializableString() {
+ throw new UnsupportedOperationException("This is a
default immutable Bend object.");
+ }
+ }
+}
Copied:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Bend.java
(from rev 28586,
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Bend.java)
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Bend.java
(rev 0)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Bend.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -0,0 +1,56 @@
+package org.cytoscape.view.presentation.property.values;
+
+import java.util.List;
+
+
+/**
+ * Definition of Edge Bends.
+ * Bend is an ordered {@link List} of {@link Handle}s.
+ *
+ */
+public interface Bend {
+
+ /**
+ * Get List of all handles on this edge
+ *
+ * @return All {@link Handle}s belong to this Bend.
+ */
+ List<Handle> getAllHandles();
+
+ /**
+ * Insert a Handle to the specified position in the Bend
+ *
+ * @param index Position of the new Handle
+ * @param handle Handle to be added
+ */
+ void insertHandleAt(final int index, final Handle handle);
+
+ /**
+ * Remove a Handle at the given index.
+ *
+ * @param handleIndex Index of the Handle to be removed
+ */
+ void removeHandleAt(final int handleIndex);
+
+ /**
+ * Remove all Handles on this Bend
+ */
+ void removeAllHandles();
+
+
+ /**
+ * Get index of a Handle
+ *
+ * @param handle
+ *
+ * @return Index of the given Handle
+ */
+ int getIndex(final Handle handle);
+
+ /**
+ * Create string representation of this object for parsing.
+ *
+ * @return serializable string.
+ */
+ String getSerializableString();
+}
Copied:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/BendFactory.java
(from rev 28586,
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/BendFactory.java)
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/BendFactory.java
(rev 0)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/BendFactory.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -0,0 +1,25 @@
+package org.cytoscape.view.presentation.property.values;
+
+
+/**
+ * Factory to create an instance of {@linkplain Bend}.
+ */
+public interface BendFactory {
+
+ /**
+ * Creates an instance of edge bend.
+ * Usually, this creates Bend object without any {@linkplain Handle}s.
+ *
+ * @return new instance of Bend object.
+ */
+ Bend createBend();
+
+ /**
+ * Creates an instance of edge bend from serializable string.
+ *
+ * @param serializedString string representation of edge bend.
+ *
+ * @return New instance of Bend (interpretation of the given string).
+ */
+ Bend parseSerializableString(final String serializedString);
+}
Copied:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Handle.java
(from rev 28586,
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Handle.java)
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Handle.java
(rev 0)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/Handle.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -0,0 +1,45 @@
+package org.cytoscape.view.presentation.property.values;
+
+import java.awt.geom.Point2D;
+
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.model.CyEdge;
+
+
+/**
+ * Defines a handle, an anchor point in the edge.
+ *
+ */
+public interface Handle {
+
+ /**
+ * Calculate absolute position of this handle for the given edge view.
+ *
+ * @param netView graph view for this handle
+ * @param edgeView The handle belongs to this edge view.
+ *
+ * @return Absolute position of this handle in the network view.
+ */
+ Point2D calculateHandleLocation(final CyNetworkView netView, final
View<CyEdge> edgeView);
+
+ /**
+ * Define this handle. Handle will be described as a relative location
from source and target node.
+ *
+ * NOTE: in the implementation, the given (x, y) values will be
converted to relative position.
+ * The conversion equation is exchangeable.
+ *
+ * @param netView graph view for this handle
+ * @param edgeView The handle belongs to this edge view.
+ * @param x Absolute value for X-location.
+ * @param y Absolute value for Y-location.
+ */
+ void defineHandle(final CyNetworkView netView, final View<CyEdge>
edgeView, final double x, final double y);
+
+ /**
+ * Create string representation of this object for parsing.
+ *
+ * @return String representation of this Handle.
+ */
+ String getSerializableString();
+}
Copied:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
(from rev 28586,
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/HandleFactory.java)
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
(rev 0)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -0,0 +1,19 @@
+package org.cytoscape.view.presentation.property.values;
+
+
+/**
+ * Factory of the handle object.
+ *
+ */
+public interface HandleFactory {
+
+ /**
+ * Creates a new instance of the Handle.
+ *
+ * @param x x position of the handle (absolute position)
+ * @param y y position of the handle (absolute position)
+ *
+ * @return instance of new handle.
+ */
+ Handle createHandle(double x, double y);
+}
Modified:
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/BasicVisualLexiconTest.java
===================================================================
---
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/BasicVisualLexiconTest.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/api/trunk/presentation-api/src/test/java/org/cytoscape/view/presentation/BasicVisualLexiconTest.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -46,7 +46,7 @@
@Test
public void test2DLexicon() throws Exception {
- assertEquals(56, richLex.getAllVisualProperties().size());
+ assertEquals(57, richLex.getAllVisualProperties().size());
}
@Test
@@ -74,7 +74,7 @@
assertEquals(24, nodeChildren.size());
Collection<VisualProperty<?>> edgeChildren =
richLex.getAllDescendants(BasicVisualLexicon.EDGE);
- assertEquals(18, edgeChildren.size());
+ assertEquals(19, edgeChildren.size());
Collection<VisualProperty<?>> leaf =
richLex.getAllDescendants(BasicVisualLexicon.EDGE_LABEL_COLOR);
assertEquals(0, leaf.size());
Added:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexicon2.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexicon2.java
(rev 0)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexicon2.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -0,0 +1,50 @@
+package org.cytoscape.view.model;
+
+import java.util.Set;
+
+public interface VisualLexicon2 {
+
+ /**
+ * Returns the Set of VisualPropertys supported by this Renderer.
+ *
+ * @return Set of all visual properties
+ *
+ */
+ Set<VisualProperty<?>> getAllVisualProperties();
+
+ /**
+ * Get a set of Visual Properties.
+ * Usually, they are grouped by Graph Object: node, edge, and network.
+ *
+ * @param groupName name of the category: node, edge, or network
+ *
+ * @return Set of Visual properties in the category
+ */
+ Set<VisualProperty<?>> getVisualPropertyGroup(final String groupName);
+
+ /**
+ * Test the given Visual Property is supported in this Lexicon.
+ *
+ * @param vp visual property to be tested.
+ * @return true if this lexicon supports the given vp.
+ */
+ boolean isSupported(final VisualProperty<?> vp);
+
+
+ /**
+ * Returns the appropriate visual property for the descriptive
+ * string. The string is generally expected to be descriptive
identifier
+ * from a file format (e.g. XGMML, GML) that can be mapped to a
VisualProperty
+ * by the implementer of the VisualLexicon. This method will return
null if
+ * no match is found.
+ *
+ * @param type The type of the visual property sought, which should
+ * (in general) be CyNode.class, CyEdge.class, or CyNetwork.class.
+ * @param identifier A string identifying a particular visual property.
+ *
+ * @return A VisualProperty identified by the input string or null if no
+ * match is found.
+ */
+ VisualProperty<?> lookup(Class<?> type, String identifier);
+
+}
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -37,7 +37,6 @@
if(parent != null)
parent.getChildren().add(this);
-
}
Added:
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualPropertyDependency.java
===================================================================
---
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualPropertyDependency.java
(rev 0)
+++
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualPropertyDependency.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -0,0 +1,34 @@
+package org.cytoscape.view.vizmap;
+
+import java.util.Set;
+
+import org.cytoscape.view.model.VisualProperty;
+
+/**
+ *
+ * Plan 1: Use existing VisualLexicon Tree as is.
+ *
+ * Set of Visual Properties which are dependent to each other
+ *
+ * All Visual Properties should have save data type T.
+ *
+ */
+public interface VisualPropertyDependency<T> {
+
+ /**
+ * Provides human-readable name of this dependency.
+ * For example, "Synchronize edge color to arrow head color,"
+ * or "Fit Custom Graphics to node"
+ *
+ * @return name of this dependency.
+ */
+ String getDisplayName();
+
+ /**
+ * A set of Visual Properties to be set by the parent if locked.
+ *
+ * @return set of visual properties to be set by parent value.
+ */
+ Set<VisualProperty<T>> getVisualProperties();
+
+}
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Bend.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Bend.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Bend.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,54 +0,0 @@
-package org.cytoscape.ding;
-
-import java.util.List;
-
-
-/**
- * Definition of Edge Bends.
- * Bend is an ordered {@link List} of {@link Handle}s.
- *
- */
-public interface Bend {
-
- /**
- *
- * @return All {@link Handle}s belong to this Bend.
- */
- List<Handle> getAllHandles();
-
- /**
- * Insert a Handle to the specified position in the Bend
- *
- * @param index Position of the new Handle
- * @param handle Handle to be added
- */
- void insertHandleAt(final int index, final Handle handle);
-
- /**
- * Remove a Handle at the given index.
- *
- * @param handleIndex Index of the Handle to be removed
- */
- void removeHandleAt(final int handleIndex);
-
- /**
- * Remove all Handles in this Bend
- */
- void removeAllHandles();
-
-
- /**
- * Get index of a Handle
- *
- * @param handle
- *
- * @return Index of the given Handle
- */
- int getIndex(final Handle handle);
-
- /**
- * Create string representation of this object for parsing.
- * @return
- */
- String getSerializableString();
-}
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/BendFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/BendFactory.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/BendFactory.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,7 +0,0 @@
-
-package org.cytoscape.ding;
-
-
-public interface BendFactory {
- Bend createBend();
-}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,5 +1,6 @@
package org.cytoscape.ding;
+import java.util.HashMap;
import java.util.Properties;
import org.cytoscape.application.CyApplicationManager;
@@ -47,6 +48,8 @@
import org.cytoscape.view.model.events.UpdateNetworkPresentationEventListener;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.presentation.property.values.BendFactory;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -184,6 +187,9 @@
BendFactory bendFactory = new BendFactoryImpl();
registerService(bc,bendFactory,BendFactory.class,new
Properties());
+
+ // Register the factory
+ dVisualLexicon.addBendFactory(bendFactory, new HashMap());
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DVisualLexicon.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DVisualLexicon.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DVisualLexicon.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -51,7 +51,6 @@
import org.cytoscape.ding.impl.strokes.VerticalSlashStroke;
import org.cytoscape.ding.impl.strokes.ZigzagStroke;
import org.cytoscape.ding.impl.visualproperty.CustomGraphicsVisualProperty;
-import org.cytoscape.ding.impl.visualproperty.EdgeBendVisualProperty;
import org.cytoscape.ding.impl.visualproperty.ObjectPositionVisualProperty;
import org.cytoscape.graph.render.immed.GraphGraphics;
import org.cytoscape.model.CyEdge;
@@ -238,10 +237,6 @@
"EDGE_TARGET_ARROW_UNSELECTED_PAINT",
"Edge Target Arrow Unselected Paint", CyEdge.class);
- public static final VisualProperty<Bend> EDGE_BEND = new
EdgeBendVisualProperty(
- EdgeBendVisualProperty.DEFAULT_EDGE_BEND, "EDGE_BEND",
- "Edge Bend");
-
public static final VisualProperty<Boolean> EDGE_CURVED = new
BooleanVisualProperty(true, "EDGE_CURVED",
"Edge Curved", CyEdge.class);
@@ -411,7 +406,6 @@
addVisualProperty(EDGE_TARGET_ARROW_UNSELECTED_PAINT,
EDGE_UNSELECTED_PAINT);
// Define edge end related VP
- addVisualProperty(EDGE_BEND, EDGE);
addVisualProperty(EDGE_CURVED, EDGE);
//addVisualProperty(EDGE_LABEL_POSITION, EDGE);
@@ -442,8 +436,7 @@
//
addIdentifierMapping(CyEdge.class,"edgeOpacity",EDGE_TRANPARENCY);
// TODO add more!
-
- addIdentifierMapping(CyEdge.class, "edgeBend", EDGE_BEND);
+
addIdentifierMapping(CyEdge.class, "edgeCurved", EDGE_CURVED);
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/EdgeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/EdgeView.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/EdgeView.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -5,6 +5,7 @@
import java.awt.Stroke;
import org.cytoscape.model.CyEdge;
+import org.cytoscape.view.presentation.property.values.Bend;
public interface EdgeView extends GraphViewObject {
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Handle.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Handle.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Handle.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,44 +0,0 @@
-package org.cytoscape.ding;
-
-import java.awt.geom.Point2D;
-
-import org.cytoscape.view.model.View;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.model.CyEdge;
-
-
-/**
- * Defines a handle, an anchor point in the edge.
- *
- */
-public interface Handle {
-
- /**
- * Calculate absolute position of this handle for the given edge view.
- *
- * @param netView graph view for this handle
- * @param edgeView The handle belongs to this edge view.
- *
- * @return Absolute position of this handle in the network view.
- */
- Point2D calculateHandleLocation(final CyNetworkView netView, final
View<CyEdge> edgeView);
-
- /**
- * Define this handle. Handle will be described as a relative location
from source and target node.
- *
- * NOTE: in the implementation, the given (x, y) values will be
converted to relative position.
- * The conversion equation is exchangeable.
- *
- * @param netView graph view for this handle
- * @param edgeView The handle belongs to this edge view.
- * @param x Absolute value for X-location.
- * @param y Absolute value for Y-location.
- */
- void defineHandle(final CyNetworkView netView, final View<CyEdge>
edgeView, final double x, final double y);
-
- /**
- * Create string representation of this object for parsing.
- * @return
- */
- String getSerializableString();
-}
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/HandleFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/HandleFactory.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/HandleFactory.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,7 +0,0 @@
-
-package org.cytoscape.ding;
-
-
-public interface HandleFactory {
- Handle createHandle(double x, double y);
-}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/EdgeBendIcon.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/EdgeBendIcon.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/EdgeBendIcon.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -11,7 +11,7 @@
import java.awt.geom.CubicCurve2D;
import java.awt.geom.Line2D;
-import org.cytoscape.ding.Bend;
+import org.cytoscape.view.presentation.property.values.Bend;
public class EdgeBendIcon extends VisualPropertyIcon<Bend> {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -5,7 +5,6 @@
import javax.swing.Icon;
-import org.cytoscape.ding.Bend;
import org.cytoscape.ding.DArrowShape;
import org.cytoscape.ding.DNodeShape;
import org.cytoscape.ding.ObjectPosition;
@@ -15,6 +14,7 @@
import org.cytoscape.view.presentation.property.ArrowShapeVisualProperty;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
import org.cytoscape.view.presentation.property.values.ArrowShape;
+import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.presentation.property.values.LineType;
import org.cytoscape.view.presentation.property.values.NodeShape;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendFactoryImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendFactoryImpl.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendFactoryImpl.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,11 +1,17 @@
-
package org.cytoscape.ding.impl;
-import org.cytoscape.ding.BendFactory;
-import org.cytoscape.ding.Bend;
+import org.cytoscape.view.presentation.property.values.Bend;
+import org.cytoscape.view.presentation.property.values.BendFactory;
public class BendFactoryImpl implements BendFactory {
+
+ @Override
public Bend createBend() {
return new BendImpl();
}
+
+ @Override
+ public Bend parseSerializableString(String serializedString) {
+ return BendImpl.parseSerializableString(serializedString);
+ }
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendImpl.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/BendImpl.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -3,8 +3,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.cytoscape.ding.Bend;
-import org.cytoscape.ding.Handle;
+import org.cytoscape.view.presentation.property.values.Bend;
+import org.cytoscape.view.presentation.property.values.Handle;
/**
* Basic Implementation of edge bends.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -37,11 +37,9 @@
import java.util.Map;
import java.util.Set;
-import org.cytoscape.ding.Bend;
import org.cytoscape.ding.DArrowShape;
import org.cytoscape.ding.DVisualLexicon;
import org.cytoscape.ding.EdgeView;
-import org.cytoscape.ding.impl.visualproperty.EdgeBendVisualProperty;
import org.cytoscape.graph.render.immed.EdgeAnchors;
import org.cytoscape.graph.render.immed.GraphGraphics;
import org.cytoscape.graph.render.stateful.EdgeDetails;
@@ -50,7 +48,9 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.util.intr.IntEnumerator;
import org.cytoscape.util.intr.MinIntHeap;
+import org.cytoscape.view.presentation.property.EdgeBendVisualProperty;
import org.cytoscape.view.presentation.property.values.ArrowShape;
+import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.presentation.property.values.LineType;
class DEdgeDetails extends EdgeDetails {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -37,12 +37,10 @@
import java.util.Collection;
import java.util.List;
-import org.cytoscape.ding.Bend;
import org.cytoscape.ding.DArrowShape;
import org.cytoscape.ding.DVisualLexicon;
import org.cytoscape.ding.EdgeView;
import org.cytoscape.ding.GraphView;
-import org.cytoscape.ding.Handle;
import org.cytoscape.ding.Label;
import org.cytoscape.graph.render.immed.EdgeAnchors;
import org.cytoscape.graph.render.immed.GraphGraphics;
@@ -54,6 +52,8 @@
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.values.ArrowShape;
+import org.cytoscape.view.presentation.property.values.Bend;
+import org.cytoscape.view.presentation.property.values.Handle;
import org.cytoscape.view.presentation.property.values.LineType;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/EdgeViewDefaultSupport.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -34,7 +34,6 @@
import java.awt.Stroke;
import java.util.Collection;
-import org.cytoscape.ding.Bend;
import org.cytoscape.ding.DArrowShape;
import org.cytoscape.ding.DVisualLexicon;
import org.cytoscape.ding.EdgeView;
@@ -44,6 +43,7 @@
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.values.ArrowShape;
+import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.presentation.property.values.LineType;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,8 +1,8 @@
package org.cytoscape.ding.impl;
-import org.cytoscape.ding.HandleFactory;
-import org.cytoscape.ding.Handle;
+import org.cytoscape.view.presentation.property.values.Handle;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
public class HandleFactoryImpl implements HandleFactory {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -3,12 +3,12 @@
import java.awt.geom.Point2D;
import org.cytoscape.ding.DVisualLexicon;
-import org.cytoscape.ding.Handle;
import org.cytoscape.ding.impl.editor.EditMode;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
+import org.cytoscape.view.presentation.property.values.Handle;
/**
* A simple implementation of edge handle.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -48,10 +48,8 @@
import java.awt.geom.Point2D;
import java.awt.image.BufferedImage;
-import org.cytoscape.ding.Bend;
import org.cytoscape.ding.EdgeView;
import org.cytoscape.ding.GraphViewChangeListener;
-import org.cytoscape.ding.Handle;
import org.cytoscape.ding.NodeView;
import org.cytoscape.ding.ViewChangeEdit;
import org.cytoscape.ding.impl.events.GraphViewEdgesSelectedEvent;
@@ -71,6 +69,8 @@
import org.cytoscape.util.intr.IntHash;
import org.cytoscape.util.intr.IntStack;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.presentation.property.values.Bend;
+import org.cytoscape.view.presentation.property.values.Handle;
import org.cytoscape.work.undo.UndoSupport;
/**
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendCellRenderer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendCellRenderer.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendCellRenderer.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -7,9 +7,9 @@
import javax.swing.JTable;
import javax.swing.SwingConstants;
-import org.cytoscape.ding.Bend;
import org.cytoscape.ding.DVisualLexicon;
import org.cytoscape.ding.icon.VisualPropertyIconFactory;
+import org.cytoscape.view.presentation.property.values.Bend;
import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendEditor.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendEditor.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,6 +1,6 @@
package org.cytoscape.ding.impl.editor;
-import org.cytoscape.ding.Bend;
+import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.vizmap.gui.editor.AbstractVisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendPropertyEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendPropertyEditor.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendPropertyEditor.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -6,7 +6,7 @@
import javax.swing.JButton;
import javax.swing.JPanel;
-import org.cytoscape.ding.Bend;
+import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
import com.l2fprod.common.swing.ComponentFactory;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendValueEditor.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -16,7 +16,6 @@
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
-import org.cytoscape.ding.Bend;
import org.cytoscape.ding.DVisualLexicon;
import org.cytoscape.ding.impl.BendImpl;
import org.cytoscape.ding.impl.DEdgeView;
@@ -32,6 +31,7 @@
import org.cytoscape.view.presentation.property.ArrowShapeVisualProperty;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
public class EdgeBendValueEditor extends JDialog implements ValueEditor<Bend> {
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,35 +0,0 @@
-package org.cytoscape.ding.impl.visualproperty;
-
-import org.cytoscape.ding.Bend;
-import org.cytoscape.ding.impl.BendImpl;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.ContinuousRange;
-import org.cytoscape.view.model.Range;
-
-public class EdgeBendVisualProperty extends AbstractVisualProperty<Bend> {
-
- private static final Range<Bend> EDGE_BEND_RANGE;
- public static final Bend DEFAULT_EDGE_BEND = new BendImpl();
-
- static {
- EDGE_BEND_RANGE = new ContinuousRange<Bend>(Bend.class,
DEFAULT_EDGE_BEND, DEFAULT_EDGE_BEND, true, true);
- }
-
- public EdgeBendVisualProperty(Bend defaultValue, String id, String
displayName) {
- super(defaultValue, EDGE_BEND_RANGE, id, displayName,
CyEdge.class);
- }
-
- @Override
- public String toSerializableString(final Bend value) {
- return value.getSerializableString();
- }
-
- @Override
- public Bend parseSerializableString(String value) {
- if(value == null)
- return DEFAULT_EDGE_BEND;
- else
- return BendImpl.parseSerializableString(value);
- }
-}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -4,6 +4,7 @@
import org.cytoscape.ding.impl.BendImpl;
import org.cytoscape.ding.impl.HandleImpl;
+import org.cytoscape.view.presentation.property.values.Bend;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified:
core3/impl/trunk/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
2012-04-02 23:10:33 UTC (rev 28717)
+++
core3/impl/trunk/presentation-impl/src/main/java/org/cytoscape/view/presentation/internal/CyActivator.java
2012-04-02 23:59:15 UTC (rev 28718)
@@ -1,13 +1,11 @@
-
package org.cytoscape.view.presentation.internal;
-import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.view.presentation.internal.RenderingEngineManagerImpl;
-import org.cytoscape.view.presentation.RenderingEngineManager;
+import java.util.Properties;
+
+import org.cytoscape.service.util.AbstractCyActivator;
import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.osgi.framework.BundleContext;
-import org.cytoscape.service.util.AbstractCyActivator;
-import java.util.Properties;
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
@@ -15,17 +13,13 @@
}
public void start(BundleContext bc) {
-
- CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
-
RenderingEngineManagerImpl renderingEngineManager = new
RenderingEngineManagerImpl();
-
+
Properties renderingEngineManagerProps = new Properties();
-
renderingEngineManagerProps.setProperty("service.type","manager");
-
registerService(bc,renderingEngineManager,RenderingEngineManager.class,
renderingEngineManagerProps);
+ renderingEngineManagerProps.setProperty("service.type",
"manager");
+ registerService(bc, renderingEngineManager,
RenderingEngineManager.class, renderingEngineManagerProps);
-
registerServiceListener(bc,renderingEngineManager,"addRenderingEngineFactory","removeRenderingEngineFactory",RenderingEngineFactory.class);
-
+ registerServiceListener(bc, renderingEngineManager,
"addRenderingEngineFactory",
+ "removeRenderingEngineFactory",
RenderingEngineFactory.class);
}
}
-
--
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.
