Author: pwang
Date: 2012-03-02 16:49:32 -0800 (Fri, 02 Mar 2012)
New Revision: 28424
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/title/EditNetworkTitleTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactory.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactoryTest.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskTest.java
Log:
Use Network Naming Service
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-03-03 00:13:28 UTC (rev 28423)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-03-03 00:49:32 UTC (rev 28424)
@@ -209,7 +209,7 @@
SaveSessionTaskFactory saveSessionTaskFactory = new
SaveSessionTaskFactory( sessionWriterManagerServiceRef,
cySessionManagerServiceRef, recentlyOpenedTrackerServiceRef, cyEventHelperRef);
SaveSessionAsTaskFactory saveSessionAsTaskFactory = new
SaveSessionAsTaskFactory( sessionWriterManagerServiceRef,
cySessionManagerServiceRef, recentlyOpenedTrackerServiceRef, cyEventHelperRef);
ProxySettingsTaskFactory proxySettingsTaskFactory = new
ProxySettingsTaskFactory(cyPropertyServiceRef, streamUtilRef);
- EditNetworkTitleTaskFactory editNetworkTitleTaskFactory = new
EditNetworkTitleTaskFactory(undoSupportServiceRef, cyNetworkManagerServiceRef);
+ EditNetworkTitleTaskFactory editNetworkTitleTaskFactory = new
EditNetworkTitleTaskFactory(undoSupportServiceRef, cyNetworkManagerServiceRef,
cyNetworkNamingServiceRef);
CreateNetworkViewTaskFactory createNetworkViewTaskFactory = new
CreateNetworkViewTaskFactory(undoSupportServiceRef,cyNetworkViewFactoryServiceRef,cyNetworkViewManagerServiceRef,cyLayoutsServiceRef,cyEventHelperRef);
ExportNetworkImageTaskFactory exportNetworkImageTaskFactory =
new
ExportNetworkImageTaskFactory(viewWriterManagerServiceRef,cyApplicationManagerServiceRef);
ExportNetworkViewTaskFactory exportNetworkViewTaskFactory = new
ExportNetworkViewTaskFactory(networkViewWriterManagerServiceRef);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
2012-03-03 00:13:28 UTC (rev 28423)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
2012-03-03 00:49:32 UTC (rev 28424)
@@ -33,6 +33,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.AbstractNetworkTask;
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
@@ -45,6 +46,7 @@
public class EditNetworkTitleTask extends AbstractNetworkTask implements
TunableValidator {
private final UndoSupport undoSupport;
private final CyNetworkManager cyNetworkManagerServiceRef;
+ private final CyNetworkNaming cyNetworkNamingServiceRef;
@ProvidesTitle
@@ -55,10 +57,12 @@
@Tunable(description = "New title")
public String title;
- public EditNetworkTitleTask(final UndoSupport undoSupport, final
CyNetwork net, CyNetworkManager cyNetworkManagerServiceRef) {
+ public EditNetworkTitleTask(final UndoSupport undoSupport, final
CyNetwork net, CyNetworkManager cyNetworkManagerServiceRef,
+ CyNetworkNaming cyNetworkNamingServiceRef) {
super(net);
this.undoSupport = undoSupport;
this.cyNetworkManagerServiceRef = cyNetworkManagerServiceRef;
+ this.cyNetworkNamingServiceRef = cyNetworkNamingServiceRef;
title = network.getRow(network).get(CyTableEntry.NAME,
String.class);
}
@@ -68,24 +72,12 @@
// Check if the network tile already existed
boolean titleAlreayExisted = false;
- Iterator<CyNetwork> it =
this.cyNetworkManagerServiceRef.getNetworkSet().iterator();
-
- while (it.hasNext()){
- CyNetwork curNetwork = it.next();
-
- // Exclude current network (itself)
- if (curNetwork == network){
- continue;
- }
-
- String curTitle =
curNetwork.getRow(curNetwork).get(CyTableEntry.NAME, String.class);
-
- if (title.equalsIgnoreCase(curTitle)){
- titleAlreayExisted = true;
- break;
- }
- }
+ String newTitle =
this.cyNetworkNamingServiceRef.getSuggestedNetworkTitle(title);
+ if (!newTitle.equalsIgnoreCase(title)){
+ titleAlreayExisted= true;
+ }
+
if (titleAlreayExisted){
// Inform user duplicated network title!
try {
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactory.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactory.java
2012-03-03 00:13:28 UTC (rev 28423)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactory.java
2012-03-03 00:49:32 UTC (rev 28424)
@@ -31,6 +31,7 @@
import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.AbstractNetworkTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.undo.UndoSupport;
@@ -39,13 +40,16 @@
public class EditNetworkTitleTaskFactory extends AbstractNetworkTaskFactory {
private final UndoSupport undoSupport;
private final CyNetworkManager cyNetworkManagerServiceRef;
+ private final CyNetworkNaming cyNetworkNamingServiceRef;
- public EditNetworkTitleTaskFactory(final UndoSupport undoSupport,
CyNetworkManager cyNetworkManagerServiceRef) {
+ public EditNetworkTitleTaskFactory(final UndoSupport undoSupport,
CyNetworkManager cyNetworkManagerServiceRef,
+ CyNetworkNaming cyNetworkNamingServiceRef) {
this.undoSupport = undoSupport;
this.cyNetworkManagerServiceRef = cyNetworkManagerServiceRef;
+ this.cyNetworkNamingServiceRef = cyNetworkNamingServiceRef;
}
public TaskIterator createTaskIterator() {
- return new TaskIterator(new EditNetworkTitleTask(undoSupport,
network, this.cyNetworkManagerServiceRef));
+ return new TaskIterator(new EditNetworkTitleTask(undoSupport,
network, this.cyNetworkManagerServiceRef, this.cyNetworkNamingServiceRef));
}
}
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactoryTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactoryTest.java
2012-03-03 00:13:28 UTC (rev 28423)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskFactoryTest.java
2012-03-03 00:49:32 UTC (rev 28424)
@@ -5,7 +5,7 @@
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
+import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyRow;
@@ -20,6 +20,7 @@
public void testGetTaskIterator() {
CyNetwork net = mock(CyNetwork.class);
CyNetworkManager netMgr = mock(CyNetworkManager.class);
+ CyNetworkNaming cyNetworkNaming = mock(CyNetworkNaming.class);
CyRow r1 = mock(CyRow.class);
when(net.getRow(net)).thenReturn(r1);
@@ -27,7 +28,7 @@
UndoSupport undoSupport = mock(UndoSupport.class);
- EditNetworkTitleTaskFactory factory = new
EditNetworkTitleTaskFactory(undoSupport,netMgr);
+ EditNetworkTitleTaskFactory factory = new
EditNetworkTitleTaskFactory(undoSupport,netMgr,cyNetworkNaming);
factory.setNetwork(net);
TaskIterator ti = factory.createTaskIterator();
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskTest.java
2012-03-03 00:13:28 UTC (rev 28423)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/title/EditNetworkTitleTaskTest.java
2012-03-03 00:49:32 UTC (rev 28424)
@@ -10,6 +10,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyRow;
+import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.undo.UndoSupport;
import org.junit.Test;
@@ -21,7 +22,8 @@
CyNetwork net = mock(CyNetwork.class);
TaskMonitor tm = mock(TaskMonitor.class);
CyNetworkManager netMgr = mock(CyNetworkManager.class);
-
+ CyNetworkNaming cyNetworkNaming = mock(CyNetworkNaming.class);
+
CyRow r1 = mock(CyRow.class);
when(net.getRow(net)).thenReturn(r1);
@@ -29,7 +31,7 @@
UndoSupport undoSupport = mock(UndoSupport.class);
- EditNetworkTitleTask t = new EditNetworkTitleTask(undoSupport,
net, netMgr);
+ EditNetworkTitleTask t = new EditNetworkTitleTask(undoSupport,
net, netMgr,cyNetworkNaming);
t.run(tm);
--
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.
