[graphl-cvs] graphl/src/org/mediavirus/graphl/graph/filter FilteredGraph.java SourceFilter.java

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

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

Modified Files:
	FilteredGraph.java SourceFilter.java 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

Index: SourceFilter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/filter/SourceFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SourceFilter.java	18 Dec 2005 11:11:41 -0000	1.3
--- SourceFilter.java	8 Jun 2006 13:15:00 -0000	1.4
***************
*** 41,45 ****
  		boolean result = rejectSources;
  		
! 		for (Iterator nodesI = node.getNeighbours(NS.graphl + "definedIn", true).iterator(); nodesI.hasNext();) {
  			Node source = (Node) nodesI.next();
  			boolean match = false;
--- 41,45 ----
  		boolean result = rejectSources;
  		
! 		for (Iterator nodesI = node.getNeighbours(NS.graphl + "definedIn", Node.FORWARD).iterator(); nodesI.hasNext();) {
  			Node source = (Node) nodesI.next();
  			boolean match = false;

Index: FilteredGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/filter/FilteredGraph.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FilteredGraph.java	18 Dec 2005 11:11:41 -0000	1.5
--- FilteredGraph.java	8 Jun 2006 13:14:59 -0000	1.6
***************
*** 231,238 ****
  
  	/**
! 	 * @see org.mediavirus.graphl.graph.Graph#getNodeOrNew(java.lang.String)
  	 */
! 	public Node getNodeOrNew(String id) {
! 		return sourceGraph.getNodeOrNew(id);
  	}
  
--- 231,238 ----
  
  	/**
! 	 * @see org.mediavirus.graphl.graph.Graph#getNodeOrAdd(java.lang.String)
  	 */
! 	public Node getNodeOrAdd(String id) {
! 		return sourceGraph.getNodeOrAdd(id);
  	}
  
***************
*** 244,249 ****
  	}
  
! 	public void addElements(Collection<Node> nodes, Collection<Edge> edges) {
! 		sourceGraph.addElements(nodes, edges);
! 	}
  }
--- 244,265 ----
  	}
  
!     public void addElements(Collection<Node> nodes, Collection<Edge> edges) {
!         sourceGraph.addElements(nodes, edges);
!     }
! 
!     public void deleteElements(Collection<Node> nodes, Collection<Edge> edges) {
!         sourceGraph.deleteElements(nodes, edges);
!     }
! 
!     public List<Edge> getEdgesWithPropertyValue(String name, String value) {
!         List<Edge> result = new ArrayList<Edge>();
!         for (Iterator<Edge> edgesI = cachedEdges.iterator(); edgesI.hasNext();) {
!             Edge edge = edgesI.next();
!             if (value.equals(edge.getProperty(name))) {
!                 result.add(edge);
!             }
!             
!         }
!         return result;
!     }
  }