[graphl-cvs] graphl/src/org/mediavirus/graphl/layout RepulsionNodeLayouter.java NeutralEdgeLayouter.
Status: Pre-Alpha
Brought to you by:
flo1
Menu
▾
▴
[graphl-cvs] graphl/src/org/mediavirus/graphl/layout RepulsionNodeLayouter.java NeutralEdgeLayouter.java SortedNodeLayouter.java AbsoluteNodeLayouter.java NodeLayouter.java UnconstrainedNodeLayouter.java EdgeLayouter.java SpringEdgeLayouter.java GraphlLayoutStrategy.java
|
From: Flo L. <fl...@us...> - 2004-08-02 12:37:12
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31344/src/org/mediavirus/graphl/layout Modified Files: RepulsionNodeLayouter.java NeutralEdgeLayouter.java SortedNodeLayouter.java AbsoluteNodeLayouter.java NodeLayouter.java UnconstrainedNodeLayouter.java EdgeLayouter.java SpringEdgeLayouter.java GraphlLayoutStrategy.java Log Message: big refactoring: * AssignableNodeController has been renamed to Facet * many methods renamed accordingly * new package for painters * moved around some classes to match new package structure Index: AbsoluteNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/AbsoluteNodeLayouter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbsoluteNodeLayouter.java 23 Jul 2004 08:57:30 -0000 1.2 --- AbsoluteNodeLayouter.java 2 Aug 2004 12:36:31 -0000 1.3 *************** *** 48,52 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#hasVisualController() */ public boolean hasVisualController() { --- 48,52 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#hasVisualController() */ public boolean hasVisualController() { *************** *** 55,59 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#getVisualController() */ public JComponent getVisualController() { --- 55,59 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#getVisualController() */ public JComponent getVisualController() { *************** *** 62,66 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { --- 62,66 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { *************** *** 124,128 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#getName() */ public String getName() { --- 124,128 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#getName() */ public String getName() { Index: NodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/NodeLayouter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NodeLayouter.java 7 Jul 2004 17:53:20 -0000 1.1 --- NodeLayouter.java 2 Aug 2004 12:36:31 -0000 1.2 *************** *** 6,10 **** import org.mediavirus.graphl.graph.Node; ! import org.mediavirus.graphl.view.AssignableGraphController; /** --- 6,10 ---- import org.mediavirus.graphl.graph.Node; ! import org.mediavirus.graphl.view.Facet; /** *************** *** 12,16 **** * created: 06.07.2004 16:14:41 */ ! public interface NodeLayouter extends AssignableGraphController { public void performLayoutStep(Node node, GraphlLayoutStrategy.GraphManager manager); --- 12,16 ---- * created: 06.07.2004 16:14:41 */ ! public interface NodeLayouter extends Facet { public void performLayoutStep(Node node, GraphlLayoutStrategy.GraphManager manager); Index: EdgeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/EdgeLayouter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdgeLayouter.java 12 Jul 2004 11:48:51 -0000 1.2 --- EdgeLayouter.java 2 Aug 2004 12:36:31 -0000 1.3 *************** *** 6,10 **** import org.mediavirus.graphl.graph.rdf.RDFEdge; ! import org.mediavirus.graphl.view.AssignableGraphController; --- 6,10 ---- import org.mediavirus.graphl.graph.rdf.RDFEdge; ! import org.mediavirus.graphl.view.Facet; *************** *** 13,17 **** * created: 09.06.2004 11:37:37 */ ! public interface EdgeLayouter extends AssignableGraphController { public void performLayoutStep(RDFEdge edge, GraphlLayoutStrategy.GraphManager manager); --- 13,17 ---- * created: 09.06.2004 11:37:37 */ ! public interface EdgeLayouter extends Facet { public void performLayoutStep(RDFEdge edge, GraphlLayoutStrategy.GraphManager manager); Index: UnconstrainedNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/UnconstrainedNodeLayouter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UnconstrainedNodeLayouter.java 23 Jul 2004 08:57:30 -0000 1.3 --- UnconstrainedNodeLayouter.java 2 Aug 2004 12:36:31 -0000 1.4 *************** *** 51,55 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#hasVisualController() */ public boolean hasVisualController() { --- 51,55 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#hasVisualController() */ public boolean hasVisualController() { *************** *** 58,62 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#getVisualController() */ public JComponent getVisualController() { --- 58,62 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#getVisualController() */ public JComponent getVisualController() { *************** *** 65,69 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { --- 65,69 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { Index: SortedNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/SortedNodeLayouter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SortedNodeLayouter.java 27 Jul 2004 13:24:05 -0000 1.2 --- SortedNodeLayouter.java 2 Aug 2004 12:36:31 -0000 1.3 *************** *** 117,121 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#hasVisualController() */ public boolean hasVisualController() { --- 117,121 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#hasVisualController() */ public boolean hasVisualController() { *************** *** 124,128 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#getVisualController() */ public JComponent getVisualController() { --- 124,128 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#getVisualController() */ public JComponent getVisualController() { *************** *** 131,135 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { --- 131,135 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { Index: GraphlLayoutStrategy.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/GraphlLayoutStrategy.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GraphlLayoutStrategy.java 27 Jul 2004 13:24:05 -0000 1.5 --- GraphlLayoutStrategy.java 2 Aug 2004 12:36:32 -0000 1.6 *************** *** 6,14 **** import java.util.Iterator; - import org.mediavirus.graphl.PainterRegistry; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.graph.rdf.RDFEdge; /** --- 6,14 ---- import java.util.Iterator; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.graph.rdf.RDFEdge; + import org.mediavirus.graphl.view.FacetRegistry; /** *************** *** 25,29 **** protected GraphManager graphManager; ! protected PainterRegistry painterRegistry; /** The damper value. A low damper value causes the graph to move slowly. A value of 1 means no damping. */ --- 25,29 ---- protected GraphManager graphManager; ! protected FacetRegistry painterRegistry; /** The damper value. A low damper value causes the graph to move slowly. A value of 1 means no damping. */ *************** *** 41,45 **** * @param graph the graph that is active */ ! public GraphlLayoutStrategy(Graph graph, PainterRegistry reg) { this.graph=graph; graphManager=new GraphManager(); --- 41,45 ---- * @param graph the graph that is active */ ! public GraphlLayoutStrategy(Graph graph, FacetRegistry reg) { this.graph=graph; graphManager=new GraphManager(); Index: RepulsionNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/RepulsionNodeLayouter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RepulsionNodeLayouter.java 27 Jul 2004 13:24:05 -0000 1.1 --- RepulsionNodeLayouter.java 2 Aug 2004 12:36:31 -0000 1.2 *************** *** 84,88 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#hasVisualController() */ public boolean hasVisualController() { --- 84,88 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#hasVisualController() */ public boolean hasVisualController() { *************** *** 91,95 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#getVisualController() */ public JComponent getVisualController() { --- 91,95 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#getVisualController() */ public JComponent getVisualController() { *************** *** 98,102 **** /* ! * Overrides @see org.mediavirus.graphl.view.AssignableGraphController#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { --- 98,102 ---- /* ! * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { Index: SpringEdgeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/SpringEdgeLayouter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SpringEdgeLayouter.java 23 Jul 2004 08:57:30 -0000 1.4 --- SpringEdgeLayouter.java 2 Aug 2004 12:36:31 -0000 1.5 *************** *** 49,53 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#getStyleName() */ public String getStyleName() { --- 49,53 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#getStyleName() */ public String getStyleName() { *************** *** 60,64 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#hasVisualController() */ public boolean hasVisualController() { --- 60,64 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#hasVisualController() */ public boolean hasVisualController() { *************** *** 67,71 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#getVisualController() */ public JComponent getVisualController() { --- 67,71 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#getVisualController() */ public JComponent getVisualController() { *************** *** 74,78 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { --- 74,78 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { *************** *** 81,85 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#clone() */ public Object clone() { --- 81,85 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#clone() */ public Object clone() { Index: NeutralEdgeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/NeutralEdgeLayouter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NeutralEdgeLayouter.java 23 Jul 2004 08:57:30 -0000 1.4 --- NeutralEdgeLayouter.java 2 Aug 2004 12:36:31 -0000 1.5 *************** *** 26,30 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#getStyleName() */ public String getStyleName() { --- 26,30 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#getStyleName() */ public String getStyleName() { *************** *** 37,41 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#hasVisualController() */ public boolean hasVisualController() { --- 37,41 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#hasVisualController() */ public boolean hasVisualController() { *************** *** 44,48 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#getVisualController() */ public JComponent getVisualController() { --- 44,48 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#getVisualController() */ public JComponent getVisualController() { *************** *** 51,55 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { --- 51,55 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#isSameClass(java.lang.Object) */ public boolean isSameClass(Object o) { *************** *** 58,62 **** /* ! * Overrides @see org.mediavirus.graphl.AssignableGraphController#clone() */ public Object clone() { --- 58,62 ---- /* ! * Overrides @see org.mediavirus.graphl.Facet#clone() */ public Object clone() { |
