Author: mes
Date: 2011-11-30 16:44:41 -0800 (Wed, 30 Nov 2011)
New Revision: 27674
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/
Removed:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/AbstractDCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/bitmap/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/vector/
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsManagerDialog.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsPropertyImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/URLImageCustomGraphicsParser.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/CustomGraphicsProperty.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientLayerCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientOvalLayer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/VectorCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotation.java
Log:
Made some custom graphics implementation public
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -16,7 +16,7 @@
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.ImageUtil;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
import org.slf4j.Logger;
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -22,12 +22,12 @@
import javax.imageio.ImageIO;
+import org.cytoscape.ding.customgraphics.AbstractDCustomGraphics;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.Taggable;
-import org.cytoscape.ding.impl.customgraphics.AbstractDCustomGraphics;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
-import org.cytoscape.ding.impl.customgraphics.vector.GradientOvalLayer;
-import
org.cytoscape.ding.impl.customgraphics.vector.GradientRoundRectangleLayer;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.ding.customgraphics.vector.GradientOvalLayer;
+import org.cytoscape.ding.customgraphics.vector.GradientRoundRectangleLayer;
import org.cytoscape.property.CyProperty;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -19,7 +19,7 @@
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.jdesktop.swingx.JXList;
/**
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -12,7 +12,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.Taggable;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.jdesktop.swingx.JXImageView;
/**
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsManagerDialog.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsManagerDialog.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsManagerDialog.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -17,8 +17,8 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.cytoscape.ding.customgraphicsmgr.internal.CustomGraphicsManagerImpl;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
(from rev 27672,
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/AbstractDCustomGraphics.java)
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
(rev 0)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -0,0 +1,143 @@
+package org.cytoscape.ding.customgraphics;
+
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.cytoscape.graph.render.stateful.CustomGraphic;
+
+public abstract class AbstractDCustomGraphics implements
+ CyCustomGraphics<CustomGraphic>, Taggable {
+
+ protected static final String DELIMITER = ",";
+ public static final String LIST_DELIMITER = "|";
+
+ protected float fitRatio = 0.9f;
+
+ // Unique ID
+ protected final Long id;
+
+ // Layers of Ding Custom Graphic objects.
+ protected List<Layer<CustomGraphic>> layers;
+
+ // Human readable name
+ protected String displayName;
+
+ protected int width = 50;
+ protected int height = 50;
+
+ protected CyCustomGraphicsParser parser;
+
+ //protected ObjectPosition position;
+
+ // For tags
+ protected final SortedSet<String> tags;
+
+
+ public AbstractDCustomGraphics(final String displayName) {
+ this(IDGenerator.getIDGenerator().getNextId(), displayName);
+ }
+
+
+ /**
+ * Create new object for a given ID.
+ * Used when restoring session.
+ *
+ * @param id
+ * @param displayName
+ */
+ public AbstractDCustomGraphics(final Long id, final String displayName)
{
+ this.id = id;
+
+ this.layers = new ArrayList<Layer<CustomGraphic>>();
+ this.displayName = displayName;
+
+ this.tags = new TreeSet<String>();
+ //this.position = new ObjectPositionImpl();
+ }
+
+
+ public Long getIdentifier() {
+ return id;
+ }
+
+ public void setWidth(final int width) {
+ this.width = width;
+ }
+
+ public void setHeight(final int height) {
+ this.height = height;
+ }
+
+ public int getWidth() {
+ return this.width;
+ }
+
+ public int getHeight() {
+ return this.height;
+ }
+
+
+ public List<Layer<CustomGraphic>> getLayers() {
+ return layers;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(final String displayName) {
+ this.displayName = displayName;
+ }
+
+ @Override abstract public Image getRenderedImage();
+
+
+ public Collection<String> getTags() {
+ return tags;
+ }
+
+
+// public ObjectPosition getPosition() {
+// return position;
+// }
+//
+// public void setPosition(final ObjectPosition position) {
+// this.position = position;
+// }
+
+
+ // This will be used prop file.
+ public String toString() {
+ String tagStr = "";
+ // Build tags as a string
+ if (tags.size() != 0) {
+ final StringBuilder builder = new StringBuilder();
+ for (String tag : tags)
+ builder.append(tag + LIST_DELIMITER);
+ String temp = builder.toString();
+ tagStr = temp.substring(0, temp.length() - 1);
+ }
+
+ String name = displayName;
+ if (displayName.contains(",")) {
+ // Replace delimiter
+ name = displayName.replace(",", "___");
+ }
+
+ return this.getClass().getName() + DELIMITER +
this.getIdentifier()
+ + DELIMITER + name + DELIMITER + tagStr;
+ }
+
+ public void setFitRatio(float fitRatio) {
+ this.fitRatio = fitRatio;
+ }
+
+ public float getFitRatio() {
+ return fitRatio;
+ }
+
+}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsPropertyImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsPropertyImpl.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsPropertyImpl.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,6 +1,6 @@
package org.cytoscape.ding.customgraphics;
-import org.cytoscape.ding.impl.customgraphics.vector.CustomGraphicsProperty;
+import org.cytoscape.ding.customgraphics.vector.CustomGraphicsProperty;
public class CustomGraphicsPropertyImpl<T> implements
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -6,8 +6,7 @@
import javax.imageio.ImageIO;
-import org.cytoscape.ding.impl.customgraphics.AbstractDCustomGraphics;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
/**
* Null object for Custom Graphics. This is used to reset custom graphics on
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/URLImageCustomGraphicsParser.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/URLImageCustomGraphicsParser.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/URLImageCustomGraphicsParser.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,6 +1,6 @@
package org.cytoscape.ding.customgraphics;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
/**
* Create instance of URLImageCustomGraphics object from String.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/bitmap/URLImageCustomGraphics.java
2011-12-01 00:08:13 UTC (rev 27672)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,4 +1,4 @@
-package org.cytoscape.ding.impl.customgraphics.bitmap;
+package org.cytoscape.ding.customgraphics.bitmap;
import java.awt.Image;
import java.awt.geom.Rectangle2D;
@@ -9,9 +9,9 @@
import javax.imageio.ImageIO;
+import org.cytoscape.ding.customgraphics.AbstractDCustomGraphics;
import org.cytoscape.ding.customgraphics.ImageUtil;
import org.cytoscape.ding.customgraphics.paint.TexturePaintFactory;
-import org.cytoscape.ding.impl.customgraphics.AbstractDCustomGraphics;
import org.cytoscape.ding.impl.customgraphics.DLayer;
import org.cytoscape.graph.render.stateful.CustomGraphic;
import org.cytoscape.graph.render.stateful.PaintFactory;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/CustomGraphicsProperty.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/vector/CustomGraphicsProperty.java
2011-12-01 00:08:13 UTC (rev 27672)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/CustomGraphicsProperty.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,4 +1,4 @@
-package org.cytoscape.ding.impl.customgraphics.vector;
+package org.cytoscape.ding.customgraphics.vector;
public interface CustomGraphicsProperty<T> {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientLayerCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/vector/GradientLayerCustomGraphics.java
2011-12-01 00:08:13 UTC (rev 27672)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientLayerCustomGraphics.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,4 +1,4 @@
-package org.cytoscape.ding.impl.customgraphics.vector;
+package org.cytoscape.ding.customgraphics.vector;
import java.awt.Color;
import java.awt.Graphics;
@@ -10,8 +10,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.cytoscape.ding.customgraphics.AbstractDCustomGraphics;
import org.cytoscape.ding.customgraphics.CustomGraphicsPropertyImpl;
-import org.cytoscape.ding.impl.customgraphics.AbstractDCustomGraphics;
import org.cytoscape.graph.render.stateful.PaintFactory;
/**
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientOvalLayer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/vector/GradientOvalLayer.java
2011-12-01 00:08:13 UTC (rev 27672)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientOvalLayer.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,4 +1,4 @@
-package org.cytoscape.ding.impl.customgraphics.vector;
+package org.cytoscape.ding.customgraphics.vector;
import java.awt.Graphics;
import java.awt.Graphics2D;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/vector/GradientRoundRectangleLayer.java
2011-12-01 00:08:13 UTC (rev 27672)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,4 +1,4 @@
-package org.cytoscape.ding.impl.customgraphics.vector;
+package org.cytoscape.ding.customgraphics.vector;
import java.awt.Graphics;
import java.awt.Graphics2D;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/VectorCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/vector/VectorCustomGraphics.java
2011-12-01 00:08:13 UTC (rev 27672)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/VectorCustomGraphics.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,4 +1,4 @@
-package org.cytoscape.ding.impl.customgraphics.vector;
+package org.cytoscape.ding.customgraphics.vector;
import java.util.Map;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -61,8 +61,8 @@
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.Layer;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
+import org.cytoscape.ding.customgraphics.vector.VectorCustomGraphics;
import org.cytoscape.ding.impl.customgraphics.CustomGraphicsPositionCalculator;
-import org.cytoscape.ding.impl.customgraphics.vector.VectorCustomGraphics;
import org.cytoscape.ding.impl.visualproperty.CustomGraphicsVisualProperty;
import org.cytoscape.ding.impl.visualproperty.ObjectPositionVisualProperty;
import org.cytoscape.graph.render.immed.GraphGraphics;
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/AbstractDCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/AbstractDCustomGraphics.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/AbstractDCustomGraphics.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -1,148 +0,0 @@
-package org.cytoscape.ding.impl.customgraphics;
-
-import java.awt.Image;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
-import org.cytoscape.ding.customgraphics.CyCustomGraphicsParser;
-import org.cytoscape.ding.customgraphics.IDGenerator;
-import org.cytoscape.ding.customgraphics.Layer;
-import org.cytoscape.ding.customgraphics.Taggable;
-import org.cytoscape.graph.render.stateful.CustomGraphic;
-
-public abstract class AbstractDCustomGraphics implements
- CyCustomGraphics<CustomGraphic>, Taggable {
-
- protected static final String DELIMITER = ",";
- public static final String LIST_DELIMITER = "|";
-
- protected float fitRatio = 0.9f;
-
- // Unique ID
- protected final Long id;
-
- // Layers of Ding Custom Graphic objects.
- protected List<Layer<CustomGraphic>> layers;
-
- // Human readable name
- protected String displayName;
-
- protected int width = 50;
- protected int height = 50;
-
- protected CyCustomGraphicsParser parser;
-
- //protected ObjectPosition position;
-
- // For tags
- protected final SortedSet<String> tags;
-
-
- public AbstractDCustomGraphics(final String displayName) {
- this(IDGenerator.getIDGenerator().getNextId(), displayName);
- }
-
-
- /**
- * Create new object for a given ID.
- * Used when restoring session.
- *
- * @param id
- * @param displayName
- */
- public AbstractDCustomGraphics(final Long id, final String displayName)
{
- this.id = id;
-
- this.layers = new ArrayList<Layer<CustomGraphic>>();
- this.displayName = displayName;
-
- this.tags = new TreeSet<String>();
- //this.position = new ObjectPositionImpl();
- }
-
-
- public Long getIdentifier() {
- return id;
- }
-
- public void setWidth(final int width) {
- this.width = width;
- }
-
- public void setHeight(final int height) {
- this.height = height;
- }
-
- public int getWidth() {
- return this.width;
- }
-
- public int getHeight() {
- return this.height;
- }
-
-
- public List<Layer<CustomGraphic>> getLayers() {
- return layers;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(final String displayName) {
- this.displayName = displayName;
- }
-
- @Override abstract public Image getRenderedImage();
-
-
- public Collection<String> getTags() {
- return tags;
- }
-
-
-// public ObjectPosition getPosition() {
-// return position;
-// }
-//
-// public void setPosition(final ObjectPosition position) {
-// this.position = position;
-// }
-
-
- // This will be used prop file.
- public String toString() {
- String tagStr = "";
- // Build tags as a string
- if (tags.size() != 0) {
- final StringBuilder builder = new StringBuilder();
- for (String tag : tags)
- builder.append(tag + LIST_DELIMITER);
- String temp = builder.toString();
- tagStr = temp.substring(0, temp.length() - 1);
- }
-
- String name = displayName;
- if (displayName.contains(",")) {
- // Replace delimiter
- name = displayName.replace(",", "___");
- }
-
- return this.getClass().getName() + DELIMITER +
this.getIdentifier()
- + DELIMITER + name + DELIMITER + tagStr;
- }
-
- public void setFitRatio(float fitRatio) {
- this.fitRatio = fitRatio;
- }
-
- public float getFitRatio() {
- return fitRatio;
- }
-
-}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotation.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotation.java
2011-12-01 00:28:57 UTC (rev 27673)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotation.java
2011-12-01 00:44:41 UTC (rev 27674)
@@ -15,7 +15,7 @@
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.customgraphics.ImageUtil;
-import org.cytoscape.ding.impl.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.cytoscape.ding.impl.DGraphView;
import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
--
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.
