graphl-cvs Mailing List for Graphl - Hybrid graph visualization tool (Page 11)
Status: Pre-Alpha
Brought to you by:
flo1
Menu
▾
▴
graphl-cvs — cvs commit mails
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(48) |
Sep
(6) |
Oct
(64) |
Nov
(12) |
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(10) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(34) |
Sep
(31) |
Oct
|
Nov
|
Dec
(25) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(43) |
Jul
(16) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Flo L. <fl...@us...> - 2004-09-23 18:22:12
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10300/src/org/mediavirus/graphl/graph/rdf Modified Files: RDFNode.java Log Message: * changed the GraphFacetRegistry to work with configuration nodes, not graphs * introduced new interface PropertySet Index: RDFNode.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RDFNode.java 12 Jul 2004 11:48:52 -0000 1.1 --- RDFNode.java 23 Sep 2004 18:21:31 -0000 1.2 *************** *** 83,86 **** --- 83,97 ---- } + public boolean hasType(String type) { + Iterator edges = getEdgesFrom().iterator(); + while (edges.hasNext()) { + RDFEdge e = (RDFEdge)edges.next(); + if (e.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type") { + if (((RDFNode)e.getTo()).getValue().equals(type)) return true; + } + } + return false; + } + public void setType(String type) { if (type != null) { |
|
From: Flo L. <fl...@us...> - 2004-09-23 18:21:44
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10300/src/org/mediavirus/graphl/painter Modified Files: LineEdgePainter.java Log Message: * changed the GraphFacetRegistry to work with configuration nodes, not graphs * introduced new interface PropertySet Index: LineEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LineEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 --- LineEdgePainter.java 23 Sep 2004 18:21:34 -0000 1.3 *************** *** 249,271 **** * Overrides @see org.mediavirus.graphl.painter.EdgePainter#isPointInLabel(org.mediavirus.graphl.GraphlPane, org.mediavirus.graphl.graph.rdf.RDFEdge, java.awt.Point) */ ! public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, ! Point point) { ! // TODO Auto-generated method stub ! return false; ! } /* * Overrides @see org.mediavirus.graphl.view.Facet#getName() */ ! public String getName() { ! // TODO Auto-generated method stub ! return null; ! } /* * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) */ ! public boolean isSameClass(Object o) { ! // TODO Auto-generated method stub ! return false; ! } /* * Overrides @see org.mediavirus.graphl.view.Facet#setConfigurationNode(org.mediavirus.graphl.graph.Node) --- 249,264 ---- * Overrides @see org.mediavirus.graphl.painter.EdgePainter#isPointInLabel(org.mediavirus.graphl.GraphlPane, org.mediavirus.graphl.graph.rdf.RDFEdge, java.awt.Point) */ ! public abstract boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point); ! /* * Overrides @see org.mediavirus.graphl.view.Facet#getName() */ ! public abstract String getName(); ! /* * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) */ ! public abstract boolean isSameClass(Object o); ! /* * Overrides @see org.mediavirus.graphl.view.Facet#setConfigurationNode(org.mediavirus.graphl.graph.Node) |
|
From: Flo L. <fl...@us...> - 2004-09-23 18:21:43
|
Update of /cvsroot/graphl/graphl/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10300/config Modified Files: config.rdf Log Message: * changed the GraphFacetRegistry to work with configuration nodes, not graphs * introduced new interface PropertySet Index: config.rdf =================================================================== RCS file: /cvsroot/graphl/graphl/config/config.rdf,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.rdf 23 Aug 2004 16:53:21 -0000 1.6 --- config.rdf 23 Sep 2004 18:21:34 -0000 1.7 *************** *** 204,207 **** --- 204,209 ---- </graphl:assignedToType> </graphl:NodePainter> + </rdf:li> + <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.InvisibleNodePainter"> *************** *** 242,245 **** --- 244,249 ---- </graphl:assignedToType> </graphl:EdgePainter> + </rdf:li> + <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" *************** *** 254,257 **** --- 258,263 ---- </graphl:assignedToType> </graphl:EdgePainter> + </rdf:li> + <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" |
|
From: Flo L. <fl...@us...> - 2004-09-23 18:21:43
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10300/src/org/mediavirus/graphl/graph Modified Files: DefaultEdge.java GraphElement.java DefaultNode.java Added Files: DefaultElement.java PropertySet.java Log Message: * changed the GraphFacetRegistry to work with configuration nodes, not graphs * introduced new interface PropertySet --- NEW FILE: PropertySet.java --- /* * Created on 21.09.2004 by flo */ package org.mediavirus.graphl.graph; /** * @author flo * created: 21.09.2004 17:02:16 */ public interface PropertySet { String getProperty(String name); String getProperty(String name, String defaultValue); } Index: DefaultNode.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultNode.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DefaultNode.java 20 Aug 2004 12:38:52 -0000 1.10 --- DefaultNode.java 23 Sep 2004 18:21:33 -0000 1.11 *************** *** 13,17 **** * The default implementation of the node in the graph. */ ! public class DefaultNode implements Node { /** The list of edges from the node. */ protected List edgesFrom; --- 13,17 ---- * The default implementation of the node in the graph. */ ! public class DefaultNode extends DefaultElement implements Node { /** The list of edges from the node. */ protected List edgesFrom; *************** *** 27,32 **** boolean dragging = false; - HashMap properties = new HashMap(); - NodePainter painter = null; NodeLayouter layouter = null; --- 27,30 ---- *************** *** 135,145 **** return null; } ! ! public String getProperty(String name) { ! return (String)properties.get(name); ! } ! ! public void setProperty(String name, String value) { ! properties.put(name, value); } --- 133,139 ---- return null; } ! ! public boolean hasType(String type) { ! return false; } Index: GraphElement.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/GraphElement.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GraphElement.java 1 Jul 2004 18:18:42 -0000 1.3 --- GraphElement.java 23 Sep 2004 18:21:33 -0000 1.4 *************** *** 9,13 **** * created: 27.06.2004 18:40:38 */ ! public interface GraphElement { /** * Returns the value of this element. --- 9,13 ---- * created: 27.06.2004 18:40:38 */ ! public interface GraphElement extends PropertySet { /** * Returns the value of this element. *************** *** 23,28 **** String getType(); ! String getProperty(String name); ! ! void setProperty(String name, String value); } \ No newline at end of file --- 23,29 ---- String getType(); ! boolean hasType(String type); ! ! void setProperty(String name, String value); ! } \ No newline at end of file Index: DefaultEdge.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultEdge.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DefaultEdge.java 2 Aug 2004 12:36:49 -0000 1.8 --- DefaultEdge.java 23 Sep 2004 18:21:33 -0000 1.9 *************** *** 9,13 **** * The default implementation of the edge. */ ! public class DefaultEdge implements Edge { /** The node from the edge. */ protected Node from; --- 9,13 ---- * The default implementation of the edge. */ ! public class DefaultEdge extends DefaultElement implements Edge { /** The node from the edge. */ protected Node from; *************** *** 88,91 **** --- 88,96 ---- return type; } + + public boolean hasType(String type) { + if (this.type == null) return false; + else return this.type.equals(type); + } /** --- NEW FILE: DefaultElement.java --- /* * Created on 23.09.2004 by flo */ package org.mediavirus.graphl.graph; import java.util.HashMap; /** * @author flo * created: 23.09.2004 17:58:53 */ public abstract class DefaultElement implements GraphElement { HashMap properties = new HashMap(); public String getProperty(String name) { return (String)properties.get(name); } public String getProperty(String name, String defaultValue) { String val = (String)properties.get(name); if (val == null) return defaultValue; return val; } public void setProperty(String name, String value) { properties.put(name, value); } } |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:55:42
|
Update of /cvsroot/graphl/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22167 Modified Files: README.txt Log Message: updated readme.txt Index: README.txt =================================================================== RCS file: /cvsroot/graphl/graphl/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README.txt 21 Jun 2004 20:47:38 -0000 1.1 --- README.txt 23 Aug 2004 16:55:30 -0000 1.2 *************** *** 2,9 **** ================= - this file should actually be named WRITEME.txt ... - info at the graphl website http://www.mediavirus.org/graphl questions & comments to fl...@su... --- 2,57 ---- ================= info at the graphl website http://www.mediavirus.org/graphl + subscribe to graphl-interest at + http://lists.sourceforge.net/lists/listinfo/graphl-interest + for notification about new releases! + + This is another pre-alpha release, to make new features available + before my vacation. Originally, i planned to do a 0.1 and some broader + dissemination to the rdf community in august, but there are some + important features still missing and no testing was done at all - so i + decided to do another pre-release to just get the features out to those + who are interested and are willing to work with really unfinished, buggy + and undocumented stuff. probably this release is not very well-suited + for pure end-users and rdf-focussed people, those should wait for the + 0.1 release to get a consistent package that will hopefully also be + documented. + + the most notable new feature is the possibility to configure the + rendering of graphs (by configuring and assigning "facets") in an + rdf configuration file. this should evolve into an "rdf-stylesheet" + mechanism in the future. at the moment, there is no documentation + for all this, but you can look at the file config/config.rdf and see + if you figure out how to change the facet settings there. + + for other improvements, see the changelog. + + i will post a notification to this list when 0.1 is out - i hope this + will happen late october. the most notable improvements i am planning + for the 0.1 release are: + + - finish and debug "load facet config from file" feature + - fully implement existing layouters and painters + make them fully + rdf-config compatible + - extend ImageNodePainter to be able to render arbitrary properties + as node icons (+ a fallback node painter if image is not found) + - SortedNodeLayouter sorts on arbitrary proprties by string, number + or date, ordered or proportional (timeline!) + - testing with real-life rdf-files (foaf, ...?) and set default config + accordingly (to get nice results on real-world data) + + some things that might also happen for 0.1, but without guarantee: + + - vocabulary registration per rdf-config (read in rdfs schemas and + use them for contextmenus etc.) + - render edges as containership + - node layouter for geographic positioning (with map image as background) + + + btw: i you are interested in contributing to any of these features, + or have requests for other features, help is greatly appreciated. + mail me for coordination, or just start hacking and send me your patches... + questions & comments to fl...@su... |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:54:00
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/src/org/mediavirus/graphl/server Modified Files: GraphlServer.java Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog Index: GraphlServer.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/server/GraphlServer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GraphlServer.java 29 Jun 2004 08:07:40 -0000 1.3 --- GraphlServer.java 23 Aug 2004 16:53:19 -0000 1.4 *************** *** 85,88 **** --- 85,89 ---- w.println(" name=\"GraphlApplet\" width=\"100%\" height=\"90%\">"); w.println(" <param name=\"rdfurl\" value=\"" + path + "\">"); + w.println(" <param name=\"configuration\" value=\"config/config.rdf\">"); //w.println(" <param name=\"saveurl\" value=\"save/testsave.rdf\"/>"); w.println("</applet>"); |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:54:00
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/src/org/mediavirus/graphl/view Modified Files: LabelGenerator.java Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog Index: LabelGenerator.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/LabelGenerator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LabelGenerator.java 20 Aug 2004 12:38:52 -0000 1.4 --- LabelGenerator.java 23 Aug 2004 16:53:04 -0000 1.5 *************** *** 75,78 **** --- 75,79 ---- } else { + if (value == null) value = ""; return value; } |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:53:46
|
Update of /cvsroot/graphl/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385 Modified Files: build.xml changelog.txt Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog Index: changelog.txt =================================================================== RCS file: /cvsroot/graphl/graphl/changelog.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** changelog.txt 22 Aug 2004 22:34:28 -0000 1.10 --- changelog.txt 23 Aug 2004 16:53:04 -0000 1.11 *************** *** 2,9 **** ================== 2004-08-23, f/0: ! Zoom label shows zoom factor, clicking on it resets to 100% 2004-08-22, f/0: File > New (contributed by martin klinke) mousewheel zooming (contributed by martin klinke) --- 2,16 ---- ================== + 2004-08-23 + ### RELEASE 0.0.2 + 2004-08-23, f/0: ! updated GraphlApplet to load config from URL ! extended default facet configuration 2004-08-22, f/0: + Zoom label shows zoom factor, clicking on it resets to 100% + + 2004-08-21, f/0: File > New (contributed by martin klinke) mousewheel zooming (contributed by martin klinke) Index: build.xml =================================================================== RCS file: /cvsroot/graphl/graphl/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 22 Aug 2004 22:47:34 -0000 1.4 --- build.xml 23 Aug 2004 16:53:04 -0000 1.5 *************** *** 13,16 **** --- 13,18 ---- </copy> <copy todir="web/WEB-INF/classes"><fileset dir="bin"/></copy> + <copy todir="web/graphs"><fileset dir="graphs"/></copy> + <copy todir="web/config"><fileset dir="config"/></copy> </target> |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:53:36
|
Update of /cvsroot/graphl/graphl/graphs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/graphs Modified Files: default.rdf foaf.rdf Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog Index: default.rdf =================================================================== RCS file: /cvsroot/graphl/graphl/graphs/default.rdf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** default.rdf 21 Aug 2004 22:26:36 -0000 1.3 --- default.rdf 23 Aug 2004 16:53:22 -0000 1.4 *************** *** 3,20 **** <!ENTITY graphl 'http://www.mediavirus.org/graphl#'> <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'> - <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'> ]> ! <rdf:RDF xml:base="" ! xmlns:graphl="&graphl;" ! xmlns:foaf="&foaf;" ! xmlns:rdf="&rdf;"> ! <graphl:Configuration> ! <rdf:seeAlso rdf:about="../config/config.rdf"/> ! </graphl:Configuration> - <foaf:Person - foaf:name="Flo Ledermann"/> - </rdf:RDF> \ No newline at end of file --- 3,15 ---- <!ENTITY graphl 'http://www.mediavirus.org/graphl#'> <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'> ]> ! <rdf:RDF xmlns:graphl="&graphl;" xmlns:rdf="&rdf;"> ! <graphl:Test rdf:about="#A_first_test"> ! <graphl:isOK> ! <graphl:OK rdf:about="#OK"/> ! </graphl:isOK> ! </graphl:Test> </rdf:RDF> \ No newline at end of file Index: foaf.rdf =================================================================== RCS file: /cvsroot/graphl/graphl/graphs/foaf.rdf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** foaf.rdf 21 Aug 2004 22:26:36 -0000 1.3 --- foaf.rdf 23 Aug 2004 16:53:22 -0000 1.4 *************** *** 72,76 **** <foaf:Person> <foaf:name>Axel Goldmann</foaf:name> ! <foaf:mbox rdf:resource="mailto:axe...@ch..."/> </foaf:Person> </foaf:knows> --- 72,76 ---- <foaf:Person> <foaf:name>Axel Goldmann</foaf:name> ! <foaf:mbox rdf:resource="mailto:ax...@un..."/> </foaf:Person> </foaf:knows> *************** *** 78,82 **** <foaf:Person> <foaf:name>Ruediger Suppin</foaf:name> ! <foaf:mbox rdf:resource="mailto:rs...@ya..."/> </foaf:Person> </foaf:knows> --- 78,82 ---- <foaf:Person> <foaf:name>Ruediger Suppin</foaf:name> ! <foaf:mbox rdf:resource="mailto:ru...@un..."/> </foaf:Person> </foaf:knows> *************** *** 84,88 **** <foaf:Person> <foaf:name>Bruno Randolf</foaf:name> ! <foaf:mbox rdf:resource="mailto:br...@su..."/> <foaf:pastProject rdf:resource="http://mprox.subnet.at"/> <foaf:pastProject rdf:resource="http://www.subnet.at"/> --- 84,88 ---- <foaf:Person> <foaf:name>Bruno Randolf</foaf:name> ! <foaf:mbox rdf:resource="mailto:br...@un..."/> <foaf:pastProject rdf:resource="http://mprox.subnet.at"/> <foaf:pastProject rdf:resource="http://www.subnet.at"/> *************** *** 92,96 **** <foaf:Person> <foaf:name>Nicole Oberrainer</foaf:name> ! <foaf:mbox rdf:resource="mailto:flo...@me..."/> </foaf:Person> </foaf:knows> --- 92,96 ---- <foaf:Person> <foaf:name>Nicole Oberrainer</foaf:name> ! <foaf:mbox rdf:resource="mailto:fl...@un..."/> </foaf:Person> </foaf:knows> *************** *** 98,102 **** <foaf:Person> <foaf:name>Ruth Ettl</foaf:name> ! <foaf:mbox rdf:resource="mailto:ru...@su..."/> </foaf:Person> </foaf:knows> --- 98,102 ---- <foaf:Person> <foaf:name>Ruth Ettl</foaf:name> ! <foaf:mbox rdf:resource="mailto:ru...@un..."/> </foaf:Person> </foaf:knows> *************** *** 104,108 **** <foaf:Person> <foaf:name>Josh Benda</foaf:name> ! <foaf:mbox rdf:resource="mailto:jos...@ho..."/> <foaf:pastProject rdf:resource="http://www.mudfuzz.com"/> </foaf:Person> --- 104,108 ---- <foaf:Person> <foaf:name>Josh Benda</foaf:name> ! <foaf:mbox rdf:resource="mailto:jo...@un..."/> <foaf:pastProject rdf:resource="http://www.mudfuzz.com"/> </foaf:Person> |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:53:36
|
Update of /cvsroot/graphl/graphl/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/config Modified Files: config.rdf Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog Index: config.rdf =================================================================== RCS file: /cvsroot/graphl/graphl/config/config.rdf,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.rdf 21 Aug 2004 22:31:02 -0000 1.5 --- config.rdf 23 Aug 2004 16:53:21 -0000 1.6 *************** *** 118,124 **** --- 118,151 ---- </rdf:first> <rdf:rest> + <rdf:List> + <rdf:first> + <graphl:LabelFacet + graphl:labelFacetType="String" + graphl:labelFacetValue=" ["/> + </rdf:first> + <rdf:rest> + <rdf:List> + <rdf:first> + <graphl:LabelFacet + graphl:labelFacetType="Type" + graphl:guessName="true"/> + </rdf:first> + <rdf:rest> + <rdf:List> + <rdf:first> + <graphl:LabelFacet + graphl:labelFacetType="String" + graphl:labelFacetValue="]"/> + </rdf:first> + <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> + </rdf:rest> + </rdf:List> + </rdf:rest> + </rdf:List> + </rdf:rest> + </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> *************** *** 177,180 **** --- 204,216 ---- </graphl:assignedToType> </graphl:NodePainter> + <graphl:NodePainter + graphl:javaClass="org.mediavirus.graphl.painter.InvisibleNodePainter"> + <graphl:assignedToType> + <rdfs:Class rdf:about="&rdf;List"/> + </graphl:assignedToType> + <graphl:assignedToType> + <rdfs:Class rdf:about="&rdf;Bag"/> + </graphl:assignedToType> + </graphl:NodePainter> </rdf:li> </rdf:Bag> *************** *** 206,209 **** --- 242,266 ---- </graphl:assignedToType> </graphl:EdgePainter> + <graphl:EdgePainter + graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" + graphl:paintArrow="false" + graphl:paintLabel="false" + graphl:lineStyle="solid"> + <graphl:assignedToType> + <rdfs:Class rdf:about="&rdf;first"/> + </graphl:assignedToType> + <graphl:assignedToType> + <rdfs:Class rdf:about="&graphl;connectedTo"/> + </graphl:assignedToType> + </graphl:EdgePainter> + <graphl:EdgePainter + graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" + graphl:paintArrow="true" + graphl:paintLabel="false" + graphl:lineStyle="solid"> + <graphl:assignedToType> + <rdfs:Class rdf:about="&rdf;rest"/> + </graphl:assignedToType> + </graphl:EdgePainter> </rdf:li> </rdf:Bag> |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:53:34
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/src/org/mediavirus/graphl Modified Files: GraphlApplet.java Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog Index: GraphlApplet.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GraphlApplet.java 12 Jul 2004 11:48:52 -0000 1.4 --- GraphlApplet.java 23 Aug 2004 16:53:21 -0000 1.5 *************** *** 22,25 **** --- 22,26 ---- import org.mediavirus.graphl.graph.rdf.RDFGraph; + import org.mediavirus.graphl.view.GraphFacetRegistry; *************** *** 34,37 **** --- 35,40 ---- private JButton saveButton; private JPanel bottomPanel; + + private RDFGraph settings = new RDFGraph(); public GraphlApplet() { *************** *** 101,105 **** } ! String urlstr = getParameter("rdfurl"); if (urlstr != null) { try { --- 104,129 ---- } ! String urlstr = getParameter("configuration"); ! if (urlstr != null) { ! try { ! // if it is an absolute url, redirect through proxy servlet ! URL testurl = new URL(urlstr); ! urlstr = "proxy?url=" + urlstr; ! } ! catch (MalformedURLException muex) {} ! ! try { ! URL settingsurl = new URL(getDocumentBase(), urlstr); ! System.out.println("Config URL: " + urlstr); ! settings.clear(); ! settings.readFromURL(settingsurl); ! mainPanel.graphPane.setFacetRegistry(new GraphFacetRegistry(settings)); ! } ! catch (MalformedURLException e) { ! e.printStackTrace(); ! } ! } ! ! urlstr = getParameter("rdfurl"); if (urlstr != null) { try { *************** *** 119,123 **** } } ! } /** --- 143,148 ---- } } ! ! } /** |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:53:33
|
Update of /cvsroot/graphl/graphl/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/web Modified Files: index.html Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog Index: index.html =================================================================== RCS file: /cvsroot/graphl/graphl/web/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.html 8 Jul 2004 08:12:19 -0000 1.5 --- index.html 23 Aug 2004 16:53:20 -0000 1.6 *************** *** 41,49 **** <tr><th>Thumbnail</th><th>ID</th><th>Language(s)</th><th>Description</th></tr> ! <tr><td><a href="http://architekt.ims.tuwien.ac.at/graphl/view?url=welt.rdf"><img src="graphs/welt.gif"></a></td><td>welt</td><td>DE</td><td>A graph trying to map the interdependencies of various economic and social entities and phenomena present in current "western" societies.</td></tr> ! <tr><td><a href="http://architekt.ims.tuwien.ac.at/graphl/view?url=foaf.rdf"><img src="graphs/foaf.gif"></a></td><td>foaf</td><td>EN</td><td>A visualization of the foaf file of Flo Ledermann. Foaf is an RDF-based standard to map social networks.</td></tr> ! <tr><td><a href="http://architekt.ims.tuwien.ac.at/graphl/view?url=todo.rdf"><img src="graphs/todo.gif"></a></td><td>todo</td><td>EN</td><td>The strategic todo-list of graphl, visualized as a graph.</td></tr> </table> --- 41,49 ---- <tr><th>Thumbnail</th><th>ID</th><th>Language(s)</th><th>Description</th></tr> ! <tr><td><a href="http://architekt.ims.tuwien.ac.at/graphl/view?url=welt.rdf"><img src="images/welt.gif"></a></td><td>welt</td><td>DE</td><td>A graph trying to map the interdependencies of various economic and social entities and phenomena present in current "western" societies.</td></tr> ! <tr><td><a href="http://architekt.ims.tuwien.ac.at/graphl/view?url=foaf.rdf"><img src="images/foaf.gif"></a></td><td>foaf</td><td>EN</td><td>A visualization of the foaf file of Flo Ledermann. Foaf is an RDF-based standard to map social networks.</td></tr> ! <tr><td><a href="http://architekt.ims.tuwien.ac.at/graphl/view?url=todo.rdf"><img src="images/todo.gif"></a></td><td>todo</td><td>EN</td><td>The strategic todo-list of graphl, visualized as a graph.</td></tr> </table> |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:53:31
|
Update of /cvsroot/graphl/graphl/web/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/web/images Added Files: todo.gif welt.gif foaf.gif Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog --- NEW FILE: foaf.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: todo.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: welt.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Flo L. <fl...@us...> - 2004-08-23 16:53:30
|
Update of /cvsroot/graphl/graphl/web/graphs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21385/web/graphs Removed Files: foaf.gif todo.gif .cvsignore welt.gif Log Message: * updated GraphlApplet to load config from URL * extended default facet configuration * removed redundant web/graphs, now created by ant * updated changelog --- foaf.gif DELETED --- --- todo.gif DELETED --- --- welt.gif DELETED --- --- .cvsignore DELETED --- |
|
From: Flo L. <fl...@us...> - 2004-08-22 22:48:00
|
Update of /cvsroot/graphl/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31644 Modified Files: build.xml Log Message: updated build.xml Index: build.xml =================================================================== RCS file: /cvsroot/graphl/graphl/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 24 Jun 2004 17:29:04 -0000 1.3 --- build.xml 22 Aug 2004 22:47:34 -0000 1.4 *************** *** 16,23 **** <target name="package_bin" depends="package_classes"> ! <zip destfile="web/graphl-0.0.1-bin.zip"> <zipfileset dir="." prefix="graphl"> <include name="graphl.*"/> <include name="lib/*"/> </zipfileset> </zip> --- 16,25 ---- <target name="package_bin" depends="package_classes"> ! <zip destfile="web/graphl-0.0.2-bin.zip"> <zipfileset dir="." prefix="graphl"> <include name="graphl.*"/> <include name="lib/*"/> + <include name="graphs/*"/> + <include name="config/*"/> </zipfileset> </zip> *************** *** 25,33 **** <target name="package_src" depends="package_classes"> ! <zip destfile="web/graphl-0.0.1-src.zip"> <zipfileset dir="." prefix="graphl"> <exclude name="bin/**"/> <exclude name="doc/**"/> <exclude name="web/**"/> <exclude name="**/*.zip"/> </zipfileset> --- 27,36 ---- <target name="package_src" depends="package_classes"> ! <zip destfile="web/graphl-0.0.2-src.zip"> <zipfileset dir="." prefix="graphl"> <exclude name="bin/**"/> <exclude name="doc/**"/> <exclude name="web/**"/> + <exclude name="related/**"/> <exclude name="**/*.zip"/> </zipfileset> |
|
From: Flo L. <fl...@us...> - 2004-08-22 22:34:41
|
Update of /cvsroot/graphl/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27740 Modified Files: changelog.txt Log Message: updated changelog Index: changelog.txt =================================================================== RCS file: /cvsroot/graphl/graphl/changelog.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** changelog.txt 21 Aug 2004 23:15:02 -0000 1.9 --- changelog.txt 22 Aug 2004 22:34:28 -0000 1.10 *************** *** 2,5 **** --- 2,8 ---- ================== + 2004-08-23, f/0: + Zoom label shows zoom factor, clicking on it resets to 100% + 2004-08-22, f/0: File > New (contributed by martin klinke) |
|
From: Flo L. <fl...@us...> - 2004-08-22 22:32:13
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26842/src/org/mediavirus/graphl/view Modified Files: GraphFacetRegistry.java Log Message: * registering available facets via config.rdf works * zoom factor visible in gui * clicking zoom label resets to 100% * fixed some repainting/relayouting issues Index: GraphFacetRegistry.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraphFacetRegistry.java 21 Aug 2004 22:31:01 -0000 1.2 --- GraphFacetRegistry.java 22 Aug 2004 22:31:29 -0000 1.3 *************** *** 56,59 **** --- 56,74 ---- } + if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodePainters",false) != null) { + registerNodePainter(nodePainter); + } + else { // look for a parent Bag containing the NodePainters to register + Iterator neighbours = node.getEdgesTo().iterator(); + while (neighbours.hasNext()) { + Node n = ((Edge)neighbours.next()).getFrom(); + if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) { + if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodePainters",false) != null) { + registerNodePainter(nodePainter); + } + } + } + } + Iterator assignedTypes = node.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator(); while (assignedTypes.hasNext()) { *************** *** 70,73 **** --- 85,103 ---- } + if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodeLayouters",false) != null) { + registerNodeLayouter(nodeLayouter); + } + else { // look for a parent Bag containing the NodeLayouters to register + Iterator neighbours = node.getEdgesTo().iterator(); + while (neighbours.hasNext()) { + Node n = ((Edge)neighbours.next()).getFrom(); + if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) { + if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodeLayouters",false) != null) { + registerNodeLayouter(nodeLayouter); + } + } + } + } + Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator(); while (assignedTypes.hasNext()) { *************** *** 84,87 **** --- 114,132 ---- } + if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",false) != null) { + registerEdgePainter(edgePainter); + } + else { // look for a parent Bag containing the edgePainters to register + Iterator neighbours = node.getEdgesTo().iterator(); + while (neighbours.hasNext()) { + Node n = ((Edge)neighbours.next()).getFrom(); + if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) { + if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",false) != null) { + registerEdgePainter(edgePainter); + } + } + } + } + Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator(); while (assignedTypes.hasNext()) { *************** *** 98,101 **** --- 143,161 ---- } + if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",false) != null) { + registerEdgeLayouter(edgeLayouter); + } + else { // look for a parent Bag containing the edgeLayouters to register + Iterator neighbours = node.getEdgesTo().iterator(); + while (neighbours.hasNext()) { + Node n = ((Edge)neighbours.next()).getFrom(); + if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) { + if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgeLayouters",false) != null) { + registerEdgeLayouter(edgeLayouter); + } + } + } + } + Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator(); while (assignedTypes.hasNext()) { |
|
From: Flo L. <fl...@us...> - 2004-08-22 22:32:11
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26842/src/org/mediavirus/graphl/gui Modified Files: EdgeContextMenu.java NodeContextMenu.java Log Message: * registering available facets via config.rdf works * zoom factor visible in gui * clicking zoom label resets to 100% * fixed some repainting/relayouting issues Index: EdgeContextMenu.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/EdgeContextMenu.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EdgeContextMenu.java 21 Aug 2004 22:31:00 -0000 1.9 --- EdgeContextMenu.java 22 Aug 2004 22:31:28 -0000 1.10 *************** *** 66,69 **** --- 66,70 ---- break; } + graphlPane.getGraph().notifyLayoutUpdated(); graphlPane.repaint(); } *************** *** 112,115 **** --- 113,117 ---- int result = GenericDialog.showModalDialog(null, newController.getVisualController(), "Controller Properties"); } + graphlPane.getGraph().notifyLayoutUpdated(); graphlPane.repaint(); } *************** *** 359,362 **** --- 361,365 ---- public void resourceChanged(String property) { currentEdge.setType(property); + graphlPane.getGraph().notifyLayoutUpdated(); graphlPane.repaint(); } Index: NodeContextMenu.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/NodeContextMenu.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NodeContextMenu.java 21 Aug 2004 22:31:00 -0000 1.10 --- NodeContextMenu.java 22 Aug 2004 22:31:29 -0000 1.11 *************** *** 66,69 **** --- 66,70 ---- break; } + graphlPane.getGraph().notifyLayoutUpdated(); graphlPane.repaint(); } *************** *** 112,115 **** --- 113,117 ---- int result = GenericDialog.showModalDialog(null, newController.getVisualController(), "Controller Properties"); } + graphlPane.getGraph().notifyLayoutUpdated(); graphlPane.repaint(); } *************** *** 362,365 **** --- 364,368 ---- public void resourceChanged(String property) { currentNode.setType(property); + graphlPane.getGraph().notifyLayoutUpdated(); graphlPane.repaint(); } |
|
From: Flo L. <fl...@us...> - 2004-08-22 22:31:47
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26842/src/org/mediavirus/graphl/interaction Modified Files: GraphlManipulator.java Log Message: * registering available facets via config.rdf works * zoom factor visible in gui * clicking zoom label resets to 100% * fixed some repainting/relayouting issues Index: GraphlManipulator.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction/GraphlManipulator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GraphlManipulator.java 2 Aug 2004 12:36:49 -0000 1.1 --- GraphlManipulator.java 22 Aug 2004 22:31:32 -0000 1.2 *************** *** 98,102 **** else { oldTranslation = ((GraphlPane)graphPane).getTranslation(); - } } --- 98,101 ---- *************** *** 217,220 **** --- 216,220 ---- e.consume(); moved = true; + graphPane.getGraph().notifyLayoutUpdated(); } else if (dragEdge != null) { *************** *** 227,230 **** --- 227,231 ---- graphPane.repaint(); e.consume(); + graphPane.getGraph().notifyLayoutUpdated(); } else if (edgeNode != null) { *************** *** 237,242 **** pane.setTranslation(diff.getX()+oldTranslation.getX(), diff.getY()+oldTranslation.getY()); } - graphPane.getGraph().notifyLayoutUpdated(); - } --- 238,241 ---- |
|
From: Flo L. <fl...@us...> - 2004-08-22 22:31:47
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26842/src/org/mediavirus/graphl Modified Files: GraphlPanel.java Log Message: * registering available facets via config.rdf works * zoom factor visible in gui * clicking zoom label resets to 100% * fixed some repainting/relayouting issues Index: GraphlPanel.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPanel.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** GraphlPanel.java 21 Aug 2004 22:31:02 -0000 1.12 --- GraphlPanel.java 22 Aug 2004 22:31:30 -0000 1.13 *************** *** 196,202 **** public void stateChanged(ChangeEvent e) { - graphPane.setScale(zoomSlider.getValue()/100.0f); ! } }); --- 196,201 ---- public void stateChanged(ChangeEvent e) { graphPane.setScale(zoomSlider.getValue()/100.0f); ! getJButton().setText("Zoom: " + zoomSlider.getValue() + "%"); } }); *************** *** 506,515 **** if (jButton == null) { jButton = new JButton(); ! jButton.setText("zoom"); jButton.setFont(new java.awt.Font("Dialog", java.awt.Font.PLAIN, 9)); ! jButton.setPreferredSize(new java.awt.Dimension(32,12)); jButton.setMargin(new java.awt.Insets(0,0,0,0)); ! jButton.setMaximumSize(new java.awt.Dimension(22,12)); jButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,0,0,0)); } return jButton; --- 505,520 ---- if (jButton == null) { jButton = new JButton(); ! jButton.setText("Zoom: 100%"); jButton.setFont(new java.awt.Font("Dialog", java.awt.Font.PLAIN, 9)); ! jButton.setPreferredSize(new java.awt.Dimension(60,12)); jButton.setMargin(new java.awt.Insets(0,0,0,0)); ! jButton.setMaximumSize(new java.awt.Dimension(60,12)); jButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,0,0,0)); + jButton.setFocusPainted(false); + jButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + getZoomSlider().setValue(100); + } + }); } return jButton; |
|
From: Flo L. <fl...@us...> - 2004-08-21 23:15:14
|
Update of /cvsroot/graphl/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13922 Modified Files: changelog.txt Log Message: updated changelog Index: changelog.txt =================================================================== RCS file: /cvsroot/graphl/graphl/changelog.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** changelog.txt 27 Jul 2004 16:44:37 -0000 1.8 --- changelog.txt 21 Aug 2004 23:15:02 -0000 1.9 *************** *** 2,5 **** --- 2,10 ---- ================== + 2004-08-22, f/0: + File > New (contributed by martin klinke) + mousewheel zooming (contributed by martin klinke) + load facet configuration from file (config/config.rdf) + 2004-07-23, f/0: refactoring of FacetRegistry (=PainterRegistry) |
|
From: Flo L. <fl...@us...> - 2004-08-21 22:31:47
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32158/src/org/mediavirus/graphl/painter Modified Files: ImageNodePainter.java StraightLineEdgePainter.java LineEdgePainter.java ManhattanEdgePainter.java AbstractEdgePainter.java BoxNodePainter.java LineEdgePainterController.java InvisibleEdgePainter.java ReificationNodePainter.java NodePainter.java InvisibleNodePainter.java EdgePainter.java ArrowEdgePainter.java Log Message: * added martin klinke's contributions (File>New and mousewheel zooming) * implemented facet configuration from rdf config file * added configuration data to config.rdf * removed historic JGraphPane, merged with GraphlPane * factored out vocabulary registry mechanism from GraphlPane Index: LineEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- LineEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 14,19 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; ! import org.mediavirus.graphl.view.JGraphPane; import org.mediavirus.graphl.view.LabelGenerator; --- 14,21 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; ! import org.mediavirus.graphl.graph.Node; ! import org.mediavirus.graphl.graph.rdf.RDFEdge; import org.mediavirus.graphl.view.LabelGenerator; *************** *** 30,35 **** protected float segmentLength = 1.0f; ! protected boolean paintingArrow = true; ! protected boolean paintingLabel = true; Stroke stroke; --- 32,37 ---- protected float segmentLength = 1.0f; ! protected boolean paintArrow = true; ! protected boolean paintLabel = true; Stroke stroke; *************** *** 49,54 **** this.lineWidth = lineWidth; this.lineStyle = lineStyle; ! this.paintingArrow = paintingArrow; ! this.paintingLabel = paintingLabel; labelGenerator = new LabelGenerator(LabelGenerator.TYPE,"",true); --- 51,56 ---- this.lineWidth = lineWidth; this.lineStyle = lineStyle; ! this.paintArrow = paintingArrow; ! this.paintLabel = paintingLabel; labelGenerator = new LabelGenerator(LabelGenerator.TYPE,"",true); *************** *** 81,85 **** * @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator = (DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); //boolean isDragging = draggingManipulator!=null && draggingManipulator.getDraggedEdge()==edge; --- 83,87 ---- * @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator = (DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); //boolean isDragging = draggingManipulator!=null && draggingManipulator.getDraggedEdge()==edge; *************** *** 96,100 **** * @param isDragging */ ! abstract void doPaintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** --- 98,102 ---- * @param isDragging */ ! abstract void doPaintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** *************** *** 102,106 **** */ public void getEdgeScreenBounds( ! JGraphPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { --- 104,108 ---- */ public void getEdgeScreenBounds( ! GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { *************** *** 145,150 **** * @return */ ! public boolean isPaintingArrow() { ! return paintingArrow; } --- 147,152 ---- * @return */ ! public boolean isPaintArrow() { ! return paintArrow; } *************** *** 152,157 **** * @param b */ ! public void setPaintingArrow(boolean b) { ! paintingArrow = b; } --- 154,159 ---- * @param b */ ! public void setPaintArrow(boolean b) { ! paintArrow = b; } *************** *** 176,181 **** * @return */ ! public boolean isPaintingLabel() { ! return paintingLabel; } --- 178,183 ---- * @return */ ! public boolean isPaintLabel() { ! return paintLabel; } *************** *** 183,188 **** * @param b */ ! public void setPaintingLabel(boolean b) { ! paintingLabel = b; } --- 185,190 ---- * @param b */ ! public void setPaintLabel(boolean b) { ! paintLabel = b; } *************** *** 219,223 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public abstract double screenDistanceFromEdge(JGraphPane graphPane, Edge edge, Point point); /** --- 221,225 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public abstract double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point); /** *************** *** 242,244 **** --- 244,293 ---- return segmentLength; } + + + /* + * Overrides @see org.mediavirus.graphl.painter.EdgePainter#isPointInLabel(org.mediavirus.graphl.GraphlPane, org.mediavirus.graphl.graph.rdf.RDFEdge, java.awt.Point) + */ + public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, + Point point) { + // TODO Auto-generated method stub + return false; + } + /* + * Overrides @see org.mediavirus.graphl.view.Facet#getName() + */ + public String getName() { + // TODO Auto-generated method stub + return null; + } + /* + * Overrides @see org.mediavirus.graphl.view.Facet#isSameClass(java.lang.Object) + */ + public boolean isSameClass(Object o) { + // TODO Auto-generated method stub + return false; + } + /* + * Overrides @see org.mediavirus.graphl.view.Facet#setConfigurationNode(org.mediavirus.graphl.graph.Node) + */ + public void setConfigurationNode(Node node) { + if (node.getProperty("http://www.mediavirus.org/graphl#paintArrow") != null) { + setPaintArrow(node.getProperty("http://www.mediavirus.org/graphl#paintArrow").equalsIgnoreCase("true")); + } + if (node.getProperty("http://www.mediavirus.org/graphl#paintLabel") != null) { + setPaintLabel(node.getProperty("http://www.mediavirus.org/graphl#paintLabel").equalsIgnoreCase("true")); + } + String styleStr = node.getProperty("http://www.mediavirus.org/graphl#lineStyle"); + if ( styleStr != null) { + if (styleStr.equalsIgnoreCase("dotted")) { + setLineStyle(DOTTED); + } + else if (styleStr.equalsIgnoreCase("dashed")) { + setLineStyle(DASHED); + } + else { + setLineStyle(SOLID); + } + } + } } Index: ArrowEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ArrowEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArrowEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- ArrowEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 11,15 **** import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 11,14 ---- *************** *** 29,33 **** * @param edge the edge to paint */ ! public void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); --- 28,32 ---- * @param edge the edge to paint */ ! public void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); *************** *** 92,96 **** * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(JGraphPane graphPane,Graphics2D g,Edge edge,Point point) { double px=point.x; double py=point.y; --- 91,95 ---- * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point) { double px=point.x; double py=point.y; *************** *** 117,121 **** * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(JGraphPane graphPane,Edge edge,Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); --- 116,120 ---- * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); Index: ReificationNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ReificationNodePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReificationNodePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- ReificationNodePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 12,18 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; /** --- 12,18 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; /** *************** *** 27,31 **** * @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Point nodePoint = graphPane.getScreenPointForNode(node); g.setColor(new Color(255,250,168)); --- 27,31 ---- * @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Point nodePoint = graphPane.getScreenPointForNode(node); g.setColor(new Color(255,250,168)); *************** *** 38,42 **** * @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(JGraphPane graphPane, Node node, Point point) { Point nodePoint = graphPane.getScreenPointForNode(node); return Math.sqrt((nodePoint.getX()-point.getX())*(nodePoint.getX()-point.getX())+(nodePoint.getY()-point.getY())*(nodePoint.getY()-point.getY())) < 5; --- 38,42 ---- * @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(GraphlPane graphPane, Node node, Point point) { Point nodePoint = graphPane.getScreenPointForNode(node); return Math.sqrt((nodePoint.getX()-point.getX())*(nodePoint.getX()-point.getX())+(nodePoint.getY()-point.getY())*(nodePoint.getY()-point.getY())) < 5; *************** *** 46,50 **** * @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(JGraphPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint = graphPane.getScreenPointForNode(node); nodeScreenRectangle.setRect(nodePoint.x-4, nodePoint.y-4, 8, 8); --- 46,50 ---- * @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(GraphlPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint = graphPane.getScreenPointForNode(node); nodeScreenRectangle.setRect(nodePoint.x-4, nodePoint.y-4, 8, 8); *************** *** 55,59 **** */ public String getToolTipText( ! JGraphPane graphPane, Node node, Point point) { --- 55,59 ---- */ public String getToolTipText( ! GraphlPane graphPane, Node node, Point point) { *************** *** 64,68 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane, Node node, Point p) { return false; } --- 64,68 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) { return false; } Index: StraightLineEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/StraightLineEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StraightLineEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- StraightLineEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 19,23 **** import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 19,22 ---- *************** *** 43,47 **** */ public double screenDistanceFromEdge( ! JGraphPane graphPane, Edge edge, Point point) { --- 42,46 ---- */ public double screenDistanceFromEdge( ! GraphlPane graphPane, Edge edge, Point point) { *************** *** 67,71 **** * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from = graphPane.getScreenPointForNode(edge.getFrom()); Point to = graphPane.getScreenPointForNode(edge.getTo()); --- 66,70 ---- * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { Point from = graphPane.getScreenPointForNode(edge.getFrom()); Point to = graphPane.getScreenPointForNode(edge.getTo()); *************** *** 83,87 **** sourceNodePainter.getNodeScreenBounds(graphPane, sourceNode, sourceNodeRectangle); ! if (isPaintingArrow()) { targetNodeRectangle.grow(2,2); //sourceNodeRectangle.grow(-3,-3); --- 82,86 ---- sourceNodePainter.getNodeScreenBounds(graphPane, sourceNode, sourceNodeRectangle); ! if (isPaintArrow()) { targetNodeRectangle.grow(2,2); //sourceNodeRectangle.grow(-3,-3); *************** *** 105,109 **** g.setColor(oldColor); ! if (isPaintingArrow() || isPaintingLabel()) { int x = (from.x+to.x)/2; --- 104,108 ---- g.setColor(oldColor); ! if (isPaintArrow() || isPaintLabel()) { int x = (from.x+to.x)/2; *************** *** 124,128 **** g.rotate(angle,x,y); ! if (isPaintingArrow()) { if (flipped) { paintArrow(g,x+5,y,x-5,y); --- 123,127 ---- g.rotate(angle,x,y); ! if (isPaintArrow()) { if (flipped) { paintArrow(g,x+5,y,x-5,y); *************** *** 132,136 **** } } ! if (isPaintingLabel()){ String label = labelGenerator.getLabel(edge); if (label != null){ --- 131,135 ---- } } ! if (isPaintLabel()){ String label = labelGenerator.getLabel(edge); if (label != null){ *************** *** 244,248 **** */ public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point) { ! if (isPaintingLabel()) { String label = edge.getValue(); if (label != null){ --- 243,247 ---- */ public boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point) { ! if (isPaintLabel()) { String label = edge.getValue(); if (label != null){ *************** *** 282,286 **** public Object clone() { ! StraightLineEdgePainter p = new StraightLineEdgePainter(lineWidth, lineStyle, paintingArrow, paintingLabel, font.getSize()); return p; } --- 281,285 ---- public Object clone() { ! StraightLineEdgePainter p = new StraightLineEdgePainter(lineWidth, lineStyle, paintArrow, paintLabel, font.getSize()); return p; } *************** *** 293,297 **** * Overrides @see org.mediavirus.graphl.view.GraphlEdgePainter#getLength(org.mediavirus.graphl.RDFEdge) */ ! public double getLength(RDFEdge edge) { return edge.getLength(); } --- 292,296 ---- * Overrides @see org.mediavirus.graphl.view.GraphlEdgePainter#getLength(org.mediavirus.graphl.RDFEdge) */ ! public double getLength(Edge edge) { return edge.getLength(); } Index: ImageNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ImageNodePainter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageNodePainter.java 20 Aug 2004 12:38:52 -0000 1.2 --- ImageNodePainter.java 21 Aug 2004 22:31:01 -0000 1.3 *************** *** 21,27 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; --- 21,27 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; *************** *** 59,63 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#paintNode(org.mediavirus.graphl.view.JGraphPane, java.awt.Graphics2D, org.mediavirus.graphl.graph.Node) */ ! public void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Image img = getImage(node, graphPane.getGraph().getBaseURL()); if (img != null) { --- 59,63 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#paintNode(org.mediavirus.graphl.view.JGraphPane, java.awt.Graphics2D, org.mediavirus.graphl.graph.Node) */ ! public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { Image img = getImage(node, graphPane.getGraph().getBaseURL()); if (img != null) { *************** *** 141,145 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#isInNode(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isInNode(JGraphPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); --- 141,145 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#isInNode(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isInNode(GraphlPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); *************** *** 151,155 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#getNodeScreenBounds(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(JGraphPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); int width=1; --- 151,155 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#getNodeScreenBounds(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(GraphlPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); int width=1; *************** *** 167,171 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#getToolTipText(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public String getToolTipText(JGraphPane graphPane, Node node, Point point) { return node.getValue(); } --- 167,171 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#getToolTipText(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public String getToolTipText(GraphlPane graphPane, Node node, Point point) { return node.getValue(); } *************** *** 175,179 **** * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane, Node node, Point p) { // TODO (2) implement this --- 175,179 ---- * Overrides @see org.mediavirus.graphl.view.NodePainter#isEdgeDragPoint(org.mediavirus.graphl.view.JGraphPane, org.mediavirus.graphl.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) { // TODO (2) implement this Index: InvisibleNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/InvisibleNodePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InvisibleNodePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- InvisibleNodePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 11,17 **** import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; /** --- 11,17 ---- import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; /** *************** *** 26,30 **** * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane, Node node, Point p) { return false; } --- 26,30 ---- * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) { return false; } *************** *** 50,54 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { } --- 50,54 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#paintNode(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Node) */ ! public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { } *************** *** 57,61 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(JGraphPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); Point nodePoint=graphPane.getScreenPointForNode(node); --- 57,61 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#isInNode(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public boolean isInNode(GraphlPane graphPane, Node node, Point point) { Rectangle nodeScreenRectangle=new Rectangle(); Point nodePoint=graphPane.getScreenPointForNode(node); *************** *** 68,72 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(JGraphPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point p=graphPane.getScreenPointForNode(node); nodeScreenRectangle.setFrame(p.x,p.y,1,1); --- 68,72 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getNodeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Rectangle) */ ! public void getNodeScreenBounds(GraphlPane graphPane, Node node, Rectangle nodeScreenRectangle) { Point p=graphPane.getScreenPointForNode(node); nodeScreenRectangle.setFrame(p.x,p.y,1,1); *************** *** 77,81 **** * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getToolTipText(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public String getToolTipText(JGraphPane graphPane, Node node, Point point) { return null; } --- 77,81 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.NodePainter#getToolTipText(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Node, java.awt.Point) */ ! public String getToolTipText(GraphlPane graphPane, Node node, Point point) { return null; } Index: NodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/NodePainter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NodePainter.java 20 Aug 2004 12:38:52 -0000 1.2 --- NodePainter.java 21 Aug 2004 22:31:01 -0000 1.3 *************** *** 5,12 **** import java.awt.Rectangle; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.Facet; - import org.mediavirus.graphl.view.JGraphPane; /** --- 5,12 ---- import java.awt.Rectangle; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.Facet; /** *************** *** 21,25 **** * @param node the node to paint */ ! void paintNode(JGraphPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted); /** * Checks whether given point is inside the node. --- 21,25 ---- * @param node the node to paint */ ! void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted); /** * Checks whether given point is inside the node. *************** *** 30,34 **** * @return <code>true</code> if the point is in the node */ ! boolean isInNode(JGraphPane graphPane,Node node,Point point); /** * Returns the outer rectangle of the node on screen. --- 30,34 ---- * @return <code>true</code> if the point is in the node */ ! boolean isInNode(GraphlPane graphPane,Node node,Point point); /** * Returns the outer rectangle of the node on screen. *************** *** 38,42 **** * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! void getNodeScreenBounds(JGraphPane graphPane,Node node,Rectangle nodeScreenRectangle); /** * Returns the tool-tip for given point. --- 38,42 ---- * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! void getNodeScreenBounds(GraphlPane graphPane,Node node,Rectangle nodeScreenRectangle); /** * Returns the tool-tip for given point. *************** *** 47,53 **** * @return the tool-tip at given point (or <code>null</code>) */ ! String getToolTipText(JGraphPane graphPane,Node node,Point point); ! public boolean isEdgeDragPoint(JGraphPane graphPane,Node node,Point p); /** --- 47,53 ---- * @return the tool-tip at given point (or <code>null</code>) */ ! String getToolTipText(GraphlPane graphPane,Node node,Point point); ! public boolean isEdgeDragPoint(GraphlPane graphPane,Node node,Point p); /** Index: LineEdgePainterController.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainterController.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LineEdgePainterController.java 2 Aug 2004 12:36:49 -0000 1.1 --- LineEdgePainterController.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 179,184 **** isUpdating = true; ! getPaintLabelCheckBox().setSelected(painter.isPaintingLabel()); ! boolean temp = painter.isPaintingArrow(); JCheckBox box = getPaintArrowCheckBox(); box.setSelected(temp); --- 179,184 ---- isUpdating = true; ! getPaintLabelCheckBox().setSelected(painter.isPaintLabel()); ! boolean temp = painter.isPaintArrow(); JCheckBox box = getPaintArrowCheckBox(); box.setSelected(temp); *************** *** 193,198 **** painter.setLineWidth(getWidthSlider().getValue()/10.0f); painter.setLineStyle(getLineTypeComboBox().getSelectedIndex()); ! painter.setPaintingArrow(getPaintArrowCheckBox().isSelected()); ! painter.setPaintingLabel(getPaintLabelCheckBox().isSelected()); } } --- 193,198 ---- painter.setLineWidth(getWidthSlider().getValue()/10.0f); painter.setLineStyle(getLineTypeComboBox().getSelectedIndex()); ! painter.setPaintArrow(getPaintArrowCheckBox().isSelected()); ! painter.setPaintLabel(getPaintLabelCheckBox().isSelected()); } } Index: ManhattanEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ManhattanEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ManhattanEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- ManhattanEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 13,17 **** import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 13,16 ---- *************** *** 24,28 **** * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { g.setStroke(getStroke(selected, highlighted)); --- 23,27 ---- * @see org.mediavirus.graphl.painter.LineEdgePainter#doPaintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge, boolean, boolean) */ ! void doPaintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { g.setStroke(getStroke(selected, highlighted)); *************** *** 42,46 **** */ public double screenDistanceFromEdge( ! JGraphPane graphPane, Edge edge, Point point) { --- 41,45 ---- */ public double screenDistanceFromEdge( ! GraphlPane graphPane, Edge edge, Point point) { *************** *** 82,86 **** } ! protected Point[] getVertices(JGraphPane graphPane, Edge edge){ //TODO (2): distribute incoming & outgoing connections across side of node (3h) Node src = edge.getFrom(); --- 81,85 ---- } ! protected Point[] getVertices(GraphlPane graphPane, Edge edge){ //TODO (2): distribute incoming & outgoing connections across side of node (3h) Node src = edge.getFrom(); Index: AbstractEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/AbstractEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- AbstractEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 4,10 **** import java.awt.Rectangle; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.view.AbstractFacet; - import org.mediavirus.graphl.view.JGraphPane; /** --- 4,10 ---- import java.awt.Rectangle; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.view.AbstractFacet; /** *************** *** 20,24 **** * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(JGraphPane graphPane,Edge edge,Point point) { double px=point.x; double py=point.y; --- 20,24 ---- * @return the distance of the point from the edge */ ! public double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point) { double px=point.x; double py=point.y; *************** *** 45,49 **** * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(JGraphPane graphPane,Edge edge,Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); --- 45,49 ---- * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! public void getEdgeScreenBounds(GraphlPane graphPane,Edge edge,Rectangle edgeScreenRectangle) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Point to=graphPane.getScreenPointForNode(edge.getTo()); Index: BoxNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/BoxNodePainter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BoxNodePainter.java 20 Aug 2004 12:38:52 -0000 1.2 --- BoxNodePainter.java 21 Aug 2004 22:31:01 -0000 1.3 *************** *** 13,23 **** import java.awt.Rectangle; import java.awt.Stroke; - import java.util.Iterator; import javax.swing.JComponent; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; import org.mediavirus.graphl.view.LabelGenerator; --- 13,22 ---- import java.awt.Rectangle; import java.awt.Stroke; import javax.swing.JComponent; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.LabelGenerator; *************** *** 81,85 **** */ public String getToolTipText( ! JGraphPane graphPane, Node node, Point point) { --- 80,84 ---- */ public String getToolTipText( ! GraphlPane graphPane, Node node, Point point) { *************** *** 155,159 **** * @param node the node to paint */ ! public void paintNode(JGraphPane graphPane,Graphics2D g,Node node, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator=(DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); boolean isDragging=false; //draggingManipulator!=null && draggingManipulator.getDraggedNode()==node; --- 154,158 ---- * @param node the node to paint */ ! public void paintNode(GraphlPane graphPane,Graphics2D g,Node node, boolean selected, boolean highlighted) { //DraggingManipulator draggingManipulator=(DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME); boolean isDragging=false; //draggingManipulator!=null && draggingManipulator.getDraggedNode()==node; *************** *** 199,203 **** * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! public void getNodeScreenBounds(JGraphPane graphPane,Node node,Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); String label = labelGenerator.getLabel(node); --- 198,202 ---- * @param nodeScreenRectangle the rectangle receiving the node's coordinates */ ! public void getNodeScreenBounds(GraphlPane graphPane,Node node,Rectangle nodeScreenRectangle) { Point nodePoint=graphPane.getScreenPointForNode(node); String label = labelGenerator.getLabel(node); *************** *** 218,222 **** * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(java.awt.Point) */ ! public boolean isEdgeDragPoint(JGraphPane graphPane,Node node,Point p) { Rectangle r = new Rectangle(); getNodeScreenBounds(graphPane, node, r); --- 217,221 ---- * Overrides @see org.mediavirus.graphl.view.GraphlNodePainter#isEdgeDragPoint(java.awt.Point) */ ! public boolean isEdgeDragPoint(GraphlPane graphPane,Node node,Point p) { Rectangle r = new Rectangle(); getNodeScreenBounds(graphPane, node, r); *************** *** 238,242 **** * @return <code>true</code> if the point is in the node */ ! public boolean isInNode(JGraphPane graphPane,Node node,Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); --- 237,241 ---- * @return <code>true</code> if the point is in the node */ ! public boolean isInNode(GraphlPane graphPane,Node node,Point point) { Rectangle nodeScreenRectangle=new Rectangle(); getNodeScreenBounds(graphPane,node,nodeScreenRectangle); Index: InvisibleEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/InvisibleEdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InvisibleEdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- InvisibleEdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 14,18 **** import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.rdf.RDFEdge; - import org.mediavirus.graphl.view.JGraphPane; /** --- 14,17 ---- *************** *** 82,86 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { if (showPins) { Rectangle r = new Rectangle(); --- 81,85 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#paintEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, java.awt.Graphics2D, de.fzi.wim.guibase.graphview.graph.Edge) */ ! public void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted) { if (showPins) { Rectangle r = new Rectangle(); *************** *** 96,100 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public double screenDistanceFromEdge(JGraphPane graphPane, Edge edge, Point point) { if (showPins) { Rectangle r = new Rectangle(); --- 95,99 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#screenDistanceFromEdge(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Point) */ ! public double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point) { if (showPins) { Rectangle r = new Rectangle(); *************** *** 111,115 **** * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#getEdgeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Rectangle) */ ! public void getEdgeScreenBounds(JGraphPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { if (showPins) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); --- 110,114 ---- * Overrides @see de.fzi.wim.guibase.graphview.view.EdgePainter#getEdgeScreenBounds(de.fzi.wim.guibase.graphview.view.JGraphPane, de.fzi.wim.guibase.graphview.graph.Edge, java.awt.Rectangle) */ ! public void getEdgeScreenBounds(GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle) { if (showPins) { Point from=graphPane.getScreenPointForNode(edge.getFrom()); Index: EdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/EdgePainter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EdgePainter.java 2 Aug 2004 12:36:49 -0000 1.1 --- EdgePainter.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 9,13 **** import org.mediavirus.graphl.graph.rdf.RDFEdge; import org.mediavirus.graphl.view.Facet; - import org.mediavirus.graphl.view.JGraphPane; /** --- 9,12 ---- *************** *** 22,26 **** * @param edge the edge to paint */ ! void paintEdge(JGraphPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** * Returns the distance of the point to the edge. --- 21,25 ---- * @param edge the edge to paint */ ! void paintEdge(GraphlPane graphPane, Graphics2D g, Edge edge, boolean selected, boolean highlighted); /** * Returns the distance of the point to the edge. *************** *** 31,35 **** * @return the distance of the point from the edge */ ! double screenDistanceFromEdge(JGraphPane graphPane, Edge edge, Point point); /** * Returns the outer rectangle of the edge on screen. --- 30,34 ---- * @return the distance of the point from the edge */ ! double screenDistanceFromEdge(GraphlPane graphPane, Edge edge, Point point); /** * Returns the outer rectangle of the edge on screen. *************** *** 39,43 **** * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! void getEdgeScreenBounds(JGraphPane graphPane, Edge edge, Rectangle edgeScreenRectangle); boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point); --- 38,42 ---- * @param edgeScreenRectangle the rectangle receiving the edge's coordinates */ ! void getEdgeScreenBounds(GraphlPane graphPane, Edge edge, Rectangle edgeScreenRectangle); boolean isPointInLabel(GraphlPane graphPane, RDFEdge edge, Point point); |
|
From: Flo L. <fl...@us...> - 2004-08-21 22:31:45
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32158/src/org/mediavirus/graphl/view Modified Files: FacetRegistry.java SimpleFacetRegistry.java GraphFacetRegistry.java Removed Files: JGraphPane.java Log Message: * added martin klinke's contributions (File>New and mousewheel zooming) * implemented facet configuration from rdf config file * added configuration data to config.rdf * removed historic JGraphPane, merged with GraphlPane * factored out vocabulary registry mechanism from GraphlPane Index: SimpleFacetRegistry.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/SimpleFacetRegistry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimpleFacetRegistry.java 20 Aug 2004 12:38:52 -0000 1.2 --- SimpleFacetRegistry.java 21 Aug 2004 22:31:01 -0000 1.3 *************** *** 409,411 **** --- 409,465 ---- } } + + /* + * Overrides @see org.mediavirus.graphl.view.FacetRegistry#updateEdgeFacets(org.mediavirus.graphl.graph.Edge) + */ + public void updateEdgeFacets(Edge edge) { + if (edge.getType() != null) { + EdgeLayouter l = getEdgeLayouterForType(edge.getType()); + if ( l != null) { + edge.setCurrentLayouter(l); + } + else { + edge.setCurrentLayouter(getDefaultEdgeLayouter()); + } + + EdgePainter p = getEdgePainterForType(edge.getType()); + if ( p != null) { + edge.setCurrentPainter(p); + } + else { + edge.setCurrentPainter(getDefaultEdgePainter()); + } + } + else { + edge.setCurrentPainter(getDefaultEdgePainter()); + edge.setCurrentLayouter(getDefaultEdgeLayouter()); + } + } + + /* + * Overrides @see org.mediavirus.graphl.view.FacetRegistry#updateNodeFacets(org.mediavirus.graphl.graph.Node) + */ + public void updateNodeFacets(Node node) { + if (node.getType() != null) { + NodeLayouter l = getNodeLayouterForType(node.getType()); + if ( l != null) { + node.setCurrentLayouter(l); + } + else { + node.setCurrentLayouter(getDefaultNodeLayouter()); + } + + NodePainter p = getNodePainterForType(node.getType()); + if ( p != null) { + node.setCurrentPainter(p); + } + else { + node.setCurrentPainter(getDefaultNodePainter()); + } + } + else { + node.setCurrentPainter(getDefaultNodePainter()); + node.setCurrentLayouter(getDefaultNodeLayouter()); + } + } } --- JGraphPane.java DELETED --- Index: FacetRegistry.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/FacetRegistry.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FacetRegistry.java 2 Aug 2004 12:36:31 -0000 1.1 --- FacetRegistry.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 98,101 **** --- 98,111 ---- public NodeLayouter getNodeLayouterForType(String type); + /** + * @param edge + */ + public void updateEdgeFacets(Edge edge); + + /** + * + */ + public void updateNodeFacets(Node node); + // public NodeLayouter getNodeLayouter(Node node); Index: GraphFacetRegistry.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GraphFacetRegistry.java 20 Aug 2004 12:38:52 -0000 1.1 --- GraphFacetRegistry.java 21 Aug 2004 22:31:01 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- import java.util.Iterator; + import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.GraphListener; *************** *** 46,66 **** while (nodes.hasNext()) { Node node = (Node) nodes.next(); ! if (node.getType().equals("http://www.mediavirus.org/graphl#NodePainter")) { ! NodePainter nodePainter = (NodePainter)getFacetInstance(node); ! ! } ! else if (node.getType().equals("http://www.mediavirus.org/graphl#NodeLayouter")) { ! NodeLayouter nodeLayouter = (NodeLayouter)getFacetInstance(node); ! } ! else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgePainter")) { ! EdgePainter edgePainter = (EdgePainter)getFacetInstance(node); ! } ! else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgeLayouter")) { ! EdgeLayouter edgeLayouter = (EdgeLayouter)getFacetInstance(node); } } } ! private Facet getFacetInstance(Node facetNode) { String type = facetNode.getProperty("http://www.mediavirus.org/graphl#javaClass"); try { --- 47,113 ---- while (nodes.hasNext()) { Node node = (Node) nodes.next(); ! if (node.getType() != null) { ! if (node.getType().equals("http://www.mediavirus.org/graphl#NodePainter")) { ! ! NodePainter nodePainter = (NodePainter)createFacetInstance(node); ! ! if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultNodePainter").isEmpty()){ ! setDefaultNodePainter(nodePainter); ! } ! ! Iterator assignedTypes = node.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator(); ! while (assignedTypes.hasNext()) { ! Node classNode = (Node)assignedTypes.next(); ! String type = classNode.getValue(); ! setPainterForNodeType(type, nodePainter); ! } ! } ! else if (node.getType().equals("http://www.mediavirus.org/graphl#NodeLayouter")) { ! NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node); ! ! if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultNodeLayouter").isEmpty()){ ! setDefaultNodeLayouter(nodeLayouter); ! } ! ! Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator(); ! while (assignedTypes.hasNext()) { ! Node classNode = ((Edge)assignedTypes.next()).getTo(); ! String type = classNode.getValue(); ! setLayouterForNodeType(type, nodeLayouter); ! } ! } ! else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgePainter")) { ! EdgePainter edgePainter = (EdgePainter)createFacetInstance(node); ! ! if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultEdgePainter").isEmpty()){ ! setDefaultEdgePainter(edgePainter); ! } ! ! Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator(); ! while (assignedTypes.hasNext()) { ! Node classNode = ((Edge)assignedTypes.next()).getTo(); ! String type = classNode.getValue(); ! setPainterForEdgeType(type, edgePainter); ! } ! } ! else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgeLayouter")) { ! EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node); ! ! if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultEdgeLayouter").isEmpty()){ ! setDefaultEdgeLayouter(edgeLayouter); ! } ! ! Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator(); ! while (assignedTypes.hasNext()) { ! Node classNode = ((Edge)assignedTypes.next()).getTo(); ! String type = classNode.getValue(); ! setLayouterForEdgeType(type, edgeLayouter); ! } ! } } } } ! private Facet createFacetInstance(Node facetNode) { String type = facetNode.getProperty("http://www.mediavirus.org/graphl#javaClass"); try { |
|
From: Flo L. <fl...@us...> - 2004-08-21 22:31:44
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32158/src/org/mediavirus/graphl/gui Modified Files: NodeContextMenu.java EdgeContextMenu.java TextFieldInPlaceNodeEditor.java InPlaceNodeEditor.java Log Message: * added martin klinke's contributions (File>New and mousewheel zooming) * implemented facet configuration from rdf config file * added configuration data to config.rdf * removed historic JGraphPane, merged with GraphlPane * factored out vocabulary registry mechanism from GraphlPane Index: TextFieldInPlaceNodeEditor.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/TextFieldInPlaceNodeEditor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TextFieldInPlaceNodeEditor.java 21 Jun 2004 18:48:04 -0000 1.1 --- TextFieldInPlaceNodeEditor.java 21 Aug 2004 22:31:00 -0000 1.2 *************** *** 11,16 **** import javax.swing.JTextField; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; --- 11,16 ---- import javax.swing.JTextField; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Node; *************** *** 20,24 **** public class TextFieldInPlaceNodeEditor extends InPlaceNodeEditor implements FocusListener,ActionListener,KeyListener { ! public TextFieldInPlaceNodeEditor(JGraphPane graphPane,Node node,NodeEditingController nodeEditingController) { super(graphPane,node,nodeEditingController); } --- 20,24 ---- public class TextFieldInPlaceNodeEditor extends InPlaceNodeEditor implements FocusListener,ActionListener,KeyListener { ! public TextFieldInPlaceNodeEditor(GraphlPane graphPane,Node node,NodeEditingController nodeEditingController) { super(graphPane,node,nodeEditingController); } Index: NodeContextMenu.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/NodeContextMenu.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** NodeContextMenu.java 2 Aug 2004 12:36:32 -0000 1.9 --- NodeContextMenu.java 21 Aug 2004 22:31:00 -0000 1.10 *************** *** 47,54 **** case DISPLAY: if (applyToNode) { ! graphlPane.getPainterRegistry().setPainterForNode(currentNode, null); } else { ! graphlPane.getPainterRegistry().setPainterForNodeType(currentNode.getType(), null); } break; --- 47,54 ---- case DISPLAY: if (applyToNode) { ! graphlPane.getFacetRegistry().setPainterForNode(currentNode, null); } else { ! graphlPane.getFacetRegistry().setPainterForNodeType(currentNode.getType(), null); } break; *************** *** 56,63 **** case LAYOUT: if (applyToNode) { ! graphlPane.getPainterRegistry().setLayouterForNode(currentNode, null); } else { ! graphlPane.getPainterRegistry().setLayouterForNodeType(currentNode.getType(), null); } break; --- 56,63 ---- case LAYOUT: if (applyToNode) { ! graphlPane.getFacetRegistry().setLayouterForNode(currentNode, null); } else { ! graphlPane.getFacetRegistry().setLayouterForNodeType(currentNode.getType(), null); } break; *************** *** 93,100 **** NodePainter painter = (NodePainter) newController; if (applyToNode) { ! graphlPane.getPainterRegistry().setPainterForNode(currentNode, painter); } else { ! graphlPane.getPainterRegistry().setPainterForNodeType(currentNode.getType(), painter); } } --- 93,100 ---- NodePainter painter = (NodePainter) newController; if (applyToNode) { ! graphlPane.getFacetRegistry().setPainterForNode(currentNode, painter); } else { ! graphlPane.getFacetRegistry().setPainterForNodeType(currentNode.getType(), painter); } } *************** *** 102,109 **** NodeLayouter layouter = (NodeLayouter) newController; if (applyToNode) { ! graphlPane.getPainterRegistry().setLayouterForNode(currentNode, layouter); } else { ! graphlPane.getPainterRegistry().setLayouterForNodeType(currentNode.getType(), layouter); } } --- 102,109 ---- NodeLayouter layouter = (NodeLayouter) newController; if (applyToNode) { ! graphlPane.getFacetRegistry().setLayouterForNode(currentNode, layouter); } else { ! graphlPane.getFacetRegistry().setLayouterForNodeType(currentNode.getType(), layouter); } } *************** *** 165,169 **** typeSubMenu.addSeparator(); ! Enumeration vocabs = graphlPane.getRegisteredVocabularies(); while (vocabs.hasMoreElements()) { Vocabulary vocab = (Vocabulary) vocabs.nextElement(); --- 165,169 ---- typeSubMenu.addSeparator(); ! Enumeration vocabs = graphlPane.getVocabularyRegistry().getRegisteredVocabularies(); while (vocabs.hasMoreElements()) { Vocabulary vocab = (Vocabulary) vocabs.nextElement(); *************** *** 199,213 **** switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getPainterRegistry().getNodePainterForType(node.getType()); ! if (defaultController == null) defaultController = graphlPane.getPainterRegistry().getDefaultNodePainter(); currentController = node.getCurrentPainter(); ! availableControllers = graphlPane.getPainterRegistry().getAvailableNodePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getPainterRegistry().getNodeLayouterForType(node.getType()); ! if (defaultController == null) defaultController = graphlPane.getPainterRegistry().getDefaultNodeLayouter(); currentController = node.getCurrentLayouter(); ! availableControllers = graphlPane.getPainterRegistry().getAvailableNodeLayouters().iterator(); break; --- 199,213 ---- switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getFacetRegistry().getNodePainterForType(node.getType()); ! if (defaultController == null) defaultController = graphlPane.getFacetRegistry().getDefaultNodePainter(); currentController = node.getCurrentPainter(); ! availableControllers = graphlPane.getFacetRegistry().getAvailableNodePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getFacetRegistry().getNodeLayouterForType(node.getType()); ! if (defaultController == null) defaultController = graphlPane.getFacetRegistry().getDefaultNodeLayouter(); currentController = node.getCurrentLayouter(); ! availableControllers = graphlPane.getFacetRegistry().getAvailableNodeLayouters().iterator(); break; *************** *** 229,243 **** switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getPainterRegistry().getDefaultNodePainter(); ! currentController = graphlPane.getPainterRegistry().getNodePainterForType(node.getType()); //currentController = node.getCurrentPainter(); ! availableControllers = graphlPane.getPainterRegistry().getAvailableNodePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getPainterRegistry().getDefaultNodeLayouter(); ! currentController = graphlPane.getPainterRegistry().getNodeLayouterForType(node.getType()); //currentController = node.getCurrentLayouter(); ! availableControllers = graphlPane.getPainterRegistry().getAvailableNodeLayouters().iterator(); break; --- 229,243 ---- switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getFacetRegistry().getDefaultNodePainter(); ! currentController = graphlPane.getFacetRegistry().getNodePainterForType(node.getType()); //currentController = node.getCurrentPainter(); ! availableControllers = graphlPane.getFacetRegistry().getAvailableNodePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getFacetRegistry().getDefaultNodeLayouter(); ! currentController = graphlPane.getFacetRegistry().getNodeLayouterForType(node.getType()); //currentController = node.getCurrentLayouter(); ! availableControllers = graphlPane.getFacetRegistry().getAvailableNodeLayouters().iterator(); break; Index: InPlaceNodeEditor.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/InPlaceNodeEditor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InPlaceNodeEditor.java 21 Jun 2004 18:48:04 -0000 1.1 --- InPlaceNodeEditor.java 21 Aug 2004 22:31:00 -0000 1.2 *************** *** 7,14 **** import javax.swing.SwingUtilities; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.GraphListener; import org.mediavirus.graphl.graph.Node; - import org.mediavirus.graphl.view.JGraphPane; /** --- 7,14 ---- import javax.swing.SwingUtilities; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.GraphListener; import org.mediavirus.graphl.graph.Node; /** *************** *** 17,21 **** public abstract class InPlaceNodeEditor implements GraphListener { /** The graph pane. */ ! protected JGraphPane m_graphPane; /** The node being edited. */ protected Node m_node; --- 17,21 ---- public abstract class InPlaceNodeEditor implements GraphListener { /** The graph pane. */ ! protected GraphlPane m_graphPane; /** The node being edited. */ protected Node m_node; *************** *** 31,35 **** protected Object m_initialValue; ! public InPlaceNodeEditor(JGraphPane graphPane,Node node,NodeEditingController nodeEditingController) { m_graphPane=graphPane; m_node=node; --- 31,35 ---- protected Object m_initialValue; ! public InPlaceNodeEditor(GraphlPane graphPane,Node node,NodeEditingController nodeEditingController) { m_graphPane=graphPane; m_node=node; *************** *** 42,46 **** * @return the graph pane */ ! public JGraphPane getGraphPane() { return m_graphPane; } --- 42,46 ---- * @return the graph pane */ ! public GraphlPane getGraphPane() { return m_graphPane; } Index: EdgeContextMenu.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/EdgeContextMenu.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EdgeContextMenu.java 2 Aug 2004 12:36:48 -0000 1.8 --- EdgeContextMenu.java 21 Aug 2004 22:31:00 -0000 1.9 *************** *** 47,54 **** case DISPLAY: if (applyToEdge) { ! graphlPane.getPainterRegistry().setPainterForEdge(currentEdge, null); } else { ! graphlPane.getPainterRegistry().setPainterForEdgeType(currentEdge.getType(), null); } break; --- 47,54 ---- case DISPLAY: if (applyToEdge) { ! graphlPane.getFacetRegistry().setPainterForEdge(currentEdge, null); } else { ! graphlPane.getFacetRegistry().setPainterForEdgeType(currentEdge.getType(), null); } break; *************** *** 56,63 **** case LAYOUT: if (applyToEdge) { ! graphlPane.getPainterRegistry().setLayouterForEdge(currentEdge, null); } else { ! graphlPane.getPainterRegistry().setLayouterForEdgeType(currentEdge.getType(), null); } break; --- 56,63 ---- case LAYOUT: if (applyToEdge) { ! graphlPane.getFacetRegistry().setLayouterForEdge(currentEdge, null); } else { ! graphlPane.getFacetRegistry().setLayouterForEdgeType(currentEdge.getType(), null); } break; *************** *** 93,100 **** EdgePainter painter = (EdgePainter) newController; if (applyToEdge) { ! graphlPane.getPainterRegistry().setPainterForEdge(currentEdge, painter); } else { ! graphlPane.getPainterRegistry().setPainterForEdgeType(currentEdge.getType(), painter); } } --- 93,100 ---- EdgePainter painter = (EdgePainter) newController; if (applyToEdge) { ! graphlPane.getFacetRegistry().setPainterForEdge(currentEdge, painter); } else { ! graphlPane.getFacetRegistry().setPainterForEdgeType(currentEdge.getType(), painter); } } *************** *** 102,109 **** EdgeLayouter layouter = (EdgeLayouter) newController; if (applyToEdge) { ! graphlPane.getPainterRegistry().setLayouterForEdge(currentEdge, layouter); } else { ! graphlPane.getPainterRegistry().setLayouterForEdgeType(currentEdge.getType(), layouter); } } --- 102,109 ---- EdgeLayouter layouter = (EdgeLayouter) newController; if (applyToEdge) { ! graphlPane.getFacetRegistry().setLayouterForEdge(currentEdge, layouter); } else { ! graphlPane.getFacetRegistry().setLayouterForEdgeType(currentEdge.getType(), layouter); } } *************** *** 165,169 **** typeSubMenu.addSeparator(); ! Enumeration vocabs = graphlPane.getRegisteredVocabularies(); while (vocabs.hasMoreElements()) { Vocabulary vocab = (Vocabulary) vocabs.nextElement(); --- 165,169 ---- typeSubMenu.addSeparator(); ! Enumeration vocabs = graphlPane.getVocabularyRegistry().getRegisteredVocabularies(); while (vocabs.hasMoreElements()) { Vocabulary vocab = (Vocabulary) vocabs.nextElement(); *************** *** 199,213 **** switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getPainterRegistry().getEdgePainterForType(edge.getType()); ! if (defaultController == null) defaultController = graphlPane.getPainterRegistry().getDefaultEdgePainter(); currentController = edge.getCurrentPainter(); ! availableControllers = graphlPane.getPainterRegistry().getAvailableEdgePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getPainterRegistry().getEdgeLayouterForType(edge.getType()); ! if (defaultController == null) defaultController = graphlPane.getPainterRegistry().getDefaultEdgeLayouter(); currentController = edge.getCurrentLayouter(); ! availableControllers = graphlPane.getPainterRegistry().getAvailableEdgeLayouters().iterator(); break; --- 199,213 ---- switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getFacetRegistry().getEdgePainterForType(edge.getType()); ! if (defaultController == null) defaultController = graphlPane.getFacetRegistry().getDefaultEdgePainter(); currentController = edge.getCurrentPainter(); ! availableControllers = graphlPane.getFacetRegistry().getAvailableEdgePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getFacetRegistry().getEdgeLayouterForType(edge.getType()); ! if (defaultController == null) defaultController = graphlPane.getFacetRegistry().getDefaultEdgeLayouter(); currentController = edge.getCurrentLayouter(); ! availableControllers = graphlPane.getFacetRegistry().getAvailableEdgeLayouters().iterator(); break; *************** *** 229,241 **** switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getPainterRegistry().getDefaultEdgePainter(); ! currentController = graphlPane.getPainterRegistry().getEdgePainterForType(edge.getType()); ! availableControllers = graphlPane.getPainterRegistry().getAvailableEdgePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getPainterRegistry().getDefaultEdgeLayouter(); ! currentController = graphlPane.getPainterRegistry().getEdgeLayouterForType(edge.getType()); ! availableControllers = graphlPane.getPainterRegistry().getAvailableEdgeLayouters().iterator(); break; --- 229,241 ---- switch (controllerType) { case DISPLAY: ! defaultController = graphlPane.getFacetRegistry().getDefaultEdgePainter(); ! currentController = graphlPane.getFacetRegistry().getEdgePainterForType(edge.getType()); ! availableControllers = graphlPane.getFacetRegistry().getAvailableEdgePainters().iterator(); break; case LAYOUT: ! defaultController = graphlPane.getFacetRegistry().getDefaultEdgeLayouter(); ! currentController = graphlPane.getFacetRegistry().getEdgeLayouterForType(edge.getType()); ! availableControllers = graphlPane.getFacetRegistry().getAvailableEdgeLayouters().iterator(); break; |
|
From: Flo L. <fl...@us...> - 2004-08-21 22:31:18
|
Update of /cvsroot/graphl/graphl/web/graphs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32158/web/graphs Removed Files: head.gif Log Message: * added martin klinke's contributions (File>New and mousewheel zooming) * implemented facet configuration from rdf config file * added configuration data to config.rdf * removed historic JGraphPane, merged with GraphlPane * factored out vocabulary registry mechanism from GraphlPane --- head.gif DELETED --- |
