Author: kono
Date: 2012-06-27 17:40:24 -0700 (Wed, 27 Jun 2012)
New Revision: 29711
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
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/impl/DEdgeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.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/DingViewModelFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
core3/impl/trunk/edge-bundler-impl/src/main/java/org/cytoscape/edge/bundler/internal/EdgeBundlerTask.java
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithmTask.java
Log:
refs #1161 Factory needs extra parameter to initialize bend correctly.
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/values/HandleFactory.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -1,6 +1,10 @@
package org.cytoscape.view.presentation.property.values;
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+
/**
* Factory of the handle object.
*
@@ -15,5 +19,5 @@
*
* @return instance of new handle.
*/
- Handle createHandle(double x, double y);
+ Handle createHandle(final CyNetworkView graphView, final View<CyEdge>
view, double x, double y);
}
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-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -140,11 +140,14 @@
DingGraphLODAll dingGraphLODAll = new DingGraphLODAll();
+ HandleFactory handleFactory = new HandleFactoryImpl();
+ registerService(bc, handleFactory, HandleFactory.class, new
Properties());
+
DingRenderingEngineFactory dingRenderingEngineFactory = new
DingRenderingEngineFactory(
cyDataTableFactoryServiceRef,
cyRootNetworkFactoryServiceRef, undoSupportServiceRef,
spacialIndex2DFactoryServiceRef,
dVisualLexicon, dialogTaskManager,
cyServiceRegistrarRef,
cyNetworkTableManagerServiceRef, cyEventHelperServiceRef,
- vtfListener, annotationFactoryManager,
dingGraphLOD, vmmServiceRef,cyNetworkViewManagerServiceRef);
+ vtfListener, annotationFactoryManager,
dingGraphLOD, vmmServiceRef,cyNetworkViewManagerServiceRef, handleFactory);
DingNavigationRenderingEngineFactory
dingNavigationRenderingEngineFactory = new DingNavigationRenderingEngineFactory(
cyServiceRegistrarServiceRef, dVisualLexicon,
renderingEngineManagerServiceRef,
applicationManagerServiceRef);
@@ -158,7 +161,7 @@
DingViewModelFactory dingNetworkViewFactory = new
DingViewModelFactory(cyDataTableFactoryServiceRef,
cyRootNetworkFactoryServiceRef,
undoSupportServiceRef, spacialIndex2DFactoryServiceRef, dVisualLexicon,
dialogTaskManager, cyServiceRegistrarRef,
cyNetworkTableManagerServiceRef,
- cyEventHelperServiceRef, vtfListener,
annotationFactoryManager, dingGraphLOD, vmmServiceRef,
cyNetworkViewManagerServiceRef);
+ cyEventHelperServiceRef, vtfListener,
annotationFactoryManager, dingGraphLOD, vmmServiceRef,
cyNetworkViewManagerServiceRef, handleFactory);
// Edge Bend editor
EdgeBendValueEditor edgeBendValueEditor = new
EdgeBendValueEditor(cyNetworkFactory, dingNetworkViewFactory,
@@ -383,9 +386,6 @@
cyNetworkViewManagerServiceRef,
dialogTaskManager, cyPropertyServiceRef, dingGraphLOD, dingGraphLODAll);
registerAllServices(bc, graphicsDetailAction, new Properties());
- HandleFactory handleFactory = new HandleFactoryImpl();
- registerService(bc, handleFactory, HandleFactory.class, new
Properties());
-
BendFactory bendFactory = new BendFactoryImpl();
registerService(bc, bendFactory, BendFactory.class, new
Properties());
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -51,6 +51,7 @@
import org.cytoscape.view.presentation.property.values.ArrowShape;
import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.presentation.property.values.Handle;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.presentation.property.values.LineType;
@@ -89,6 +90,8 @@
private LineType lineType;
private Float fontSize =
DVisualLexicon.EDGE_LABEL_FONT_SIZE.getDefault().floatValue();
+
+ private final HandleFactory handleFacgtory;
/**
*
@@ -96,11 +99,12 @@
* @param inx
* @param model
*/
- DEdgeView(final DGraphView view, final long inx, final CyEdge model) {
+ DEdgeView(final DGraphView view, final long inx, final CyEdge model,
final HandleFactory handleFactory) {
super(model);
if (view == null )
throw new IllegalArgumentException("Constructor needs
its parent DGraphView.");
+ this.handleFacgtory = handleFactory;
m_view = view;
m_inx = inx;
m_selected = false;
@@ -530,8 +534,8 @@
protected final void moveHandleInternal(final int inx, double x, double
y) {
final Bend bend = m_view.m_edgeDetails.bend(model);
- final Handle handle = bend.getAllHandles().get(inx);
- handle.defineHandle(m_view.getViewModel(),this, x, y);
+ final HandleImpl handle = (HandleImpl)
bend.getAllHandles().get(inx);
+ handle.defineHandle(m_view.getViewModel(), this, x, y);
if (m_view.m_spacialA.delete((m_inx << 6) | inx))
m_view.m_spacialA.insert((m_inx << 6) | inx,
@@ -609,9 +613,7 @@
private void addHandleInternal(final int insertInx, final Point2D
handleLocation) {
synchronized (m_view.m_lock) {
final Bend bend = m_view.m_edgeDetails.bend(model);
- final Handle handle = new
HandleImpl(handleLocation.getX(), handleLocation.getY());
- handle.defineHandle(m_view, this,
handleLocation.getX(), handleLocation.getY());
-
+ final Handle handle =
handleFacgtory.createHandle(m_view, this, handleLocation.getX(),
handleLocation.getY());
bend.insertHandleAt(insertInx, handle);
if (m_selected) {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -135,6 +135,7 @@
import org.cytoscape.view.model.events.UpdateNetworkPresentationEvent;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.undo.UndoSupport;
@@ -405,6 +406,8 @@
private final VisualMappingManager vmm;
private final CyNetworkViewManager netViewMgr;
+
+ private final HandleFactory handleFactory;
/**
* Create presentation from View Model
@@ -419,10 +422,10 @@
CyEventHelper eventHelper,
CyNetworkTableManager tableMgr,
AnnotationFactoryManager annMgr, final DingGraphLOD
dingGraphLOD, final VisualMappingManager vmm,
- final CyNetworkViewManager netViewMgr) {
+ final CyNetworkViewManager netViewMgr, final
HandleFactory handleFactory) {
this(view.getModel(), dataFactory, cyRoot, undo,
spacialFactory, dingLexicon,
- vtfl, manager, eventHelper, tableMgr, annMgr,
dingGraphLOD, vmm, netViewMgr);
+ vtfl, manager, eventHelper, tableMgr, annMgr,
dingGraphLOD, vmm, netViewMgr, handleFactory);
}
@@ -450,10 +453,11 @@
CyEventHelper cyEventHelper,
CyNetworkTableManager tableMgr,
AnnotationFactoryManager annMgr, final DingGraphLOD
dingGraphLOD, final VisualMappingManager vmm,
- final CyNetworkViewManager netViewMgr) {
+ final CyNetworkViewManager netViewMgr, final
HandleFactory handleFactory) {
super(model);
this.props = new Properties();
this.vmm = vmm;
+ this.handleFactory = handleFactory;
long start = System.currentTimeMillis();
logger.debug("Phase 1: rendering start.");
@@ -862,7 +866,7 @@
m_drawPersp.addEdge(edge);
- dEdgeView = new DEdgeView(this, edgeInx, edge);
+ dEdgeView = new DEdgeView(this, edgeInx, edge,
handleFactory);
m_edgeViewMap.put(edge, dEdgeView);
m_contentChanged = true;
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
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -24,6 +24,7 @@
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.undo.UndoSupport;
@@ -53,6 +54,7 @@
private final VisualMappingManager vmm;
private final CyNetworkViewManager netViewMgr;
+ private final HandleFactory handleFactory;
public DingRenderingEngineFactory(CyTableFactory dataTableFactory,
CyRootNetworkManager rootNetworkManager, UndoSupport
undo,
@@ -63,7 +65,7 @@
CyEventHelper eventHelper,
ViewTaskFactoryListener vtfListener,
AnnotationFactoryManager annMgr, DingGraphLOD
dingGraphLOD, final VisualMappingManager vmm,
- final CyNetworkViewManager netViewMgr) {
+ final CyNetworkViewManager netViewMgr, final
HandleFactory handleFactory) {
this.dataTableFactory = dataTableFactory;
this.rootNetworkManager = rootNetworkManager;
@@ -76,6 +78,7 @@
this.eventHelper = eventHelper;
this.annMgr = annMgr;
this.vmm=vmm;
+ this.handleFactory = handleFactory;
this.netViewMgr = netViewMgr;
@@ -120,7 +123,7 @@
else
dgv = new DGraphView(targetView,
dataTableFactory,
rootNetworkManager, undo,
spacialFactory, dingLexicon,
- vtfListener,dialogTaskManager,
eventHelper, tableMgr, annMgr, dingGraphLOD, vmm, netViewMgr);
+ vtfListener,dialogTaskManager,
eventHelper, tableMgr, annMgr, dingGraphLOD, vmm, netViewMgr, handleFactory);
logger.info("DGraphView created as a presentation for
view model: "
+ targetView.getSUID());
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -15,6 +15,7 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.undo.UndoSupport;
@@ -41,7 +42,8 @@
private final DingGraphLOD dingGraphLOD;
private final VisualMappingManager vmm;
- private final CyNetworkViewManager netViewMgr;
+ private final CyNetworkViewManager netViewMgr;
+ private final HandleFactory handleFactory;
public DingViewModelFactory(CyTableFactory dataTableFactory,
CyRootNetworkManager rootNetworkManager,
UndoSupport undo, SpacialIndex2DFactory spacialFactory,
VisualLexicon dingLexicon,
@@ -49,7 +51,7 @@
CyServiceRegistrar registrar, CyNetworkTableManager
tableMgr, CyEventHelper eventHelper,
ViewTaskFactoryListener vtfListener,
AnnotationFactoryManager annMgr, DingGraphLOD
dingGraphLOD, final VisualMappingManager vmm,
- final CyNetworkViewManager netViewMgr) {
+ final CyNetworkViewManager netViewMgr, final
HandleFactory handleFactory) {
this.dataTableFactory = dataTableFactory;
this.rootNetworkManager = rootNetworkManager;
@@ -66,6 +68,7 @@
this.vmm=vmm;
this.netViewMgr = netViewMgr;
+ this.handleFactory = handleFactory;
}
@Override
@@ -74,7 +77,7 @@
throw new IllegalArgumentException("Cannot create view
without model.");
final DGraphView dgv = new DGraphView(network,
dataTableFactory, rootNetworkManager, undo, spacialFactory, dingLexicon,
- vtfListener, dialogTaskManager, eventHelper,
tableMgr, annMgr, dingGraphLOD, vmm, netViewMgr);
+ vtfListener, dialogTaskManager, eventHelper,
tableMgr, annMgr, dingGraphLOD, vmm, netViewMgr, handleFactory);
registrar.registerAllServices(dgv, new Properties());
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleFactoryImpl.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -1,12 +1,15 @@
package org.cytoscape.ding.impl;
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
import org.cytoscape.view.presentation.property.values.Handle;
import org.cytoscape.view.presentation.property.values.HandleFactory;
public class HandleFactoryImpl implements HandleFactory {
- public Handle createHandle(double x, double y) {
- return new HandleImpl(x,y);
+ public Handle createHandle(final CyNetworkView graphView, final
View<CyEdge> view, double x, double y) {
+ return new HandleImpl(graphView, view, x,y);
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -25,10 +25,9 @@
// Original handle location
private double x = Double.NaN;
private double y = Double.NaN;
-
- public HandleImpl(double x, double y) {
- this.x = x;
- this.y = y;
+
+ public HandleImpl(final CyNetworkView graphView, final View<CyEdge>
view, double x, double y) {
+ defineHandle(graphView, view, x, y);
}
@Override
@@ -59,6 +58,7 @@
return newPoint;
}
+
@Override
public void defineHandle(final CyNetworkView graphView, final
View<CyEdge> view, double x, double y) {
if(!((Double)x).equals(Double.NaN))
@@ -66,7 +66,9 @@
if(!((Double)y).equals(Double.NaN))
this.y = y;
- convertToRatio(graphView, view, new Point2D.Double(this.x,
this.y));
+
+ if(graphView != null && view != null)
+ convertToRatio(graphView, view, new
Point2D.Double(this.x, this.y));
}
private void convertToRatio(final CyNetworkView graphView, View<CyEdge>
view, final Point2D absolutePoint) {
@@ -202,7 +204,7 @@
final double sin = Double.valueOf(parts[1]);
final double ratio = Double.valueOf(parts[2]);
- HandleImpl handle = new HandleImpl(0, 0);
+ HandleImpl handle = new HandleImpl(null, null, 0, 0);
handle.setSin(sin);
handle.setCos(cos);
handle.setRatio(ratio);
@@ -216,7 +218,7 @@
try {
final double x = Double.valueOf(parts[0]);
final double y = Double.valueOf(parts[1]);
- return new HandleImpl(x, y);
+ return new HandleImpl(null, null, x, y);
} catch (Exception ex) {
return null;
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/EdgeBendTest.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -22,7 +22,7 @@
@Test
public void testEdgeBend() {
Bend bend1 = new BendImpl();
- bend1.insertHandleAt(0, new HandleImpl(10, 20));
+ bend1.insertHandleAt(0, new HandleImpl(null, null, 10, 20));
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -16,6 +16,7 @@
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.undo.UndoSupport;
@@ -43,7 +44,7 @@
mock(ViewTaskFactoryListener.class),
mock(AnnotationFactoryManager.class),
mock(DingGraphLOD.class), mock(VisualMappingManager.class),
-
mock(CyNetworkViewManager.class));
+
mock(CyNetworkViewManager.class), mock(HandleFactory.class));
}
public CyNetworkView getNetworkView() {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -24,6 +24,7 @@
import org.cytoscape.view.model.AbstractCyNetworkViewTest;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.undo.UndoSupport;
@@ -67,7 +68,10 @@
private VisualMappingManager vmm;
@Mock
- private CyNetworkViewManager netViewMgr;
+ private CyNetworkViewManager netViewMgr;
+
+ @Mock
+ private HandleFactory handleFactory;
private final TableTestSupport tableSupport = new TableTestSupport();
@@ -87,7 +91,7 @@
vtfl,
/*nodeViewTFs, edgeViewTFs, emptySpaceTFs,
dropNodeViewTFs,
dropEmptySpaceTFs, */
- manager, eventHelper, tableMgr,annMgr,
dingGRaphLOD, vmm, netViewMgr);
+ manager, eventHelper, tableMgr,annMgr,
dingGRaphLOD, vmm, netViewMgr, handleFactory);
}
@Override
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -39,6 +39,7 @@
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
+import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.presentation.property.values.NodeShape;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -94,6 +95,9 @@
@Mock
private VisualMappingManager vmm;
+ @Mock
+ private HandleFactory handleFactory;
+
private final TableTestSupport tableSupport = new TableTestSupport();
private final NetworkTestSupport netSupport = new NetworkTestSupport();
@@ -123,7 +127,7 @@
networkView = new DGraphView(network, dataFactory, cyRoot,
undo, spacialFactory, lexicon,
vtfl,
/*nodeViewTFs, edgeViewTFs, emptySpaceTFs,
dropNodeViewTFs,
- dropEmptySpaceTFs,*/ manager, eventHelper,
tableMgr, annMgr, dingGraphLOD, vmm, netViewMgr);
+ dropEmptySpaceTFs,*/ manager, eventHelper,
tableMgr, annMgr, dingGraphLOD, vmm, netViewMgr, handleFactory);
dnv1 = (DNodeView) networkView.getDNodeView(node1);
dnv2 = (DNodeView) networkView.getDNodeView(node2);
Modified:
core3/impl/trunk/edge-bundler-impl/src/main/java/org/cytoscape/edge/bundler/internal/EdgeBundlerTask.java
===================================================================
---
core3/impl/trunk/edge-bundler-impl/src/main/java/org/cytoscape/edge/bundler/internal/EdgeBundlerTask.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/edge-bundler-impl/src/main/java/org/cytoscape/edge/bundler/internal/EdgeBundlerTask.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -247,8 +247,7 @@
for (int ni = 0; ni < numNubs; ni++) {
final double x = nubs[ni][0][ei];
final double y = nubs[ni][1][ei];
- final Handle h = hf.createHandle(0, 0);
- h.defineHandle(view, edge, x, y);
+ final Handle h = hf.createHandle(view, edge, 0,
0);
hlist.add(h);
}
Modified:
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithmTask.java
===================================================================
---
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithmTask.java
2012-06-27 22:41:32 UTC (rev 29710)
+++
core3/impl/trunk/layout-cytoscape-impl/src/main/java/csapps/layout/algorithms/hierarchicalLayout/HierarchicalLayoutAlgorithmTask.java
2012-06-28 00:40:24 UTC (rev 29711)
@@ -566,8 +566,7 @@
Bend b = bendFactory.createBend();
- Handle h =
handleFactory.createHandle(xPos,node.yPos);
-
h.defineHandle(networkView,ev,xPos,node.yPos);
+ Handle h =
handleFactory.createHandle(networkView,ev,xPos,node.yPos);
b.insertHandleAt(0,h);
ev.setVisualProperty(BasicVisualLexicon.EDGE_BEND, b);
--
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.
