Author: kono
Date: 2011-06-30 16:06:50 -0700 (Thu, 30 Jun 2011)
New Revision: 25997
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
Log:
Fixed broken source code format. NO FUNCTIONAL CHANGES.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
2011-06-30 23:06:10 UTC (rev 25996)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
2011-06-30 23:06:50 UTC (rev 25997)
@@ -53,90 +53,92 @@
abstract class AbstractNetworkFromSelectionTask extends AbstractCreationTask {
- protected final CyRootNetworkFactory rootNetworkFactory;
- protected final CyNetworkViewFactory viewFactory;
- protected final VisualMappingManager vmm;
- protected final CyNetworkNaming cyNetworkNaming;
- protected final CyApplicationManager appManager;
+ protected final CyRootNetworkFactory rootNetworkFactory;
+ protected final CyNetworkViewFactory viewFactory;
+ protected final VisualMappingManager vmm;
+ protected final CyNetworkNaming cyNetworkNaming;
+ protected final CyApplicationManager appManager;
- public AbstractNetworkFromSelectionTask(final CyNetwork parentNetwork,
- final CyRootNetworkFactory rootNetworkFactory, final
CyNetworkViewFactory viewFactory,
- final CyNetworkManager netmgr, final CyNetworkViewManager
networkViewManager,
- final CyNetworkNaming cyNetworkNaming, final VisualMappingManager
vmm, final CyApplicationManager appManager) {
- super(parentNetwork, netmgr, networkViewManager);
- this.rootNetworkFactory = rootNetworkFactory;
- this.viewFactory = viewFactory;
- this.cyNetworkNaming = cyNetworkNaming;
- this.vmm = vmm;
- this.appManager = appManager;
- }
+ public AbstractNetworkFromSelectionTask(final CyNetwork parentNetwork,
+ final CyRootNetworkFactory rootNetworkFactory, final
CyNetworkViewFactory viewFactory,
+ final CyNetworkManager netmgr, final
CyNetworkViewManager networkViewManager,
+ final CyNetworkNaming cyNetworkNaming, final
VisualMappingManager vmm, final CyApplicationManager appManager) {
+ super(parentNetwork, netmgr, networkViewManager);
+ this.rootNetworkFactory = rootNetworkFactory;
+ this.viewFactory = viewFactory;
+ this.cyNetworkNaming = cyNetworkNaming;
+ this.vmm = vmm;
+ this.appManager = appManager;
+ }
- abstract Collection<CyEdge> getEdges(CyNetwork netx, List<CyNode> nodes);
+ abstract Collection<CyEdge> getEdges(CyNetwork netx, List<CyNode>
nodes);
- @Override
- public void run(TaskMonitor tm) {
- if (parentNetwork == null)
- throw new NullPointerException("Source network is null.");
+ @Override
+ public void run(TaskMonitor tm) {
+ if (parentNetwork == null)
+ throw new NullPointerException("Source network is
null.");
- final CyNetworkView curView =
networkViewManager.getNetworkView(parentNetwork.getSUID());
+ final CyNetworkView curView =
networkViewManager.getNetworkView(parentNetwork.getSUID());
- // Get the selected nodes, but only create network if nodes are
actually selected.
- final List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(parentNetwork, CyNetwork.SELECTED, true);
+ // Get the selected nodes, but only create network if nodes are
actually
+ // selected.
+ final List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(parentNetwork, CyNetwork.SELECTED, true);
- if (selectedNodes.size() <= 0)
- throw new IllegalArgumentException("No nodes are selected!");
+ if (selectedNodes.size() <= 0)
+ throw new IllegalArgumentException("No nodes are
selected!");
- // create subnetwork and add selected nodes and appropriate edges
- final CySubNetwork newNet =
rootNetworkFactory.convert(parentNetwork).addSubNetwork();
+ // create subnetwork and add selected nodes and appropriate
edges
+ final CySubNetwork newNet =
rootNetworkFactory.convert(parentNetwork).addSubNetwork();
- for (final CyNode node : selectedNodes)
- newNet.addNode(node);
+ for (final CyNode node : selectedNodes)
+ newNet.addNode(node);
- for (final CyEdge edge : getEdges(parentNetwork, selectedNodes))
- newNet.addEdge(edge);
+ for (final CyEdge edge : getEdges(parentNetwork, selectedNodes))
+ newNet.addEdge(edge);
- newNet.getCyRow().set(CyTableEntry.NAME,
cyNetworkNaming.getSuggestedSubnetworkTitle(parentNetwork));
+ newNet.getCyRow().set(CyTableEntry.NAME,
cyNetworkNaming.getSuggestedSubnetworkTitle(parentNetwork));
- networkManager.addNetwork(newNet);
-
- appManager.setCurrentNetwork(newNet.getSUID());
-
- if (curView == null) {
- // Create view for the new network.
- final CreateNetworkViewTask createViewTask = new
CreateNetworkViewTask(newNet, viewFactory, networkViewManager);
- insertTasksAfterCurrentTask(createViewTask);
-
- appManager.setCurrentNetworkView(newNet.getSUID());
- return;
- }
+ networkManager.addNetwork(newNet);
- // create new view
- final CyNetworkView newView = viewFactory.getNetworkView(newNet);
+ appManager.setCurrentNetwork(newNet.getSUID());
- networkViewManager.addNetworkView(newView);
+ if (curView == null) {
+ // Create view for the new network.
+ final CreateNetworkViewTask createViewTask = new
CreateNetworkViewTask(newNet, viewFactory,
+ networkViewManager);
+ insertTasksAfterCurrentTask(createViewTask);
- // copy node location only.
- for (View<CyNode> newNodeView : newView.getNodeViews()) {
- View<CyNode> origNodeView =
curView.getNodeView(newNodeView.getModel());
- newNodeView.setVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION,
-
origNodeView.getVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION));
- newNodeView.setVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION,
-
origNodeView.getVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION));
+ appManager.setCurrentNetworkView(newNet.getSUID());
+ return;
+ }
- // FIXME
- // // Set lock (if necessary)
- // for ( VisualProperty<?> vp : vpSet ) {
- // if (origNodeView.isValueLocked(vp) )
- // newNodeView.setLockedValue(vp,
- // origNodeView.getVisualProperty(vp));
- // }
+ // create new view
+ final CyNetworkView newView =
viewFactory.getNetworkView(newNet);
+
+ networkViewManager.addNetworkView(newView);
+
+ // copy node location only.
+ for (View<CyNode> newNodeView : newView.getNodeViews()) {
+ View<CyNode> origNodeView =
curView.getNodeView(newNodeView.getModel());
+
newNodeView.setVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION,
+
origNodeView.getVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION));
+
newNodeView.setVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION,
+
origNodeView.getVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION));
+
+ // FIXME
+ // // Set lock (if necessary)
+ // for ( VisualProperty<?> vp : vpSet ) {
+ // if (origNodeView.isValueLocked(vp) )
+ // newNodeView.setLockedValue(vp,
+ // origNodeView.getVisualProperty(vp));
+ // }
+ }
+
+ final VisualStyle style = vmm.getVisualStyle(curView);
+ vmm.setVisualStyle(vmm.getVisualStyle(curView), newView);
+ style.apply(newView);
+ newView.fitContent();
+
+ appManager.setCurrentNetworkView(newView.getModel().getSUID());
}
-
- final VisualStyle style = vmm.getVisualStyle(curView);
- vmm.setVisualStyle(vmm.getVisualStyle(curView), newView);
- style.apply(newView);
- newView.fitContent();
-
- appManager.setCurrentNetworkView(newView.getModel().getSUID());
- }
}
--
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.
