[graphl-cvs] graphl/src/org/mediavirus/graphl/selection DefaultSelectionModel.java SelectionModel.java

[Flo L. <fl...@us...>]

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15693/src/org/mediavirus/graphl/selection

Modified Files:
	DefaultSelectionModel.java SelectionModel.java 
Log Message:
implementing XPath-based filters

Index: DefaultSelectionModel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/DefaultSelectionModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultSelectionModel.java	8 Jun 2006 13:14:59 -0000	1.3
--- DefaultSelectionModel.java	3 Jul 2006 15:26:33 -0000	1.4
***************
*** 12,15 ****
--- 12,16 ----
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Graph;
+ import org.mediavirus.graphl.graph.GraphElement;
  import org.mediavirus.graphl.graph.GraphListener;
  import org.mediavirus.graphl.graph.Node;
***************
*** 148,151 ****
--- 149,159 ----
          return Collections.unmodifiableCollection(selectedEdges);
      }
+     
+     public Collection<GraphElement> getSelectedElements() {
+         // todo change code to store selectedElements only and remove getSelectedNodes/Edges above
+         Set<GraphElement> elements = new HashSet<GraphElement>(selectedNodes);
+         elements.addAll(selectedEdges);
+         return Collections.unmodifiableCollection(elements);
+     }
      /*
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#isEdgeSelected(org.mediavirus.graphl.graph.Edge)

Index: SelectionModel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/SelectionModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SelectionModel.java	18 Dec 2005 11:11:41 -0000	1.3
--- SelectionModel.java	3 Jul 2006 15:26:33 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  
  import org.mediavirus.graphl.graph.Edge;
+ import org.mediavirus.graphl.graph.GraphElement;
  import org.mediavirus.graphl.graph.Node;
  
***************
*** 76,79 ****
--- 77,82 ----
       */
      Collection<Edge> getSelectedEdges();
+     
+     Collection<GraphElement> getSelectedElements();
      /**
       * Checks whteher the node has been selected.