Author: kono
Date: 2010-10-20 17:12:09 -0700 (Wed, 20 Oct 2010)
New Revision: 22324
Added:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/NullDataTypeImpl.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/VisualizableImpl.java
Modified:
core3/presentation-api/trunk/osgi.bnd
core3/presentation-api/trunk/pom.xml
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
Log:
Null object implementations are added for Visualizable and NullDataType.
Modified: core3/presentation-api/trunk/osgi.bnd
===================================================================
--- core3/presentation-api/trunk/osgi.bnd 2010-10-20 23:49:05 UTC (rev
22323)
+++ core3/presentation-api/trunk/osgi.bnd 2010-10-21 00:12:09 UTC (rev
22324)
@@ -4,3 +4,4 @@
Import-Package: *
Export-Package: org.cytoscape.view.presentation,
org.cytoscape.view.presentation.property
+Private-Package: org.cytoscape.view.presentation.internal.*
Modified: core3/presentation-api/trunk/pom.xml
===================================================================
--- core3/presentation-api/trunk/pom.xml 2010-10-20 23:49:05 UTC (rev
22323)
+++ core3/presentation-api/trunk/pom.xml 2010-10-21 00:12:09 UTC (rev
22324)
@@ -93,7 +93,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Added:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/NullDataTypeImpl.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/NullDataTypeImpl.java
(rev 0)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/NullDataTypeImpl.java
2010-10-21 00:12:09 UTC (rev 22324)
@@ -0,0 +1,10 @@
+package org.cytoscape.view.presentation.internal.property;
+
+import org.cytoscape.view.model.NullDataType;
+
+/**
+ * Null Object
+ */
+public class NullDataTypeImpl implements NullDataType {
+
+}
Added:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/VisualizableImpl.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/VisualizableImpl.java
(rev 0)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/internal/property/VisualizableImpl.java
2010-10-21 00:12:09 UTC (rev 22324)
@@ -0,0 +1,7 @@
+package org.cytoscape.view.presentation.internal.property;
+
+import org.cytoscape.view.model.Visualizable;
+
+public class VisualizableImpl implements Visualizable {
+
+}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2010-10-20 23:49:05 UTC (rev 22323)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2010-10-21 00:12:09 UTC (rev 22324)
@@ -2,11 +2,14 @@
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.Visualizable;
+import org.cytoscape.view.presentation.internal.property.VisualizableImpl;
public class DefaultVisualizableVisualProperty extends
AbstractVisualProperty<Visualizable> {
+
+ private static final Visualizable visualizable = new VisualizableImpl();
public DefaultVisualizableVisualProperty(final String id, final String
name) {
- super(null, id, name);
+ super(visualizable, id, name);
}
@@ -18,8 +21,7 @@
@Override
public Visualizable parseSerializableString(final String text) {
- // TODO: what should I return?
- return null;
+ return visualizable;
}
}
\ No newline at end of file
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2010-10-20 23:49:05 UTC (rev 22323)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2010-10-21 00:12:09 UTC (rev 22324)
@@ -2,11 +2,14 @@
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.NullDataType;
+import org.cytoscape.view.presentation.internal.property.NullDataTypeImpl;
public class NullVisualProperty extends AbstractVisualProperty<NullDataType> {
+ private static final NullDataType dummyObject = new NullDataTypeImpl();
+
public NullVisualProperty(final String id, final String name) {
- super(null, id, name);
+ super(dummyObject, id, name);
}
public String toSerializableString(final NullDataType value) {
@@ -14,6 +17,6 @@
}
public NullDataType parseSerializableString(final String text) {
- return null;
+ return dummyObject;
}
}
\ No newline at end of file
--
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.
