Author: mes
Date: 2012-04-13 14:12:38 -0700 (Fri, 13 Apr 2012)
New Revision: 28830
Added:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/AbstractVisualPropertyValue.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/VisualPropertyValue.java
Removed:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualPropertyValue.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/ArrowShape.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/LineType.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/NodeShape.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DLineType.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/DiscreteValueEditor.java
Log:
Removed a cyclic dependency between packages.
Deleted:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualPropertyValue.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualPropertyValue.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualPropertyValue.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -1,37 +0,0 @@
-package org.cytoscape.view.presentation.property;
-
-/**
- * Base class for all {@link VisualPropertyValue}.
- * @CyAPI.Abstract.Class
- */
-public abstract class AbstractVisualPropertyValue implements
VisualPropertyValue {
-
- private final String displayName;
- private final String serializableString;
-
- /**
- * Constructs an AbstractVisualPropertyValue.
- * @param displayName the display name of the visual property value.
- * @param serializableString #ASKMIKE
- */
- public AbstractVisualPropertyValue(final String displayName, final
String serializableString) {
- this.displayName = displayName;
- this.serializableString = serializableString;
- }
-
- @Override
- public String getDisplayName() {
- return this.displayName;
- }
-
- @Override
- public String getSerializableString() {
- return this.serializableString;
- }
-
- @Override
- public String toString() {
- return displayName;
- }
-
-}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -6,6 +6,7 @@
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
+import
org.cytoscape.view.presentation.property.values.AbstractVisualPropertyValue;
import org.cytoscape.view.presentation.property.values.ArrowShape;
/**
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -6,6 +6,7 @@
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
+import
org.cytoscape.view.presentation.property.values.AbstractVisualPropertyValue;
import org.cytoscape.view.presentation.property.values.LineType;
/**
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -6,6 +6,7 @@
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
+import
org.cytoscape.view.presentation.property.values.AbstractVisualPropertyValue;
import org.cytoscape.view.presentation.property.values.NodeShape;
/**
Deleted:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -1,28 +0,0 @@
-package org.cytoscape.view.presentation.property;
-
-/**
- * Object used as a Visual Property value.
- * In most cases, Visual Property uses basic objects such as Number or Color.
- * If developers want to use custom objects as a Visual Property value, they
should implement this.
- *
- * @CyAPI.Api.Interface
- */
-public interface VisualPropertyValue {
-
- /**
- * Name of this value type.
- * For example, Arrow Shape or Node Shape.
- *
- * @return human readable name of this object type.
- */
- String getDisplayName();
-
-
- /**
- * Returns serializable representation of this value.
- *
- * @return Value in serializable string form.
- */
- String getSerializableString();
-
-}
Copied:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/AbstractVisualPropertyValue.java
(from rev 28828,
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualPropertyValue.java)
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/AbstractVisualPropertyValue.java
(rev 0)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/AbstractVisualPropertyValue.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -0,0 +1,38 @@
+package org.cytoscape.view.presentation.property.values;
+
+
+/**
+ * Base class for all {@link VisualPropertyValue}.
+ * @CyAPI.Abstract.Class
+ */
+public abstract class AbstractVisualPropertyValue implements
VisualPropertyValue {
+
+ private final String displayName;
+ private final String serializableString;
+
+ /**
+ * Constructs an AbstractVisualPropertyValue.
+ * @param displayName the display name of the visual property value.
+ * @param serializableString #ASKMIKE
+ */
+ public AbstractVisualPropertyValue(final String displayName, final
String serializableString) {
+ this.displayName = displayName;
+ this.serializableString = serializableString;
+ }
+
+ @Override
+ public String getDisplayName() {
+ return this.displayName;
+ }
+
+ @Override
+ public String getSerializableString() {
+ return this.serializableString;
+ }
+
+ @Override
+ public String toString() {
+ return displayName;
+ }
+
+}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/ArrowShape.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/ArrowShape.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/ArrowShape.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -1,6 +1,5 @@
package org.cytoscape.view.presentation.property.values;
-import org.cytoscape.view.presentation.property.VisualPropertyValue;
/**
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/LineType.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/LineType.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/LineType.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -1,6 +1,5 @@
package org.cytoscape.view.presentation.property.values;
-import org.cytoscape.view.presentation.property.VisualPropertyValue;
/**
* Marker interface for line types.
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/NodeShape.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/NodeShape.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/NodeShape.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -1,6 +1,5 @@
package org.cytoscape.view.presentation.property.values;
-import org.cytoscape.view.presentation.property.VisualPropertyValue;
/**
* Marker interface for node shapes.
Copied:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/VisualPropertyValue.java
(from rev 28828,
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java)
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/VisualPropertyValue.java
(rev 0)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/VisualPropertyValue.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -0,0 +1,28 @@
+package org.cytoscape.view.presentation.property.values;
+
+/**
+ * Object used as a Visual Property value.
+ * In most cases, Visual Property uses basic objects such as Number or Color.
+ * If developers want to use custom objects as a Visual Property value, they
should implement this.
+ *
+ * @CyAPI.Api.Interface
+ */
+public interface VisualPropertyValue {
+
+ /**
+ * Name of this value type.
+ * For example, Arrow Shape or Node Shape.
+ *
+ * @return human readable name of this object type.
+ */
+ String getDisplayName();
+
+
+ /**
+ * Returns serializable representation of this value.
+ *
+ * @return Value in serializable string form.
+ */
+ String getSerializableString();
+
+}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -6,8 +6,8 @@
import org.cytoscape.graph.render.immed.GraphGraphics;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
-import org.cytoscape.view.presentation.property.VisualPropertyValue;
import org.cytoscape.view.presentation.property.values.NodeShape;
+import org.cytoscape.view.presentation.property.values.VisualPropertyValue;
public class DNodeShape implements NodeShape {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DLineType.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DLineType.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DLineType.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -12,8 +12,8 @@
import org.cytoscape.ding.impl.strokes.WidthStroke;
import org.cytoscape.ding.impl.strokes.ZeroStroke;
import org.cytoscape.view.presentation.property.LineTypeVisualProperty;
-import org.cytoscape.view.presentation.property.VisualPropertyValue;
import org.cytoscape.view.presentation.property.values.LineType;
+import org.cytoscape.view.presentation.property.values.VisualPropertyValue;
public class DLineType implements LineType {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/DiscreteValueEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/DiscreteValueEditor.java
2012-04-13 21:05:15 UTC (rev 28829)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/DiscreteValueEditor.java
2012-04-13 21:12:38 UTC (rev 28830)
@@ -61,7 +61,7 @@
import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.RenderingEngine;
-import org.cytoscape.view.presentation.property.VisualPropertyValue;
+import org.cytoscape.view.presentation.property.values.VisualPropertyValue;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
import org.jdesktop.swingx.border.DropShadowBorder;
--
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.
