Author: mes
Date: 2012-02-28 16:10:10 -0800 (Tue, 28 Feb 2012)
New Revision: 28393

Added:
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
Modified:
   
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
   
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyApplicationManagerImpl.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTaskFactory.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactory.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactory.java
Log:
Updated application manager to now set current network/view based on add 
network/view event. Also removed calls to setCurrentNetwork/View from the 
various creation tasks.  Also cleaned up a lot of creation code.

Modified: 
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
===================================================================
--- 
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
 2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
 2012-02-29 00:10:10 UTC (rev 28393)
@@ -15,7 +15,9 @@
 
 import org.cytoscape.application.CyApplicationManager;
 import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.model.events.NetworkAddedListener;
 import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener;
+import org.cytoscape.view.model.events.NetworkViewAddedListener;
 import org.cytoscape.property.CyProperty;
 
 
@@ -50,6 +52,8 @@
                
registerService(bc,cyApplicationManager,CyApplicationManager.class, new 
Properties());
                
registerService(bc,cyApplicationManager,NetworkAboutToBeDestroyedListener.class,
 new Properties());
                
registerService(bc,cyApplicationManager,NetworkViewAboutToBeDestroyedListener.class,
 new Properties());
+               
registerService(bc,cyApplicationManager,NetworkAddedListener.class, new 
Properties());
+               
registerService(bc,cyApplicationManager,NetworkViewAddedListener.class, new 
Properties());
                registerAllServices(bc,cytoscapeShutdown, new Properties());
                registerAllServices(bc,cytoscapeVersion, new Properties());
                registerAllServices(bc,cyApplicationConfiguration, new 
Properties());

Modified: 
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyApplicationManagerImpl.java
===================================================================
--- 
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyApplicationManagerImpl.java
    2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/application-impl/src/main/java/org/cytoscape/application/internal/CyApplicationManagerImpl.java
    2012-02-29 00:10:10 UTC (rev 28393)
@@ -43,11 +43,15 @@
 import org.cytoscape.model.CyTable;
 import org.cytoscape.model.events.NetworkAboutToBeDestroyedEvent;
 import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.model.events.NetworkAddedEvent;
+import org.cytoscape.model.events.NetworkAddedListener;
 
 import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.view.model.CyNetworkViewManager;
 import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedEvent;
 import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener;
+import org.cytoscape.view.model.events.NetworkViewAddedEvent;
+import org.cytoscape.view.model.events.NetworkViewAddedListener;
 import org.cytoscape.view.presentation.RenderingEngine;
 
 import org.slf4j.Logger;
@@ -64,7 +68,9 @@
  */
 public class CyApplicationManagerImpl implements CyApplicationManager,
                                                  
NetworkAboutToBeDestroyedListener,
-                                                 
NetworkViewAboutToBeDestroyedListener {
+                                                 
NetworkViewAboutToBeDestroyedListener,
+                                                                               
                 NetworkAddedListener,
+                                                                               
                 NetworkViewAddedListener {
        private static final Logger logger = 
LoggerFactory.getLogger(CyApplicationManagerImpl.class);
        private final CyEventHelper cyEventHelper;
        private final CyNetworkManager networkManager;
@@ -94,6 +100,18 @@
        }
 
        @Override
+       public void handleEvent(final NetworkViewAddedEvent event) {
+               if ( !event.getNetworkView().equals( currentNetworkView ) )
+                       setCurrentNetworkView( event.getNetworkView() );
+       }
+
+       @Override
+       public void handleEvent(final NetworkAddedEvent event) {
+               if ( !event.getNetwork().equals( currentNetwork ) )
+                       setCurrentNetwork( event.getNetwork() );
+       }
+
+       @Override
        public void handleEvent(final NetworkAboutToBeDestroyedEvent event) {
                final CyNetwork toBeDestroyed = event.getNetwork();
                boolean changed = false;

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
    2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
    2012-02-29 00:10:10 UTC (rev 28393)
@@ -124,69 +124,12 @@
                networkManager.addNetwork(newNet);
                tm.setProgress(0.6);
 
-               // Set the new network as current network
-               appManager.setCurrentNetwork(newNet);
-               
-               // No view is available for parent network.
-               if (sourceView == null) {
-                       // inserted first, happens second
-                       final Task setCurrentNetworkView = new 
SetCurrentNetworkViewTask(newNet); 
-                       insertTasksAfterCurrentTask(setCurrentNetworkView);
-                       
-                       // inserted second, happens first
-                       final Task createViewTask = new 
CreateNetworkViewTask(undoSupport, newNet, viewFactory,
-                                                                             
networkViewManager, null, eventHelper);
-                       insertTasksAfterCurrentTask(createViewTask);
-                       return;
-               }
-               tm.setProgress(0.7);
+               // create the view in a separate task
+               final Task createViewTask = new 
CreateNetworkViewTask(undoSupport, newNet, viewFactory,
+                                                                     
networkViewManager, null, eventHelper, 
+                                                                     vmm, 
sourceView);
+               insertTasksAfterCurrentTask(createViewTask);
 
-               // create new view
-               final CyNetworkView newView = 
viewFactory.createNetworkView(newNet);
-
-//             networkViewManager.addNetworkView(newView);
-               tm.setProgress(0.8);
-
-               // copy node location only.
-               for (View<CyNode> newNodeView : newView.getNodeViews()) {
-                       View<CyNode> origNodeView = 
sourceView.getNodeView(parentNetwork.getNode(newNodeView.getModel().getIndex()));
-                       
newNodeView.setVisualProperty(BasicVisualLexicon.NODE_X_LOCATION,
-                                       
origNodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION));
-                       
newNodeView.setVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION,
-                                       
origNodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION));
-
-                       // FIXME
-                       // // Set lock (if necessary)
-                       // for ( VisualProperty<?> vp : vpSet ) {
-                       // if (origNodeView.isValueLocked(vp) )
-                       // newNodeView.setLockedValue(vp,
-                       // origNodeView.getVisualProperty(vp));
-                       // }
-               }
-               tm.setProgress(0.9);
-
-               final VisualStyle style = vmm.getVisualStyle(sourceView);
-               vmm.setVisualStyle(style, newView);
-               style.apply(newView);
-               newView.fitContent();
-               
-               networkViewManager.addNetworkView(newView);
-               appManager.setCurrentNetworkView(newView);
                tm.setProgress(1.0);
        }
