Author: kono
Date: 2010-09-20 13:12:26 -0700 (Mon, 20 Sep 2010)
New Revision: 21954
Removed:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
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:
Accidentally committed code removed.
Deleted:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
2010-09-20 20:05:30 UTC (rev 21953)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
2010-09-20 20:12:26 UTC (rev 21954)
@@ -1,90 +0,0 @@
-package org.cytoscape.view.presentation.property;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.cytoscape.view.model.NullDataType;
-import org.cytoscape.view.model.VisualLexicon;
-import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.Visualizable;
-
-
-/**
- * Basic tree implementation of a visual lexicon. All rendering engine should
use this class
- * to implement their own version of lexicon.
- *
- * This tree has minimum set of method required to implement VizMapper.
- *
- * This is an immutable tree, except the rendering engine's root.
- *
- * @author kono
- *
- */
-public abstract class AbstractVisualLexicon implements VisualLexicon {
-
- //
- private final Map<String, VisualProperty<?>> visualPropertyMap;
-
- // Root of this tree.
- protected final VisualProperty<NullDataType> rootVisualProperty;
-
-
- /**
- * Insert a root node to the tree and build it.
- *
- * @param rootVisualProperty
- */
- public AbstractVisualLexicon(final VisualProperty<NullDataType>
rootVisualProperty) {
- this.visualPropertyMap = new HashMap<String,
VisualProperty<?>>();
- this.rootVisualProperty = rootVisualProperty;
-
- visualPropertyMap.put(rootVisualProperty.getIdString(),
rootVisualProperty);
- }
-
-
- // Returns all visual properties as a set.
- public Set<VisualProperty<?>> getAllVisualProperties() {
- return new
HashSet<VisualProperty<?>>(visualPropertyMap.values());
- }
-
-
- @Override
- public Collection<VisualProperty<?>> getAllDescendants(final
VisualProperty<Visualizable> prop) {
- if(prop == null)
- throw new NullPointerException("Target visual property
cannot be null.");
-
- if(!this.visualPropertyMap.containsValue(prop))
- throw new IllegalArgumentException("No such Visual
Property in the Lexicon.");
-
- return getChildNodes(prop);
- }
-
-
- @Override
- public VisualProperty<NullDataType> getRootVisualProperty() {
- return this.rootVisualProperty;
- }
-
-
- private Set<VisualProperty<?>> getChildNodes(VisualProperty<?> prop) {
- final Set<VisualProperty<?>> children = new
HashSet<VisualProperty<?>>();
-
- // if this is a leaf node, return empty set
- if(prop.getChildren().size() == 0)
- return children;
-
- Collection<VisualProperty<?>> currentChildren =
prop.getChildren();
- children.addAll(currentChildren);
- for(VisualProperty<?> vp: currentChildren)
- children.addAll(getChildNodes(vp));
-
- return children;
- }
-
- protected void addVisualProperty(final VisualProperty<?> vp) {
- this.visualPropertyMap.put(vp.getIdString(), vp);
- }
-}
Deleted:
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-09-20 20:05:30 UTC (rev 21953)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2010-09-20 20:12:26 UTC (rev 21954)
@@ -1,30 +0,0 @@
-package org.cytoscape.view.presentation.property;
-
-import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.Visualizable;
-
-public class DefaultVisualizableVisualProperty extends
AbstractVisualProperty<Visualizable> implements AppendableVisualProperty {
-
- public DefaultVisualizableVisualProperty(final String id, final String
name, final VisualProperty<?> parent) {
- super(null, id, name, parent);
- }
-
-
- @Override
- public String toSerializableString(final Visualizable value) {
- return value.toString();
- }
-
-
- @Override
- public Visualizable parseSerializableString(final String text) {
- // TODO: what should I return?
- return null;
- }
-
- @Override
- public void setParent(final VisualProperty<?> parent) {
- this.parent = parent;
- }
-}
\ No newline at end of file
Deleted:
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-09-20 20:05:30 UTC (rev 21953)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2010-09-20 20:12:26 UTC (rev 21954)
@@ -1,19 +0,0 @@
-package org.cytoscape.view.presentation.property;
-
-import org.cytoscape.view.model.AbstractVisualProperty;
-import org.cytoscape.view.model.NullDataType;
-
-public class NullVisualProperty extends AbstractVisualProperty<NullDataType> {
-
- public NullVisualProperty(final String id, final String name) {
- super(null, id, name, null);
- }
-
- public String toSerializableString(final NullDataType value) {
- return value.toString();
- }
-
- public NullDataType parseSerializableString(final String text) {
- return null;
- }
-}
\ 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.
