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

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

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

Modified Files:
	DefaultSelectionModel.java SelectionListener.java 
	SelectionModel.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: SelectionListener.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/SelectionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectionListener.java	23 Jun 2004 09:18:57 -0000	1.1
--- SelectionListener.java	18 Dec 2005 11:11:41 -0000	1.2
***************
*** 5,8 ****
--- 5,11 ----
  import java.util.EventListener;
  
+ import org.mediavirus.graphl.graph.Edge;
+ import org.mediavirus.graphl.graph.Node;
+ 
  /**
   * A listener for node selection.
***************
*** 15,19 ****
       * @param nodes                                 the nodes added to the selection
       */
!     void nodesAddedToSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when nodes are removed to the selection.
--- 18,22 ----
       * @param nodes                                 the nodes added to the selection
       */
!     void nodesAddedToSelection(SelectionModel nodeSelectionModel,Collection<Node> nodes);
      /**
       * Called when nodes are removed to the selection.
***************
*** 22,26 ****
       * @param nodes                                 the nodes removed to the selection
       */
!     void nodesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when nodes are added to the selection.
--- 25,29 ----
       * @param nodes                                 the nodes removed to the selection
       */
!     void nodesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection<Node> nodes);
      /**
       * Called when nodes are added to the selection.
***************
*** 29,33 ****
       * @param nodes                                 the nodes added to the selection
       */
!     void edgesAddedToSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when nodes are removed to the selection.
--- 32,36 ----
       * @param nodes                                 the nodes added to the selection
       */
!     void edgesAddedToSelection(SelectionModel nodeSelectionModel,Collection<Edge> edges);
      /**
       * Called when nodes are removed to the selection.
***************
*** 36,40 ****
       * @param nodes                                 the nodes removed to the selection
       */
!     void edgesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when the selection is cleared.
--- 39,43 ----
       * @param nodes                                 the nodes removed to the selection
       */
!     void edgesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection<Edge> edges);
      /**
       * Called when the selection is cleared.

Index: DefaultSelectionModel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/DefaultSelectionModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DefaultSelectionModel.java	23 Jun 2004 09:18:57 -0000	1.1
--- DefaultSelectionModel.java	18 Dec 2005 11:11:41 -0000	1.2
***************
*** 21,27 ****
      protected EventListenerList eventListenerList;
      /** The set of selected nodes. */
!     protected Set selectedNodes;
      /** The set of selected nodes. */
!     protected Set selectedEdges;
      /** The graph being managed by this model. */
      protected Graph graph;
--- 21,27 ----
      protected EventListenerList eventListenerList;
      /** The set of selected nodes. */
!     protected Set<Node> selectedNodes;
      /** The set of selected nodes. */
!     protected Set<Edge> selectedEdges;
      /** The graph being managed by this model. */
      protected Graph graph;
***************
*** 35,40 ****
          this.graph = graph;
          eventListenerList = new EventListenerList();
!         selectedNodes = new HashSet();
!         selectedEdges = new HashSet();
          graph.addGraphListener(new GraphHandler());
      }
--- 35,40 ----
          this.graph = graph;
          eventListenerList = new EventListenerList();
!         selectedNodes = new HashSet<Node>();
!         selectedEdges = new HashSet<Edge>();
          graph.addGraphListener(new GraphHandler());
      }
