Author: kono
Date: 2010-08-04 17:01:07 -0700 (Wed, 04 Aug 2010)
New Revision: 21212
Added:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
Removed:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/BirdsEyeView.java
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Class name of PresentationFactory had been changed to RenderingEngineFactory
for consistency.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/BirdsEyeView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/BirdsEyeView.java
2010-08-04 23:49:35 UTC (rev 21211)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/BirdsEyeView.java
2010-08-05 00:01:07 UTC (rev 21212)
@@ -39,7 +39,7 @@
import org.cytoscape.ding.impl.ContentChangeListener;
import org.cytoscape.ding.impl.DGraphView;
import org.cytoscape.ding.impl.ViewportChangeListener;
-import org.cytoscape.ding.impl.PresentationFactoryImpl;
+import org.cytoscape.ding.impl.DingRenderingEngineFactory;
import org.cytoscape.view.presentation.NavigationPresentation;
import org.cytoscape.view.model.CyNetworkView;
@@ -74,7 +74,7 @@
private double m_viewYCenter;
private double m_viewScaleFactor;
private Component m_desktopView;
- private PresentationFactoryImpl presFactory;
+ private DingRenderingEngineFactory presFactory;
/**
* Creates a new BirdsEyeView object.
@@ -82,7 +82,7 @@
* @param view The view to monitor
* @param desktopView The desktop area holding the view. This should be
NetworkViewManager.getDesktopPane().
*/
- public BirdsEyeView(Component desktopView, PresentationFactoryImpl
presFactory) {
+ public BirdsEyeView(Component desktopView, DingRenderingEngineFactory
presFactory) {
super();
this.presFactory = presFactory;
m_cLis = new InnerContentChangeListener();
Copied:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
(from rev 21204,
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java)
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
(rev 0)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-08-05 00:01:07 UTC (rev 21212)
@@ -0,0 +1,192 @@
+
+package org.cytoscape.ding.impl;
+
+import java.awt.Component;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.swing.JComponent;
+import javax.swing.JDesktopPane;
+import javax.swing.JInternalFrame;
+import javax.swing.JPanel;
+
+import org.cytoscape.ding.BirdsEyeView;
+import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.spacial.SpacialIndex2DFactory;
+import org.cytoscape.task.EdgeViewTaskFactory;
+import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NodeViewTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.RootVisualLexicon;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.events.NetworkViewChangedEvent;
+import org.cytoscape.view.model.events.NetworkViewChangedListener;
+import org.cytoscape.view.presentation.NavigationPresentation;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.presentation.RenderingEngine;
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.TunableInterceptor;
+import org.cytoscape.work.UndoSupport;
+import org.cytoscape.service.util.CyServiceRegistrar;
+
+public class DingRenderingEngineFactory implements
RenderingEngineFactory<CyNetwork>, NetworkViewChangedListener {
+
+ private CyDataTableFactory dataTableFactory;
+ private CyRootNetworkFactory rootNetworkFactory;
+ private SpacialIndex2DFactory spacialFactory;
+ private UndoSupport undo;
+ private RootVisualLexicon rootLexicon;
+ private VisualLexicon dingLexicon;
+ private CyServiceRegistrar registrar;
+
+ private Map<CyNetworkView, DGraphView> viewMap;
+
+ private Map<NodeViewTaskFactory,Map> nodeViewTFs;
+ private Map<EdgeViewTaskFactory,Map> edgeViewTFs;
+ private Map<NetworkViewTaskFactory,Map> emptySpaceTFs;
+
+ private TunableInterceptor ti;
+ private TaskManager tm;
+
+ public DingRenderingEngineFactory(CyDataTableFactory dataTableFactory,
+ CyRootNetworkFactory rootNetworkFactory,
+ UndoSupport
undo, SpacialIndex2DFactory spacialFactory,
+
RootVisualLexicon vpc, VisualLexicon dingLexicon,
+
TunableInterceptor ti, TaskManager tm,
+
CyServiceRegistrar registrar) {
+ this.dataTableFactory = dataTableFactory;
+ this.rootNetworkFactory = rootNetworkFactory;
+ this.spacialFactory = spacialFactory;
+ this.undo = undo;
+ this.rootLexicon = vpc;
+ this.dingLexicon = dingLexicon;
+ this.ti = ti;
+ this.tm = tm;
+ this.registrar = registrar;
+
+ viewMap = new HashMap<CyNetworkView, DGraphView>();
+ nodeViewTFs = new HashMap<NodeViewTaskFactory,Map>();
+ edgeViewTFs = new HashMap<EdgeViewTaskFactory,Map>();
+ emptySpaceTFs = new HashMap<NetworkViewTaskFactory,Map>();
+ }
+
+ /**
+ *
+ */
+ public RenderingEngine<CyNetwork> render(Object presentationContainer,
View<CyNetwork> view) {
+
+ if ( view == null )
+ throw new IllegalArgumentException("Cannot create
presentation for null view model.");
+
+ if ( view instanceof CyNetworkView == false )
+ throw new IllegalArgumentException("Ding accepts
CyNetworkView only.");
+
+ CyNetworkView targetView = (CyNetworkView) view;
+ DGraphView dgv = null;
+ if ( presentationContainer instanceof JComponent ) {
+
+ dgv = new DGraphView(targetView,
dataTableFactory,rootNetworkFactory,undo,spacialFactory,
+ rootLexicon,
dingLexicon,nodeViewTFs,edgeViewTFs,emptySpaceTFs,ti,tm);
+ viewMap.put(targetView, dgv);
+ targetView.addViewChangeListener(dgv);
+
+ if(presentationContainer instanceof JInternalFrame) {
+ JInternalFrame inFrame =
(JInternalFrame)presentationContainer;
+ JDesktopPane desktopPane =
inFrame.getDesktopPane();
+
+ // TODO - not sure this layered pane bit is
optimal
+ inFrame.setContentPane(
dgv.getContainer(inFrame.getLayeredPane()) );
+ dgv.addTransferComponent(desktopPane);
+ } else {
+ JComponent component = (JComponent)
presentationContainer;
+ component.add(dgv.getComponent());
+ }
+
+ } else {
+ throw new IllegalArgumentException("frame object is not
of type JInternalFrame, which is invalid for this implementation of
PresentationFactory");
+ }
+
+ registrar.registerAllServices(dgv, new Properties());
+ registrar.registerAllServices(new AddDeleteHandler(dgv), new
Properties());
+
+ return dgv;
+ }
+
+ public NavigationPresentation addNavigationPresentation(Object
targetComponent, Object navBounds) {
+ if ( !(targetComponent instanceof JPanel) )
+ throw new IllegalArgumentException("targetComponent
object is not of type JPanel, which is invalid for this implementation of
PresentationFactory");
+
+ if ( !(navBounds instanceof Component) )
+ throw new IllegalArgumentException("navBounds object is
not of type Component, which is invalid for this implementation of
PresentationFactory");
+
+ JPanel target = (JPanel)targetComponent;
+
+ BirdsEyeView bev = new BirdsEyeView((Component)navBounds,this);
+ target.add( bev );
+
+ return bev;
+ }
+
+
+ public void handleEvent(NetworkViewChangedEvent nvce) {
+ DGraphView gv = viewMap.get(nvce.getSource());
+ if ( gv != null )
+ gv.updateView();
+ }
+
+ public DGraphView getGraphView(CyNetworkView cnv) {
+ return viewMap.get(cnv);
+ }
+
+ public void addNodeViewTaskFactory(NodeViewTaskFactory nvtf, Map props)
{
+ System.out.println("addNodeViewTaskFactory");
+ if ( nvtf == null )
+ return;
+
+ nodeViewTFs.put(nvtf,props);
+ }
+
+ public void removeNodeViewTaskFactory(NodeViewTaskFactory nvtf, Map
props) {
+ System.out.println("removeNodeViewTaskFactory");
+ if ( nvtf == null )
+ return;
+
+ nodeViewTFs.remove(nvtf);
+ }
+
+ public void addEdgeViewTaskFactory(EdgeViewTaskFactory evtf, Map props)
{
+ System.out.println("addEdgeViewTaskFactory");
+ if ( evtf == null )
+ return;
+
+ edgeViewTFs.put(evtf,props);
+ }
+
+ public void removeEdgeViewTaskFactory(EdgeViewTaskFactory evtf, Map
props) {
+ System.out.println("removeEdgeViewTaskFactory");
+ if ( evtf == null )
+ return;
+
+ edgeViewTFs.remove(evtf);
+ }
+
+ public void addNetworkViewTaskFactory(NetworkViewTaskFactory evtf, Map
props) {
+ System.out.println("addNetworkViewTaskFactory");
+ if ( evtf == null )
+ return;
+
+ emptySpaceTFs.put(evtf,props);
+ }
+
+ public void removeNetworkViewTaskFactory(NetworkViewTaskFactory evtf,
Map props) {
+ System.out.println("removeNetworkViewTaskFactory");
+ if ( evtf == null )
+ return;
+
+ emptySpaceTFs.remove(evtf);
+ }
+}
Deleted:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
2010-08-04 23:49:35 UTC (rev 21211)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PresentationFactoryImpl.java
2010-08-05 00:01:07 UTC (rev 21212)
@@ -1,192 +0,0 @@
-
-package org.cytoscape.ding.impl;
-
-import java.awt.Component;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.swing.JComponent;
-import javax.swing.JDesktopPane;
-import javax.swing.JInternalFrame;
-import javax.swing.JPanel;
-
-import org.cytoscape.ding.BirdsEyeView;
-import org.cytoscape.model.CyDataTableFactory;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
-import org.cytoscape.spacial.SpacialIndex2DFactory;
-import org.cytoscape.task.EdgeViewTaskFactory;
-import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.NodeViewTaskFactory;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.RootVisualLexicon;
-import org.cytoscape.view.model.View;
-import org.cytoscape.view.model.VisualLexicon;
-import org.cytoscape.view.model.events.NetworkViewChangedEvent;
-import org.cytoscape.view.model.events.NetworkViewChangedListener;
-import org.cytoscape.view.presentation.NavigationPresentation;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
-import org.cytoscape.view.presentation.RenderingEngine;
-import org.cytoscape.work.TaskManager;
-import org.cytoscape.work.TunableInterceptor;
-import org.cytoscape.work.UndoSupport;
-import org.cytoscape.service.util.CyServiceRegistrar;
-
-public class PresentationFactoryImpl implements
RenderingEngineFactory<CyNetwork>, NetworkViewChangedListener {
-
- private CyDataTableFactory dataTableFactory;
- private CyRootNetworkFactory rootNetworkFactory;
- private SpacialIndex2DFactory spacialFactory;
- private UndoSupport undo;
- private RootVisualLexicon rootLexicon;
- private VisualLexicon dingLexicon;
- private CyServiceRegistrar registrar;
-
- private Map<CyNetworkView, DGraphView> viewMap;
-
- private Map<NodeViewTaskFactory,Map> nodeViewTFs;
- private Map<EdgeViewTaskFactory,Map> edgeViewTFs;
- private Map<NetworkViewTaskFactory,Map> emptySpaceTFs;
-
- private TunableInterceptor ti;
- private TaskManager tm;
-
- public PresentationFactoryImpl(CyDataTableFactory dataTableFactory,
- CyRootNetworkFactory rootNetworkFactory,
- UndoSupport
undo, SpacialIndex2DFactory spacialFactory,
-
RootVisualLexicon vpc, VisualLexicon dingLexicon,
-
TunableInterceptor ti, TaskManager tm,
-
CyServiceRegistrar registrar) {
- this.dataTableFactory = dataTableFactory;
- this.rootNetworkFactory = rootNetworkFactory;
- this.spacialFactory = spacialFactory;
- this.undo = undo;
- this.rootLexicon = vpc;
- this.dingLexicon = dingLexicon;
- this.ti = ti;
- this.tm = tm;
- this.registrar = registrar;
-
- viewMap = new HashMap<CyNetworkView, DGraphView>();
- nodeViewTFs = new HashMap<NodeViewTaskFactory,Map>();
- edgeViewTFs = new HashMap<EdgeViewTaskFactory,Map>();
- emptySpaceTFs = new HashMap<NetworkViewTaskFactory,Map>();
- }
-
- /**
- *
- */
- public RenderingEngine<CyNetwork> render(Object presentationContainer,
View<CyNetwork> view) {
-
- if ( view == null )
- throw new IllegalArgumentException("Cannot create
presentation for null view model.");
-
- if ( view instanceof CyNetworkView == false )
- throw new IllegalArgumentException("Ding accepts
CyNetworkView only.");
-
- CyNetworkView targetView = (CyNetworkView) view;
- DGraphView dgv = null;
- if ( presentationContainer instanceof JComponent ) {
-
- dgv = new DGraphView(targetView,
dataTableFactory,rootNetworkFactory,undo,spacialFactory,
- rootLexicon,
dingLexicon,nodeViewTFs,edgeViewTFs,emptySpaceTFs,ti,tm);
- viewMap.put(targetView, dgv);
- targetView.addViewChangeListener(dgv);
-
- if(presentationContainer instanceof JInternalFrame) {
- JInternalFrame inFrame =
(JInternalFrame)presentationContainer;
- JDesktopPane desktopPane =
inFrame.getDesktopPane();
-
- // TODO - not sure this layered pane bit is
optimal
- inFrame.setContentPane(
dgv.getContainer(inFrame.getLayeredPane()) );
- dgv.addTransferComponent(desktopPane);
- } else {
- JComponent component = (JComponent)
presentationContainer;
- component.add(dgv.getComponent());
- }
-
- } else {
- throw new IllegalArgumentException("frame object is not
of type JInternalFrame, which is invalid for this implementation of
PresentationFactory");
- }
-
- registrar.registerAllServices(dgv, new Properties());
- registrar.registerAllServices(new AddDeleteHandler(dgv), new
Properties());
-
- return dgv;
- }
-
- public NavigationPresentation addNavigationPresentation(Object
targetComponent, Object navBounds) {
- if ( !(targetComponent instanceof JPanel) )
- throw new IllegalArgumentException("targetComponent
object is not of type JPanel, which is invalid for this implementation of
PresentationFactory");
-
- if ( !(navBounds instanceof Component) )
- throw new IllegalArgumentException("navBounds object is
not of type Component, which is invalid for this implementation of
PresentationFactory");
-
- JPanel target = (JPanel)targetComponent;
-
- BirdsEyeView bev = new BirdsEyeView((Component)navBounds,this);
- target.add( bev );
-
- return bev;
- }
-
-
- public void handleEvent(NetworkViewChangedEvent nvce) {
- DGraphView gv = viewMap.get(nvce.getSource());
- if ( gv != null )
- gv.updateView();
- }
-
- public DGraphView getGraphView(CyNetworkView cnv) {
- return viewMap.get(cnv);
- }
-
- public void addNodeViewTaskFactory(NodeViewTaskFactory nvtf, Map props)
{
- System.out.println("addNodeViewTaskFactory");
- if ( nvtf == null )
- return;
-
- nodeViewTFs.put(nvtf,props);
- }
-
- public void removeNodeViewTaskFactory(NodeViewTaskFactory nvtf, Map
props) {
- System.out.println("removeNodeViewTaskFactory");
- if ( nvtf == null )
- return;
-
- nodeViewTFs.remove(nvtf);
- }
-
- public void addEdgeViewTaskFactory(EdgeViewTaskFactory evtf, Map props)
{
- System.out.println("addEdgeViewTaskFactory");
- if ( evtf == null )
- return;
-
- edgeViewTFs.put(evtf,props);
- }
-
- public void removeEdgeViewTaskFactory(EdgeViewTaskFactory evtf, Map
props) {
- System.out.println("removeEdgeViewTaskFactory");
- if ( evtf == null )
- return;
-
- edgeViewTFs.remove(evtf);
- }
-
- public void addNetworkViewTaskFactory(NetworkViewTaskFactory evtf, Map
props) {
- System.out.println("addNetworkViewTaskFactory");
- if ( evtf == null )
- return;
-
- emptySpaceTFs.put(evtf,props);
- }
-
- public void removeNetworkViewTaskFactory(NetworkViewTaskFactory evtf,
Map props) {
- System.out.println("removeNetworkViewTaskFactory");
- if ( evtf == null )
- return;
-
- emptySpaceTFs.remove(evtf);
- }
-}
Modified:
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-04 23:49:35 UTC (rev 21211)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-05 00:01:07 UTC (rev 21212)
@@ -18,7 +18,7 @@
<bean id="dVisualLexicon"
class="org.cytoscape.ding.impl.DVisualLexicon" />
- <bean id="dingPresentationFactory"
class="org.cytoscape.ding.impl.PresentationFactoryImpl">
+ <bean id="dingPresentationFactory"
class="org.cytoscape.ding.impl.DingRenderingEngineFactory">
<constructor-arg ref="cyDataTableFactoryServiceRef" />
<constructor-arg ref="cyRootNetworkFactoryServiceRef" />
<constructor-arg ref="undoSupportServiceRef" />
--
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.
