[graphl-cvs] graphl/src/org/mediavirus/graphl/graph Edge.java GraphElement.java Graph.java DefaultGr
Status: Pre-Alpha
Brought to you by:
flo1
Menu
▾
▴
[graphl-cvs] graphl/src/org/mediavirus/graphl/graph Edge.java GraphElement.java Graph.java DefaultGraph.java DefaultEdge.java DefaultNode.java
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:29
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/graph Modified Files: Edge.java GraphElement.java Graph.java DefaultGraph.java DefaultEdge.java DefaultNode.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: DefaultEdge.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultEdge.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** DefaultEdge.java 30 Nov 2004 09:38:33 -0000 1.12 --- DefaultEdge.java 17 Aug 2005 15:52:50 -0000 1.13 *************** *** 5,8 **** --- 5,9 ---- import org.mediavirus.graphl.layout.EdgeLayouter; import org.mediavirus.graphl.painter.EdgePainter; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 19,23 **** String id; ! public static final String DEFAULTTYPE = "http://www.mediavirus.org/graphl#connectedTo"; String type = DEFAULTTYPE; --- 20,31 ---- String id; ! /** ! * ! * @uml.property name="baseURL" ! */ ! String source = null; ! ! ! public static final String DEFAULTTYPE = NS.graphl + "connectedTo"; String type = DEFAULTTYPE; *************** *** 181,184 **** --- 189,209 ---- } + /** + * @see org.mediavirus.graphl.graph.GraphElement#getBaseURL() + * + * @uml.property name="baseURL" + */ + public String getSource() { + return source; + } + + /** + * @see org.mediavirus.graphl.graph.GraphElement#setBaseURL(java.lang.String) + * + * @uml.property name="baseURL" + */ + public void setSource(String source) { + this.source = source; + } } Index: DefaultNode.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultNode.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** DefaultNode.java 29 Dec 2004 14:31:33 -0000 1.14 --- DefaultNode.java 17 Aug 2005 15:52:50 -0000 1.15 *************** *** 266,268 **** --- 266,269 ---- this.width = width; } + } Index: Graph.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Graph.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Graph.java 11 Jan 2005 13:26:41 -0000 1.4 --- Graph.java 17 Aug 2005 15:52:50 -0000 1.5 *************** *** 1,5 **** package org.mediavirus.graphl.graph; - import java.net.URL; import java.util.List; --- 1,4 ---- *************** *** 43,51 **** */ List getEdges(); - /** - * @return The URL this graph was loaded from. This can be used for dereferencing relative URLs in - * the Graph. - */ - URL getBaseURL(); public Node createNode(); --- 42,45 ---- Index: Edge.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Edge.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Edge.java 30 Nov 2004 09:38:33 -0000 1.11 --- Edge.java 17 Aug 2005 15:52:50 -0000 1.12 *************** *** 25,29 **** */ public void invert(); ! /** * Returns the length of this edge. --- 25,32 ---- */ public void invert(); ! ! String getSource(); ! void setSource(String source); ! /** * Returns the length of this edge. Index: GraphElement.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/GraphElement.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GraphElement.java 14 Oct 2004 13:03:02 -0000 1.6 --- GraphElement.java 17 Aug 2005 15:52:50 -0000 1.7 *************** *** 32,35 **** // TODO (2, 2h) this should be removed! maybe a getLabel() in NodeView/EdgeView String getLabel(); ! } \ No newline at end of file --- 32,35 ---- // TODO (2, 2h) this should be removed! maybe a getLabel() in NodeView/EdgeView String getLabel(); ! } \ No newline at end of file Index: DefaultGraph.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultGraph.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DefaultGraph.java 27 Oct 2004 10:55:41 -0000 1.3 --- DefaultGraph.java 17 Aug 2005 15:52:50 -0000 1.4 *************** *** 1,5 **** package org.mediavirus.graphl.graph; - import java.net.URL; import java.util.Collection; import java.util.Iterator; --- 1,4 ---- *************** *** 12,18 **** public class DefaultGraph extends AbstractGraph { /** Nodes of the graph. */ ! protected List m_nodes; /** Edges of the graph. */ ! protected List m_edges; protected boolean loading = false; --- 11,17 ---- public class DefaultGraph extends AbstractGraph { /** Nodes of the graph. */ ! protected List allNodes; /** Edges of the graph. */ ! protected List allEdges; protected boolean loading = false; *************** *** 22,27 **** */ public DefaultGraph() { ! m_nodes=new LinkedList(); ! m_edges=new LinkedList(); } /** --- 21,26 ---- */ public DefaultGraph() { ! allNodes=new LinkedList(); ! allEdges=new LinkedList(); } /** *************** *** 31,35 **** */ public List getNodes() { ! return m_nodes; } /** --- 30,34 ---- */ public List getNodes() { ! return allNodes; } /** *************** *** 39,43 **** */ public List getEdges() { ! return m_edges; } /** --- 38,42 ---- */ public List getEdges() { ! return allEdges; } /** *************** *** 52,57 **** while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! if (!m_nodes.contains(node)) ! m_nodes.add(node); } } --- 51,56 ---- while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! if (!allNodes.contains(node)) ! allNodes.add(node); } } *************** *** 60,65 **** while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (!m_edges.contains(edge)) { ! m_edges.add(edge); ((DefaultNode)edge.getFrom()).notifyEdgeAdded(edge); ((DefaultNode)edge.getTo()).notifyEdgeAdded(edge); --- 59,64 ---- while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (!allEdges.contains(edge)) { ! allEdges.add(edge); ((DefaultNode)edge.getFrom()).notifyEdgeAdded(edge); ((DefaultNode)edge.getTo()).notifyEdgeAdded(edge); *************** *** 82,86 **** while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! m_nodes.remove(node); } } --- 81,85 ---- while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! allNodes.remove(node); } } *************** *** 89,93 **** while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (m_edges.remove(edge)) { ((DefaultNode)edge.getFrom()).notifyEdgeRemoved(edge); ((DefaultNode)edge.getTo()).notifyEdgeRemoved(edge); --- 88,92 ---- while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (allEdges.remove(edge)) { ((DefaultNode)edge.getFrom()).notifyEdgeRemoved(edge); ((DefaultNode)edge.getTo()).notifyEdgeRemoved(edge); *************** *** 101,114 **** */ public synchronized void clear() { ! m_nodes.clear(); ! m_edges.clear(); fireGraphContentsChanged(); } ! /* ! * Overrides @see org.mediavirus.graphl.graph.Graph#getBaseURL() ! */ ! public URL getBaseURL() { ! return null; ! } /* * Overrides @see org.mediavirus.graphl.graph.Graph#createNode() --- 100,108 ---- */ public synchronized void clear() { ! allNodes.clear(); ! allEdges.clear(); fireGraphContentsChanged(); } ! /* * Overrides @see org.mediavirus.graphl.graph.Graph#createNode() |
