Author: kono
Date: 2011-05-31 15:36:05 -0700 (Tue, 31 May 2011)
New Revision: 25610
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/HideSelectedEdgesTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
Log:
Show/Hide edge problems had been fixed.
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
2011-05-31 22:34:57 UTC (rev 25609)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTask.java
2011-05-31 22:36:05 UTC (rev 25610)
@@ -37,17 +37,16 @@
package org.cytoscape.task.internal.hide;
-import org.cytoscape.task.AbstractNetworkViewTask;
+import java.util.List;
+
import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableUtil;
-import org.cytoscape.model.CyNetwork;
+import org.cytoscape.task.AbstractNetworkViewTask;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
-import java.util.List;
-
public class HideSelectedEdgesTask extends AbstractNetworkViewTask {
public HideSelectedEdgesTask(CyNetworkView v) {
@@ -55,11 +54,12 @@
}
public void run(TaskMonitor e) {
+
final CyNetwork curr = view.getModel();
- final List<CyEdge> selectedEdges =
CyTableUtil.getEdgesInState(curr,"selected",true);
+ final List<CyEdge> selectedEdges =
CyTableUtil.getEdgesInState(curr,CyNetwork.SELECTED, true);
HideUtils.setVisibleEdges( selectedEdges, false, view );
-
+
view.updateView();
}
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactory.java
2011-05-31 22:34:57 UTC (rev 25609)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactory.java
2011-05-31 22:36:05 UTC (rev 25610)
@@ -26,17 +26,15 @@
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.task.AbstractNetworkViewTaskFactory;
import org.cytoscape.work.TaskIterator;
-
public class HideSelectedEdgesTaskFactory extends
AbstractNetworkViewTaskFactory {
public TaskIterator getTaskIterator() {
return new TaskIterator(new HideSelectedEdgesTask(view));
- }
+ }
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
2011-05-31 22:34:57 UTC (rev 25609)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideUtils.java
2011-05-31 22:36:05 UTC (rev 25610)
@@ -54,21 +54,17 @@
static void setVisibleNodes(Collection<CyNode> nodes, boolean visible,
CyNetworkView view) {
final CyNetwork net = view.getModel();
- for ( CyNode n : nodes ) {
- if ( view != null ) {
-
view.getNodeView(n).setVisualProperty(NODE_VISIBLE,visible);
+ for (CyNode n : nodes) {
+ view.getNodeView(n).setVisualProperty(NODE_VISIBLE,
visible);
- 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))
+
view.getEdgeView(e).setVisualProperty(EDGE_VISIBLE, visible);
}
}
static void setVisibleEdges(Collection<CyEdge> edges, boolean visible,
CyNetworkView view) {
- for ( CyEdge e : edges ) {
- if ( view != null )
-
view.getEdgeView(e).setVisualProperty(EDGE_VISIBLE,visible);
- }
+ for (CyEdge e : edges)
+ view.getEdgeView(e).setVisualProperty(EDGE_VISIBLE,
visible);
}
}
--
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.
