Author: kono
Date: 2012-06-05 17:05:38 -0700 (Tue, 05 Jun 2012)
New Revision: 29475
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskTest.java
Log:
Current style will be applied by loader.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -224,8 +224,8 @@
LoadVizmapFileTaskFactoryImpl loadVizmapFileTaskFactory = new
LoadVizmapFileTaskFactoryImpl(vizmapReaderManagerServiceRef,visualMappingManagerServiceRef,synchronousTaskManagerServiceRef,
tunableSetterServiceRef);
- LoadNetworkFileTaskFactoryImpl loadNetworkFileTaskFactory = new
LoadNetworkFileTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,
tunableSetterServiceRef);
- LoadNetworkURLTaskFactoryImpl loadNetworkURLTaskFactory = new
LoadNetworkURLTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,streamUtilRef,
synchronousTaskManagerServiceRef, tunableSetterServiceRef);
+ LoadNetworkFileTaskFactoryImpl loadNetworkFileTaskFactory = new
LoadNetworkFileTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,
tunableSetterServiceRef, visualMappingManagerServiceRef);
+ LoadNetworkURLTaskFactoryImpl loadNetworkURLTaskFactory = new
LoadNetworkURLTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,streamUtilRef,
synchronousTaskManagerServiceRef, tunableSetterServiceRef,
visualMappingManagerServiceRef);
DeleteSelectedNodesAndEdgesTaskFactoryImpl
deleteSelectedNodesAndEdgesTaskFactory = new
DeleteSelectedNodesAndEdgesTaskFactoryImpl(undoSupportServiceRef,cyNetworkViewManagerServiceRef,visualMappingManagerServiceRef,cyEventHelperRef);
SelectAllTaskFactoryImpl selectAllTaskFactory = new
SelectAllTaskFactoryImpl(undoSupportServiceRef,cyNetworkViewManagerServiceRef,cyEventHelperRef);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -43,6 +43,7 @@
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
@@ -72,14 +73,16 @@
protected CyNetworkViewManager networkViewManager;
protected Properties props;
protected CyNetworkNaming namingUtil;
+ protected final VisualMappingManager vmm;
public AbstractLoadNetworkTask(final CyNetworkReaderManager mgr, final
CyNetworkManager networkManager,
- final CyNetworkViewManager networkViewManager, final
Properties props, final CyNetworkNaming namingUtil) {
+ final CyNetworkViewManager networkViewManager, final
Properties props, final CyNetworkNaming namingUtil, final VisualMappingManager
vmm) {
this.mgr = mgr;
this.networkManager = networkManager;
this.networkViewManager = networkViewManager;
this.props = props;
this.namingUtil = namingUtil;
+ this.vmm = vmm;
this.viewThreshold = getViewThreshold();
}
@@ -94,7 +97,7 @@
taskMonitor.setStatusMessage("Creating Cytoscape
Network...");
}
insertTasksAfterCurrentTask(viewReader, new
GenerateNetworkViewsTask(name, viewReader, networkManager,
- networkViewManager, namingUtil, viewThreshold));
+ networkViewManager, namingUtil, viewThreshold,
vmm));
if (taskMonitor != null)
taskMonitor.setProgress(1.0);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -35,10 +35,10 @@
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
@@ -49,16 +49,18 @@
private final CyNetworkViewManager networkViewManager;
private final CyNetworkNaming namingUtil;
private final int viewThreshold;
+ private final VisualMappingManager vmm;
public GenerateNetworkViewsTask(final String name, final
CyNetworkReader viewReader,
final CyNetworkManager networkManager, final
CyNetworkViewManager networkViewManager,
- final CyNetworkNaming namingUtil, final int
viewThreshold) {
+ final CyNetworkNaming namingUtil, final int
viewThreshold, final VisualMappingManager vmm) {
this.name = name;
this.viewReader = viewReader;
this.networkManager = networkManager;
this.networkViewManager = networkViewManager;
this.namingUtil = namingUtil;
- this.viewThreshold = viewThreshold;
+ this.viewThreshold = viewThreshold;
+ this.vmm = vmm;
}
public void run(final TaskMonitor taskMonitor) throws Exception {
@@ -85,6 +87,8 @@
if (numGraphObjects < viewThreshold) {
final CyNetworkView view =
viewReader.buildCyNetworkView(network);
networkViewManager.addNetworkView(view);
+ vmm.setVisualStyle(vmm.getCurrentVisualStyle(),
view);
+ vmm.getCurrentVisualStyle().apply(view);
view.fitContent();
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -36,6 +36,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
@@ -53,8 +54,8 @@
}
public LoadNetworkFileTask(CyNetworkReaderManager mgr, CyNetworkManager
netmgr,
- final CyNetworkViewManager networkViewManager, final
Properties props, CyNetworkNaming namingUtil) {
- super(mgr, netmgr, networkViewManager, props, namingUtil);
+ final CyNetworkViewManager networkViewManager, final
Properties props, CyNetworkNaming namingUtil, final VisualMappingManager vmm) {
+ super(mgr, netmgr, networkViewManager, props, namingUtil, vmm);
}
/**
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -41,6 +41,7 @@
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.read.LoadNetworkFileTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TunableSetter;
@@ -58,10 +59,11 @@
private CyNetworkNaming cyNetworkNaming;
private final TunableSetter tunableSetter;
+ private final VisualMappingManager vmm;
public LoadNetworkFileTaskFactoryImpl(CyNetworkReaderManager mgr,
CyNetworkManager netmgr,
final CyNetworkViewManager networkViewManager,
CyProperty<Properties> cyProp,
- CyNetworkNaming cyNetworkNaming, TunableSetter
tunableSetter) {
+ CyNetworkNaming cyNetworkNaming, TunableSetter
tunableSetter, final VisualMappingManager vmm) {
this.mgr = mgr;
this.netmgr = netmgr;
@@ -69,11 +71,12 @@
this.props = cyProp.getProperties();
this.cyNetworkNaming = cyNetworkNaming;
this.tunableSetter = tunableSetter;
+ this.vmm = vmm;
}
public TaskIterator createTaskIterator() {
// Load, visualize, and layout.
- return new TaskIterator(3, new LoadNetworkFileTask(mgr, netmgr,
networkViewManager, props, cyNetworkNaming));
+ return new TaskIterator(3, new LoadNetworkFileTask(mgr, netmgr,
networkViewManager, props, cyNetworkNaming, vmm));
}
@Override
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -40,6 +40,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
@@ -58,9 +59,9 @@
public LoadNetworkURLTask(CyNetworkReaderManager mgr,
CyNetworkManager netmgr, final
CyNetworkViewManager networkViewManager,
final Properties props,
- CyNetworkNaming namingUtil, StreamUtil
streamUtil)
+ CyNetworkNaming namingUtil, StreamUtil
streamUtil, final VisualMappingManager vmm)
{
- super(mgr, netmgr, networkViewManager, props, namingUtil);
+ super(mgr, netmgr, networkViewManager, props, namingUtil, vmm);
this.streamUtil = streamUtil;
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskFactoryImpl.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskFactoryImpl.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -44,6 +44,7 @@
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.read.LoadNetworkURLTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.SynchronousTaskManager;
import org.cytoscape.work.TaskIterator;
@@ -65,14 +66,16 @@
private final SynchronousTaskManager<?> syncTaskManager;
- private final TunableSetter tunableSetter;
+ private final TunableSetter tunableSetter;
+
+ private final VisualMappingManager vmm;
public LoadNetworkURLTaskFactoryImpl(CyNetworkReaderManager mgr,
CyNetworkManager netmgr,
final CyNetworkViewManager
networkViewManager,
CyProperty<Properties> cyProps,
CyNetworkNaming cyNetworkNaming,
StreamUtil streamUtil, final
SynchronousTaskManager<?> syncTaskManager,
- TunableSetter tunableSetter)
+ TunableSetter tunableSetter,
final VisualMappingManager vmm)
{
this.mgr = mgr;
this.netmgr = netmgr;
@@ -82,11 +85,12 @@
this.streamUtil = streamUtil;
this.tunableSetter = tunableSetter;
this.syncTaskManager = syncTaskManager;
+ this.vmm = vmm;
}
public TaskIterator createTaskIterator() {
// Usually we need to create view, so expected number is 2.
- return new TaskIterator(2, new LoadNetworkURLTask(mgr, netmgr,
networkViewManager, props, cyNetworkNaming, streamUtil));
+ return new TaskIterator(2, new LoadNetworkURLTask(mgr, netmgr,
networkViewManager, props, cyNetworkNaming, streamUtil, vmm));
}
@Override
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -52,6 +52,8 @@
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.SynchronousTaskManager;
public class AbstractLoadNetworkTaskTester {
@@ -70,9 +72,14 @@
CyNetwork[] networks;
CyNetworkReader reader;
+ VisualMappingManager vmm;
+ VisualStyle style;
public void setUp() throws Exception {
CyRow attrs = mock(CyRow.class);
+ vmm=mock(VisualMappingManager.class);
+ style=mock(VisualStyle.class);
+ when(vmm.getCurrentVisualStyle()).thenReturn(style);
net = mock(CyNetwork.class);
when(net.getNodeCount()).thenReturn(2);
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -62,7 +62,7 @@
@Test
public void testRun() throws Exception {
- TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts);
+ TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm);
TaskIterator ti = factory.createTaskIterator();
TaskMonitor tm = mock(TaskMonitor.class);
boolean first = true;
@@ -81,7 +81,7 @@
@Test(expected = NullPointerException.class)
public void testNullFile() throws Exception {
- TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts);
+ TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm);
TaskIterator ti = factory.createTaskIterator();
TaskMonitor tm = mock(TaskMonitor.class);
boolean first = true;
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskTest.java
2012-06-05 23:51:24 UTC (rev 29474)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTaskTest.java
2012-06-06 00:05:38 UTC (rev 29475)
@@ -63,7 +63,7 @@
TunableSetter ts = mock(TunableSetter.class);
TaskFactory factory = new LoadNetworkURLTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil,
- streamUtil, synchronousTaskManager,ts);
+ streamUtil, synchronousTaskManager,ts, vmm);
assertNotNull(networkViewManager);
TaskIterator ti = factory.createTaskIterator();
TaskMonitor tm = mock(TaskMonitor.class);
@@ -91,7 +91,7 @@
TunableSetter ts = mock(TunableSetter.class);
TaskFactory factory = new LoadNetworkURLTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil,
- streamUtil, synchronousTaskManager,ts);
+ streamUtil, synchronousTaskManager,ts, vmm);
TaskIterator ti = factory.createTaskIterator();
TaskMonitor tm = mock(TaskMonitor.class);
boolean first = true;
@@ -113,7 +113,7 @@
TunableSetter ts = mock(TunableSetter.class);
TaskFactory factory = new LoadNetworkURLTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil,
- streamUtil, synchronousTaskManager,ts);
+ streamUtil, synchronousTaskManager,ts, vmm);
TaskIterator ti = factory.createTaskIterator();
TaskMonitor tm = mock(TaskMonitor.class);
boolean first = true;
--
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.
