Author: clopes
Date: 2012-05-07 15:10:30 -0700 (Mon, 07 May 2012)
New Revision: 29139

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/hide/HideSelectedEdgesTask.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryImpl.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryImpl.java
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
   
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
Log:
Fixes #950 : Hidden state of nodes/edges is not saved in the session file

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-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
  2012-05-07 22:10:30 UTC (rev 29139)
@@ -244,8 +244,8 @@
                SelectFirstNeighborsNodeViewTaskFactoryImpl 
selectFirstNeighborsNodeViewTaskFactory = new 
SelectFirstNeighborsNodeViewTaskFactoryImpl(CyEdge.Type.ANY);
                
                HideSelectedTaskFactoryImpl hideSelectedTaskFactory = new 
HideSelectedTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef);
-               HideSelectedNodesTaskFactoryImpl hideSelectedNodesTaskFactory = 
new HideSelectedNodesTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef);
-               HideSelectedEdgesTaskFactoryImpl hideSelectedEdgesTaskFactory = 
new HideSelectedEdgesTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef);
+               HideSelectedNodesTaskFactoryImpl hideSelectedNodesTaskFactory = 
new 
HideSelectedNodesTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef,visualMappingManagerServiceRef);
+               HideSelectedEdgesTaskFactoryImpl hideSelectedEdgesTaskFactory = 
new 
HideSelectedEdgesTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef,visualMappingManagerServiceRef);
                UnHideAllTaskFactoryImpl unHideAllTaskFactory = new 
UnHideAllTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef);
                UnHideAllNodesTaskFactoryImpl unHideAllNodesTaskFactory = new 
UnHideAllNodesTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef);
                UnHideAllEdgesTaskFactoryImpl unHideAllEdgesTaskFactory = new 
UnHideAllEdgesTaskFactoryImpl(undoSupportServiceRef,cyEventHelperRef);

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
   2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
   2012-05-07 22:10:30 UTC (rev 29139)
@@ -29,7 +29,6 @@
 */
 package org.cytoscape.task.internal.hide;
 
-
 import java.util.List;
 
 import org.cytoscape.event.CyEventHelper;
@@ -38,34 +37,37 @@
 import org.cytoscape.model.CyTableUtil;
 import org.cytoscape.task.AbstractNetworkViewTask;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.undo.UndoSupport;
 
