Author: scooter
Date: 2012-09-06 17:22:45 -0700 (Thu, 06 Sep 2012)
New Revision: 30331
Removed:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/Layer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/DLayer.java
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
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/customgraphics/AbstractDCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsManager.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/CustomGraphicsRange.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsUtil.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParser.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParserFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/DefaultCyCustomGraphicsParser.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/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/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ReplaceDummyGraphicsTask.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsCellRenderer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
core3/impl/trunk/ding-impl/ding-presentation-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/customgraphicsmgr/internal/ui/CyCustomGraphicsTableCellRenderer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CyCustomGraphicsTreeCellRenderer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.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/DNodeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsTranslator.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CyCustomGraphicsParserFactoryImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotationImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
core3/impl/trunk/pom.xml
core3/impl/trunk/session-impl/integration-test/pom.xml
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
Log:
Landing first part of reorganization of customgraphics implementation in
preparation for exposing a custom graphics api.
Modified: core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2012-09-07
00:21:08 UTC (rev 30330)
+++ core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2012-09-07
00:22:45 UTC (rev 30331)
@@ -87,6 +87,10 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>custom-graphics-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
</dependency>
<dependency>
@@ -155,6 +159,12 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>custom-graphics-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>model-impl</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
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-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -32,8 +32,10 @@
import org.cytoscape.ding.impl.HandleFactoryImpl;
import org.cytoscape.ding.impl.NVLTFActionSupport;
import org.cytoscape.ding.impl.ViewTaskFactoryListener;
+import org.cytoscape.ding.impl.customgraphics.CustomGraphicsTranslator;
+//
// Annotation api
-import org.cytoscape.ding.impl.customgraphics.CustomGraphicsTranslator;
+//
import org.cytoscape.ding.impl.cyannotator.api.Annotation;
// Annotation creation
import org.cytoscape.ding.impl.cyannotator.create.AnnotationFactory;
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-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DVisualLexicon.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -37,7 +37,7 @@
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.customgraphics.CustomGraphicsRange;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.ding.impl.DLineType;
import org.cytoscape.ding.impl.ObjectPositionImpl;
@@ -75,7 +75,7 @@
private static final Set<VisualProperty<?>> CG_POSITIONS = new
HashSet<VisualProperty<?>>();
private static final Set<VisualProperty<CyCustomGraphics>> CG = new
HashSet<VisualProperty<CyCustomGraphics>>();
private static final Set<VisualProperty<?>> CG_SIZE = new
HashSet<VisualProperty<?>>();
- private static final Map<VisualProperty<?>, VisualProperty<?>>
CG_TO_SIZE = new HashMap<VisualProperty<?>, VisualProperty<?>>();
+ private static final Map<VisualProperty<?>, VisualProperty<Double>>
CG_TO_SIZE = new HashMap<VisualProperty<?>, VisualProperty<Double>>();
private static final Map<VisualProperty<?>,
VisualProperty<ObjectPosition>> CG_TO_POSITION = new HashMap<VisualProperty<?>,
VisualProperty<ObjectPosition>>();
// Root of Ding's VP tree.
@@ -461,7 +461,7 @@
return CG_SIZE;
}
- public static VisualProperty<?> getAssociatedCustomGraphicsSizeVP(
+ public static VisualProperty<Double> getAssociatedCustomGraphicsSizeVP(
VisualProperty<?> cgVP) {
return CG_TO_SIZE.get(cgVP);
}
Modified:
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/AbstractDCustomGraphics.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -7,6 +7,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.graph.render.stateful.CustomGraphic;
public abstract class AbstractDCustomGraphics implements
@@ -21,7 +22,7 @@
protected final Long id;
// Layers of Ding Custom Graphic objects.
- protected List<Layer<CustomGraphic>> layers;
+ protected List<CustomGraphic> layers;
// Human readable name
protected String displayName;
@@ -47,7 +48,7 @@
public AbstractDCustomGraphics(final Long id, final String displayName)
{
this.id = id;
- this.layers = new ArrayList<Layer<CustomGraphic>>();
+ this.layers = new ArrayList<CustomGraphic>();
this.displayName = displayName;
this.tags = new TreeSet<String>();
@@ -76,7 +77,7 @@
}
- public List<Layer<CustomGraphic>> getLayers() {
+ public List<CustomGraphic> getLayers() {
return layers;
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsManager.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsManager.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsManager.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -5,6 +5,8 @@
import java.util.Properties;
import java.util.SortedSet;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
public interface CustomGraphicsManager {
void addCustomGraphics(CyCustomGraphics cg, URL source);
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
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsPropertyImpl.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -2,6 +2,7 @@
import org.cytoscape.ding.customgraphics.vector.CustomGraphicsProperty;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
public class CustomGraphicsPropertyImpl<T> implements
CustomGraphicsProperty<T> {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsRange.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -6,6 +6,8 @@
import org.cytoscape.graph.render.stateful.CustomGraphic;
import org.cytoscape.view.model.DiscreteRange;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
public class CustomGraphicsRange extends DiscreteRange<CyCustomGraphics> {
public CustomGraphicsRange() {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsUtil.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsUtil.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CustomGraphicsUtil.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -2,6 +2,8 @@
import java.awt.Image;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
public class CustomGraphicsUtil {
public static Image getResizedImage(Image original, final Integer w,
final Integer h, boolean keepAspectRatio) {
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphics.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphics.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -1,92 +0,0 @@
-package org.cytoscape.ding.customgraphics;
-
-import java.awt.Image;
-import java.util.List;
-
-
-/**
- * Base interface for all Custom Graphics.
- *
- */
-public interface CyCustomGraphics<T> {
-
- /**
- * Immutable session-unique identifier of image generated in
constructor.
- *
- * NOT globally unique. Uniqueness is guaranteed in a session.
- *
- * @return Immutable ID as Long.
- */
- public Long getIdentifier();
-
- /**
- * Display name is a simple description of this image object.
- * May not be unique and mutable.
- *
- * @return display name as String.
- */
- public String getDisplayName();
-
-
- /**
- * Set human readable display name.
- *
- * @param displayName
- */
- public void setDisplayName(final String displayName);
-
-
- /**
- * Get layers belongs to this object.
- * In current Implementation, ti's always Ding's CustomGraphic object.
- * Ordered by Z-Order value.
- *
- * @return Collection of layer objects (in this version, it's
CustomGraphics in Ding)
- *
- */
- public List<Layer<T>> getLayers();
-
-
- /**
- * Returns width of current object.
- *
- * @return
- */
- public int getWidth();
-
-
- /**
- * Returns height of current object.
- *
- * @return
- */
- public int getHeight();
-
-
- /**
- * Set width of Custom Graphics.
- *
- * @param width
- */
- public void setWidth(final int width);
-
- /**
- * Set height of Custom Graphics.
- *
- * @param height
- */
- public void setHeight(final int height);
-
- public float getFitRatio();
- public void setFitRatio(float ratio);
-
- /**
- * From layers of graphics objects, render scaled Image object.
- * Usually done by Java2D low level code.
- *
- * Usually, the image returned by this method is used in GUI components
(as icons).
- *
- * @return rendered image object.
- */
- public Image getRenderedImage();
-}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParser.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParser.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParser.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -1,5 +1,7 @@
package org.cytoscape.ding.customgraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
public interface CyCustomGraphicsParser {
public CyCustomGraphics getInstance(final String entry);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParserFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParserFactory.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/CyCustomGraphicsParserFactory.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -1,5 +1,7 @@
package org.cytoscape.ding.customgraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
public interface CyCustomGraphicsParserFactory {
public CyCustomGraphicsParser getParser(final String
customGraphicsClassName);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/DefaultCyCustomGraphicsParser.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/DefaultCyCustomGraphicsParser.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/DefaultCyCustomGraphicsParser.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -3,6 +3,8 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
public class DefaultCyCustomGraphicsParser implements CyCustomGraphicsParser {
private final CustomGraphicsManager manager;
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/Layer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/Layer.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/Layer.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -1,20 +0,0 @@
-package org.cytoscape.ding.customgraphics;
-
-
-/**
- * Wrapper for actual implementations of layers.
- * In current version, it's always CustomGraphic
- *
- */
-public interface Layer<T> {
-
- /**
- * Each layer has immutable Z-Order value for rendering.
- * This method returns the value as int.
- *
- * @return
- */
- int getZorder();
-
- T getLayerObject();
-}
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
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -9,6 +9,8 @@
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.cytoscape.graph.render.stateful.CustomGraphic;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
/**
* Null object for Custom Graphics. This is used to reset custom graphics on
* node views.
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
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/URLImageCustomGraphicsParser.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -2,6 +2,8 @@
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
+
/**
* 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/customgraphics/bitmap/URLImageCustomGraphics.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -12,7 +12,6 @@
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.DLayer;
import org.cytoscape.graph.render.stateful.CustomGraphic;
import org.cytoscape.graph.render.stateful.PaintFactory;
@@ -75,9 +74,7 @@
cg = new CustomGraphic(bound, paintFactory);
- // This object is always one layer, so simply add without
sorting.
- DLayer layer = new DLayer(cg, 1);
- layers.add(layer);
+ layers.add(cg);
}
private void createImage(String url) throws MalformedURLException {
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/customgraphics/vector/GradientOvalLayer.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientOvalLayer.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -5,7 +5,6 @@
import java.awt.geom.Ellipse2D;
import org.cytoscape.ding.customgraphics.paint.GradientPaintFactory;
-import org.cytoscape.ding.impl.customgraphics.DLayer;
import org.cytoscape.graph.render.stateful.CustomGraphic;
public class GradientOvalLayer extends GradientLayerCustomGraphics {
@@ -36,8 +35,7 @@
paintFactory = new GradientPaintFactory(c1.getValue(),
c2.getValue());
final CustomGraphic cg = new CustomGraphic(bound, paintFactory);
- DLayer layer = new DLayer(cg, 1);
- layers.add(layer);
+ layers.add(cg);
}
}
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/customgraphics/vector/GradientRoundRectangleLayer.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -4,9 +4,7 @@
import java.awt.Graphics2D;
import java.awt.geom.RoundRectangle2D;
-import org.cytoscape.ding.customgraphics.Layer;
import org.cytoscape.ding.customgraphics.paint.GradientPaintFactory;
-import org.cytoscape.ding.impl.customgraphics.DLayer;
import org.cytoscape.graph.render.stateful.CustomGraphic;
public class GradientRoundRectangleLayer extends GradientLayerCustomGraphics {
@@ -41,8 +39,7 @@
width, height, r, r);
paintFactory = new GradientPaintFactory(c1.getValue(),
c2.getValue());
final CustomGraphic cg = new CustomGraphic(bound, paintFactory);
- final Layer layer = new DLayer(cg, 1);
- layers.add(layer);
+ layers.add(cg);
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -19,7 +19,7 @@
import org.cytoscape.application.events.CyShutdownEvent;
import org.cytoscape.application.events.CyShutdownListener;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.IDGenerator;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.ding.impl.DGraphView;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -13,7 +13,7 @@
import javax.imageio.ImageIO;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.ImageUtil;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ReplaceDummyGraphicsTask.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ReplaceDummyGraphicsTask.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ReplaceDummyGraphicsTask.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -6,7 +6,7 @@
import org.cytoscape.ding.DVisualLexicon;
import org.cytoscape.ding.DummyCustomGraphics;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualProperty;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -29,7 +29,7 @@
import javax.imageio.ImageIO;
import org.cytoscape.ding.customgraphics.AbstractDCustomGraphics;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.Taggable;
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.cytoscape.ding.customgraphics.vector.GradientOvalLayer;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsBrowser.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -14,7 +14,7 @@
import javax.swing.DefaultListModel;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import
org.cytoscape.ding.customgraphicsmgr.internal.event.CustomGraphicsLibraryUpdatedEvent;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsCellRenderer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsCellRenderer.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsCellRenderer.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -15,7 +15,7 @@
import javax.swing.border.TitledBorder;
import org.cytoscape.ding.customgraphics.CustomGraphicsUtil;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.jdesktop.swingx.JXImagePanel;
/**
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsDetailPanel.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -10,7 +10,7 @@
import javax.swing.event.ListSelectionListener;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.Taggable;
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.jdesktop.swingx.JXImageView;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-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/customgraphicsmgr/internal/ui/CustomGraphicsManagerDialog.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CustomGraphicsManagerDialog.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -15,7 +15,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CyCustomGraphicsTableCellRenderer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CyCustomGraphicsTableCellRenderer.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CyCustomGraphicsTableCellRenderer.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -6,7 +6,7 @@
import javax.swing.JTable;
import javax.swing.table.DefaultTableCellRenderer;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
public class CyCustomGraphicsTableCellRenderer extends
DefaultTableCellRenderer {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CyCustomGraphicsTreeCellRenderer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CyCustomGraphicsTreeCellRenderer.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/ui/CyCustomGraphicsTreeCellRenderer.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -6,7 +6,7 @@
import javax.swing.JTree;
import javax.swing.tree.DefaultTreeCellRenderer;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
public class CyCustomGraphicsTreeCellRenderer extends DefaultTreeCellRenderer {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -6,7 +6,7 @@
import java.awt.Image;
import java.awt.RenderingHints;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
public class CustomGraphicsIcon extends
VisualPropertyIcon<CyCustomGraphics<?>> {
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-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -8,9 +8,9 @@
import org.cytoscape.ding.DArrowShape;
import org.cytoscape.ding.DNodeShape;
import org.cytoscape.ding.ObjectPosition;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.impl.DLineType;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.property.ArrowShapeVisualProperty;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
import org.cytoscape.view.presentation.property.values.ArrowShape;
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
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -59,8 +59,7 @@
import org.cytoscape.ding.Label;
import org.cytoscape.ding.NodeView;
import org.cytoscape.ding.ObjectPosition;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
-import org.cytoscape.ding.customgraphics.Layer;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.ding.customgraphics.vector.VectorCustomGraphics;
import org.cytoscape.ding.impl.customgraphics.CustomGraphicsPositionCalculator;
@@ -1141,14 +1140,14 @@
if (customGraphics == null || customGraphics instanceof
NullCustomGraphics)
return;
- final List<Layer<CustomGraphic>> layers =
customGraphics.getLayers();
+ final List<CustomGraphic> layers = customGraphics.getLayers();
// No need to update
if (layers == null || layers.size() == 0)
return;
// Check dependency. Sync size or not.
- final VisualProperty<?> cgSizeVP =
DVisualLexicon.getAssociatedCustomGraphicsSizeVP(vp);
+ final VisualProperty<Double> cgSizeVP =
DVisualLexicon.getAssociatedCustomGraphicsSizeVP(vp);
Set<VisualPropertyDependency<?>> dependencies =
vmm.getCurrentVisualStyle().getAllVisualPropertyDependencies();
boolean sync = false;
@@ -1161,15 +1160,18 @@
final VisualProperty<ObjectPosition> cgPositionVP =
DVisualLexicon.getAssociatedCustomGraphicsPositionVP(vp);
final ObjectPosition positionValue =
getVisualProperty(cgPositionVP);
+ final Double customSize = getVisualProperty(cgSizeVP);
- for (Layer<CustomGraphic> layer : layers) {
+ for (CustomGraphic newCG : layers) {
// Assume it's a Ding layer
- CustomGraphic newCG = layer.getLayerObject();
CustomGraphic finalCG = newCG;
if (sync) {
// Size is locked to node size.
- finalCG = syncSize(customGraphics, newCG);
+ finalCG = syncSize(customGraphics, newCG,
this.getWidth(), this.getHeight());
+ } else if (customSize != null) {
+ // Size should be set to customSize
+ finalCG = syncSize(customGraphics, newCG,
customSize, customSize);
}
finalCG = moveCustomGraphicsToNewPosition(finalCG,
positionValue);
@@ -1216,9 +1218,10 @@
this.cgMap.put(parent, currentCG);
}
- private CustomGraphic syncSize(CyCustomGraphics<?> graphics, final
CustomGraphic cg) {
- final double nodeW = this.getWidth();
- final double nodeH = this.getHeight();
+ private CustomGraphic syncSize(CyCustomGraphics<?> graphics,
+ final CustomGraphic cg, double width,
double height) {
+ // final double nodeW = this.getWidth();
+ // final double nodeH = this.getHeight();
final Shape originalShape = cg.getShape();
final Rectangle2D originalBounds = originalShape.getBounds2D();
@@ -1226,7 +1229,7 @@
final double cgH = originalBounds.getHeight();
// In case size is same, return the original.
- if (nodeW == cgW && nodeH == cgH)
+ if (width == cgW && height == cgH)
return cg;
final AffineTransform scale;
@@ -1234,13 +1237,13 @@
// Case 1: if custom graphic is a vector fit width and length
if (graphics instanceof VectorCustomGraphics) {
- scale = AffineTransform.getScaleInstance(fit * nodeW /
cgW, fit * nodeH / cgH);
+ scale = AffineTransform.getScaleInstance(fit * width /
cgW, fit * height / cgH);
} else {
// Case 2: node height value is larger than width
- if (nodeW >= nodeH) {
- scale = AffineTransform.getScaleInstance(fit *
(nodeW / cgW) * (nodeH / nodeW), fit * nodeH / cgH);
+ if (width >= height) {
+ scale = AffineTransform.getScaleInstance(fit *
(width / cgW) * (height / width), fit * height / cgH);
} else {
- scale = AffineTransform.getScaleInstance(fit *
nodeW / cgW, fit * (nodeH / cgH) * (nodeW / nodeH));
+ scale = AffineTransform.getScaleInstance(fit *
width / cgW, fit * (height / cgH) * (width / height));
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsTranslator.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsTranslator.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsTranslator.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -4,7 +4,7 @@
import java.net.URL;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
import org.cytoscape.view.vizmap.mappings.ValueTranslator;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CyCustomGraphicsParserFactoryImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CyCustomGraphicsParserFactoryImpl.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CyCustomGraphicsParserFactoryImpl.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.CyCustomGraphicsParser;
import org.cytoscape.ding.customgraphics.CyCustomGraphicsParserFactory;
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/DLayer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/DLayer.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/DLayer.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -1,29 +0,0 @@
-package org.cytoscape.ding.impl.customgraphics;
-
-import org.cytoscape.ding.customgraphics.Layer;
-import org.cytoscape.graph.render.stateful.CustomGraphic;
-
-
-/**
- * Ding implementation of Custom graphics layers.
- *
- */
-public class DLayer implements Layer<CustomGraphic> {
-
- private final CustomGraphic layer;
- private final int zOrder;
-
- public DLayer(final CustomGraphic layer, final int zOrder) {
- this.layer = layer;
- this.zOrder = zOrder;
- }
-
- public int getZorder() {
- return zOrder;
- }
-
- public CustomGraphic getLayerObject() {
- return layer;
- }
-
-}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotationImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotationImpl.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ImageAnnotationImpl.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -20,7 +20,7 @@
import javax.swing.JFrame;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.customgraphics.ImageUtil;
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -2,7 +2,7 @@
import org.cytoscape.ding.DummyCustomGraphics;
import org.cytoscape.ding.customgraphics.CustomGraphicsRange;
-import org.cytoscape.ding.customgraphics.CyCustomGraphics;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.graph.render.stateful.CustomGraphic;
import org.cytoscape.model.CyIdentifiable;
Modified: core3/impl/trunk/pom.xml
===================================================================
--- core3/impl/trunk/pom.xml 2012-09-07 00:21:08 UTC (rev 30330)
+++ core3/impl/trunk/pom.xml 2012-09-07 00:22:45 UTC (rev 30331)
@@ -153,6 +153,11 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>custom-graphics-api</artifactId>
+ <version>${cytoscape.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>property-api</artifactId>
<version>${cytoscape.api.version}</version>
</dependency>
@@ -279,6 +284,12 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>custom-graphics-api</artifactId>
+ <version>${cytoscape.api.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>session-api</artifactId>
<version>${cytoscape.api.version}</version>
<type>test-jar</type>
Modified: core3/impl/trunk/session-impl/integration-test/pom.xml
===================================================================
--- core3/impl/trunk/session-impl/integration-test/pom.xml 2012-09-07
00:21:08 UTC (rev 30330)
+++ core3/impl/trunk/session-impl/integration-test/pom.xml 2012-09-07
00:22:45 UTC (rev 30331)
@@ -125,6 +125,7 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>ding-presentation-impl</artifactId>
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
2012-09-07 00:21:08 UTC (rev 30330)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
2012-09-07 00:22:45 UTC (rev 30331)
@@ -167,6 +167,7 @@
mavenBundle().groupId("org.cytoscape").artifactId("group-api").version(apiBundleVersion).startLevel(5),
mavenBundle().groupId("org.cytoscape").artifactId("viewmodel-api").version(apiBundleVersion).startLevel(5),
mavenBundle().groupId("org.cytoscape").artifactId("presentation-api").version(apiBundleVersion).startLevel(5),
+
mavenBundle().groupId("org.cytoscape").artifactId("custom-graphics-api").version(apiBundleVersion).startLevel(5),
mavenBundle().groupId("org.cytoscape").artifactId("vizmap-api").version(apiBundleVersion).startLevel(5),
mavenBundle().groupId("org.cytoscape").artifactId("session-api").version(apiBundleVersion).startLevel(5),
mavenBundle().groupId("org.cytoscape").artifactId("io-api").version(apiBundleVersion).startLevel(5),
--
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.
