Author: scooter
Date: 2013-01-18 14:56:30 -0800 (Fri, 18 Jan 2013)
New Revision: 31064
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/AbstractEnhancedCustomGraphics.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/AbstractChartCustomGraphics.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/bar/BarChart.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/heatstrip/HeatStripChart.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/line/LineChart.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/pie/PieChart.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/stripe/StripeChart.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCGFactory.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCustomGraphics.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCGFactory.java
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCustomGraphics.java
Log:
Modified to support final Custom Graphics API
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/AbstractEnhancedCustomGraphics.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/AbstractEnhancedCustomGraphics.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/AbstractEnhancedCustomGraphics.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -24,8 +24,8 @@
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphicsFactory;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
-public abstract class AbstractEnhancedCustomGraphics<T extends
CustomGraphicLayer>
- implements CyCustomGraphics
{
+public abstract class AbstractEnhancedCustomGraphics <T extends
CustomGraphicLayer>
+ implements CyCustomGraphics <T> {
protected Long id = null;
protected float fitRatio = 0.9f;
@@ -48,8 +48,7 @@
public void setHeight(final int height) { this.height = height; }
public int getWidth() { return width; }
public int getHeight() { return height; }
- @Override
- public List<T> getLayers(CyNetworkView networkView, View nodeView) {
return layers; }
+ public List<T> getLayers(CyNetworkView networkView, View<? extends
CyIdentifiable> nodeView) { return layers; }
public String getDisplayName() { return displayName; }
public void setDisplayName(final String displayName) {
this.displayName = displayName;
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/AbstractChartCustomGraphics.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/AbstractChartCustomGraphics.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/AbstractChartCustomGraphics.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -18,11 +18,13 @@
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
+import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
import org.cytoscape.view.presentation.customgraphics.PaintedShape;
import edu.ucsf.rbvi.enhancedcg.internal.AbstractEnhancedCustomGraphics;
-abstract public class AbstractChartCustomGraphics<T extends PaintedShape>
extends AbstractEnhancedCustomGraphics {
+abstract public class AbstractChartCustomGraphics<T extends
CustomGraphicLayer>
+ extends AbstractEnhancedCustomGraphics<T> {
// Standard command strings
public static final String ALL = "all";
public static final String ATTRIBUTELIST = "attributelist";
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/bar/BarChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/bar/BarChart.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/bar/BarChart.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -104,7 +104,7 @@
public Image getRenderedImage() { return null; }
@Override
- public List<BarLayer> getLayers(CyNetworkView networkView, View
nodeView) {
+ public List<BarLayer> getLayers(CyNetworkView networkView, View<?
extends CyIdentifiable> nodeView) {
CyNetwork network = networkView.getModel();
if (!(nodeView.getModel() instanceof CyNode))
return null;
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/heatstrip/HeatStripChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/heatstrip/HeatStripChart.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/heatstrip/HeatStripChart.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -120,7 +120,7 @@
public Image getRenderedImage() { return null; }
@Override
- public List<HeatStripLayer> getLayers(CyNetworkView networkView, View
nodeView) {
+ public List<HeatStripLayer> getLayers(CyNetworkView networkView, View<?
extends CyIdentifiable> nodeView) {
CyNetwork network = networkView.getModel();
if (!(nodeView.getModel() instanceof CyNode))
return null;
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/line/LineChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/line/LineChart.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/line/LineChart.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -104,7 +104,7 @@
public Image getRenderedImage() { return null; }
@Override
- public List<LineLayer> getLayers(CyNetworkView networkView, View
nodeView) {
+ public List<LineLayer> getLayers(CyNetworkView networkView, View<?
extends CyIdentifiable> nodeView) {
CyNetwork network = networkView.getModel();
if (!(nodeView.getModel() instanceof CyNode))
return null;
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/pie/PieChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/pie/PieChart.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/pie/PieChart.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -56,6 +56,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
+import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import edu.ucsf.rbvi.enhancedcg.internal.charts.AbstractChartCustomGraphics;
@@ -126,8 +127,7 @@
public Image getRenderedImage() { return null; }
- @Override
- public List<PieLayer> getLayers(CyNetworkView networkView, View
nodeView) {
+ public List<PieLayer> getLayers(CyNetworkView networkView, View<?
extends CyIdentifiable> nodeView) {
CyNetwork network = networkView.getModel();
if (!(nodeView.getModel() instanceof CyNode))
return null;
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/stripe/StripeChart.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/stripe/StripeChart.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/charts/stripe/StripeChart.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -52,7 +52,6 @@
// Cytoscape imports
import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCGFactory.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCGFactory.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCGFactory.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -2,11 +2,12 @@
import java.net.URL;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphicsFactory;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
-public class LinearGradientCGFactory implements CyCustomGraphicsFactory {
+public class LinearGradientCGFactory implements CyCustomGraphicsFactory
<LinearGradientLayer> {
private static final Class<? extends CyCustomGraphics> TARGET_CLASS =
LinearGradientCustomGraphics.class;
public LinearGradientCGFactory() {
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCustomGraphics.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCustomGraphics.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/linear/LinearGradientCustomGraphics.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.Map;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphicsFactory;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCGFactory.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCGFactory.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCGFactory.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -2,11 +2,12 @@
import java.net.URL;
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphicsFactory;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
-public class RadialGradientCGFactory implements CyCustomGraphicsFactory {
+public class RadialGradientCGFactory implements
CyCustomGraphicsFactory<RadialGradientLayer> {
private static final Class<? extends CyCustomGraphics> TARGET_CLASS =
RadialGradientCustomGraphics.class;
public RadialGradientCGFactory() {
Modified:
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCustomGraphics.java
===================================================================
---
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCustomGraphics.java
2013-01-18 22:55:55 UTC (rev 31063)
+++
csplugins/trunk/ucsf/scooter/enhancedcg/src/main/java/edu/ucsf/rbvi/internal/gradients/radial/RadialGradientCustomGraphics.java
2013-01-18 22:56:30 UTC (rev 31064)
@@ -21,7 +21,7 @@
import edu.ucsf.rbvi.enhancedcg.internal.AbstractEnhancedCustomGraphics;
-public class RadialGradientCustomGraphics extends
AbstractEnhancedCustomGraphics <RadialGradientLayer>{
+public class RadialGradientCustomGraphics extends
AbstractEnhancedCustomGraphics <RadialGradientLayer> {
// Parse the input string, which is always of the form:
// radgrad: center="x,y" radius="r"
stoplist="r,g,b,a,stop|r,g,b,a,stop|r,g,b,a,stop"
--
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.