-
-       private class SetCurrentNetworkViewTask extends AbstractTask {
-               CyNetwork net;
-               SetCurrentNetworkViewTask(CyNetwork net) {
-                       this.net = net;
-               }
-               public void run(TaskMonitor tm) {
-                       tm.setProgress(0.0);
-                       final CyNetworkView view = 
networkViewManager.getNetworkView(net);                      
-                       tm.setProgress(0.5);
-                       if ( view != null )
-                               appManager.setCurrentNetworkView( view );
-                       tm.setProgress(1.0);
-               }
-       }
 }

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
    2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
    2012-02-29 00:10:10 UTC (rev 28393)
@@ -59,6 +59,7 @@
        private static final Logger logger = 
LoggerFactory.getLogger(CloneNetworkTask.class);
 
        private Map<CyNode, CyNode> orig2NewNodeMap;
+       private Map<CyNode, CyNode> new2OrigNodeMap;
 
        private final VisualMappingManager vmm;
        private final CyNetworkFactory netFactory;
@@ -91,22 +92,12 @@
                networkManager.addNetwork(newNet);
                tm.setProgress(0.6);
 
-               CyNetworkView newView = null;
-               
-               if (origView != null)
-                       newView = copyView(newNet, origView);
-               
-               tm.setProgress(0.9);
+               if (origView != null) {
+               final CyNetworkView newView = 
netViewFactory.createNetworkView(newNet);
+                       networkViewManager.addNetworkView(newView);
+                       insertTasksAfterCurrentTask(new 
CopyExistingViewTask(vmm, newView, origView, new2OrigNodeMap));
+               }
 
-               orig2NewNodeMap.clear();
-               orig2NewNodeMap = null;
-               
-               if (newView != null)
-                       appMgr.setCurrentNetworkView(newView);
-               else
-                       appMgr.setCurrentNetwork(newNet);
-               
-               logger.debug("Cloning finished in " + 
(System.currentTimeMillis() - start) + " msec.");
                tm.setProgress(1.0);
        }
 
@@ -131,9 +122,11 @@
 
        private void cloneNodes(CyNetwork origNet, CyNetwork newNet) {
                orig2NewNodeMap = new HashMap<CyNode, CyNode>();
+               new2OrigNodeMap = new HashMap<CyNode, CyNode>();
                for (final CyNode origNode : origNet.getNodeList()) {
                        final CyNode newNode = newNet.addNode();
                        orig2NewNodeMap.put(origNode, newNode);
+                       new2OrigNodeMap.put(newNode, origNode);
                        cloneRow(origNet.getRow(origNode), 
newNet.getRow(newNode));
                }
        }
@@ -172,31 +165,4 @@
                        to.set(column.getName(), from.getRaw(column.getName()));
        }
 