-
 public class HideSelectedEdgesTask extends AbstractNetworkViewTask {
        private final UndoSupport undoSupport;
        private final CyEventHelper eventHelper;
+       private final VisualMappingManager vmMgr;
 
        public HideSelectedEdgesTask(final UndoSupport undoSupport,
-                                    final CyEventHelper eventHelper, final 
CyNetworkView v)
-       {
+                                    final CyEventHelper eventHelper,
+                                    final VisualMappingManager vmMgr,
+                                    final CyNetworkView v) {
                super(v);
                this.undoSupport = undoSupport;
                this.eventHelper = eventHelper;
+               this.vmMgr = vmMgr;
        }
 
        public void run(TaskMonitor e) {
                e.setProgress(0.0);
+               
                final CyNetwork network = view.getModel(); 
-               undoSupport.postEdit(
-                       new HideEdit(eventHelper, "Hide Selected Edges", 
network, view));
-
-               final List<CyEdge> selectedEdges =
-                       CyTableUtil.getEdgesInState(network, 
CyNetwork.SELECTED, true); 
-
+               undoSupport.postEdit(new HideEdit(eventHelper, "Hide Selected 
Edges", network, view));
                e.setProgress(0.3);
+               
+               final List<CyEdge> selectedEdges = 
CyTableUtil.getEdgesInState(network, CyNetwork.SELECTED, true); 
                HideUtils.setVisibleEdges(selectedEdges, false, view);
                e.setProgress(0.7);
+               
+               vmMgr.getVisualStyle(view).apply(view);
                view.updateView();
                e.setProgress(1.0);
        } 

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryImpl.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryImpl.java
        2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryImpl.java
        2012-05-07 22:10:30 UTC (rev 29139)
@@ -29,27 +29,30 @@
 */
 package org.cytoscape.task.internal.hide;
 
-
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.task.AbstractNetworkViewTaskFactory;
 import org.cytoscape.task.hide.HideSelectedEdgesTaskFactory;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.work.TaskIterator;
 import org.cytoscape.work.undo.UndoSupport;
 
-
-public class HideSelectedEdgesTaskFactoryImpl extends 
AbstractNetworkViewTaskFactory implements HideSelectedEdgesTaskFactory{
+public class HideSelectedEdgesTaskFactoryImpl extends 
AbstractNetworkViewTaskFactory implements
+               HideSelectedEdgesTaskFactory {
+       
        private final UndoSupport undoSupport;
        private final CyEventHelper eventHelper;
+       private final VisualMappingManager vmMgr;
 
        public HideSelectedEdgesTaskFactoryImpl(final UndoSupport undoSupport,
-                                           final CyEventHelper eventHelper)
-       {
+                                                                               
        final CyEventHelper eventHelper,
+                                                                               
        final VisualMappingManager vmMgr) {
                this.undoSupport = undoSupport;
                this.eventHelper = eventHelper;
+               this.vmMgr = vmMgr;
        }
 
        public TaskIterator createTaskIterator(CyNetworkView view) {
-               return new TaskIterator(new HideSelectedEdgesTask(undoSupport, 
eventHelper, view));
+               return new TaskIterator(new HideSelectedEdgesTask(undoSupport, 
eventHelper, vmMgr, view));
        }
 }

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
   2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
   2012-05-07 22:10:30 UTC (rev 29139)
@@ -29,15 +29,15 @@
 */
 package org.cytoscape.task.internal.hide;
 
-
 import java.util.List;
 
 import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.model.CyTableUtil;
 import org.cytoscape.model.CyNetwork;
 import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTableUtil;
 import org.cytoscape.task.AbstractNetworkViewTask;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.undo.UndoSupport;
 
@@ -45,26 +45,30 @@
 public class HideSelectedNodesTask extends AbstractNetworkViewTask {
        private final UndoSupport undoSupport;
        private final CyEventHelper eventHelper;
+       private final VisualMappingManager vmMgr;
 
        public HideSelectedNodesTask(final UndoSupport undoSupport,
-                                    final CyEventHelper eventHelper, final 
CyNetworkView v)
-       {
+                                    final CyEventHelper eventHelper,
+                                    final VisualMappingManager vmMgr,
+                                    final CyNetworkView v) {
                super(v);
                this.undoSupport = undoSupport;
                this.eventHelper = eventHelper;
+               this.vmMgr = vmMgr;
        }
 
        public void run(TaskMonitor e) {
                e.setProgress(0.0);
+               
                final CyNetwork network = view.getModel();
-               undoSupport.postEdit(
-                       new HideEdit(eventHelper, "Hide Selected Nodes", 
network, view));
-
-               final List<CyNode> selectedNodes =
-                       CyTableUtil.getNodesInState(network, CyNetwork.SELECTED 
,true);
+               undoSupport.postEdit(new HideEdit(eventHelper, "Hide Selected 
Nodes", network, view));
                e.setProgress(0.3);
+               
+               final List<CyNode> selectedNodes = 
CyTableUtil.getNodesInState(network, CyNetwork.SELECTED ,true);
                HideUtils.setVisibleNodes(selectedNodes, false, view);
                e.setProgress(0.7);
+               
+               vmMgr.getVisualStyle(view).apply(view);
                view.updateView();
                e.setProgress(1.0);
        } 

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryImpl.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryImpl.java
        2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryImpl.java
        2012-05-07 22:10:30 UTC (rev 29139)
@@ -26,30 +26,33 @@
   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.hide;
 
-
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.task.AbstractNetworkViewTaskFactory;
 import org.cytoscape.task.hide.HideSelectedNodesTaskFactory;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.work.TaskIterator;
 import org.cytoscape.work.undo.UndoSupport;
 
-
-public class HideSelectedNodesTaskFactoryImpl extends 
AbstractNetworkViewTaskFactory implements HideSelectedNodesTaskFactory{
+public class HideSelectedNodesTaskFactoryImpl extends 
AbstractNetworkViewTaskFactory implements
+               HideSelectedNodesTaskFactory {
+       
        private final UndoSupport undoSupport;
        private final CyEventHelper eventHelper;
+       private final VisualMappingManager vmMgr;
 
        public HideSelectedNodesTaskFactoryImpl(final UndoSupport undoSupport,
-                                           final CyEventHelper eventHelper)
-       {
+                                                                               
        final CyEventHelper eventHelper,
+                                                                               
        final VisualMappingManager vmMgr) {
                this.undoSupport = undoSupport;
                this.eventHelper = eventHelper;
+               this.vmMgr = vmMgr;
        }
 
        public TaskIterator createTaskIterator(CyNetworkView view) {
-               return new TaskIterator(new HideSelectedNodesTask(undoSupport, 
eventHelper, view));
-       } 
+               return new TaskIterator(new HideSelectedNodesTask(undoSupport, 
eventHelper, vmMgr, view));
+       }
 }

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
       2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
       2012-05-07 22:10:30 UTC (rev 29139)
@@ -48,23 +48,41 @@
 import org.cytoscape.model.CyNode;
 import org.cytoscape.model.CyNetwork;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
 
 
 abstract class HideUtils {
 
        static void setVisibleNodes(Collection<CyNode> nodes, boolean visible, 
CyNetworkView view) {
                final CyNetwork net = view.getModel();
+               
                for (CyNode n : nodes) {
-                       view.getNodeView(n).setVisualProperty(NODE_VISIBLE, 
visible);
+                       if (visible)
+                               
view.getNodeView(n).clearValueLock(NODE_VISIBLE);
+                       else
+                               
view.getNodeView(n).setLockedValue(NODE_VISIBLE, false);
 
-                       for (CyNode n2 : net.getNeighborList(n, 
CyEdge.Type.ANY))
-                               for (CyEdge e : net.getConnectingEdgeList(n, 
n2, CyEdge.Type.ANY))
-                                       
view.getEdgeView(e).setVisualProperty(EDGE_VISIBLE, visible);
+                       for (CyNode n2 : net.getNeighborList(n, 
CyEdge.Type.ANY)) {
+                               for (CyEdge e : net.getConnectingEdgeList(n, 
n2, CyEdge.Type.ANY)) {
+                                       final View<CyEdge> ev = 
view.getEdgeView(e);
+                                       
+                                       if (visible)
+                                               ev.clearValueLock(EDGE_VISIBLE);
+                                       else
+                                               ev.setLockedValue(EDGE_VISIBLE, 
false);
+                               }
+                       }
                }
        }
 
        static void setVisibleEdges(Collection<CyEdge> edges, boolean visible, 
CyNetworkView view) {
-               for (CyEdge e : edges)
-                       view.getEdgeView(e).setVisualProperty(EDGE_VISIBLE, 
visible);
+               for (CyEdge e : edges) {
+                       final View<CyEdge> ev = view.getEdgeView(e);
+                                       
+                       if (visible)
+                               ev.clearValueLock(EDGE_VISIBLE);
+                       else
+                               ev.setLockedValue(EDGE_VISIBLE, false);
+               }
        }
 }

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryTest.java
        2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryTest.java
        2012-05-07 22:10:30 UTC (rev 29139)
@@ -7,6 +7,7 @@
 
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.work.Task;
 import org.cytoscape.work.TaskIterator;
 import org.cytoscape.work.undo.UndoSupport;
@@ -18,8 +19,9 @@
        public void testRun() throws Exception {
                UndoSupport undoSupport = mock(UndoSupport.class);
                CyEventHelper eventHelper = mock(CyEventHelper.class);
-               HideSelectedEdgesTaskFactoryImpl factory =
-                       new HideSelectedEdgesTaskFactoryImpl(undoSupport, 
eventHelper);
+               VisualMappingManager vmMgr = mock(VisualMappingManager.class);
+               
+               HideSelectedEdgesTaskFactoryImpl factory = new 
HideSelectedEdgesTaskFactoryImpl(undoSupport, eventHelper, vmMgr);
 
                CyNetworkView view = mock(CyNetworkView.class);
                

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
       2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
       2012-05-07 22:10:30 UTC (rev 29139)
@@ -1,6 +1,10 @@
 package org.cytoscape.task.internal.hide;
 
 
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+
 import org.cytoscape.ding.NetworkViewTestSupport;
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.model.CyEdge;
@@ -8,6 +12,8 @@
 import org.cytoscape.model.CyNode;
 import org.cytoscape.task.AbstractNetworkViewTaskTest;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
 import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.undo.UndoSupport;
 import org.junit.Before;
@@ -22,6 +28,7 @@
        @Mock TaskMonitor tm;
        @Mock CyEventHelper eventHelper;
        @Mock UndoSupport undoSupport;
+       @Mock VisualMappingManager vmMgr;
        
        CyEdge edge1;
        CyEdge edge2;
@@ -30,6 +37,8 @@
        @Before
        public void initMocks() {
                MockitoAnnotations.initMocks(this);
+               final VisualStyle vs = mock(VisualStyle.class);
+               
when(vmMgr.getVisualStyle(any(CyNetworkView.class))).thenReturn(vs);
                
                final CyNetwork network = view.getModel();
                final CyNode n1 = network.addNode();
@@ -46,10 +55,7 @@
        
        @Test(expected=NullPointerException.class)
        public void testHideSelectedEdgesTask() throws Exception {
-               final HideSelectedEdgesTask task =
-                       new HideSelectedEdgesTask(undoSupport, eventHelper, 
view);
-               
+               final HideSelectedEdgesTask task = new 
HideSelectedEdgesTask(undoSupport, eventHelper, vmMgr, view);
                task.run(tm);
        }
-
 }

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryTest.java
        2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryTest.java
        2012-05-07 22:10:30 UTC (rev 29139)
@@ -7,6 +7,7 @@
 
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.work.Task;
 import org.cytoscape.work.TaskIterator;
 import org.cytoscape.work.undo.UndoSupport;
@@ -18,8 +19,9 @@
        public void testRun() throws Exception {
                UndoSupport undoSupport = mock(UndoSupport.class);
                CyEventHelper eventHelper = mock(CyEventHelper.class);
-               HideSelectedNodesTaskFactoryImpl factory =
-                       new HideSelectedNodesTaskFactoryImpl(undoSupport, 
eventHelper);
+               VisualMappingManager vmMgr = mock(VisualMappingManager.class);
+               
+               HideSelectedNodesTaskFactoryImpl factory = new 
HideSelectedNodesTaskFactoryImpl(undoSupport, eventHelper, vmMgr);
 
                CyNetworkView view = mock(CyNetworkView.class);
                

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
       2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
       2012-05-07 22:10:30 UTC (rev 29139)
@@ -1,13 +1,14 @@
 package org.cytoscape.task.internal.hide;
 
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import org.cytoscape.ding.NetworkViewTestSupport;
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.task.AbstractNetworkViewTaskTest;
 import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
 import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.undo.UndoSupport;
 import org.junit.Before;
@@ -22,17 +23,18 @@
        @Mock TaskMonitor tm;
        @Mock CyEventHelper eventHelper;
        @Mock UndoSupport undoSupport;
+       @Mock VisualMappingManager vmMgr;
        
        @Before
        public void initMocks() {
                MockitoAnnotations.initMocks(this);
+               final VisualStyle vs = mock(VisualStyle.class);
+               
when(vmMgr.getVisualStyle(any(CyNetworkView.class))).thenReturn(vs);
        }
        
        @Test
        public void testHideSelectedEdgesTask() throws Exception {
-               
-               final HideSelectedNodesTask task =
-                       new HideSelectedNodesTask(undoSupport, eventHelper, 
view);
+               final HideSelectedNodesTask task = new 
HideSelectedNodesTask(undoSupport, eventHelper, vmMgr, view);
                task.run(tm);
        }
 

Modified: 
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
===================================================================
--- 
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
        2012-05-07 22:06:44 UTC (rev 29138)
+++ 
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
        2012-05-07 22:10:30 UTC (rev 29139)
@@ -539,7 +539,7 @@
                                                                final 
View<CyEdge> ev = view.getEdgeView(e);
                                                                
                                                                if (ev != null)
-                                                                       
ev.setVisualProperty(BasicVisualLexicon.EDGE_VISIBLE, false);
+                                                                       
ev.setLockedValue(BasicVisualLexicon.EDGE_VISIBLE, false);
                                                                else
                                                                        
logger.error("Cannot restore hidden state of edge \"" + name
                                                                                
        + "\": Edge view not found.");
@@ -558,7 +558,7 @@
                                                                final 
View<CyNode> nv = view.getNodeView(n);
 
                                                                if (nv != null)
-                                                                       
nv.setVisualProperty(BasicVisualLexicon.NODE_VISIBLE, false);
+                                                                       
nv.setLockedValue(BasicVisualLexicon.NODE_VISIBLE, false);
                                                                else
                                                                        
logger.error("Cannot restore hidden state of node \"" + name
                                                                                
        + "\": Node view not found.");

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