***************
*** 45,49 ****
       */
      public void addNode(Node node) {
!         Set addedNode=new HashSet();
          addedNode.add(node);
          addNodes(addedNode);
--- 45,49 ----
       */
      public void addNode(Node node) {
!         Set<Node> addedNode=new HashSet<Node>();
          addedNode.add(node);
          addNodes(addedNode);
***************
*** 54,58 ****
       * @param nodes                         the collection of nodes to add to the selection
       */
!     public void addNodes(Collection nodes) {
          if (selectedNodes.addAll(nodes))
              fireNodesAddedToSelection(nodes);
--- 54,58 ----
       * @param nodes                         the collection of nodes to add to the selection
       */
!     public void addNodes(Collection<Node> nodes) {
          if (selectedNodes.addAll(nodes))
              fireNodesAddedToSelection(nodes);
***************
*** 64,71 ****
       */
      public void removeNode(Node node) {
!         Set removedNode=new HashSet();
          removedNode.add(node);
          removeNodes(removedNode);
!         System.out.println("removing node");
      }
      /**
--- 64,71 ----
       */
      public void removeNode(Node node) {
!         Set<Node> removedNode=new HashSet<Node>();
          removedNode.add(node);
          removeNodes(removedNode);
!         //System.out.println("removing node");
      }
      /**
***************
*** 74,78 ****
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     public void removeNodes(Collection nodes) {
          if (selectedNodes.removeAll(nodes))
              fireNodesRemovedFromSelection(nodes);
--- 74,78 ----
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     public void removeNodes(Collection<Node> nodes) {
          if (selectedNodes.removeAll(nodes))
              fireNodesRemovedFromSelection(nodes);
***************
*** 98,102 ****
       */
      public void addEdge(Edge edge) {
!         Set addedEdge=new HashSet();
          addedEdge.add(edge);
          addEdges(addedEdge);
--- 98,102 ----
       */
      public void addEdge(Edge edge) {
!         Set<Edge> addedEdge=new HashSet<Edge>();
          addedEdge.add(edge);
          addEdges(addedEdge);
***************
*** 105,109 ****
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#addEdges(java.util.Collection)
       */
!     public void addEdges(Collection edges) {
          if (selectedEdges.addAll(edges))
              fireEdgesAddedToSelection(edges);
--- 105,109 ----
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#addEdges(java.util.Collection)
       */
!     public void addEdges(Collection<Edge> edges) {
          if (selectedEdges.addAll(edges))
              fireEdgesAddedToSelection(edges);
***************
*** 113,117 ****
       */
      public void removeEdge(Edge edge) {
!         Set removedEdge=new HashSet();
          removedEdge.add(edge);
          removeEdges(removedEdge);
--- 113,117 ----
       */
      public void removeEdge(Edge edge) {
!         Set<Edge> removedEdge=new HashSet<Edge>();
          removedEdge.add(edge);
          removeEdges(removedEdge);
***************
*** 120,124 ****
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#removeEdges(java.util.Collection)
       */
!     public void removeEdges(Collection edges) {
          if (selectedEdges.removeAll(edges))
              fireEdgesRemovedFromSelection(edges);
--- 120,124 ----
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#removeEdges(java.util.Collection)
       */
!     public void removeEdges(Collection<Edge> edges) {
          if (selectedEdges.removeAll(edges))
              fireEdgesRemovedFromSelection(edges);
***************
*** 129,133 ****
       * @return                              the selection
       */
!     public Collection getSelectedNodes() {
          return Collections.unmodifiableCollection(selectedNodes);
      }
--- 129,133 ----
       * @return                              the selection
       */
!     public Collection<Node> getSelectedNodes() {
          return Collections.unmodifiableCollection(selectedNodes);
      }
***************
*** 144,148 ****
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#getSelectedEdges()
       */
!     public Collection getSelectedEdges() {
          return Collections.unmodifiableCollection(selectedEdges);
      }
--- 144,148 ----
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#getSelectedEdges()
       */
!     public Collection<Edge> getSelectedEdges() {
          return Collections.unmodifiableCollection(selectedEdges);
      }
***************
*** 174,178 ****
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireNodesAddedToSelection(Collection nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 174,178 ----
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireNodesAddedToSelection(Collection<Node> nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 184,188 ****
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireNodesRemovedFromSelection(Collection nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 184,188 ----
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireNodesRemovedFromSelection(Collection<Node> nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 194,198 ****
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireEdgesAddedToSelection(Collection edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 194,198 ----
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireEdgesAddedToSelection(Collection<Edge> edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 204,208 ****
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireEdgesRemovedFromSelection(Collection edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 204,208 ----
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireEdgesRemovedFromSelection(Collection<Edge> edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 233,237 ****
          public void elementsRemoved(Graph graph,Collection nodes,Collection edges) {
              if (nodes!=null) {
!                 Set toRemove=null;
                  Iterator iterator=nodes.iterator();
                  while (iterator.hasNext()) {
--- 233,237 ----
          public void elementsRemoved(Graph graph,Collection nodes,Collection edges) {
              if (nodes!=null) {
!                 Set<Node> toRemove=null;
                  Iterator iterator=nodes.iterator();
                  while (iterator.hasNext()) {
***************
*** 239,243 ****
                      if (selectedNodes.contains(node)) {
                          if (toRemove==null)
!                             toRemove=new HashSet();
                          toRemove.add(node);
                      }
--- 239,243 ----
                      if (selectedNodes.contains(node)) {
                          if (toRemove==null)
!                             toRemove=new HashSet<Node>();
                          toRemove.add(node);
                      }

Index: SelectionModel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/SelectionModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelectionModel.java	4 Oct 2004 10:21:06 -0000	1.2
--- SelectionModel.java	18 Dec 2005 11:11:41 -0000	1.3
***************
*** 23,27 ****
       * @param nodes                         the collection of nodes to add to the selection
       */
!     void addNodes(Collection nodes);
      /**
       * Removes a node from the selection.
--- 23,27 ----
       * @param nodes                         the collection of nodes to add to the selection
       */
!     void addNodes(Collection<Node> nodes);
      /**
       * Removes a node from the selection.
***************
*** 35,39 ****
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     void removeNodes(Collection nodes);
      /**
       * Adds an edge to the selection.
--- 35,39 ----
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     void removeNodes(Collection<Node> nodes);
      /**
       * Adds an edge to the selection.
***************
*** 47,51 ****
       * @param edges                         the collection of edges to add to the selection
       */
!     void addEdges(Collection edges);
      /**
       * Removes an edge from the selection.
--- 47,51 ----
       * @param edges                         the collection of edges to add to the selection
       */
!     void addEdges(Collection<Edge> edges);
      /**
       * Removes an edge from the selection.
***************
*** 59,63 ****
       * @param edges                         the collection of edges to remove from the selection
       */
!     void removeEdges(Collection edges);
      /**
       * Clears the selection.
--- 59,63 ----
       * @param edges                         the collection of edges to remove from the selection
       */
!     void removeEdges(Collection<Edge> edges);
      /**
       * Clears the selection.
***************
*** 69,73 ****
       * @return                              the selection
       */
!     Collection getSelectedNodes();
      /**
       * Returns the selection.
--- 69,73 ----
       * @return                              the selection
       */
!     Collection<Node> getSelectedNodes();
      /**
       * Returns the selection.
***************
*** 75,79 ****
       * @return                              the selection
       */
!     Collection getSelectedEdges();
      /**
       * Checks whteher the node has been selected.
--- 75,79 ----
       * @return                              the selection
       */
!     Collection<Edge> getSelectedEdges();
      /**
       * Checks whteher the node has been selected.