-       /**
-        * Copy Visual Properties to the new network view.
-        * 
-        */
-       private CyNetworkView copyView(final CyNetwork newNet, final 
CyNetworkView origView) {
-               final CyNetworkView newView = 
netViewFactory.createNetworkView(newNet);
-
-               // Copy node locations since this is controlled outside of 
visual style.
-               for (final View<CyNode> origNodeView : origView.getNodeViews()) 
{
-                       final CyNode node = origNodeView.getModel();
-                       final View<CyNode> newNodeView = 
newView.getNodeView(orig2NewNodeMap.get(node));
-
-                       
newNodeView.setVisualProperty(BasicVisualLexicon.NODE_X_LOCATION,
-                                       
origNodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION));
-                       
newNodeView.setVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION,
-                                       
origNodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION));
-                       
newNodeView.setVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION,
-                                       
origNodeView.getVisualProperty(BasicVisualLexicon.NODE_Z_LOCATION));
-               }
-
-               vmm.setVisualStyle(vmm.getVisualStyle(origView), newView);
-               vmm.getVisualStyle(origView).apply(newView);
-               networkViewManager.addNetworkView(newView);
-               newView.fitContent();
-               
-               return newView;
-       }
 }

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTaskFactory.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTaskFactory.java
     2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTaskFactory.java
     2012-02-29 00:10:10 UTC (rev 28393)
