Author: ruschein
Date: 2011-09-02 15:33:12 -0700 (Fri, 02 Sep 2011)
New Revision: 26721
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ShowGraphicsDetailTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
Log:
Strip out some of the Sping overhead.
Modified: core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
2011-09-02 21:23:11 UTC (rev 26720)
+++ core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
2011-09-02 22:33:12 UTC (rev 26721)
@@ -68,17 +68,18 @@
<artifactId>ding-presentation-impl</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>di-util-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>property-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>work-api</artifactId>
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -1,5 +1,6 @@
package org.cytoscape.ding.impl.customgraphics;
+
import java.io.File;
import java.net.URL;
import java.util.Collection;
@@ -13,6 +14,7 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.application.events.CytoscapeShutdownEvent;
import org.cytoscape.application.events.CytoscapeShutdownListener;
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
@@ -23,10 +25,7 @@
public final class CustomGraphicsManagerImpl implements CustomGraphicsManager,
CytoscapeShutdownListener {
-
private static final Logger logger =
LoggerFactory.getLogger(CustomGraphicsManagerImpl.class);
-
-
private static final String IMAGE_DIR_NAME = "images3";
protected final Map<Long, CyCustomGraphics> graphicsMap = new
ConcurrentHashMap<Long, CyCustomGraphics>();
@@ -35,52 +34,49 @@
protected final Map<URL, Long> sourceMap = new ConcurrentHashMap<URL,
Long>();
// Null Object
- private static final CyCustomGraphics NULL = NullCustomGraphics
- .getNullObject();
+ private static final CyCustomGraphics NULL =
NullCustomGraphics.getNullObject();
private final File imageHomeDirectory;
-
protected final Map<CyCustomGraphics,Boolean> isUsedCustomGraphics;
private final TaskManager taskManager;
-
-
/**
* Creates an image pool object and restore existing images from user
* resource directory.
*/
- public CustomGraphicsManagerImpl(final CyProperty<Properties>
properties, final TaskManager taskManager, final CyApplicationConfiguration
config) {
-
- this.taskManager = taskManager;
+ public CustomGraphicsManagerImpl(final CyProperty<Properties>
properties,
+ final TaskManager taskManager,
+ final CyApplicationConfiguration
config)
+ {
+ this.taskManager = DIUtil.stripProxy(taskManager);
this.isUsedCustomGraphics = new HashMap<CyCustomGraphics,
Boolean>();
-
- if(properties == null)
+
+ if (properties == null)
throw new NullPointerException("Property object is
null.");
-
+
final Properties props = properties.getProperties();
-
- if(props == null)
+
+ if (props == null)
throw new NullPointerException("Property is missing.");
-
+
this.imageHomeDirectory = new File(config.getSettingLocation(),
IMAGE_DIR_NAME);
-
+
logger.debug("\n!!!!!!!!!!!!!!!!! Cytoscape image directory: "
+ imageHomeDirectory.toString());
graphicsMap.put(NULL.getIdentifier(), NULL);
this.isUsedCustomGraphics.put(NULL, false);
-
+
final RestoreImageTaskFactory taskFactory = new
RestoreImageTaskFactory(imageHomeDirectory, this);
-
+
taskManager.execute(taskFactory);
-
}
-
+
/**
* Add a custom graphics to current session.
- *
+ *
* @param hash
* : Hasn code of image object
* @param graphics
@@ -103,7 +99,7 @@
/**
* Remove graphics from current session (memory).
- *
+ *
* @param id
* : ID of graphics (hash code)
*/
@@ -117,12 +113,12 @@
/**
* Get a Custom Graphics by integer ID.
- *
+ *
* @param hash
* Hash code of Custom Graphics object
- *
+ *
* @return Custom Graphics if exists. Otherwise, null.
- *
+ *
*/
@Override public CyCustomGraphics getCustomGraphicsByID(Long id) {
return graphicsMap.get(id);
@@ -131,7 +127,7 @@
/**
* Get Custom Graphics by source URL. Images without source cannot be
* retreved by this method.
- *
+ *
* @param sourceURL
* @return
*/
@@ -145,7 +141,7 @@
/**
* Get a collection of all Custom Graphics in current session.
- *
+ *
* @return
*/
@Override public Collection<CyCustomGraphics> getAllCustomGraphics() {
@@ -167,7 +163,7 @@
/**
* Convert current list of custom graphics into Property object.
- *
+ *
* @return
*/
@Override public Properties getMetadata() {
@@ -190,18 +186,18 @@
@Override public SortedSet<Long> getIDSet() {
return new TreeSet<Long>(graphicsMap.keySet());
}
-
+
@Override public boolean isUsedInCurrentSession(final CyCustomGraphics
graphics) {
if(graphics == null ||
this.isUsedCustomGraphics.containsKey(graphics) == false)
return false;
return isUsedCustomGraphics.get(graphics);
}
-
+
@Override public void setUsedInCurrentSession(final CyCustomGraphics
graphics, final Boolean isUsed) {
if(isUsed == null || graphics == null)
return;
-
+
if(this.isUsedCustomGraphics.containsKey(graphics) == false){
// Just ignore.
return;
@@ -219,7 +215,7 @@
final PersistImageTaskFactory factory = new
PersistImageTaskFactory(imageHomeDirectory, this);
try {
-
+
//FIXME how this section can wait until everything is
done?
taskManager.execute(factory);
} catch (Exception e1) {
@@ -227,6 +223,6 @@
}
logger.info("========== Image saving process finished
=============");
-
+
}
}
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -1,20 +1,23 @@
package org.cytoscape.ding.impl.customgraphics.action;
+
import java.awt.event.ActionEvent;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.AbstractCyAction;
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.impl.customgraphics.ui.CustomGraphicsManagerDialog;
+
public class CustomGraphicsManagerAction extends AbstractCyAction {
-
private static final long serialVersionUID = -4582671383878015609L;
-
private final CustomGraphicsManagerDialog dialog;
- public CustomGraphicsManagerAction(final CustomGraphicsManager manager,
final CyApplicationManager applicationManager) {
- super("Open Custom Graphics Manager", applicationManager);
+ public CustomGraphicsManagerAction(final CustomGraphicsManager manager,
+ final CyApplicationManager
applicationManager)
+ {
+ super("Open Custom Graphics Manager",
DIUtil.stripProxy(applicationManager));
setPreferredMenu("View");
this.dialog = new CustomGraphicsManagerDialog(manager,
applicationManager);
Modified: core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2011-09-02
21:23:11 UTC (rev 26720)
+++ core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2011-09-02
22:33:12 UTC (rev 26721)
@@ -68,6 +68,16 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>di-util-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
</dependency>
<dependency>
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -5,6 +5,7 @@
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.DataFlavor;
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.dnd.DropNodeViewTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -15,17 +16,15 @@
import org.cytoscape.work.AbstractTask;
-
public class AddEdgeNodeViewTaskFactoryImpl implements DropNodeViewTaskFactory
{
private View<CyNode> nv;
private CyNetworkView view;
private Point2D xformPt;
private Point2D javaPt;
-
private final CyNetworkManager netMgr;
public AddEdgeNodeViewTaskFactoryImpl(CyNetworkManager netMgr) {
- this.netMgr = netMgr;
+ this.netMgr = DIUtil.stripProxy(netMgr);
}
public void setNodeView(View<CyNode> nv, CyNetworkView view) {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -1,13 +1,6 @@
/*
- Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2007, 2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -31,9 +24,10 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
+*/
package org.cytoscape.ding.impl;
+
import java.awt.Color;
import java.awt.Paint;
import java.util.HashMap;
@@ -41,6 +35,7 @@
import java.util.Map;
import java.util.Set;
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.ArrowShape;
import org.cytoscape.ding.DNodeShape;
import org.cytoscape.ding.ObjectPosition;
@@ -78,8 +73,8 @@
import org.cytoscape.view.presentation.property.values.LineType;
import org.cytoscape.view.presentation.property.values.NodeShape;
-public class DVisualLexicon extends RichVisualLexicon {
+public class DVisualLexicon extends RichVisualLexicon {
// Set of custom graphics positions.
private static final Set<VisualProperty<?>> CG_POSITIONS = new
HashSet<VisualProperty<?>>();
private static final Set<VisualProperty<?>> CG_SIZE = new
HashSet<VisualProperty<?>>();
@@ -350,7 +345,7 @@
((DiscreteRange<LineType>)
EDGE_LINE_TYPE.getRange()).addRangeValue(SINEWAVE);
((DiscreteRange<LineType>)
EDGE_LINE_TYPE.getRange()).addRangeValue(VERTICAL_SLASH);
- CG_RANGE.setManager(manager);
+ CG_RANGE.setManager(DIUtil.stripProxy(manager));
addVisualProperty(NETWORK_NODE_SELECTION, NETWORK);
addVisualProperty(NETWORK_EDGE_SELECTION, NETWORK);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -8,6 +8,7 @@
import javax.swing.JComponent;
import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -23,31 +24,29 @@
/**
* RenderingEngineFactory for Navigation.
- *
*/
public class DingNavigationRenderingEngineFactory implements
RenderingEngineFactory<CyNetwork>,
UpdateNetworkPresentationEventListener
{
private static final Logger logger =
LoggerFactory.getLogger(DingNavigationRenderingEngineFactory.class);
-
private final RenderingEngineManager renderingEngineManager;
private final VisualLexicon dingLexicon;
private final Map<CyNetworkView, DGraphView> viewMap;
private final CyApplicationManager appManager;
- public DingNavigationRenderingEngineFactory(VisualLexicon dingLexicon,
- RenderingEngineManager renderingEngineManager,
CyApplicationManager appManager) {
+ public DingNavigationRenderingEngineFactory(final VisualLexicon
dingLexicon,
+ final
RenderingEngineManager renderingEngineManager,
+ final CyApplicationManager
appManager)
+ {
+ this.dingLexicon = DIUtil.stripProxy(dingLexicon);
+ this.renderingEngineManager =
DIUtil.stripProxy(renderingEngineManager);
+ this.appManager = DIUtil.stripProxy(appManager);
- this.dingLexicon = dingLexicon;
- this.renderingEngineManager = renderingEngineManager;
- this.appManager = appManager;
-
viewMap = new HashMap<CyNetworkView, DGraphView>();
}
-
-
- @Override public RenderingEngine<CyNetwork> getInstance(final Object
visualizationContainer, final View<CyNetwork> view) {
+ @Override
+ public RenderingEngine<CyNetwork> getInstance(final Object
visualizationContainer, final View<CyNetwork> view) {
if (visualizationContainer == null)
throw new IllegalArgumentException(
"Visualization container is null. This
should be an JComponent for this rendering engine.");
@@ -60,25 +59,23 @@
throw new IllegalArgumentException(
"Visualization Container object is not
of type Component, "
+ "which is invalid for
this implementation of PresentationFactory");
-
+
logger.debug("Start adding BEV.");
final JComponent container = (JComponent)
visualizationContainer;
final RenderingEngine<CyNetwork> engine =
appManager.getCurrentRenderingEngine();
final BirdsEyeView bev = new BirdsEyeView((DGraphView) engine);
-
+
container.setLayout(new BorderLayout());
container.add(bev, BorderLayout.CENTER);
-
+
this.renderingEngineManager.addRenderingEngine(bev);
-
+
logger.debug("Bird's Eye View had been set to the component.
Network Model = " + view.getModel().getSUID());
return bev;
}
-
/**
* Catch the events from view model layer.
- *
*/
@Override
public void handleEvent(UpdateNetworkPresentationEvent nvce) {
@@ -87,10 +84,8 @@
gv.updateView();
}
-
@Override
public VisualLexicon getVisualLexicon() {
return dingLexicon;
}
-
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -1,5 +1,6 @@
package org.cytoscape.ding.impl;
+
import java.awt.BorderLayout;
import java.util.HashMap;
import java.util.Map;
@@ -8,6 +9,7 @@
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.dnd.DropNetworkViewTaskFactory;
import org.cytoscape.dnd.DropNodeViewTaskFactory;
import org.cytoscape.event.CyEventHelper;
@@ -33,10 +35,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
public class DingRenderingEngineFactory implements
RenderingEngineFactory<CyNetwork>,
- UpdateNetworkPresentationEventListener {
-
+ UpdateNetworkPresentationEventListener
+{
private static final Logger logger =
LoggerFactory.getLogger(DingRenderingEngineFactory.class);
private final RenderingEngineManager renderingEngineManager;
@@ -67,16 +70,16 @@
CyTableManager tableMgr, CyEventHelper eventHelper,
RenderingEngineManager renderingEngineManager) {
- this.dataTableFactory = dataTableFactory;
- this.rootNetworkFactory = rootNetworkFactory;
- this.spacialFactory = spacialFactory;
- this.undo = undo;
- this.dingLexicon = dingLexicon;
- this.tm = tm;
- this.registrar = registrar;
- this.tableMgr = tableMgr;
- this.eventHelper = eventHelper;
- this.renderingEngineManager = renderingEngineManager;
+ this.dataTableFactory = DIUtil.stripProxy(dataTableFactory);
+ this.rootNetworkFactory = DIUtil.stripProxy(rootNetworkFactory);
+ this.spacialFactory = DIUtil.stripProxy(spacialFactory);
+ this.undo = DIUtil.stripProxy(undo);
+ this.dingLexicon = DIUtil.stripProxy(dingLexicon);
+ this.tm = DIUtil.stripProxy(tm);
+ this.registrar = DIUtil.stripProxy(registrar);
+ this.tableMgr = DIUtil.stripProxy(tableMgr);
+ this.eventHelper = DIUtil.stripProxy(eventHelper);
+ this.renderingEngineManager =
DIUtil.stripProxy(renderingEngineManager);
viewMap = new HashMap<CyNetworkView, DGraphView>();
nodeViewTFs = new HashMap<NodeViewTaskFactory, Map>();
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ShowGraphicsDetailTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ShowGraphicsDetailTaskFactory.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ShowGraphicsDetailTaskFactory.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -1,20 +1,22 @@
package org.cytoscape.ding.impl;
+
import java.util.Properties;
import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.property.CyProperty;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskIterator;
+
public class ShowGraphicsDetailTaskFactory implements TaskFactory {
-
private final CyApplicationManager appManager;
private final CyProperty<Properties> defaultProps;
ShowGraphicsDetailTaskFactory(final CyApplicationManager appManager, final
CyProperty<Properties> defaultProps) {
- this.appManager = appManager;
- this.defaultProps = defaultProps;
+ this.appManager = DIUtil.stripProxy(appManager);
+ this.defaultProps = DIUtil.stripProxy(defaultProps);
}
@Override
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
2011-09-02 21:23:11 UTC (rev 26720)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
2011-09-02 22:33:12 UTC (rev 26721)
@@ -1,19 +1,23 @@
package org.cytoscape.ding.impl.editor;
+
+import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.CyObjectPositionPropertyEditor;
import org.cytoscape.ding.ObjectPosition;
import org.cytoscape.ding.ObjectPositionCellRenderer;
import org.cytoscape.view.vizmap.gui.editor.AbstractVisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
+
public class ObjectPositionEditor extends
- AbstractVisualPropertyEditor<ObjectPosition> {
-
+ AbstractVisualPropertyEditor<ObjectPosition>
+{
/**
* Constructor. Should instantiate one editor per VisualProperty.
*/
public ObjectPositionEditor(final ValueEditor<ObjectPosition>
valueEditor) {
- super(ObjectPosition.class, new
CyObjectPositionPropertyEditor(valueEditor));
+ super(ObjectPosition.class,
+ new
CyObjectPositionPropertyEditor(DIUtil.stripProxy(valueEditor)));
discreteTableCellRenderer = new ObjectPositionCellRenderer();
// continuousTableCellRenderer = new
ColorContinuousMappingCellRenderer();
--
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.
