Author: mes
Date: 2010-10-14 13:55:25 -0700 (Thu, 14 Oct 2010)
New Revision: 22238
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/setcurrent/SetCurrentNetworkTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask2.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitContentTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitSelectedTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomInTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomOutTask.java
Log:
removed unnecessary cancel implementations
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -58,8 +58,4 @@
for ( CyNetwork n : networks )
netmgr.destroyNetwork(n);
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -58,8 +58,4 @@
for ( CyNetworkView n : networkViews )
netmgr.destroyNetworkView(n);
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -62,8 +62,4 @@
view.updateView();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -61,8 +61,4 @@
view.updateView();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -64,8 +64,4 @@
view.updateView();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -57,8 +57,4 @@
view.updateView();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -57,8 +57,4 @@
view.updateView();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -56,8 +56,4 @@
view.updateView();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadDataTableTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -57,8 +57,4 @@
taskMonitor.setProgress(1.0);
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -59,7 +59,6 @@
protected CyNetworkManager netMgr;
protected Properties props;
protected CyNetworkNaming namingUtil;
- protected boolean cancelled = false;
public AbstractLoadNetworkTask(final CyNetworkViewReaderManager mgr,
final CyNetworkManager netMgr,
final Properties props, final
CyNetworkNaming namingUtil)
@@ -85,11 +84,6 @@
@Override
abstract public void run(TaskMonitor taskMonitor) throws Exception;
-
- @Override
- public final void cancel() {
- cancelled = true;
- }
}
@@ -99,7 +93,6 @@
private final CyNetworkManager netMgr;
private final CyNetworkNaming namingUtil;
private final Properties props;
- private boolean cancelled = false;
GenerateNetworkViewsTask(final String name, final CyNetworkViewReader
viewReader, final CyNetworkManager netMgr,
final CyNetworkNaming namingUtil, final
Properties props)
@@ -136,11 +129,6 @@
taskMonitor.setProgress(1.0);
}
- @Override
- public void cancel() {
- cancelled = true;
- }
-
/**
* Inform User of Network Stats.
*/
@@ -170,4 +158,4 @@
taskMonitor.setStatusMessage(sb.toString());
}
-}
\ No newline at end of file
+}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/proxysettings/ProxySettingsTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -86,10 +86,6 @@
oldSettings.clear();
}
- @Override
- public void cancel() {
- }
-
void storeProxySettings() {
oldSettings.clear();
for (String key : KEYS) {
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -46,8 +46,4 @@
public void run(TaskMonitor taskMonitor) {
mgr.setCurrentSession(null,null);
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/setcurrent/SetCurrentNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/setcurrent/SetCurrentNetworkTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/setcurrent/SetCurrentNetworkTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -28,7 +28,4 @@
Object[] setNetworks = netmgr.getNetworkSet().toArray();
netmgr.setCurrentNetwork(((CyNetwork)
setNetworks[setNetworks.length-1]).getSUID());
}
-
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -125,10 +125,6 @@
System.err.println("Validated tunable="+vt);
}
- @Override
- public void cancel() {
- }
-
@Tunable(description="Getter/setter int")
public Integer getInt() { return new Integer(getterSetterInt); }
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask2.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask2.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/tests/tunables/TunablesTestTask2.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -49,8 +49,4 @@
System.err.println("loopCount="+loopCount);
System.err.println("inputFile="+inputFile);
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -56,8 +56,4 @@
public void run(TaskMonitor e) {
net.attrs().set("name",title);
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitContentTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitContentTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitContentTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -54,7 +54,4 @@
view.fitContent();
}
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitSelectedTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitSelectedTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/FitSelectedTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -50,8 +50,4 @@
public void run(TaskMonitor tm) {
view.fitSelected();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomInTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomInTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomInTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -47,9 +47,5 @@
public ZoomInTask(CyNetworkView v) {
super(v,1.1);
}
-
- @Override
- public void cancel() {
- }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomOutTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomOutTask.java
2010-10-14 20:22:32 UTC (rev 22237)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/ZoomOutTask.java
2010-10-14 20:55:25 UTC (rev 22238)
@@ -46,8 +46,4 @@
public ZoomOutTask(CyNetworkView v) {
super(v,0.9);
}
-
- @Override
- public void cancel() {
- }
}
--
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.