@@ -63,7 +63,7 @@
     }
 
     public TaskIterator createTaskIterator() {
-       return new TaskIterator(new CloneNetworkTask(network, networkMgr, 
networkViewMgr, vmm, netFactory, 
+       return new TaskIterator(2,new CloneNetworkTask(network, networkMgr, 
networkViewMgr, vmm, netFactory, 
                        netViewFactory, naming, appMgr));
     }
 }

Added: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
                                (rev 0)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
        2012-02-29 00:10:10 UTC (rev 28393)
@@ -0,0 +1,138 @@
+
+/*
+ File: CopyExistingViewTask.java
+
+ Copyright (c) 2006, 2010-2011, The Cytoscape Consortium (www.cytoscape.org)
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications.  In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage.  See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+*/
+package org.cytoscape.task.internal.creation;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyTableUtil;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
+import org.cytoscape.model.subnetwork.CySubNetwork;
+import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.undo.UndoSupport;
+
+import java.util.Map;
+
+/**
+ * A utility task that copies the node positions and visual style to a new
+ * network view from an existing network view.
+ */
+class CopyExistingViewTask extends AbstractTask {
+
+       private final CyNetworkView newView;
+       private final CyNetworkView sourceView;
+       private final VisualMappingManager vmm; 
+       private final Map<CyNode,CyNode> new2sourceMap; 
+
+       CopyExistingViewTask(final VisualMappingManager vmm, 
+                            final CyNetworkView newView, 
+                            final CyNetworkView sourceView, 
+                            final Map<CyNode,CyNode> new2sourceMap // may be 
null!
+                                                ) {
+               super();
+               this.newView = newView;
+               this.sourceView = sourceView;
+               this.vmm = vmm;
+               this.new2sourceMap = new2sourceMap;
+       }
+
+       @Override
+       public void run(TaskMonitor tm) {
+
+               if (sourceView == null)
+                       throw new NullPointerException("source network view is 
null.");
+               if (newView == null)
+                       throw new NullPointerException("new network view is 
null.");
+
+               tm.setProgress(0.0);
+
+               CyNetwork sourceNet = sourceView.getModel();
+
+               // copy node location only.
+               for (View<CyNode> newNodeView : newView.getNodeViews()) {
+                       
+                       View<CyNode> origNodeView = getOrigNodeView( 
newNodeView ); 
+                       if ( origNodeView == null )
+                               continue;
+
+                       
newNodeView.setVisualProperty(BasicVisualLexicon.NODE_X_LOCATION,
+                                       
origNodeView.getVisualProperty(BasicVisualLexicon.NODE_X_LOCATION));
+                       
newNodeView.setVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION,
+                                       
origNodeView.getVisualProperty(BasicVisualLexicon.NODE_Y_LOCATION));
+
+                       // FIXME
+                       // // Set lock (if necessary)
+                       // for ( VisualProperty<?> vp : vpSet ) {
+                       // if (origNodeView.isValueLocked(vp) )
+                       // newNodeView.setLockedValue(vp,
+                       // origNodeView.getVisualProperty(vp));
+                       // }
+               }
+               tm.setProgress(0.9);
+
+               final VisualStyle style = vmm.getVisualStyle(sourceView);
+               vmm.setVisualStyle(style, newView);
+               style.apply(newView);
+               newView.fitContent();
+               
+               tm.setProgress(1.0);
+       }
+
+       // may return null if nodes don't somehow line up!
+       private View<CyNode> getOrigNodeView(View<CyNode> newNodeView) {
+               if ( new2sourceMap != null ) {
+                       CyNode origNode = 
new2sourceMap.get(newNodeView.getModel());
+                       if (origNode == null) 
+                               return null;
+                       return sourceView.getNodeView(origNode);
+               } else {
+                       return sourceView.getNodeView(newNodeView.getModel());
+               }
+       }
+}

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
       2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
       2012-02-29 00:10:10 UTC (rev 28393)
@@ -39,6 +39,7 @@
 import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.view.model.CyNetworkViewFactory;
 import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.undo.UndoSupport;
 import org.slf4j.Logger;
@@ -54,6 +55,8 @@
        private final CyNetworkViewFactory viewFactory;
        private final CyLayoutAlgorithmManager layouts;
        private final CyEventHelper eventHelper;
+       private final VisualMappingManager vmm;
+       private final CyNetworkView sourceView;
 
        public CreateNetworkViewTask(final UndoSupport undoSupport, final 
CyNetwork networkModel,
                                     final CyNetworkViewFactory viewFactory,
@@ -61,6 +64,17 @@
                                     final CyLayoutAlgorithmManager layouts,
                                     final CyEventHelper eventHelper)
        {
+               
this(undoSupport,networkModel,viewFactory,networkViewManager,layouts,eventHelper,null,null);
+       }
+
+       public CreateNetworkViewTask(final UndoSupport undoSupport, final 
CyNetwork networkModel,
+                                    final CyNetworkViewFactory viewFactory,
+                                    final CyNetworkViewManager 
networkViewManager,
+                                    final CyLayoutAlgorithmManager layouts,
+                                    final CyEventHelper eventHelper,
+                                                                final 
VisualMappingManager vmm,
+                                                                final 
CyNetworkView sourceView)
+       {
                super(networkModel);
 
                this.undoSupport        = undoSupport;
@@ -68,6 +82,8 @@
                this.networkViewManager = networkViewManager;
                this.layouts            = layouts;
                this.eventHelper        = eventHelper;
+               this.vmm                = vmm;
+               this.sourceView         = sourceView;
        }
 
        public void run(TaskMonitor taskMonitor) throws Exception {
@@ -85,9 +101,14 @@
                        
                        networkViewManager.addNetworkView(view);
                        taskMonitor.setProgress(0.9d);
-                       
-                       // Apply layout only when it is necessary.
-                       if (layouts != null)
+               
+                       // If a source view has been provided, use that to set 
the X/Y positions of the 
+                       // nodes along with the visual style.
+                       if ( sourceView != null )       
+                               insertTasksAfterCurrentTask(new 
CopyExistingViewTask(vmm, view, sourceView, null));
+
+                       // Otherwise check if layouts have been provided.
+                       else if (layouts != null)
                                insertTasksAfterCurrentTask(new 
ApplyPreferredLayoutTask(view, layouts));
 
                } catch (Exception e) {

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
 2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
 2012-02-29 00:10:10 UTC (rev 28393)
@@ -81,8 +81,6 @@
                networkManager.addNetwork(newNet);
                tm.setProgress(0.8);
                networkViewManager.addNetworkView(view);
-               tm.setProgress(0.9);
-               appManager.setCurrentNetworkView(view);
                tm.setProgress(1.0);
        }
 

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactory.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactory.java
     2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskFactory.java
     2012-02-29 00:10:10 UTC (rev 28393)
@@ -76,7 +76,7 @@
        }
 
        public TaskIterator createTaskIterator() {
-               return new TaskIterator(2,
+               return new TaskIterator(3,
                        new NewNetworkSelectedNodesEdgesTask(undoSupport, 
network, crnf, cnvf,
                                                             netmgr, 
networkViewManager, naming, vmm,
                                                             appManager, 
eventHelper));

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactory.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactory.java
      2012-02-28 23:43:57 UTC (rev 28392)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskFactory.java
      2012-02-29 00:10:10 UTC (rev 28393)
@@ -76,7 +76,7 @@
        }
 
        public TaskIterator createTaskIterator() {
-               return new TaskIterator(2,
+               return new TaskIterator(3,
                        new NewNetworkSelectedNodesOnlyTask(undoSupport, 
network, crnf, cnvf, netmgr,
                                                            networkViewManager, 
naming, vmm,
                                                            appManager, 
eventHelper));

-- 
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.

Reply via email to