Author: scooter
Date: 2013-01-18 14:51:05 -0800 (Fri, 18 Jan 2013)
New Revision: 31062
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphicsFactory.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/NullCustomGraphics.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/RestoreImageTask.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/impl/DNodeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
Log:
Updated to CustomGraphics to simplify generics signature
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -4,7 +4,8 @@
import java.util.List;
import org.cytoscape.model.CyIdentifiable;
-import org.cytoscape.model.CyNetwork;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
/**
@@ -12,8 +13,7 @@
* object is a container for one or more {@link CustomGraphicLayer} objects.
It is
* the layer objects that will actually create the graphics that are used by
the
* renderer.
- * @CyAPI.Spi.Interface
- * @CyAPI.InModule presentation-api
+ *
*/
public interface CyCustomGraphics<T extends CustomGraphicLayer> {
@@ -67,17 +67,17 @@
/**
* Get layers that belong to this object. Get the list of layers to be
rendered. Each
* layer is rendered in list order, which means that the layers at the
end of the list are
- * rendered last, and are therefore on top. The {@link CyNetwork} and
{@link CyIdentifiable}
- * graph object are passed in case there is information about the
network that is required
+ * rendered last, and are therefore on top. The {@link CyNetworkView}
and {@link View}
+ * graph object view are passed in case there is information about the
network that is required
* to render the layer. For example, a pie chart layer might need to
extract data from the
* {@link CyRow} for this graph object. For other layer types, this
can be safely ignored.
*
- * @param network the network the Renderer is rendering
- * @param grObject the graph object the Renderer is rendering
(currently only nodes are supported)
+ * @param networkView the network view the Renderer is rendering
+ * @param grView the graph object view the Renderer is rendering
(currently only nodes are supported)
* @return List of layer objects
*
*/
- public List<T> getLayers(CyNetwork network, CyIdentifiable grObject);
+ public List<T> getLayers(CyNetworkView networkView, View<? extends
CyIdentifiable> grView);
/**
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphicsFactory.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphicsFactory.java
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphicsFactory.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -4,7 +4,9 @@
import java.net.URL;
import java.util.List;
+import org.cytoscape.model.CyIdentifiable;
+
/**
* This interface provides the factory to create CyCustomGraphics objects.
* CyCustomGraphicsFactory objects should be registered as services in
@@ -19,8 +21,7 @@
registerService(bundleContext, myCustomGraphicsFactory,
CyCustomGraphicsFactory.class, new Properites());
</pre>
*
- * @CyAPI.Spi.Interface
- * @CyAPI.InModule presentation-api
+ *
*/
public interface CyCustomGraphicsFactory<T extends CustomGraphicLayer> {
/**
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
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -8,14 +8,18 @@
import java.util.TreeSet;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphicsFactory;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
-public abstract class AbstractDCustomGraphics<T extends CustomGraphicLayer>
implements
- CyCustomGraphics<T>, Taggable {
+public abstract class AbstractDCustomGraphics<T extends CustomGraphicLayer>
+ implements CyCustomGraphics<T>, Taggable {
protected static final String DELIMITER = ",";
public static final String LIST_DELIMITER = "|";
@@ -83,8 +87,8 @@
return this.height;
}
-
- public List<T> getLayers(CyNetwork network, CyIdentifiable graphObject)
{
+ @Override
+ public List<T> getLayers(CyNetworkView networkView, View<? extends
CyIdentifiable> graphObject) {
return layers;
}
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
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -8,6 +8,7 @@
import org.cytoscape.ding.customgraphics.bitmap.URLImageCustomGraphics;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
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
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/PersistImageTask.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -13,10 +13,11 @@
import javax.imageio.ImageIO;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-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;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
import org.slf4j.Logger;
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
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -37,6 +37,7 @@
import
org.cytoscape.ding.customgraphicsmgr.internal.event.CustomGraphicsLibraryUpdatedEvent;
import org.cytoscape.ding.impl.DNodeView;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyNode;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
import org.slf4j.Logger;
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
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -6,6 +6,7 @@
import java.awt.Image;
import java.awt.RenderingHints;
+import org.cytoscape.model.CyNode;
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/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -63,6 +63,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualLexiconNode;
import org.cytoscape.view.model.VisualProperty;
@@ -1123,7 +1124,8 @@
}
}
- private void applyCustomGraphics(final VisualProperty<?> vp, final
CyCustomGraphics<CustomGraphicLayer> customGraphics) {
+ private void applyCustomGraphics(final VisualProperty<?> vp,
+ final
CyCustomGraphics<CustomGraphicLayer> customGraphics) {
Set<CustomGraphicLayer> dCustomGraphicsSet = cgMap.get(vp);
if (dCustomGraphicsSet == null)
@@ -1137,7 +1139,7 @@
if (customGraphics == null || customGraphics instanceof
NullCustomGraphics)
return;
- final List<CustomGraphicLayer> layers =
customGraphics.getLayers(graphView.getModel(), model);
+ final List<CustomGraphicLayer> layers =
customGraphics.getLayers(graphView, this);
// No need to update
if (layers == null || layers.size() == 0)
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
2013-01-18 22:49:33 UTC (rev 31061)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
2013-01-18 22:51:05 UTC (rev 31062)
@@ -8,6 +8,7 @@
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.AbstractVisualProperty;
public class CustomGraphicsVisualProperty extends
AbstractVisualProperty<CyCustomGraphics> {
--
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.
