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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	FilteredGraph.java SourceFilter.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: SourceFilter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/filter/SourceFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SourceFilter.java	5 Sep 2005 15:43:13 -0000	1.2
--- SourceFilter.java	18 Dec 2005 11:11:41 -0000	1.3
***************
*** 20,24 ****
  public class SourceFilter implements GraphFilter {

! 	protected List sources = new LinkedList();

  	protected boolean rejectSources = true;
--- 20,24 ----
  public class SourceFilter implements GraphFilter {

! 	protected List<String> sources = new LinkedList<String>();

  	protected boolean rejectSources = true;
***************
*** 105,109 ****
  	}

! 	public Collection getSources() {
  		return sources;
  	}
--- 105,109 ----
  	}

! 	public Collection<String> getSources() {
  		return sources;
  	}

Index: FilteredGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/filter/FilteredGraph.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FilteredGraph.java	7 Sep 2005 12:29:55 -0000	1.4
--- FilteredGraph.java	18 Dec 2005 11:11:41 -0000	1.5
***************
*** 22,29 ****
  public class FilteredGraph extends AbstractGraph implements GraphListener{

! 	List cachedNodes = new ArrayList();
! 	List cachedEdges = new ArrayList();

! 	List filters = new LinkedList();

  	Graph sourceGraph;
--- 22,29 ----
  public class FilteredGraph extends AbstractGraph implements GraphListener{

! 	List<Node> cachedNodes = new ArrayList<Node>();
! 	List<Edge> cachedEdges = new ArrayList<Edge>();

! 	List<GraphFilter> filters = new LinkedList<GraphFilter>();

  	Graph sourceGraph;
***************
*** 83,90 ****
  		cachedNodes.clear();

! 		Collection filteredEdges = filterEdges(sourceGraph.getEdges());
  		if (filteredEdges != null) cachedEdges.addAll(filteredEdges);

! 		Collection filteredNodes = filterNodes(sourceGraph.getNodes());
  		if (filteredNodes != null) cachedNodes.addAll(filteredNodes);

--- 83,90 ----
  		cachedNodes.clear();

! 		Collection<Edge> filteredEdges = filterEdges(sourceGraph.getEdges());
  		if (filteredEdges != null) cachedEdges.addAll(filteredEdges);

! 		Collection<Node> filteredNodes = filterNodes(sourceGraph.getNodes());
  		if (filteredNodes != null) cachedNodes.addAll(filteredNodes);

***************
*** 95,109 ****
  	 * @see org.mediavirus.graphl.graph.GraphListener#elementsAdded(org.mediavirus.graphl.graph.Graph, java.util.Collection, java.util.Collection)
  	 */
! 	public void elementsAdded(Graph graph, Collection nodes, Collection edges) {

! 		Collection filteredNodes = filterNodes(nodes);		
! 		Collection filteredEdges = filterEdges(edges);

  		if (filteredEdges != null) {
  			cachedEdges.addAll(filteredEdges);

! 			if (filteredNodes == null) filteredNodes = new ArrayList();
! 			for (Iterator edgesI = filteredEdges.iterator(); edgesI.hasNext();) {
! 				Edge edge = (Edge) edgesI.next();
  				if (! filteredNodes.contains(edge.getFrom())) filteredNodes.add(edge.getFrom());
  				if (! filteredNodes.contains(edge.getTo())) filteredNodes.add(edge.getTo());
--- 95,109 ----
  	 * @see org.mediavirus.graphl.graph.GraphListener#elementsAdded(org.mediavirus.graphl.graph.Graph, java.util.Collection, java.util.Collection)
  	 */
! 	public void elementsAdded(Graph graph, Collection<Node> nodes, Collection<Edge> edges) {

! 		Collection<Node> filteredNodes = filterNodes(nodes);		
! 		Collection<Edge> filteredEdges = filterEdges(edges);

  		if (filteredEdges != null) {
  			cachedEdges.addAll(filteredEdges);

! 			if (filteredNodes == null) filteredNodes = new ArrayList<Node>();
! 			for (Iterator<Edge> edgesI = filteredEdges.iterator(); edgesI.hasNext();) {
! 				Edge edge = edgesI.next();
  				if (! filteredNodes.contains(edge.getFrom())) filteredNodes.add(edge.getFrom());
  				if (! filteredNodes.contains(edge.getTo())) filteredNodes.add(edge.getTo());
***************
*** 119,127 ****
  	 * @param edges
  	 */
! 	private Collection filterEdges(Collection edges) {
  		if (edges != null) {
! 			List filteredEdges = new ArrayList();
! 			for (Iterator edgesI = edges.iterator(); edgesI.hasNext();) {
! 				Edge edge = (Edge) edgesI.next();
  				if (filterEdge(edge, sourceGraph)) filteredEdges.add(edge);
  			}
--- 119,127 ----
  	 * @param edges
  	 */
! 	private Collection<Edge> filterEdges(Collection<Edge> edges) {
  		if (edges != null) {
! 			List<Edge> filteredEdges = new ArrayList<Edge>();
! 			for (Iterator<Edge> edgesI = edges.iterator(); edgesI.hasNext();) {
! 				Edge edge = edgesI.next();
  				if (filterEdge(edge, sourceGraph)) filteredEdges.add(edge);
  			}
***************
*** 136,144 ****
  	 * @param nodes
  	 */
! 	private Collection filterNodes(Collection nodes) {
  		if (nodes != null) {
! 			List filteredNodes = new ArrayList();
! 			for (Iterator nodesI = nodes.iterator(); nodesI.hasNext();) {
! 				Node node = (Node) nodesI.next();
  				if (filterNode(node, sourceGraph)) filteredNodes.add(node);
  			}
--- 136,144 ----
  	 * @param nodes
  	 */
! 	private Collection<Node> filterNodes(Collection<Node> nodes) {
  		if (nodes != null) {
! 			List<Node> filteredNodes = new ArrayList<Node>();
! 			for (Iterator<Node> nodesI = nodes.iterator(); nodesI.hasNext();) {
! 				Node node = nodesI.next();
  				if (filterNode(node, sourceGraph)) filteredNodes.add(node);
  			}
***************
*** 181,190 ****
  	 * @see org.mediavirus.graphl.graph.GraphListener#elementsRemoved(org.mediavirus.graphl.graph.Graph, java.util.Collection, java.util.Collection)
  	 */
! 	public void elementsRemoved(Graph graph, Collection nodes, Collection edges) {
! 		List removedNodes = null;
! 		List removedEdges = null;

  		if (nodes != null) {
! 			removedNodes = new ArrayList();
  			for (Iterator nodesI = nodes.iterator(); nodesI.hasNext();) {
  				Node node = (Node) nodesI.next();
--- 181,190 ----
  	 * @see org.mediavirus.graphl.graph.GraphListener#elementsRemoved(org.mediavirus.graphl.graph.Graph, java.util.Collection, java.util.Collection)
  	 */
! 	public void elementsRemoved(Graph graph, Collection<Node> nodes, Collection<Edge> edges) {
! 		List<Node> removedNodes = null;
! 		List<Edge> removedEdges = null;

  		if (nodes != null) {
! 			removedNodes = new ArrayList<Node>();
  			for (Iterator nodesI = nodes.iterator(); nodesI.hasNext();) {
  				Node node = (Node) nodesI.next();
***************
*** 196,200 ****
  		}
  		if (edges != null) {
! 			removedEdges = new ArrayList();
  			for (Iterator edgesI = edges.iterator(); edgesI.hasNext();) {
  				Edge edge = (Edge) edgesI.next();
--- 196,200 ----
  		}
  		if (edges != null) {
! 			removedEdges = new ArrayList<Edge>();
  			for (Iterator edgesI = edges.iterator(); edgesI.hasNext();) {
  				Edge edge = (Edge) edgesI.next();
***************
*** 212,216 ****
  	 * @see org.mediavirus.graphl.graph.Graph#getNodes()
  	 */
! 	public List getNodes() {
  		return cachedNodes;
  	}
--- 212,216 ----
  	 * @see org.mediavirus.graphl.graph.Graph#getNodes()
  	 */
! 	public List<Node> getNodes() {
  		return cachedNodes;
  	}
***************
*** 219,223 ****
  	 * @see org.mediavirus.graphl.graph.Graph#getEdges()
  	 */
! 	public List getEdges() {
  		return cachedEdges;
  	}
--- 219,223 ----
  	 * @see org.mediavirus.graphl.graph.Graph#getEdges()
  	 */
! 	public List<Edge> getEdges() {
  		return cachedEdges;
  	}
***************
*** 244,248 ****
  	}

! 	public void addElements(Collection nodes, Collection edges) {
  		sourceGraph.addElements(nodes, edges);
  	}
--- 244,248 ----
  	}

! 	public void addElements(Collection<Node> nodes, Collection<Edge> edges) {
  		sourceGraph.addElements(nodes, edges);
  	}