graphl-cvs Mailing List for Graphl - Hybrid graph visualization tool (Page 6)
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...> - 2005-08-24 16:06:03
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3880/src/org/mediavirus/graphl/layout Modified Files: RepulsionNodeLayouter.java GraphlLayoutStrategy.java Log Message: some adjustments to layout algorithm Index: GraphlLayoutStrategy.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/GraphlLayoutStrategy.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GraphlLayoutStrategy.java 17 Aug 2005 15:52:49 -0000 1.11 --- GraphlLayoutStrategy.java 24 Aug 2005 16:05:54 -0000 1.12 *************** *** 101,108 **** * Returns <code>true</code> if more steps in the layout should be executed. * ! * @return <code>true</code> if more steps should be executed */ public boolean shouldExecuteStep() { ! return !(damper<0.2 && damping && graphManager.maxMotion<0.5); } /** --- 101,109 ---- * Returns <code>true</code> if more steps in the layout should be executed. * ! * @return <code>true</code> if more steps should be executed */ public boolean shouldExecuteStep() { ! //System.out.println(damping + ":" + damper + ":" + graphManager.maxMotion); ! return !(damper<0.2 && damping && graphManager.maxMotion<1.0); } /** *************** *** 173,183 **** //We never want the damper to be negative though if ((graphManager.maxMotion<0.2 || (graphManager.maxMotion>1 && damper<0.9)) && damper > 0.01) ! damper-=0.01; //If we've slowed down significanly, damp more aggresively (then the line two below) ! else if (graphManager.maxMotion<0.4 && damper > 0.003) ! damper-=0.003; //If max motion is pretty high, and we just started damping, then only damp slightly else if(damper>0.0001) ! damper -=0.0001; } } --- 174,184 ---- //We never want the damper to be negative though if ((graphManager.maxMotion<0.2 || (graphManager.maxMotion>1 && damper<0.9)) && damper > 0.01) ! damper-=0.1; //If we've slowed down significanly, damp more aggresively (then the line two below) ! else if (graphManager.maxMotion<0.8 && damper > 0.003) ! damper-=0.03; //If max motion is pretty high, and we just started damping, then only damp slightly else if(damper>0.0001) ! damper -=0.001; } } Index: RepulsionNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/RepulsionNodeLayouter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RepulsionNodeLayouter.java 17 Aug 2005 15:52:49 -0000 1.8 --- RepulsionNodeLayouter.java 24 Aug 2005 16:05:54 -0000 1.9 *************** *** 48,52 **** dy=Math.random(); } ! else if (currentLengthSquared<600*600) { // 600, because we don't want deleted nodes to fly too far away dx=deltaX/currentLengthSquared; // If it was sqrt(len) then a single node surrounded by many others will dy=deltaY/currentLengthSquared; // always look like a circle. This might look good at first, but I think --- 48,52 ---- dy=Math.random(); } ! else if (currentLengthSquared<300*300) { // 600, because we don't want deleted nodes to fly too far away dx=deltaX/currentLengthSquared; // If it was sqrt(len) then a single node surrounded by many others will dy=deltaY/currentLengthSquared; // always look like a circle. This might look good at first, but I think |
|
From: Flo L. <fl...@us...> - 2005-08-24 16:05:27
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3672/src/org/mediavirus/graphl/vocabulary Modified Files: NS.java Log Message: added foaf namespace to NS helper class Index: NS.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/NS.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NS.java 17 Aug 2005 15:52:52 -0000 1.1 --- NS.java 24 Aug 2005 16:05:16 -0000 1.2 *************** *** 10,12 **** --- 10,13 ---- public class NS { public static final String graphl = "http://www.mediavirus.org/graphl#"; + public static final String foaf = "http://xmlns.com/foaf/0.1/"; } |
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/layout Modified Files: RepulsionNodeLayouter.java SortedNodeLayouter.java AbsoluteNodeLayouter.java SpringEdgeLayouter.java GraphlLayoutStrategy.java DirectedEdgeLayouter.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: DirectedEdgeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/DirectedEdgeLayouter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectedEdgeLayouter.java 4 Oct 2004 10:21:01 -0000 1.1 --- DirectedEdgeLayouter.java 17 Aug 2005 15:52:49 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- import org.mediavirus.graphl.layout.GraphlLayoutStrategy.GraphManager; import org.mediavirus.graphl.view.AbstractFacet; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 115,123 **** public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#length"); if (str != null) { setLength(Float.parseFloat(str)); } ! str = node.getProperty("http://www.mediavirus.org/graphl#direction"); if ( str != null) { if (str.equalsIgnoreCase("up")) { --- 116,124 ---- public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "length"); if (str != null) { setLength(Float.parseFloat(str)); } ! str = node.getProperty(NS.graphl + "direction"); if ( str != null) { if (str.equalsIgnoreCase("up")) { Index: SortedNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/SortedNodeLayouter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SortedNodeLayouter.java 27 Oct 2004 10:55:40 -0000 1.7 --- SortedNodeLayouter.java 17 Aug 2005 15:52:49 -0000 1.8 *************** *** 19,22 **** --- 19,23 ---- import org.mediavirus.graphl.layout.GraphlLayoutStrategy.NodeMovement; import org.mediavirus.graphl.view.AbstractFacet; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 306,326 **** */ public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#distance"); if (str != null) { setDistance(Float.parseFloat(str)); } ! str = node.getProperty("http://www.mediavirus.org/graphl#property"); if ( str != null) { setProperty(str); } ! str = node.getProperty("http://www.mediavirus.org/graphl#align"); if (str != null) { setAlign(str.equalsIgnoreCase("true")); } ! str = node.getProperty("http://www.mediavirus.org/graphl#proportional"); if (str != null) { setProportional(str.equalsIgnoreCase("true")); } ! str = node.getProperty("http://www.mediavirus.org/graphl#orientation"); if (str != null) { if (str.equalsIgnoreCase("DOWN")) { --- 307,327 ---- */ public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "distance"); if (str != null) { setDistance(Float.parseFloat(str)); } ! str = node.getProperty(NS.graphl + "property"); if ( str != null) { setProperty(str); } ! str = node.getProperty(NS.graphl + "align"); if (str != null) { setAlign(str.equalsIgnoreCase("true")); } ! str = node.getProperty(NS.graphl + "proportional"); if (str != null) { setProportional(str.equalsIgnoreCase("true")); } ! str = node.getProperty(NS.graphl + "orientation"); if (str != null) { if (str.equalsIgnoreCase("DOWN")) { Index: RepulsionNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/RepulsionNodeLayouter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RepulsionNodeLayouter.java 30 Nov 2004 09:38:32 -0000 1.7 --- RepulsionNodeLayouter.java 17 Aug 2005 15:52:49 -0000 1.8 *************** *** 11,14 **** --- 11,15 ---- import org.mediavirus.graphl.layout.GraphlLayoutStrategy.NodeMovement; import org.mediavirus.graphl.view.AbstractFacet; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 18,22 **** public class RepulsionNodeLayouter extends AbstractFacet implements NodeLayouter { ! float strength = 1.0f; /* --- 19,23 ---- public class RepulsionNodeLayouter extends AbstractFacet implements NodeLayouter { ! float strength = 0.3f; /* *************** *** 144,148 **** */ public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#strength"); if (str != null) { setStrength(Float.parseFloat(str)); --- 145,149 ---- */ public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "strength"); if (str != null) { setStrength(Float.parseFloat(str)); Index: AbsoluteNodeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/AbsoluteNodeLayouter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AbsoluteNodeLayouter.java 30 Nov 2004 09:38:32 -0000 1.8 --- AbsoluteNodeLayouter.java 17 Aug 2005 15:52:49 -0000 1.9 *************** *** 13,16 **** --- 13,17 ---- import org.mediavirus.graphl.layout.GraphlLayoutStrategy.GraphManager; import org.mediavirus.graphl.view.AbstractFacet; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.util.ParseUtils; *************** *** 276,280 **** public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#method"); if ( str != null) { if (str.equalsIgnoreCase("property")) { --- 277,281 ---- public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "method"); if ( str != null) { if (str.equalsIgnoreCase("property")) { *************** *** 289,296 **** } ! str = node.getProperty("http://www.mediavirus.org/graphl#property"); if (str != null) setProperty(str); ! str = node.getProperty("http://www.mediavirus.org/graphl#draggable"); if (str != null) setDraggable(Boolean.valueOf(str).booleanValue()); --- 290,297 ---- } ! str = node.getProperty(NS.graphl + "property"); if (str != null) setProperty(str); ! str = node.getProperty(NS.graphl + "draggable"); if (str != null) setDraggable(Boolean.valueOf(str).booleanValue()); Index: GraphlLayoutStrategy.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/GraphlLayoutStrategy.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GraphlLayoutStrategy.java 30 Nov 2004 09:38:32 -0000 1.10 --- GraphlLayoutStrategy.java 17 Aug 2005 15:52:49 -0000 1.11 *************** *** 115,119 **** EdgeLayouter edgeLayouter = edge.getCurrentLayouter(); ! edgeLayouter.performLayoutStep(edge, graphManager); } --- 115,120 ---- EdgeLayouter edgeLayouter = edge.getCurrentLayouter(); ! // TODO (1) should never be null! ! if (edgeLayouter != null) edgeLayouter.performLayoutStep(edge, graphManager); } *************** *** 130,134 **** Node node=(Node)iterator.next(); NodeLayouter nodeLayouter = node.getCurrentLayouter(); ! nodeLayouter.performLayoutStep(node, graphManager); } if (graphManager.maxMotion>0) --- 131,137 ---- Node node=(Node)iterator.next(); NodeLayouter nodeLayouter = node.getCurrentLayouter(); ! ! // TODO (1) should never be null! ! if (nodeLayouter != null) nodeLayouter.performLayoutStep(node, graphManager); } if (graphManager.maxMotion>0) *************** *** 324,329 **** NodeMovement nodeMovement1=getNodeMovement(edge.getFrom()); NodeMovement nodeMovement2=getNodeMovement(edge.getTo()); ! if (nodeMovement1.getSubGraph()!=nodeMovement2.getSubGraph()) ! mergeSubGraphs(nodeMovement1.getSubGraph(),nodeMovement2.getSubGraph()); } public void graphContentsChanged() { --- 327,332 ---- NodeMovement nodeMovement1=getNodeMovement(edge.getFrom()); NodeMovement nodeMovement2=getNodeMovement(edge.getTo()); ! if (nodeMovement1.getSubGraph()!=nodeMovement2.getSubGraph()) ! mergeSubGraphs(nodeMovement1.getSubGraph(),nodeMovement2.getSubGraph()); } public void graphContentsChanged() { Index: SpringEdgeLayouter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/SpringEdgeLayouter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SpringEdgeLayouter.java 21 Oct 2004 16:00:48 -0000 1.8 --- SpringEdgeLayouter.java 17 Aug 2005 15:52:49 -0000 1.9 *************** *** 9,12 **** --- 9,13 ---- import org.mediavirus.graphl.layout.GraphlLayoutStrategy.GraphManager; import org.mediavirus.graphl.view.AbstractFacet; + import org.mediavirus.graphl.vocabulary.NS; *************** *** 59,62 **** --- 60,64 ---- // because we want the edges to be stretchy. The edges are ideal rubberbands. // They don't become springs when they are too short. That only causes the graph to oscillate. + manager.getNodeMovement(from).applyDelta(dx,dy); manager.getNodeMovement(to).applyDelta(-dx,-dy); *************** *** 107,123 **** public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#lengthFactor"); if (str != null) { setLengthFactor(Float.parseFloat(str)); } ! str = node.getProperty("http://www.mediavirus.org/graphl#lengthProperty"); if ( str != null) { setLengthProperty(str); } ! str = node.getProperty("http://www.mediavirus.org/graphl#defaultLength"); if (str != null) { setDefaultLength(Float.parseFloat(str)); } ! str = node.getProperty("http://www.mediavirus.org/graphl#rigidity"); if (str != null) { setRigidity(Float.parseFloat(str)); --- 109,125 ---- public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "lengthFactor"); if (str != null) { setLengthFactor(Float.parseFloat(str)); } ! str = node.getProperty(NS.graphl + "lengthProperty"); if ( str != null) { setLengthProperty(str); } ! str = node.getProperty(NS.graphl + "defaultLength"); if (str != null) { setDefaultLength(Float.parseFloat(str)); } ! str = node.getProperty(NS.graphl + "rigidity"); if (str != null) { setRigidity(Float.parseFloat(str)); |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:32
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/view Modified Files: LabelGenerator.java GraphFacetRegistry.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: GraphFacetRegistry.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GraphFacetRegistry.java 30 Nov 2004 09:38:33 -0000 1.7 --- GraphFacetRegistry.java 17 Aug 2005 15:52:50 -0000 1.8 *************** *** 16,19 **** --- 16,20 ---- import org.mediavirus.graphl.painter.EdgePainter; import org.mediavirus.graphl.painter.NodePainter; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 49,53 **** clearRegistry(); if (registryNode != null) { // TODO (3) && graph.containsNode(registryNode) ! for (Iterator baseNodes = registryNode.getNeighbours("http://www.mediavirus.org/graphl#basedOn",true).iterator(); baseNodes.hasNext();) { Node baseNode = (Node) baseNodes.next(); processRegistryNode(baseNode); --- 50,54 ---- clearRegistry(); if (registryNode != null) { // TODO (3) && graph.containsNode(registryNode) ! for (Iterator baseNodes = registryNode.getNeighbours(NS.graphl + "basedOn",true).iterator(); baseNodes.hasNext();) { Node baseNode = (Node) baseNodes.next(); processRegistryNode(baseNode); *************** *** 59,94 **** private void processRegistryNode(Node registryNode) { if (registryNode != null) { ! if (!registryNode.hasType("http://www.mediavirus.org/graphl#Configuration")) return; ! Node node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultNodePainter",true); ! if (node != null && node.hasType("http://www.mediavirus.org/graphl#NodePainter")) { NodePainter nodePainter = (NodePainter)createFacetInstance(node); setDefaultNodePainter(nodePainter); } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultEdgePainter",true); ! if (node != null && node.hasType("http://www.mediavirus.org/graphl#EdgePainter")) { EdgePainter edgePainter = (EdgePainter)createFacetInstance(node); setDefaultEdgePainter(edgePainter); } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultNodeLayouter",true); ! if (node != null && node.hasType("http://www.mediavirus.org/graphl#NodeLayouter")) { NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node); setDefaultNodeLayouter(nodeLayouter); } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultEdgeLayouter",true); ! if (node != null && node.hasType("http://www.mediavirus.org/graphl#EdgeLayouter")) { EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node); setDefaultEdgeLayouter(edgeLayouter); } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#NodePainter")) { NodePainter nodePainter = (NodePainter)createFacetInstance(n); registerNodePainter(nodePainter); --- 60,95 ---- private void processRegistryNode(Node registryNode) { if (registryNode != null) { ! if (!registryNode.hasType(NS.graphl + "Configuration")) return; ! Node node = registryNode.getFirstNeighbour(NS.graphl + "defaultNodePainter",true); ! if (node != null && node.hasType(NS.graphl + "NodePainter")) { NodePainter nodePainter = (NodePainter)createFacetInstance(node); setDefaultNodePainter(nodePainter); } ! node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgePainter",true); ! if (node != null && node.hasType(NS.graphl + "EdgePainter")) { EdgePainter edgePainter = (EdgePainter)createFacetInstance(node); setDefaultEdgePainter(edgePainter); } ! node = registryNode.getFirstNeighbour(NS.graphl + "defaultNodeLayouter",true); ! if (node != null && node.hasType(NS.graphl + "NodeLayouter")) { NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node); setDefaultNodeLayouter(nodeLayouter); } ! node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgeLayouter",true); ! if (node != null && node.hasType(NS.graphl + "EdgeLayouter")) { EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node); setDefaultEdgeLayouter(edgeLayouter); } ! node = registryNode.getFirstNeighbour(NS.graphl + "availableNodePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "NodePainter")) { NodePainter nodePainter = (NodePainter)createFacetInstance(n); registerNodePainter(nodePainter); *************** *** 97,106 **** } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#EdgePainter")) { EdgePainter edgePainter = (EdgePainter)createFacetInstance(n); registerEdgePainter(edgePainter); --- 98,107 ---- } ! node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "EdgePainter")) { EdgePainter edgePainter = (EdgePainter)createFacetInstance(n); registerEdgePainter(edgePainter); *************** *** 109,118 **** } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#NodeLayouter")) { NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n); registerNodeLayouter(nodeLayouter); --- 110,119 ---- } ! node = registryNode.getFirstNeighbour(NS.graphl + "availableNodeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "NodeLayouter")) { NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n); registerNodeLayouter(nodeLayouter); *************** *** 121,130 **** } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#EdgeLayouter")) { EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n); registerEdgeLayouter(edgeLayouter); --- 122,131 ---- } ! node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "EdgeLayouter")) { EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n); registerEdgeLayouter(edgeLayouter); *************** *** 133,144 **** } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedNodePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#NodePainter")) { NodePainter nodePainter = (NodePainter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); --- 134,145 ---- } ! node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "NodePainter")) { NodePainter nodePainter = (NodePainter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); *************** *** 150,161 **** } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedEdgePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#EdgePainter")) { EdgePainter edgePainter = (EdgePainter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); --- 151,162 ---- } ! node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgePainters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "EdgePainter")) { EdgePainter edgePainter = (EdgePainter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); *************** *** 167,178 **** } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedNodeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#NodeLayouter")) { NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); --- 168,179 ---- } ! node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "NodeLayouter")) { NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); *************** *** 184,195 **** } ! node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedEdgeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType("http://www.mediavirus.org/graphl#EdgeLayouter")) { EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); --- 185,196 ---- } ! node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgeLayouters",true); if (node != null) { Iterator painters = node.getEdgesFrom().iterator(); while (painters.hasNext()) { Node n = ((Edge)painters.next()).getTo(); ! if (n.hasType(NS.graphl + "EdgeLayouter")) { EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n); ! Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator(); while (assignedTypes.hasNext()) { Node classNode = (Node)assignedTypes.next(); *************** *** 219,223 **** private Facet createFacetInstance(Node facetNode) { ! String type = facetNode.getProperty("http://www.mediavirus.org/graphl#javaClass"); try { if (type != null) { --- 220,224 ---- private Facet createFacetInstance(Node facetNode) { ! String type = facetNode.getProperty(NS.graphl + "javaClass"); try { if (type != null) { Index: LabelGenerator.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/LabelGenerator.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** LabelGenerator.java 21 Oct 2004 16:00:46 -0000 1.9 --- LabelGenerator.java 17 Aug 2005 15:52:50 -0000 1.10 *************** *** 12,15 **** --- 12,16 ---- import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.util.ParseUtils; *************** *** 278,282 **** Node listNode = null; ! listNode = node.getFirstNeighbour("http://www.mediavirus.org/graphl#labelFacets", true); if (listNode != null) { facets.clear(); --- 279,283 ---- Node listNode = null; ! listNode = node.getFirstNeighbour(NS.graphl + "labelFacets", true); if (listNode != null) { facets.clear(); *************** *** 286,292 **** Node labelFacetNode = listNode.getFirstNeighbour("http://www.w3.org/1999/02/22-rdf-syntax-ns#first", true); if (labelFacetNode != null) { ! String data = labelFacetNode.getProperty("http://www.mediavirus.org/graphl#labelFacetValue"); int type = STRING; ! String str = labelFacetNode.getProperty("http://www.mediavirus.org/graphl#labelFacetType"); if (str != null) { if (str.equalsIgnoreCase("value")) { --- 287,293 ---- Node labelFacetNode = listNode.getFirstNeighbour("http://www.w3.org/1999/02/22-rdf-syntax-ns#first", true); if (labelFacetNode != null) { ! String data = labelFacetNode.getProperty(NS.graphl + "labelFacetValue"); int type = STRING; ! String str = labelFacetNode.getProperty(NS.graphl + "labelFacetType"); if (str != null) { if (str.equalsIgnoreCase("value")) { *************** *** 304,308 **** } boolean guessName = false; ! str = labelFacetNode.getProperty("http://www.mediavirus.org/graphl#guessName"); if (str != null && str.equalsIgnoreCase("true")) guessName = true; LabelFacet labelFacet = new LabelFacet(type,data,guessName); --- 305,309 ---- } boolean guessName = false; ! str = labelFacetNode.getProperty(NS.graphl + "guessName"); if (str != null && str.equalsIgnoreCase("true")) guessName = true; LabelFacet labelFacet = new LabelFacet(type,data,guessName); |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:32
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl Modified Files: GraphlApplication.java GraphlPane.java GraphlApplet.java GraphlPanel.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: GraphlPanel.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPanel.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** GraphlPanel.java 11 Jan 2005 13:26:43 -0000 1.22 --- GraphlPanel.java 17 Aug 2005 15:52:51 -0000 1.23 *************** *** 25,28 **** --- 25,29 ---- import org.mediavirus.graphl.graph.*; + import org.mediavirus.graphl.graph.filter.FilteredGraph; import org.mediavirus.graphl.graph.rdf.RDFGraph; import org.mediavirus.graphl.interaction.DefaultNodeManipulator; *************** *** 43,46 **** --- 44,48 ---- GraphlPane graphPane; GraphlManipulator gui; + Graph graph; JCheckBox layoutBox; *************** *** 54,57 **** --- 56,65 ---- public GraphlPanel(){ + graph = new RDFGraph(); + initialize(); + } + + public GraphlPanel(Graph graph) { + this.graph = graph; initialize(); } *************** *** 192,196 **** public GraphlPane getGraphPane() { if (graphPane == null) { ! graphPane = new GraphlPane(); graphPane.setEnabled(true); graphPane.addManipulator(new GraphlManipulator()); --- 200,204 ---- public GraphlPane getGraphPane() { if (graphPane == null) { ! graphPane = new GraphlPane(graph); graphPane.setEnabled(true); graphPane.addManipulator(new GraphlManipulator()); *************** *** 235,240 **** } public RDFGraph getGraph() { ! return (RDFGraph) graphPane.getGraph(); } --- 243,249 ---- } + // TODO (1) fix access and casting public RDFGraph getGraph() { ! return (RDFGraph)((FilteredGraph) graphPane.getGraph()).getSource(); } Index: GraphlApplet.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GraphlApplet.java 29 Dec 2004 14:31:33 -0000 1.9 --- GraphlApplet.java 17 Aug 2005 15:52:51 -0000 1.10 *************** *** 26,29 **** --- 26,30 ---- import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.graph.rdf.RDFGraph; + import org.mediavirus.graphl.vocabulary.NS; *************** *** 134,138 **** for (Iterator settings = mainPanel.graphPane.getConfigurations().iterator(); settings.hasNext();) { Node node = (Node) settings.next(); ! if ((i == 0) || node.getProperty("http://www.mediavirus.org/graphl#default","").equalsIgnoreCase("true")) { defaultSettings = node; } --- 135,139 ---- for (Iterator settings = mainPanel.graphPane.getConfigurations().iterator(); settings.hasNext();) { Node node = (Node) settings.next(); ! if ((i == 0) || node.getProperty(NS.graphl + "default","").equalsIgnoreCase("true")) { defaultSettings = node; } Index: GraphlApplication.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplication.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** GraphlApplication.java 11 Jan 2005 13:26:43 -0000 1.18 --- GraphlApplication.java 17 Aug 2005 15:52:51 -0000 1.19 *************** *** 12,15 **** --- 12,16 ---- import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; + import java.awt.geom.Point2D; import java.io.File; import java.io.FileOutputStream; *************** *** 17,21 **** --- 18,24 ---- import java.net.MalformedURLException; import java.net.URL; + import java.util.ArrayList; import java.util.Iterator; + import java.util.List; import javax.swing.ButtonGroup; *************** *** 30,33 **** --- 33,38 ---- import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.graph.filter.FilteredGraph; + import org.mediavirus.graphl.graph.filter.TestFilter; import org.mediavirus.graphl.graph.rdf.RDFGraph; import org.mediavirus.graphl.gui.GenericDialog; *************** *** 37,40 **** --- 42,46 ---- import org.mediavirus.graphl.vocabulary.FOAF; import org.mediavirus.graphl.vocabulary.Graphl; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.graphl.vocabulary.RDF; import org.mediavirus.graphl.vocabulary.RDFS; *************** *** 90,94 **** }); ! mainPanel = new GraphlPanel(); this.getContentPane().setLayout(new BorderLayout()); --- 96,102 ---- }); ! FilteredGraph fgraph = new FilteredGraph(new RDFGraph()); ! fgraph.addFilter(new TestFilter()); ! mainPanel = new GraphlPanel(fgraph); this.getContentPane().setLayout(new BorderLayout()); *************** *** 440,444 **** } ! protected class SettingsAdapter implements ActionListener { private Node node; --- 448,452 ---- } ! protected class SettingsAdapter implements ActionListener { private Node node; *************** *** 472,476 **** public void loadSettings(String filename) throws IOException { ! RDFGraph settingsGraph = new RDFGraph(); settingsGraph.readFromFile(filename); mainPanel.graphPane.setConfigurationGraph(settingsGraph); --- 480,485 ---- public void loadSettings(String filename) throws IOException { ! // TODO (1) fix this to properly access graph. think about GraphlPanel vs. GraphlApplication features ! RDFGraph settingsGraph = (RDFGraph)((FilteredGraph)mainPanel.graphPane.getGraph()).getSource(); settingsGraph.readFromFile(filename); mainPanel.graphPane.setConfigurationGraph(settingsGraph); *************** *** 483,496 **** for (Iterator settings = mainPanel.graphPane.getConfigurations().iterator(); settings.hasNext();) { Node node = (Node) settings.next(); ! JRadioButtonMenuItem item = new JRadioButtonMenuItem(node.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>")); ! item.addActionListener(new SettingsAdapter(node)); ! item.setFont(menuFont); ! configConfigurationMenu.add(item); ! settingsGroup.add(item); ! if ((i == 0) || node.getProperty("http://www.mediavirus.org/graphl#default","").equalsIgnoreCase("true")) { ! defaultItem = item; ! defaultSettings = node; ! } ! i++; } --- 492,507 ---- for (Iterator settings = mainPanel.graphPane.getConfigurations().iterator(); settings.hasNext();) { Node node = (Node) settings.next(); ! if (! node.getProperty(NS.graphl + "public","true").equalsIgnoreCase("false")){ ! JRadioButtonMenuItem item = new JRadioButtonMenuItem(node.getProperty(NS.graphl + "name","<unnamed>")); ! item.addActionListener(new SettingsAdapter(node)); ! item.setFont(menuFont); ! configConfigurationMenu.add(item); ! settingsGroup.add(item); ! if ((i == 0) || node.getProperty(NS.graphl + "default","").equalsIgnoreCase("true")) { ! defaultItem = item; ! defaultSettings = node; ! } ! i++; ! } } *************** *** 583,586 **** --- 594,599 ---- app.scheduleRefresh(refresh * 1000); } + + //app.startNavigator(); } } *************** *** 591,594 **** --- 604,697 ---- /** + * + */ + private void startNavigator() { + Thread navigator = new Thread(){ + int counter = 0; + int zoomValue = 26; + int zoomStart = 25; + int zoomInc = 0; + + double tX=0, tY=0; + + long starttime = 0; + + List persons = new ArrayList(200); + + public void run() { + try { + List nodes = mainPanel.graphPane.graph.getNodes(); + for (Iterator iter = nodes.iterator(); iter.hasNext();) { + Node node = (Node) iter.next(); + if (("http://xmlns.com/foaf/0.1/Person".equals(node.getType()))) { + persons.add(node); + } + } + while(true) { + counter++; + + if (zoomValue >= 80) zoomInc = 0; + if (zoomValue <= 25) zoomInc = 0; + if (zoomInc != 0) { + zoomValue = zoomStart + (int)(((System.currentTimeMillis()-starttime) / 400.0) * zoomInc); + } + mainPanel.getZoomSlider().setValue(zoomValue); + Point2D pos = mainPanel.graphPane.getTranslation(); + mainPanel.graphPane.setTranslation((pos.getX()+(tX*((zoomValue-25)/55.0)-pos.getX())/30), (pos.getY()+(tY*((zoomValue-25)/55.0)-pos.getY())/30)); + + if (counter == 36000) System.exit(0); + + if ((counter % 400 == 150) || (counter % 400 == 230) || (counter % 400 == 310)) { + Node p = (Node)persons.get((int)(Math.random() * persons.size())); + //System.out.println(p.getProperty("http://xmlns.com/foaf/0.1/name","<null>")); + tX = -p.getCenterX(); + tY = -p.getCenterY(); + } + if (counter % 400 == 150) { + starttime = System.currentTimeMillis(); + zoomValue = 26; + zoomStart = 26; + zoomInc = 2; + } + if (counter % 400 == 0) { + starttime = System.currentTimeMillis(); + zoomValue = 79; + zoomStart = 79; + zoomInc = -4; + } + if ((counter > 30 ) && (counter % 400 == 30)) { + Node first = null; + for (Iterator settings = mainPanel.graphPane.getConfigurations().iterator(); settings.hasNext();) { + Node node = (Node) settings.next(); + if (! node.getProperty(NS.graphl + "public","true").equalsIgnoreCase("false")){ + if (first == null) first = node; + if (node.getProperty(NS.graphl + "active","").equalsIgnoreCase("true")) { + if (settings.hasNext()) { + node = (Node) settings.next(); + } + else { + node = first; + } + if (node != null) { + mainPanel.graphPane.setConfiguration(node); + break; + } + } + } + } + } + sleep(200); + } + } + catch (InterruptedException iex) { + System.out.println("navigator: interrupted"); + } + } + }; + navigator.start(); + + } + + /** * Controls the visibility of the menu bar. * @param visible The new visibility setting. Index: GraphlPane.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPane.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** GraphlPane.java 11 Jan 2005 13:26:43 -0000 1.18 --- GraphlPane.java 17 Aug 2005 15:52:51 -0000 1.19 *************** *** 47,50 **** --- 47,51 ---- import org.mediavirus.graphl.view.GraphFacetRegistry; import org.mediavirus.graphl.view.SimpleFacetRegistry; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.graphl.vocabulary.SimpleVocabularyRegistry; import org.mediavirus.graphl.vocabulary.VocabularyRegistry; *************** *** 88,91 **** --- 89,95 ---- Edge hoverEdge = null; + String comment = null; + + /** * Creates a graph pane. *************** *** 124,127 **** --- 128,145 ---- /** + * @return Returns the comment. + */ + public String getComment() { + return comment; + } + + /** + * @param comment The comment to set. + */ + public void setComment(String comment) { + this.comment = comment; + } + + /** * @return The VocabularyRegistry. */ *************** *** 180,188 **** public void paintComponent(Graphics g) { Graphics2D g2 = (Graphics2D) g; ! g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); if (transform != null) { g2.transform(transform); } - long renderStartTime=System.currentTimeMillis(); Rectangle clipRectangle=g.getClipBounds(); --- 198,206 ---- public void paintComponent(Graphics g) { Graphics2D g2 = (Graphics2D) g; ! g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); ! if (transform != null) { g2.transform(transform); } long renderStartTime=System.currentTimeMillis(); Rectangle clipRectangle=g.getClipBounds(); *************** *** 191,195 **** g.fillRect(clipRectangle.x,clipRectangle.y,clipRectangle.width,clipRectangle.height); g.setColor(oldColor); ! if (graph!=null) synchronized (graph) { // this is the main rendering loop --- 209,219 ---- g.fillRect(clipRectangle.x,clipRectangle.y,clipRectangle.width,clipRectangle.height); g.setColor(oldColor); ! ! // if (comment != null) { ! // g2.setFont(Font.decode("Dialog-10")); ! // g2.drawString("fooo", 0, 20); ! // } ! ! if (graph!=null) synchronized (graph) { // this is the main rendering loop *************** *** 371,389 **** */ public void setGraph(Graph graph) { Graph oldGraph = this.graph; ! if (this.graph!=null) { ! this.graph.removeGraphListener(graphListener); ! this.graph.removeGraphListener(this); } ! this.graph=graph; ! if (this.graph!=null) { ! this.graph.addGraphListener(graphListener); ! this.graph.addGraphListener(this); } repaint(); selection = new DefaultSelectionModel(graph); ! firePropertyChange("graph",oldGraph,this.graph); ! graph.addGraphListener(this); } --- 395,415 ---- */ public void setGraph(Graph graph) { + Graph oldGraph = this.graph; ! if (oldGraph != null) { ! oldGraph.removeGraphListener(graphListener); ! oldGraph.removeGraphListener(this); } ! ! this.graph = graph; ! if (graph != null) { ! graph.addGraphListener(graphListener); ! graph.addGraphListener(this); } repaint(); selection = new DefaultSelectionModel(graph); ! firePropertyChange("graph",oldGraph,graph); ! //graph.addGraphListener(this); } *************** *** 402,406 **** Node node=(Node)iterator.previous(); NodePainter nodePainter = node.getCurrentPainter(); ! if (nodePainter.isInNode(this,node,point)) return node; } --- 428,432 ---- Node node=(Node)iterator.previous(); NodePainter nodePainter = node.getCurrentPainter(); ! if (nodePainter != null && nodePainter.isInNode(this,node,point)) return node; } *************** *** 443,450 **** Edge edge=(Edge)iterator.previous(); EdgePainter edgePainter=getPainterForEdge(edge); ! double distance=edgePainter.screenDistanceFromEdge(this,edge,point); ! if (distance<minDistance) { ! minDistance=distance; ! nearestEdge=edge; } } --- 469,478 ---- Edge edge=(Edge)iterator.previous(); EdgePainter edgePainter=getPainterForEdge(edge); ! if (edgePainter != null) { ! double distance=edgePainter.screenDistanceFromEdge(this,edge,point); ! if (distance<minDistance) { ! minDistance=distance; ! nearestEdge=edge; ! } } } *************** *** 470,474 **** */ public void getNodeScreenBounds(Node node,Rectangle nodeScreenRectangle) { ! node.getCurrentPainter().getNodeScreenBounds(this,node,nodeScreenRectangle); } /** --- 498,503 ---- */ public void getNodeScreenBounds(Node node,Rectangle nodeScreenRectangle) { ! if (node.getCurrentPainter() != null) ! node.getCurrentPainter().getNodeScreenBounds(this,node,nodeScreenRectangle); } /** *************** *** 489,493 **** */ public void getEdgeScreenBounds(Edge edge,Rectangle edgeScreenRectangle) { ! edge.getCurrentPainter().getEdgeScreenBounds(this,edge,edgeScreenRectangle); } /** --- 518,523 ---- */ public void getEdgeScreenBounds(Edge edge,Rectangle edgeScreenRectangle) { ! if (edge.getCurrentPainter() != null) ! edge.getCurrentPainter().getEdgeScreenBounds(this,edge,edgeScreenRectangle); } /** *************** *** 751,757 **** for (Iterator nodes = settingsGraph.getNodes().iterator(); nodes.hasNext();) { Node node = (Node) nodes.next(); ! if (node.hasType("http://www.mediavirus.org/graphl#Configuration")) { configurations.add(node); ! node.setProperty("http://www.mediavirus.org/graphl#active","false"); } } --- 781,787 ---- for (Iterator nodes = settingsGraph.getNodes().iterator(); nodes.hasNext();) { Node node = (Node) nodes.next(); ! if (node.hasType(NS.graphl + "Configuration")) { configurations.add(node); ! node.setProperty(NS.graphl + "active","false"); } } *************** *** 773,782 **** public void setConfiguration(Node configuration){ if (currentConfiguration != null) { ! currentConfiguration.setProperty("http://www.mediavirus.org/graphl#active","false"); } currentConfiguration = configuration; setFacetRegistry(new GraphFacetRegistry(settingsGraph,configuration)); ! setVocabularies(configuration.getFirstNeighbour("http://www.mediavirus.org/graphl#vocabularies",true)); ! configuration.setProperty("http://www.mediavirus.org/graphl#active","true"); } /** --- 803,814 ---- public void setConfiguration(Node configuration){ if (currentConfiguration != null) { ! currentConfiguration.setProperty(NS.graphl + "active","false"); } currentConfiguration = configuration; setFacetRegistry(new GraphFacetRegistry(settingsGraph,configuration)); ! setVocabularies(configuration.getFirstNeighbour(NS.graphl + "vocabularies",true)); ! configuration.setProperty(NS.graphl + "active","true"); ! setComment(configuration.getProperty(NS.graphl + "comment")); ! graph.notifyLayoutUpdated(); } /** *************** *** 792,794 **** --- 824,832 ---- return hoverEdge; } + /** + * @return Returns the centerXF. + */ + public AffineTransform getCenter() { + return centerXF; + } } |
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/painter Modified Files: ImageNodePainter.java StraightLineEdgePainter.java LineEdgePainter.java BoxNodePainter.java StraightLineEdgePainterBeanInfo.java ShapeNodePainter.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: LineEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LineEdgePainter.java 30 Nov 2004 09:38:34 -0000 1.8 --- LineEdgePainter.java 17 Aug 2005 15:52:51 -0000 1.9 *************** *** 17,20 **** --- 17,21 ---- import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.LabelGenerator; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.util.ParseUtils; *************** *** 27,31 **** --- 28,40 ---- protected boolean paintArrow = true; protected boolean paintLabel = true; + + /** + * + * @uml.property name="invertArrow" + */ + protected boolean invertArrow = false; + + Stroke stroke; Stroke highlightedStroke; *************** *** 101,104 **** --- 110,132 ---- /** + * @return Returns the invertArrow. + * + * @uml.property name="invertArrow" + */ + public boolean isInvertArrow() { + return invertArrow; + } + + /** + * @param invertArrow The invertArrow to set. + * + * @uml.property name="invertArrow" + */ + public void setInvertArrow(boolean invertArrow) { + this.invertArrow = invertArrow; + } + + + /** * @return The Stroke currently set for rendering the Edge. */ *************** *** 217,236 **** public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#paintArrow"); if (str != null) { setPaintArrow(str.equalsIgnoreCase("true")); } ! str = node.getProperty("http://www.mediavirus.org/graphl#paintLabel"); if (str != null) { setPaintLabel(str.equalsIgnoreCase("true")); } ! Color col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#color")); if (col != null) setColor(col); ! col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#labelColor")); if (col != null) setLabelColor(col); ! Stroke stroke = ParseUtils.parseStroke(node.getProperty("http://www.mediavirus.org/graphl#stroke")); if (stroke != null) setStroke(stroke); --- 245,268 ---- public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "paintArrow"); if (str != null) { setPaintArrow(str.equalsIgnoreCase("true")); } ! str = node.getProperty(NS.graphl + "paintLabel"); if (str != null) { setPaintLabel(str.equalsIgnoreCase("true")); } + str = node.getProperty(NS.graphl + "invertArrow"); + if (str != null) { + setInvertArrow(str.equalsIgnoreCase("true")); + } ! Color col = ParseUtils.parseColor(node.getProperty(NS.graphl + "color")); if (col != null) setColor(col); ! col = ParseUtils.parseColor(node.getProperty(NS.graphl + "labelColor")); if (col != null) setLabelColor(col); ! Stroke stroke = ParseUtils.parseStroke(node.getProperty(NS.graphl + "stroke")); if (stroke != null) setStroke(stroke); Index: StraightLineEdgePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/StraightLineEdgePainter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** StraightLineEdgePainter.java 30 Nov 2004 09:38:33 -0000 1.6 --- StraightLineEdgePainter.java 17 Aug 2005 15:52:51 -0000 1.7 *************** *** 123,130 **** if (to.x>from.x) { angle = Math.atan2(to.y-from.y,to.x-from.x); } else { angle = Math.atan2(from.y-to.y,from.x-to.x); ! flipped = true; } --- 123,131 ---- if (to.x>from.x) { angle = Math.atan2(to.y-from.y,to.x-from.x); + flipped = invertArrow; } else { angle = Math.atan2(from.y-to.y,from.x-to.x); ! flipped = !invertArrow; } Index: ImageNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ImageNodePainter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ImageNodePainter.java 21 Oct 2004 16:00:46 -0000 1.6 --- ImageNodePainter.java 17 Aug 2005 15:52:51 -0000 1.7 *************** *** 23,26 **** --- 23,27 ---- import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.util.ParseUtils; *************** *** 56,60 **** public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { ! Image img = getImage(node, graphPane.getGraph().getBaseURL()); if (img != null) { int iw, ih; --- 57,68 ---- public void paintNode(GraphlPane graphPane, Graphics2D g, Node node, boolean selected, boolean highlighted) { ! URL baseURL = null; ! try { ! baseURL = new URL(node.getFirstNeighbour(NS.graphl + "loadedFrom", true).getId()); ! } ! catch (Exception ex) { ! // do nothing ! } ! Image img = getImage(node, baseURL); if (img != null) { int iw, ih; *************** *** 140,144 **** int iw=1, ih=1; ! Image img = getImage(node, graphPane.getGraph().getBaseURL()); if (img != null) { if (node.getWidth() > 0) { --- 148,159 ---- int iw=1, ih=1; ! URL baseURL = null; ! try { ! baseURL = new URL(node.getFirstNeighbour(NS.graphl + "loadedFrom", true).getId()); ! } ! catch (Exception ex) { ! // do nothing ! } ! Image img = getImage(node, baseURL); if (img != null) { if (node.getWidth() > 0) { *************** *** 330,343 **** public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#useStatic"); if (str != null) setUseStatic(Boolean.valueOf(str).booleanValue()); ! str = node.getProperty("http://www.mediavirus.org/graphl#property"); if (str != null) setProperty(str); ! str = node.getProperty("http://www.mediavirus.org/graphl#staticURL"); if (str != null) setStaticURL(str); ! Color col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#borderColor")); if (col != null) setBorderColor(col); --- 345,358 ---- public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "useStatic"); if (str != null) setUseStatic(Boolean.valueOf(str).booleanValue()); ! str = node.getProperty(NS.graphl + "property"); if (str != null) setProperty(str); ! str = node.getProperty(NS.graphl + "staticURL"); if (str != null) setStaticURL(str); ! Color col = ParseUtils.parseColor(node.getProperty(NS.graphl + "borderColor")); if (col != null) setBorderColor(col); Index: ShapeNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ShapeNodePainter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ShapeNodePainter.java 30 Nov 2004 09:38:34 -0000 1.5 --- ShapeNodePainter.java 17 Aug 2005 15:52:51 -0000 1.6 *************** *** 22,25 **** --- 22,26 ---- import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.util.ParseUtils; *************** *** 197,201 **** public void setConfigurationNode(Node node) { ! String str = node.getProperty("http://www.mediavirus.org/graphl#shape"); if ( str != null) { if (str.equalsIgnoreCase("X")) { --- 198,202 ---- public void setConfigurationNode(Node node) { ! String str = node.getProperty(NS.graphl + "shape"); if ( str != null) { if (str.equalsIgnoreCase("X")) { *************** *** 210,220 **** } ! Stroke stroke = ParseUtils.parseStroke(node.getProperty("http://www.mediavirus.org/graphl#stroke")); if (stroke != null) setStroke(stroke); ! Color col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#color")); if (col != null) setBorderColor(col); ! col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#fillColor")); if (col != null) setFillColor(col); --- 211,221 ---- } ! Stroke stroke = ParseUtils.parseStroke(node.getProperty(NS.graphl + "stroke")); if (stroke != null) setStroke(stroke); ! Color col = ParseUtils.parseColor(node.getProperty(NS.graphl + "color")); if (col != null) setBorderColor(col); ! col = ParseUtils.parseColor(node.getProperty(NS.graphl + "fillColor")); if (col != null) setFillColor(col); Index: StraightLineEdgePainterBeanInfo.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/StraightLineEdgePainterBeanInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StraightLineEdgePainterBeanInfo.java 14 Oct 2004 13:03:03 -0000 1.2 --- StraightLineEdgePainterBeanInfo.java 17 Aug 2005 15:52:51 -0000 1.3 *************** *** 31,34 **** --- 31,35 ---- new PropertyDescriptor("stroke", beanClass), new PropertyDescriptor("paintArrow", beanClass), + new PropertyDescriptor("invertArrow", beanClass), new PropertyDescriptor("paintLabel", beanClass) }; Index: BoxNodePainter.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/BoxNodePainter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** BoxNodePainter.java 29 Dec 2004 14:31:34 -0000 1.9 --- BoxNodePainter.java 17 Aug 2005 15:52:51 -0000 1.10 *************** *** 18,21 **** --- 18,22 ---- import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.view.LabelGenerator; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.util.ParseUtils; *************** *** 323,340 **** public void setConfigurationNode(Node node) { ! Color col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#baseColor")); if (col != null) baseColor = col; ! col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#borderColor")); if (col != null) borderColor = col; ! col = ParseUtils.parseColor(node.getProperty("http://www.mediavirus.org/graphl#textColor")); if (col != null) textColor = col; ! Font font = ParseUtils.parseFont(node.getProperty("http://www.mediavirus.org/graphl#font")); if (font != null) setFont(font); try { ! Node labelGeneratorNode = (Node)node.getNeighbours("http://www.mediavirus.org/graphl#labelGenerator", true).get(0); labelGenerator.setConfigurationNode(labelGeneratorNode); } --- 324,341 ---- public void setConfigurationNode(Node node) { ! Color col = ParseUtils.parseColor(node.getProperty(NS.graphl + "baseColor")); if (col != null) baseColor = col; ! col = ParseUtils.parseColor(node.getProperty(NS.graphl + "borderColor")); if (col != null) borderColor = col; ! col = ParseUtils.parseColor(node.getProperty(NS.graphl + "textColor")); if (col != null) textColor = col; ! Font font = ParseUtils.parseFont(node.getProperty(NS.graphl + "font")); if (font != null) setFont(font); try { ! Node labelGeneratorNode = (Node)node.getNeighbours(NS.graphl + "labelGenerator", true).get(0); labelGenerator.setConfigurationNode(labelGeneratorNode); } *************** *** 343,356 **** } ! Stroke stroke = ParseUtils.parseStroke(node.getProperty("http://www.mediavirus.org/graphl#borderStroke")); if (stroke != null) setBorderStroke(stroke); ! String str = node.getProperty("http://www.mediavirus.org/graphl#roundRect"); if (str != null) setRoundRect(str.equalsIgnoreCase("true")); ! str = node.getProperty("http://www.mediavirus.org/graphl#useBorderColor"); if (str != null) setUseBorderColor(str.equalsIgnoreCase("true")); ! str = node.getProperty("http://www.mediavirus.org/graphl#cornerRadius"); if (str != null) setCornerRadius(Integer.parseInt(str)); } --- 344,357 ---- } ! Stroke stroke = ParseUtils.parseStroke(node.getProperty(NS.graphl + "borderStroke")); if (stroke != null) setBorderStroke(stroke); ! String str = node.getProperty(NS.graphl + "roundRect"); if (str != null) setRoundRect(str.equalsIgnoreCase("true")); ! str = node.getProperty(NS.graphl + "useBorderColor"); if (str != null) setUseBorderColor(str.equalsIgnoreCase("true")); ! str = node.getProperty(NS.graphl + "cornerRadius"); if (str != null) setCornerRadius(Integer.parseInt(str)); } |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:31
|
Update of /cvsroot/graphl/graphl/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/config Modified Files: config.rdf Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: config.rdf =================================================================== RCS file: /cvsroot/graphl/graphl/config/config.rdf,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** config.rdf 11 Jan 2005 13:19:12 -0000 1.13 --- config.rdf 17 Aug 2005 15:52:53 -0000 1.14 *************** *** 1,4 **** --- 1,5 ---- <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE rdf:RDF [ + <!ENTITY foo 'http://www.mediavirus.org/foo#'> <!ENTITY graphl 'http://www.mediavirus.org/graphl#'> <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'> *************** *** 11,14 **** --- 12,16 ---- <rdf:RDF xml:base="" + xmlns:foo="&foo;" xmlns:graphl="&graphl;" xmlns:foaf="&foaf;" *************** *** 421,430 **** <graphl:LabelGenerator> <graphl:labelFacets rdf:parseType="Collection"> ! <graphl:LabelFacet graphl:labelFacetType="Value" ! graphl:guessName="true"/> <graphl:LabelFacet graphl:labelFacetType="String" ! graphl:labelFacetValue=" ["/> <graphl:LabelFacet graphl:labelFacetType="Type" --- 423,432 ---- <graphl:LabelGenerator> <graphl:labelFacets rdf:parseType="Collection"> ! <!--<graphl:LabelFacet graphl:labelFacetType="Value" ! graphl:guessName="true"/>--> <graphl:LabelFacet graphl:labelFacetType="String" ! graphl:labelFacetValue=" [ "/> <graphl:LabelFacet graphl:labelFacetType="Type" *************** *** 432,436 **** <graphl:LabelFacet graphl:labelFacetType="String" ! graphl:labelFacetValue="]"/> </graphl:labelFacets> </graphl:LabelGenerator> --- 434,438 ---- <graphl:LabelFacet graphl:labelFacetType="String" ! graphl:labelFacetValue=" ] "/> </graphl:labelFacets> </graphl:LabelGenerator> *************** *** 509,512 **** --- 511,526 ---- <rdfs:Class rdf:about="&foaf;Project"/> </graphl:assignedToType> + <graphl:assignedToType> + <rdfs:Class rdf:about="&foo;Institution"/> + </graphl:assignedToType> + <graphl:assignedToType> + <rdfs:Class rdf:about="&foo;Network"/> + </graphl:assignedToType> + <graphl:assignedToType> + <rdfs:Class rdf:about="&foo;Company"/> + </graphl:assignedToType> + <graphl:assignedToType> + <rdfs:Class rdf:about="&foo;Exhibition"/> + </graphl:assignedToType> </graphl:NodePainter> </rdf:li> |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:31
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/vocabulary Modified Files: Graphl.java Added Files: NS.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code --- NEW FILE: NS.java --- /* * Created on 16.08.2005 */ package org.mediavirus.graphl.vocabulary; /** * @author flo */ public class NS { public static final String graphl = "http://www.mediavirus.org/graphl#"; } Index: Graphl.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/Graphl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Graphl.java 4 Oct 2004 10:21:01 -0000 1.2 --- Graphl.java 17 Aug 2005 15:52:52 -0000 1.3 *************** *** 20,24 **** private Graphl() { ! namespace = "http://www.mediavirus.org/graphl#"; name = "Graphl"; defaultNamespacePrefix = "graphl"; --- 20,24 ---- private Graphl() { ! namespace = NS.graphl; name = "Graphl"; defaultNamespacePrefix = "graphl"; |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:29
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/graph Modified Files: Edge.java GraphElement.java Graph.java DefaultGraph.java DefaultEdge.java DefaultNode.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: DefaultEdge.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultEdge.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** DefaultEdge.java 30 Nov 2004 09:38:33 -0000 1.12 --- DefaultEdge.java 17 Aug 2005 15:52:50 -0000 1.13 *************** *** 5,8 **** --- 5,9 ---- import org.mediavirus.graphl.layout.EdgeLayouter; import org.mediavirus.graphl.painter.EdgePainter; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 19,23 **** String id; ! public static final String DEFAULTTYPE = "http://www.mediavirus.org/graphl#connectedTo"; String type = DEFAULTTYPE; --- 20,31 ---- String id; ! /** ! * ! * @uml.property name="baseURL" ! */ ! String source = null; ! ! ! public static final String DEFAULTTYPE = NS.graphl + "connectedTo"; String type = DEFAULTTYPE; *************** *** 181,184 **** --- 189,209 ---- } + /** + * @see org.mediavirus.graphl.graph.GraphElement#getBaseURL() + * + * @uml.property name="baseURL" + */ + public String getSource() { + return source; + } + + /** + * @see org.mediavirus.graphl.graph.GraphElement#setBaseURL(java.lang.String) + * + * @uml.property name="baseURL" + */ + public void setSource(String source) { + this.source = source; + } } Index: DefaultNode.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultNode.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** DefaultNode.java 29 Dec 2004 14:31:33 -0000 1.14 --- DefaultNode.java 17 Aug 2005 15:52:50 -0000 1.15 *************** *** 266,268 **** --- 266,269 ---- this.width = width; } + } Index: Graph.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Graph.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Graph.java 11 Jan 2005 13:26:41 -0000 1.4 --- Graph.java 17 Aug 2005 15:52:50 -0000 1.5 *************** *** 1,5 **** package org.mediavirus.graphl.graph; - import java.net.URL; import java.util.List; --- 1,4 ---- *************** *** 43,51 **** */ List getEdges(); - /** - * @return The URL this graph was loaded from. This can be used for dereferencing relative URLs in - * the Graph. - */ - URL getBaseURL(); public Node createNode(); --- 42,45 ---- Index: Edge.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Edge.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Edge.java 30 Nov 2004 09:38:33 -0000 1.11 --- Edge.java 17 Aug 2005 15:52:50 -0000 1.12 *************** *** 25,29 **** */ public void invert(); ! /** * Returns the length of this edge. --- 25,32 ---- */ public void invert(); ! ! String getSource(); ! void setSource(String source); ! /** * Returns the length of this edge. Index: GraphElement.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/GraphElement.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GraphElement.java 14 Oct 2004 13:03:02 -0000 1.6 --- GraphElement.java 17 Aug 2005 15:52:50 -0000 1.7 *************** *** 32,35 **** // TODO (2, 2h) this should be removed! maybe a getLabel() in NodeView/EdgeView String getLabel(); ! } \ No newline at end of file --- 32,35 ---- // TODO (2, 2h) this should be removed! maybe a getLabel() in NodeView/EdgeView String getLabel(); ! } \ No newline at end of file Index: DefaultGraph.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultGraph.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DefaultGraph.java 27 Oct 2004 10:55:41 -0000 1.3 --- DefaultGraph.java 17 Aug 2005 15:52:50 -0000 1.4 *************** *** 1,5 **** package org.mediavirus.graphl.graph; - import java.net.URL; import java.util.Collection; import java.util.Iterator; --- 1,4 ---- *************** *** 12,18 **** public class DefaultGraph extends AbstractGraph { /** Nodes of the graph. */ ! protected List m_nodes; /** Edges of the graph. */ ! protected List m_edges; protected boolean loading = false; --- 11,17 ---- public class DefaultGraph extends AbstractGraph { /** Nodes of the graph. */ ! protected List allNodes; /** Edges of the graph. */ ! protected List allEdges; protected boolean loading = false; *************** *** 22,27 **** */ public DefaultGraph() { ! m_nodes=new LinkedList(); ! m_edges=new LinkedList(); } /** --- 21,26 ---- */ public DefaultGraph() { ! allNodes=new LinkedList(); ! allEdges=new LinkedList(); } /** *************** *** 31,35 **** */ public List getNodes() { ! return m_nodes; } /** --- 30,34 ---- */ public List getNodes() { ! return allNodes; } /** *************** *** 39,43 **** */ public List getEdges() { ! return m_edges; } /** --- 38,42 ---- */ public List getEdges() { ! return allEdges; } /** *************** *** 52,57 **** while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! if (!m_nodes.contains(node)) ! m_nodes.add(node); } } --- 51,56 ---- while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! if (!allNodes.contains(node)) ! allNodes.add(node); } } *************** *** 60,65 **** while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (!m_edges.contains(edge)) { ! m_edges.add(edge); ((DefaultNode)edge.getFrom()).notifyEdgeAdded(edge); ((DefaultNode)edge.getTo()).notifyEdgeAdded(edge); --- 59,64 ---- while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (!allEdges.contains(edge)) { ! allEdges.add(edge); ((DefaultNode)edge.getFrom()).notifyEdgeAdded(edge); ((DefaultNode)edge.getTo()).notifyEdgeAdded(edge); *************** *** 82,86 **** while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! m_nodes.remove(node); } } --- 81,85 ---- while (iterator.hasNext()) { DefaultNode node=(DefaultNode)iterator.next(); ! allNodes.remove(node); } } *************** *** 89,93 **** while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (m_edges.remove(edge)) { ((DefaultNode)edge.getFrom()).notifyEdgeRemoved(edge); ((DefaultNode)edge.getTo()).notifyEdgeRemoved(edge); --- 88,92 ---- while (iterator.hasNext()) { DefaultEdge edge=(DefaultEdge)iterator.next(); ! if (allEdges.remove(edge)) { ((DefaultNode)edge.getFrom()).notifyEdgeRemoved(edge); ((DefaultNode)edge.getTo()).notifyEdgeRemoved(edge); *************** *** 101,114 **** */ public synchronized void clear() { ! m_nodes.clear(); ! m_edges.clear(); fireGraphContentsChanged(); } ! /* ! * Overrides @see org.mediavirus.graphl.graph.Graph#getBaseURL() ! */ ! public URL getBaseURL() { ! return null; ! } /* * Overrides @see org.mediavirus.graphl.graph.Graph#createNode() --- 100,108 ---- */ public synchronized void clear() { ! allNodes.clear(); ! allEdges.clear(); fireGraphContentsChanged(); } ! /* * Overrides @see org.mediavirus.graphl.graph.Graph#createNode() |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:07
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/gui Modified Files: GraphContextMenu.java TypeMenu.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: GraphContextMenu.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/GraphContextMenu.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraphContextMenu.java 29 Dec 2004 14:31:29 -0000 1.2 --- GraphContextMenu.java 17 Aug 2005 15:52:55 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 51,61 **** for (Iterator settings = graphlPane.getConfigurations().iterator(); settings.hasNext();) { Node node = (Node) settings.next(); ! JRadioButtonMenuItem item = new JRadioButtonMenuItem(node.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>")); ! item.addActionListener(new SettingsAdapter(node)); ! configMenu.add(item); ! settingsGroup.add(item); ! if (node.getProperty("http://www.mediavirus.org/graphl#active","").equalsIgnoreCase("true")) { ! selectedItem = item; ! } } --- 52,64 ---- for (Iterator settings = graphlPane.getConfigurations().iterator(); settings.hasNext();) { Node node = (Node) settings.next(); ! if (! node.getProperty(NS.graphl + "public","true").equalsIgnoreCase("false")){ ! JRadioButtonMenuItem item = new JRadioButtonMenuItem(node.getProperty(NS.graphl + "name","<unnamed>")); ! item.addActionListener(new SettingsAdapter(node)); ! configMenu.add(item); ! settingsGroup.add(item); ! if (node.getProperty(NS.graphl + "active","").equalsIgnoreCase("true")) { ! selectedItem = item; ! } ! } } Index: TypeMenu.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/TypeMenu.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TypeMenu.java 11 Jan 2005 13:26:42 -0000 1.2 --- TypeMenu.java 17 Aug 2005 15:52:55 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.graphl.vocabulary.ResourceActionListener; *************** *** 20,24 **** public class TypeMenu extends JMenu implements ResourceListener{ ! static final int CLASSES = 1, PROPERTIES = 2, ALL = 3; Node types = null; String currentType = null; --- 21,25 ---- public class TypeMenu extends JMenu implements ResourceListener{ ! public static final int CLASSES = 1, PROPERTIES = 2, ALL = 3; Node types = null; String currentType = null; *************** *** 56,67 **** */ protected void addItem(Node node, int which, boolean deep) { ! List items = node.getNeighbours("http://www.mediavirus.org/graphl#contains", true); for (Iterator iter = items.iterator(); iter.hasNext();) { Node item = (Node) iter.next(); ! if (item.hasType("http://www.mediavirus.org/graphl#Vocabulary")) { ! TypeMenu menu = new TypeMenu(item.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>"), item); menu.updateMenu(which); ! menu.setToolTipText(item.getProperty("http://www.mediavirus.org/graphl#description","")); this.add(menu); menu.addResourceListener(this); --- 57,68 ---- */ protected void addItem(Node node, int which, boolean deep) { ! List items = node.getNeighbours(NS.graphl + "contains", true); for (Iterator iter = items.iterator(); iter.hasNext();) { Node item = (Node) iter.next(); ! if (item.hasType(NS.graphl + "Vocabulary")) { ! TypeMenu menu = new TypeMenu(item.getProperty(NS.graphl + "name","<unnamed>"), item); menu.updateMenu(which); ! menu.setToolTipText(item.getProperty(NS.graphl + "description","")); this.add(menu); menu.addResourceListener(this); *************** *** 82,91 **** this.add(mItem); } ! else if ( (((which & CLASSES) > 0) && item.hasType("http://www.mediavirus.org/graphl#ClassGroup")) ! || (((which & PROPERTIES) > 0) && item.hasType("http://www.mediavirus.org/graphl#PropertyGroup"))) { if (deep) { ! TypeMenu menu = new TypeMenu(item.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>"), item); menu.updateMenu(which); ! menu.setToolTipText(item.getProperty("http://www.mediavirus.org/graphl#description","<unnamed>")); this.add(menu); menu.addResourceListener(this); --- 83,92 ---- this.add(mItem); } ! else if ( (((which & CLASSES) > 0) && item.hasType(NS.graphl + "ClassGroup")) ! || (((which & PROPERTIES) > 0) && item.hasType(NS.graphl + "PropertyGroup"))) { if (deep) { ! TypeMenu menu = new TypeMenu(item.getProperty(NS.graphl + "name","<unnamed>"), item); menu.updateMenu(which); ! menu.setToolTipText(item.getProperty(NS.graphl + "description","<unnamed>")); this.add(menu); menu.addResourceListener(this); |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:07
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/graph/rdf Modified Files: RDFNode.java RDFGraph.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: RDFNode.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFNode.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RDFNode.java 11 Jan 2005 13:26:40 -0000 1.7 --- RDFNode.java 17 Aug 2005 15:52:53 -0000 1.8 *************** *** 12,15 **** --- 12,16 ---- import org.mediavirus.graphl.graph.DefaultNode; import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.vocabulary.NS; import org.mediavirus.util.ParseUtils; *************** *** 50,54 **** // TODO (2, 2h) label generation mechanism has to be hooked up here public String getLabel() { ! String label = getProperty("http://www.mediavirus.org/graphl#label"); if ( label != null) return label; else { --- 51,55 ---- // TODO (2, 2h) label generation mechanism has to be hooked up here public String getLabel() { ! String label = getProperty(NS.graphl + "label"); if ( label != null) return label; else { Index: RDFGraph.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFGraph.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RDFGraph.java 11 Jan 2005 13:26:41 -0000 1.8 --- RDFGraph.java 17 Aug 2005 15:52:53 -0000 1.9 *************** *** 7,10 **** --- 7,11 ---- import java.util.Iterator; + import java.io.File; import java.io.FileReader; import java.io.IOException; *************** *** 17,25 **** import java.util.Hashtable; import java.util.List; - import java.util.Map; import org.mediavirus.graphl.graph.DefaultGraph; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; import org.xml.sax.InputSource; import org.xml.sax.SAXException; --- 18,26 ---- import java.util.Hashtable; import java.util.List; import org.mediavirus.graphl.graph.DefaultGraph; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Node; + import org.mediavirus.graphl.vocabulary.NS; import org.xml.sax.InputSource; import org.xml.sax.SAXException; *************** *** 41,45 **** Hashtable allNodes = new Hashtable(); ! URL baseURL = null; private int loadCount = 0; --- 42,47 ---- Hashtable allNodes = new Hashtable(); ! URL loadingURL = null; ! Node sourceNode = null; private int loadCount = 0; *************** *** 55,59 **** // TODO (2) use vocabularies from config for prefix resolution ! writer.addNamespacePrefix("graphl","http://www.mediavirus.org/graphl#"); writer.addNamespacePrefix("foaf","http://xmlns.com/foaf/0.1/"); writer.addNamespacePrefix("rdf","http://www.w3.org/1999/02/22-rdf-syntax-ns#"); --- 57,61 ---- // TODO (2) use vocabularies from config for prefix resolution ! writer.addNamespacePrefix("graphl",NS.graphl); writer.addNamespacePrefix("foaf","http://xmlns.com/foaf/0.1/"); writer.addNamespacePrefix("rdf","http://www.w3.org/1999/02/22-rdf-syntax-ns#"); *************** *** 65,69 **** writer.prepareNamespaceCollection(); ! writer.collectNamespace("http://www.mediavirus.org/graphl#"); writer.collectNamespace("http://xmlns.com/foaf/0.1/"); writer.collectNamespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#"); --- 67,71 ---- writer.prepareNamespaceCollection(); ! writer.collectNamespace(NS.graphl); writer.collectNamespace("http://xmlns.com/foaf/0.1/"); writer.collectNamespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#"); *************** *** 84,88 **** writer.writeStatement(node.getId(), attr, node.getProperty(attr), null, null, true); } ! //writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#canvasPosition", node.getCenterX() + ":" + node.getCenterY(), null, null, true); List nodeEdges = node.getEdgesFrom(); for (Iterator edgeIter = nodeEdges.iterator(); edgeIter.hasNext();) { --- 86,90 ---- writer.writeStatement(node.getId(), attr, node.getProperty(attr), null, null, true); } ! //writer.writeStatement(node.getId(), NS.graphl + "canvasPosition", node.getCenterX() + ":" + node.getCenterY(), null, null, true); List nodeEdges = node.getEdgesFrom(); for (Iterator edgeIter = nodeEdges.iterator(); edgeIter.hasNext();) { *************** *** 97,111 **** public void readFromFile(String filename) throws IOException { try { ! baseURL = new URL("file:///" + filename); } catch (MalformedURLException e) {} ! InputSource input = new InputSource(new FileReader(filename)); input.setSystemId(""); readGraph(input); } public void readFromURL(URL url){ ! baseURL = url; InputSource input; try { --- 99,123 ---- public void readFromFile(String filename) throws IOException { + File f = new File(filename); try { ! loadingURL = new URL("file:///" + f.getAbsolutePath()); } catch (MalformedURLException e) {} ! ! sourceNode = getNodeOrNew(loadingURL.toString()); ! ! InputSource input = new InputSource(new FileReader(f)); input.setSystemId(""); readGraph(input); + + loadingURL = null; + sourceNode = null; } public void readFromURL(URL url){ ! ! loadingURL = url; ! sourceNode = getNodeOrNew(loadingURL.toString()); ! InputSource input; try { *************** *** 117,121 **** e.printStackTrace(); } ! } public synchronized void readGraph(InputSource input) { --- 129,136 ---- e.printStackTrace(); } ! ! loadingURL = null; ! sourceNode = null; ! } public synchronized void readGraph(InputSource input) { *************** *** 154,158 **** */ public void statementWithResourceValue(String subject, String predicate, String object) throws SAXException { ! //if (predicate.equals("http://www.mediavirus.org/graphl#connectedTo")) { // get / create node with label subject Node snode; --- 169,173 ---- */ public void statementWithResourceValue(String subject, String predicate, String object) throws SAXException { ! //if (predicate.equals(NS.graphl + "connectedTo")) { // get / create node with label subject Node snode; *************** *** 178,181 **** --- 193,197 ---- edge = new RDFEdge(snode,onode); edge.setType(predicate); + edge.setSource(loadingURL.toString()); addElements(null, Collections.singleton(edge)); if (DEBUG) System.out.println("created edge " + subject + ", " + predicate + ", " + object); *************** *** 184,193 **** System.out.println("#### " + object); try { ! URL oldBase = baseURL; ! URL importURL = new URL(baseURL, object); System.out.println("importing " + importURL.toString() + " ... "); readFromURL(importURL); // restore original base url ! baseURL = oldBase; } catch (MalformedURLException muex) { --- 200,209 ---- System.out.println("#### " + object); try { ! URL oldBase = loadingURL; ! URL importURL = new URL(loadingURL, object); System.out.println("importing " + importURL.toString() + " ... "); readFromURL(importURL); // restore original base url ! loadingURL = oldBase; } catch (MalformedURLException muex) { *************** *** 214,221 **** node.setCenter(r*Math.sin(loadAlpha), r*Math.cos(loadAlpha)); loadCount++; - //node.setCenter(400*Math.random()-200,400*Math.random()-200); addElements(Collections.singleton(node), null); if (DEBUG) System.out.println("created node " + uri); } return node; } --- 230,251 ---- node.setCenter(r*Math.sin(loadAlpha), r*Math.cos(loadAlpha)); loadCount++; addElements(Collections.singleton(node), null); if (DEBUG) System.out.println("created node " + uri); } + if (sourceNode != null) { + boolean found = false; + for (Iterator i = node.getNeighbours(NS.graphl + "definedIn", true).iterator(); i.hasNext();) { + Node source = (Node) i.next(); + if (source.equals(sourceNode)) { + found = true; + break; + } + } + if (!found) { + Edge edge = createEdge(node, sourceNode); + edge.setSource(NS.graphl + "SYSTEM"); + edge.setType(NS.graphl + "definedIn"); + } + } return node; } *************** *** 229,232 **** --- 259,263 ---- public Edge createEdge(Node from, Node to) { RDFEdge edge = new RDFEdge(from, to); + edge.setSource(loadingURL.toString()); addElements(null, Collections.singleton(edge)); return edge; *************** *** 239,246 **** // TODO (2): for incremental loading, check if these things are already set - // in the future, all this should be properly modeled by literal nodes - // and corresponding node/edge renderer setups ! if (predicate.equals("http://www.mediavirus.org/graphl#canvasPosition")) { RDFNode snode = getNodeById(subject); if (snode != null){ --- 270,275 ---- // TODO (2): for incremental loading, check if these things are already set ! if (predicate.equals(NS.graphl + "canvasPosition")) { RDFNode snode = getNodeById(subject); if (snode != null){ *************** *** 251,255 **** } else { ! //if (predicate.equals("http://www.mediavirus.org/graphl#connectedTo")) { // get / create node with label subject Node snode; --- 280,284 ---- } else { ! //if (predicate.equals(NS.graphl + "connectedTo")) { // get / create node with label subject Node snode; *************** *** 352,358 **** } - public URL getBaseURL() { - return baseURL; - } - } --- 381,383 ---- |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:07
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/interaction Modified Files: GraphlManipulator.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: GraphlManipulator.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction/GraphlManipulator.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GraphlManipulator.java 29 Dec 2004 14:31:30 -0000 1.9 --- GraphlManipulator.java 17 Aug 2005 15:52:55 -0000 1.10 *************** *** 12,15 **** --- 12,17 ---- import java.util.Collections; + import javax.swing.JPopupMenu; + import org.mediavirus.graphl.GraphlPane; import org.mediavirus.graphl.graph.*; *************** *** 20,26 **** --- 22,31 ---- import org.mediavirus.graphl.gui.NodeContextMenu; import org.mediavirus.graphl.gui.NodeEditingController; + import org.mediavirus.graphl.gui.ResourceListener; import org.mediavirus.graphl.gui.TextFieldInPlaceNodeEditor; + import org.mediavirus.graphl.gui.TypeMenu; import org.mediavirus.graphl.painter.ArrowEdgePainter; import org.mediavirus.graphl.painter.NodePainter; + import org.mediavirus.graphl.vocabulary.NS; /** *************** *** 104,112 **** } } ! else if (overEdge != null) { ! dragEdge = (RDFEdge)overEdge; ! oldLength = dragEdge.getLength(); ! e.consume(); ! } else { oldTranslation = ((GraphlPane)graphPane).getTranslation(); --- 109,117 ---- } } ! // else if (overEdge != null) { ! // dragEdge = (RDFEdge)overEdge; ! // oldLength = dragEdge.getLength(); ! // e.consume(); ! // } else { oldTranslation = ((GraphlPane)graphPane).getTranslation(); *************** *** 120,130 **** Node clickNode = graphPane.getHoverNode(); Edge clickEdge = graphPane.getHoverEdge(); ! ! if ((e.getWhen() - lastClick) < 300) { if ((clickNode == null) && (clickEdge == null)) { ! clickNode = graphPane.getGraph().createNode(); clickNode.setCenter(p.getX(), p.getY()); ! ((DefaultGraph)graphPane.getGraph()).addElements(Collections.singleton(clickNode), null); ! graphPane.getGraph().notifyLayoutUpdated(); } else if (clickNode != null) { --- 125,149 ---- Node clickNode = graphPane.getHoverNode(); Edge clickEdge = graphPane.getHoverEdge(); ! ! if (e.getClickCount() == 2) { //(e.getWhen() - lastClick) < 300) { if ((clickNode == null) && (clickEdge == null)) { ! final Node newNode = graphPane.getGraph().createNode(); ! clickNode = newNode; clickNode.setCenter(p.getX(), p.getY()); ! TypeMenu nodeTypeMenu = new TypeMenu("New Node", graphPane.getVocabularies()); ! nodeTypeMenu.updateMenu(TypeMenu.CLASSES); ! nodeTypeMenu.addResourceListener(new ResourceListener() { ! public void resourceChanged(String resource) { ! newNode.setType(resource); ! graphPane.getGraph().notifyPropertyChanged(); ! graphPane.repaint(); ! } ! }); ! ! JPopupMenu menu = new JPopupMenu(); ! menu.add(nodeTypeMenu); ! menu.show(graphPane, e.getX(), e.getY()); ! ! //graphPane.getGraph().notifyLayoutUpdated(); } else if (clickNode != null) { *************** *** 243,257 **** graphPane.getGraph().notifyLayoutUpdated(); } ! else if (dragEdge != null) { ! int delta = (int)(mousePos.getY() - dragStart.getY()); ! // TODO (2) setLength is not in Edge interface! -> Edge Manipulators ! if (oldLength-delta > 2) ! ((DefaultEdge)dragEdge).setLength(oldLength-delta); ! else ! ((DefaultEdge)dragEdge).setLength(2); ! graphPane.repaint(); ! e.consume(); ! graphPane.getGraph().notifyLayoutUpdated(); ! } else if (edgeNode != null) { graphPane.repaint(); --- 262,276 ---- graphPane.getGraph().notifyLayoutUpdated(); } ! // else if (dragEdge != null) { ! // int delta = (int)(mousePos.getY() - dragStart.getY()); ! // // TODO (2) setLength is not in Edge interface! -> Edge Manipulators ! // if (oldLength-delta > 2) ! // ((DefaultEdge)dragEdge).setLength(oldLength-delta); ! // else ! // ((DefaultEdge)dragEdge).setLength(2); ! // graphPane.repaint(); ! // e.consume(); ! // graphPane.getGraph().notifyLayoutUpdated(); ! // } else if (edgeNode != null) { graphPane.repaint(); *************** *** 306,310 **** public boolean editingFinished(Node node, Object value) { if (!((String)value).equals("")) { ! ((RDFNode)node).setProperty("http://www.mediavirus.org/graphl#label",(String)value); } return true; --- 325,329 ---- public boolean editingFinished(Node node, Object value) { if (!((String)value).equals("")) { ! ((RDFNode)node).setProperty(NS.graphl + "label",(String)value); } return true; |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:07
|
Update of /cvsroot/graphl/graphl/config/vocabs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/config/vocabs Modified Files: foaf-owl.rdf Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: foaf-owl.rdf =================================================================== RCS file: /cvsroot/graphl/graphl/config/vocabs/foaf-owl.rdf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** foaf-owl.rdf 11 Jan 2005 13:19:09 -0000 1.1 --- foaf-owl.rdf 17 Aug 2005 15:52:54 -0000 1.2 *************** *** 11,16 **** <owl:Ontology rdf:about="http://xmlns.com/foaf/0.1/" dc:title="Friend of a Friend (FOAF) vocabulary" dc:description="The Friend of a Friend (FOAF) RDF vocabulary, described using W3C RDF Schema and the Web Ontology Language." dc:date="$Date$"> <rdfs:seeAlso rdf:resource="http://www.w3.org/2001/08/rdfweb/foaf"/> ! <owl:imports rdf:resource="http://www.w3.org/2000/01/rdf-schema"/> ! <owl:imports rdf:resource="http://www.w3.org/2002/07/owl"/> <wot:assurance rdf:resource="../foafsig"/> <wot:src_assurance rdf:resource="../htmlfoafsig"/> --- 11,16 ---- <owl:Ontology rdf:about="http://xmlns.com/foaf/0.1/" dc:title="Friend of a Friend (FOAF) vocabulary" dc:description="The Friend of a Friend (FOAF) RDF vocabulary, described using W3C RDF Schema and the Web Ontology Language." dc:date="$Date$"> <rdfs:seeAlso rdf:resource="http://www.w3.org/2001/08/rdfweb/foaf"/> ! <!--<owl:imports rdf:resource="http://www.w3.org/2000/01/rdf-schema"/> ! <owl:imports rdf:resource="http://www.w3.org/2002/07/owl"/>--> <wot:assurance rdf:resource="../foafsig"/> <wot:src_assurance rdf:resource="../htmlfoafsig"/> |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:02
|
Update of /cvsroot/graphl/graphl/web/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/web/config Added Files: vocabularies.rdf config.rdf facets.rdf netznetz-config.rdf Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code --- NEW FILE: vocabularies.rdf --- <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE rdf:RDF [ <!ENTITY graphl 'http://www.mediavirus.org/graphl#'> <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'> <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'> <!ENTITY dc 'http://purl.org/dc/elements/1.1/'> <!ENTITY rss 'http://purl.org/rss/1.0/'> ]> <rdf:RDF xml:base="" xmlns:graphl="&graphl;" xmlns:foaf="&foaf;" xmlns:rdf="&rdf;"> <graphl:Configuration> <graphl:registeredNamespaces> <rdf:Bag> <rdf:li> <graphl:Namespace graphl:defaultPrefix="graphl" graphl:uri="http://www.mediavirus.org/graphl#"/> </rdf:li> <rdf:li> <graphl:Namespace graphl:defaultPrefix="foaf" graphl:uri="http://xmlns.com/foaf/0.1/"/> </rdf:li> <rdf:li> <graphl:Namespace graphl:defaultPrefix="rdf" graphl:uri="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/> </rdf:li> <rdf:li> <graphl:Namespace graphl:defaultPrefix="dc" graphl:uri="http://purl.org/dc/elements/1.1/"/> </rdf:li> <rdf:li> <graphl:Namespace graphl:defaultPrefix="rss" graphl:uri="http://purl.org/rss/1.0/"/> </rdf:li> </rdf:Bag> </graphl:registeredNamespaces> <graphl:registeredVocabularies> <rdf:Seq> <rdf:li> <graphl:Vocabulary graphl:name="Document metadata" graphl:description=""> <graphl:resources> <rdf:Bag> <rdf:li> <graphl:ResourceGroup graphl:name="Content properties" graphl:description=""> <graphl:properties> <rdf:Bag> <rdf:li> <graphl:PropertyDescription graphl:name="title" graphl:description="The title of a document"> <graphl:property rdf:resource="&dc;title"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="description" graphl:description="Description (Abstract) of the document's content"> <graphl:property rdf:resource="&dc;description"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="subject" graphl:description="The subject of a document"> <graphl:property rdf:resource="&dc;subject"/> </graphl:PropertyDescription> </rdf:li> </rdf:Bag> </graphl:properties> </graphl:ResourceGroup> </rdf:li> <rdf:li> <graphl:ResourceGroup graphl:name="Associated Persons" graphl:description=""> <graphl:properties> <rdf:Bag> <rdf:li> <graphl:PropertyDescription graphl:name="creator" graphl:description="The creator of a document"> <graphl:property rdf:resource="&dc;creator"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="contributor" graphl:description="An entity who contributed to the document"> <graphl:property rdf:resource="&dc;contributor"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="publisher" graphl:description="The publisher of a document"> <graphl:property rdf:resource="&dc;publisher"/> </graphl:PropertyDescription> </rdf:li> </rdf:Bag> </graphl:properties> </graphl:ResourceGroup> </rdf:li> <rdf:li> <graphl:ResourceGroup graphl:name="Metadata" graphl:description=""> <graphl:properties> <rdf:Bag> <rdf:li> <graphl:PropertyDescription graphl:name="type" graphl:description="The type of the document"> <graphl:property rdf:resource="&dc;type"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="language" graphl:description="The language(s) the document is written in"> <graphl:property rdf:resource="&dc;language"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="format" graphl:description="The format of the document"> <graphl:property rdf:resource="&dc;format"/> </graphl:PropertyDescription> </rdf:li> </rdf:Bag> </graphl:properties> </graphl:ResourceGroup> </rdf:li> <rdf:li> <graphl:ResourceGroup graphl:name="Intellectual property" graphl:description=""> <graphl:properties> <rdf:Bag> <rdf:li> <graphl:PropertyDescription graphl:name="rights" graphl:description="Generic description of copyrights"> <graphl:property rdf:resource="&dc;rights"/> </graphl:PropertyDescription> </rdf:li> </rdf:Bag> </graphl:properties> </graphl:ResourceGroup> </rdf:li> </rdf:Bag> </graphl:resources> </graphl:Vocabulary> </rdf:li> <rdf:li> <graphl:Vocabulary graphl:name="Data Structures" graphl:description=""> <graphl:resources> <rdf:Bag> <rdf:li> <graphl:ResourceGroup graphl:name="Containers" graphl:description=""> <graphl:types> <rdf:Bag> <rdf:li> <graphl:TypeDescription graphl:name="Bag" graphl:description="A Bag contains an unordered collection of resources, each connected with an rdf:li property"> <graphl:class rdf:resource="&rdf;Bag"/> </graphl:TypeDescription> </rdf:li> <rdf:li> <graphl:TypeDescription graphl:name="Alternative" graphl:description="A collection of resources that can be used alternatively, each connected with an rdf:li property"> <graphl:class rdf:resource="&rdf;Alt"/> </graphl:TypeDescription> </rdf:li> <rdf:li> <graphl:TypeDescription graphl:name="Sequence" graphl:description="A group of resources or literals, possibly including duplicate members, where the order of the members is significant. Each is connected with an rdf:li property."> <graphl:class rdf:resource="&rdf;Seq"/> </graphl:TypeDescription> </rdf:li> <rdf:li> <graphl:TypeDescription graphl:name="List" graphl:description="A linked list, ending with rdf:nil"> <graphl:class rdf:resource="&rdf;List"/> </graphl:TypeDescription> </rdf:li> </rdf:Bag> </graphl:types> <graphl:resources> <rdf:Bag> <rdf:li> <graphl:ResourceDescription graphl:name="NIL" graphl:description="End of a list"> <graphl:resource rdf:resource="&rdf;nil"/> </graphl:ResourceDescription> </rdf:li> </rdf:Bag> </graphl:resources> <graphl:properties> <rdf:Bag> <rdf:li> <graphl:PropertyDescription graphl:name="Collection item" graphl:description="An item in a collection"> <graphl:property rdf:resource="&rdf;li"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="First list item" graphl:description="First item of a list"> <graphl:property rdf:resource="&rdf;first"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="Rest of list" graphl:description="The remainder of a list"> <graphl:property rdf:resource="&rdf;rest"/> </graphl:PropertyDescription> </rdf:li> </rdf:Bag> </graphl:properties> </graphl:ResourceGroup> </rdf:li> <rdf:li> <graphl:ResourceGroup graphl:name="Complex Data Structures" graphl:description=""> <graphl:properties> <rdf:Bag> <rdf:li> <graphl:PropertyDescription graphl:name="value" graphl:description="The main value of a structured value"> <graphl:property rdf:resource="&rdf;value"/> </graphl:PropertyDescription> </rdf:li> </rdf:Bag> </graphl:properties> </graphl:ResourceGroup> </rdf:li> </rdf:Bag> </graphl:resources> </graphl:Vocabulary> </rdf:li> <rdf:li> <graphl:Vocabulary graphl:name="Reification" graphl:description=""> <graphl:types> <rdf:Bag> <rdf:li> <graphl:TypeDescription graphl:name="Statement" graphl:description="An RDF statement"> <graphl:class rdf:resource="&rdf;Statement"/> </graphl:TypeDescription> </rdf:li> </rdf:Bag> </graphl:types> <graphl:properties> <rdf:Bag> <rdf:li> <graphl:PropertyDescription graphl:name="subject" graphl:description="The subject of a statement"> <graphl:property rdf:resource="&rdf;subject"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="predicate" graphl:description="The predicate of a statement"> <graphl:property rdf:resource="&rdf;predicate"/> </graphl:PropertyDescription> </rdf:li> <rdf:li> <graphl:PropertyDescription graphl:name="object" graphl:description="The object of a statement"> <graphl:property rdf:resource="&rdf;object"/> </graphl:PropertyDescription> </rdf:li> </rdf:Bag> </graphl:properties> </graphl:Vocabulary> </rdf:li> </rdf:Seq> </graphl:registeredVocabularies> </graphl:Configuration> </rdf:RDF> --- NEW FILE: facets.rdf --- <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE rdf:RDF [ <!ENTITY graphl 'http://www.mediavirus.org/graphl#'> <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'> <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'> <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'> ]> <rdf:RDF xml:base="" xmlns:graphl="&graphl;" xmlns:foaf="&foaf;" xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" > <graphl:Configuration> <graphl:availableNodeLayouters> <rdf:Bag> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.RepulsionNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SortedNodeLayouter"> </graphl:NodeLayouter> </rdf:li> </rdf:Bag> </graphl:availableNodeLayouters> <graphl:availableNodePainters> <rdf:Bag> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.view.BoxNodePainter"> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.view.ImageNodePainter"> <graphl:defaultImage> <graphl:Image rdf:about="http://www.mediavirus.org/graphl/images/default.gif"/> </graphl:defaultImage> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.view.InvisibleNodePainter"> </graphl:NodePainter> </rdf:li> </rdf:Bag> </graphl:availableNodePainters> <graphl:assignedNodePainters> <rdf:Bag> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.view.BoxNodePainter" graphl:backgoundColor="#66ff66"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="String" graphl:labelFacetValue="Person: "/> </rdf:first> <rdf:rest> <graphl:LabelFacet graphl:labelFacetType="Property" graphl:labelFacetValue="&foaf;name"/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Person"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> </rdf:Bag> </graphl:assignedNodePainters> <graphl:availableEdgeLayouters> <rdf:Bag> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SpringEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> </rdf:Bag> </graphl:availableEdgeLayouters> <graphl:assignedEdgeLayouters> <rdf:Bag> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.view.NeutralEdgeLayouter"> <graphl:assignedToType rdf:resource="&rdf;type"/> </graphl:EdgeLayouter> </rdf:li> </rdf:Bag> </graphl:assignedEdgeLayouters> <graphl:availableEdgePainters> <rdf:Bag> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.view.StraightLineEdgePainter"> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.view.ManhattanEdgePainter"> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.view.InvisibleEdgePainter"> </graphl:EdgePainter> </rdf:li> </rdf:Bag> </graphl:availableEdgePainters> <graphl:assignedEdgePainters> <rdf:Bag> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.view.StraightLineEdgePainter" graphl:paintArrow="false" graphl:paintLabel="false" graphl:lineType="dotted"> <graphl:assignedToType rdf:resource="&rdf;type"/> </graphl:EdgePainter> </rdf:li> </rdf:Bag> </graphl:assignedEdgePainters> </graphl:Configuration> --- NEW FILE: config.rdf --- <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE rdf:RDF [ <!ENTITY graphl 'http://www.mediavirus.org/graphl#'> <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'> <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'> <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'> <!ENTITY owl 'http://www.w3.org/2002/07/owl#'> <!ENTITY map 'http://fabl.net/vocabularies/geography/map/1.1/'> <!ENTITY geo 'http://www.w3.org/2003/01/geo/wgs84_pos#'> ]> <rdf:RDF xml:base="" xmlns:graphl="&graphl;" xmlns:foaf="&foaf;" xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" xmlns:owl="&owl;" xmlns:map="↦" xmlns:geo="&geo;" > <graphl:Configuration graphl:name="Default" graphl:public="true" graphl:default="true" rdf:nodeID="defaultConfig"> <graphl:availableNodeLayouters> <rdf:Bag> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.RepulsionNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SortedNodeLayouter"> </graphl:NodeLayouter> </rdf:li> </rdf:Bag> </graphl:availableNodeLayouters> <graphl:availableNodePainters> <rdf:Bag> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ImageNodePainter"> <graphl:defaultImage> <graphl:Image rdf:about="http://www.mediavirus.org/graphl/images/default.gif"/> </graphl:defaultImage> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.InvisibleNodePainter"> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter"> </graphl:NodePainter> </rdf:li> </rdf:Bag> </graphl:availableNodePainters> <graphl:availableEdgeLayouters> <rdf:Bag> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SpringEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> </rdf:Bag> </graphl:availableEdgeLayouters> <graphl:availableEdgePainters> <rdf:Bag> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.ManhattanEdgePainter"> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.InvisibleEdgePainter"> </graphl:EdgePainter> </rdf:li> </rdf:Bag> </graphl:availableEdgePainters> <graphl:defaultNodePainter> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#f0f0f0" graphl:stroke="1.0"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Value" graphl:guessName="true"/> </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> </graphl:labelGenerator> </graphl:NodePainter> </graphl:defaultNodePainter> <graphl:defaultEdgePainter> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="true" graphl:paintLabel="true" graphl:color="#000000" graphl:labelColor="#000000"/> </graphl:defaultEdgePainter> <graphl:defaultNodeLayouter> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.RepulsionNodeLayouter" graphl:strength="1.0"/> </graphl:defaultNodeLayouter> <graphl:defaultEdgeLayouter> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SpringEdgeLayouter" graphl:defaultLength="40.0" graphl:rigidity="1.0"/> </graphl:defaultEdgeLayouter> <graphl:assignedNodePainters> <rdf:Bag> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#d0d0d0" graphl:borderColor="#000000" graphl:font="14" graphl:borderStroke="1.5"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Property" graphl:labelFacetValue="&foaf;name"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Person"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#d0d0d0" graphl:borderColor="#000000" graphl:font="14" graphl:borderStroke="1.5 5 2"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Property" graphl:labelFacetValue="&foaf;name"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Group"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Organization"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Project"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#f9f9f9" graphl:borderColor="#d0d0d0" graphl:textColor="#909090" graphl:borderStroke="1.0" graphl:useBorderColor="true" graphl:roundRect="false"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Value" graphl:guessName="true"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Document"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#e0e0e0"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Value" graphl:guessName="true"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&rdfs;Class"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#f0f0f0"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Value" graphl:guessName="true"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&rdf;Property"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#f0f0f0"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Property" graphl:labelFacetValue="&graphl;labelFacetType"/> </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="Property" graphl:labelFacetValue="&graphl;labelFacetValue"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </rdf:rest> </rdf:List> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&graphl;LabelFacet"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ImageNodePainter" graphl:method="property" graphl:property="↦image"> <graphl:assignedToType> <rdfs:Class rdf:about="↦Map"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter" graphl:shape="X"> <graphl:assignedToType> <rdfs:Class rdf:about="&geo;Point"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter" graphl:shape="circle"> <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:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter" graphl:shape="circle" graphl:color="#ff0000"> <graphl:assignedToType> <rdfs:Class rdf:about="&rdf;nil"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> </rdf:Bag> </graphl:assignedNodePainters> <graphl:assignedNodeLayouters> <rdf:Bag> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter"> <graphl:assignedToType> <rdfs:Class rdf:about="&rdf;nil"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&graphl;LabelFacet"/> </graphl:assignedToType> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter" graphl:method="property" graphl:property="↦coverage" graphl:draggable="false"> <graphl:assignedToType> <rdfs:Class rdf:about="↦Map"/> </graphl:assignedToType> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter" graphl:method="geo" graphl:draggable="false"> <graphl:assignedToType> <rdfs:Class rdf:about="&geo;Point"/> </graphl:assignedToType> </graphl:NodeLayouter> </rdf:li> </rdf:Bag> </graphl:assignedNodeLayouters> <graphl:assignedEdgePainters> <rdf:Bag> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="false" graphl:paintLabel="false" graphl:stroke="1.0 1 5"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;type"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;isDefinedBy"/> </graphl:assignedToType> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="false" graphl:paintLabel="false" graphl:stroke="1.0 5 5" graphl:color="#ff0000"> <graphl:assignedToType> <rdf:Property rdf:about="&owl;inverseOf"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&owl;disjointWith"/> </graphl:assignedToType> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="false" graphl:paintLabel="false" graphl:stroke="1.0 5 5"> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;range"/> </graphl:assignedToType> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="true" graphl:paintLabel="false" graphl:stroke="1.5 5 5"> <graphl:assignedToType> <rdf:Property rdf:about="&foaf;knows"/> </graphl:assignedToType> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="false" graphl:paintLabel="false" graphl:stroke="1.0"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;first"/> </graphl:assignedToType> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="true" graphl:paintLabel="false" graphl:stroke="1.0"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;rest"/> </graphl:assignedToType> </graphl:EdgePainter> </rdf:li> </rdf:Bag> </graphl:assignedEdgePainters> <graphl:assignedEdgeLayouters> <rdf:Bag> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;type"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;range"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;isDefinedBy"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&owl;disjointWith"/> </graphl:assignedToType> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter" graphl:direction="up"> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;subClassOf"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;subPropertyOf"/> </graphl:assignedToType> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter" graphl:direction="right"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;rest"/> </graphl:assignedToType> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter" graphl:direction="down" graphl:length="40.0"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;first"/> </graphl:assignedToType> </graphl:EdgeLayouter> </rdf:li> </rdf:Bag> </graphl:assignedEdgeLayouters> </graphl:Configuration> <graphl:Configuration graphl:name="Hide Schema" graphl:public="true" rdf:nodeID="hideSchemaConfig"> <graphl:basedOn rdf:nodeID="defaultConfig"/> <graphl:assignedNodePainters> <rdf:Bag> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.InvisibleNodePainter"> <graphl:assignedToType> <rdfs:Class rdf:about="&rdfs;Class"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&rdf;Property"/> </graphl:assignedToType> </graphl:NodePainter> </rdf:li> </rdf:Bag> </graphl:assignedNodePainters> <graphl:assignedNodeLayouters> <rdf:Bag> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter"> <graphl:assignedToType> <rdfs:Class rdf:about="&rdfs;Class"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&rdf;Property"/> </graphl:assignedToType> </graphl:NodeLayouter> </rdf:li> </rdf:Bag> </graphl:assignedNodeLayouters> <graphl:assignedEdgePainters> <rdf:Bag> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.InvisibleEdgePainter"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;type"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;isDefinedBy"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;range"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;subClassOf"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;subPropertyOf"/> </graphl:assignedToType> </graphl:EdgePainter> </rdf:li> </rdf:Bag> </graphl:assignedEdgePainters> <graphl:assignedEdgeLayouters> <rdf:Bag> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter"> <graphl:assignedToType> <rdf:Property rdf:about="&rdf;type"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;range"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;isDefinedBy"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;subClassOf"/> </graphl:assignedToType> <graphl:assignedToType> <rdf:Property rdf:about="&rdfs;subPropertyOf"/> </graphl:assignedToType> </graphl:EdgeLayouter> </rdf:li> </rdf:Bag> </graphl:assignedEdgeLayouters> </graphl:Configuration> </rdf:RDF> --- NEW FILE: netznetz-config.rdf --- <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE rdf:RDF [ <!ENTITY graphl 'http://www.mediavirus.org/graphl#'> <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'> <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'> <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'> <!ENTITY owl 'http://www.w3.org/2002/07/owl#'> <!ENTITY map 'http://fabl.net/vocabularies/geography/map/1.1/'> <!ENTITY geo 'http://www.w3.org/2003/01/geo/wgs84_pos#'> <!ENTITY foo 'http://www.mediavirus.org/foo#'> ]> <rdf:RDF xml:base="" xmlns:graphl="&graphl;" xmlns:foaf="&foaf;" xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" xmlns:owl="&owl;" xmlns:map="↦" xmlns:geo="&geo;" xmlns:foo="&foo;" > <!--<graphl:Configuration> <rdf:seeAlso rdf:about="facets.rdf"/> <rdf:seeAlso rdf:about="vocabularies.rdf"/> </graphl:Configuration>--> <graphl:Configuration> <graphl:availableNodeLayouters> <rdf:Bag> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.RepulsionNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter"> </graphl:NodeLayouter> </rdf:li> <rdf:li> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SortedNodeLayouter"> </graphl:NodeLayouter> </rdf:li> </rdf:Bag> </graphl:availableNodeLayouters> <graphl:availableNodePainters> <rdf:Bag> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ImageNodePainter"> <graphl:defaultImage> <graphl:Image rdf:about="http://www.mediavirus.org/graphl/images/default.gif"/> </graphl:defaultImage> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.InvisibleNodePainter"> </graphl:NodePainter> </rdf:li> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter"> </graphl:NodePainter> </rdf:li> </rdf:Bag> </graphl:availableNodePainters> <graphl:availableEdgeLayouters> <rdf:Bag> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SpringEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> <rdf:li> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter"> </graphl:EdgeLayouter> </rdf:li> </rdf:Bag> </graphl:availableEdgeLayouters> <graphl:availableEdgePainters> <rdf:Bag> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.ManhattanEdgePainter"> </graphl:EdgePainter> </rdf:li> <rdf:li> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.InvisibleEdgePainter"> </graphl:EdgePainter> </rdf:li> </rdf:Bag> </graphl:availableEdgePainters> <graphl:defaultNodePainter> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#f0f0f0"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Value" graphl:guessName="true"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> </graphl:NodePainter> </graphl:defaultNodePainter> <graphl:defaultEdgePainter> <graphl:EdgePainter graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter" graphl:paintArrow="false" graphl:paintLabel="false" graphl:labelColor="#666666"/> </graphl:defaultEdgePainter> <graphl:defaultNodeLayouter> <graphl:NodeLayouter graphl:javaClass="org.mediavirus.graphl.layout.RepulsionNodeLayouter"/> </graphl:defaultNodeLayouter> <graphl:defaultEdgeLayouter> <graphl:EdgeLayouter graphl:javaClass="org.mediavirus.graphl.layout.SpringEdgeLayouter"/> </graphl:defaultEdgeLayouter> <graphl:assignedNodePainters> <rdf:Bag> <rdf:li> <graphl:NodePainter graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter" graphl:baseColor="#d0d0d0" graphl:borderColor="#000000" graphl:font="Verdana-14" graphl:borderStroke="2.0"> <graphl:labelGenerator> <graphl:LabelGenerator> <graphl:labelFacets> <rdf:List> <rdf:first> <graphl:LabelFacet graphl:labelFacetType="Property" graphl:labelFacetValue="&foaf;name"/> </rdf:first> <rdf:rest> <rdf:nil/> </rdf:rest> </rdf:List> </graphl:labelFacets> </graphl:LabelGenerator> </graphl:labelGenerator> <graphl:assignedToType> <rdfs:Class rdf:about="&foo;NGO"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&foo;Company"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&foo;School"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Group"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&foaf;Project"/> </graphl:assignedToType> <graphl:assignedToType> <rdfs:Class rdf:about="&foo;Institute"/> ... [truncated message content] |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:02
|
Update of /cvsroot/graphl/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461 Modified Files: .project changelog.txt Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code Index: changelog.txt =================================================================== RCS file: /cvsroot/graphl/graphl/changelog.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** changelog.txt 29 Dec 2004 14:31:27 -0000 1.13 --- changelog.txt 17 Aug 2005 15:52:53 -0000 1.14 *************** *** 2,5 **** --- 2,11 ---- ================== + 2005-08-17, f/0: + - FEATURE: added navigator thread for update-exhibition, disabled in normal operation + - FEATURE: started implementation of filtering architecture + - FEATURE: creating new node opens type context menu + - CODE: added NS calss for easier namespace referencing in code + 2004-12-29, f/0: - FEATURE: updated applets parameters to match application command line options Index: .project =================================================================== RCS file: /cvsroot/graphl/graphl/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .project 23 Jun 2004 09:52:53 -0000 1.2 --- .project 17 Aug 2005 15:52:53 -0000 1.3 *************** *** 2,6 **** <projectDescription> <name>graphl</name> ! <comment></comment> <projects> </projects> --- 2,6 ---- <projectDescription> <name>graphl</name> ! <comment>@key 32303034313132352D31302067726170686C </comment> <projects> </projects> *************** *** 11,14 **** --- 11,24 ---- </arguments> </buildCommand> + <buildCommand> + <name>net.sourceforge.metrics.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.omondo.uml.std.Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> *************** *** 16,19 **** --- 26,31 ---- <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature> + <nature>net.sourceforge.metrics.nature</nature> + <nature>com.omondo.uml.std.Nature</nature> </natures> </projectDescription> |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:53:00
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16461/src/org/mediavirus/graphl/graph/filter Added Files: TestFilter.java GraphFilter.java FilteredGraph.java Log Message: - FEATURE: added navigator thread for update-exhibition, disabled in normal operation - FEATURE: started implementation of filtering architecture - FEATURE: creating new node opens type context menu - CODE: added NS calss for easier namespace referencing in code --- NEW FILE: GraphFilter.java --- /* * Created on 11.08.2005 */ package org.mediavirus.graphl.graph.filter; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.Node; /** * @author flo */ public interface GraphFilter { public boolean acceptNode(Node node, Graph graph); public boolean acceptEdge(Edge edge, Graph graph); } --- NEW FILE: FilteredGraph.java --- /* * Created on 11.08.2005 */ package org.mediavirus.graphl.graph.filter; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import org.mediavirus.graphl.graph.AbstractGraph; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.GraphListener; import org.mediavirus.graphl.graph.Node; /** * @author flo */ public class FilteredGraph extends AbstractGraph implements GraphListener{ List cachedNodes = new ArrayList(); List cachedEdges = new ArrayList(); List filters = new LinkedList(); Graph sourceGraph; public FilteredGraph() { } public FilteredGraph(Graph graph) { setSource(graph); } public void addFilter(GraphFilter filter) { filters.add(filter); } public void removeFilter(GraphFilter filter) { filters.remove(filter); } public void setSource(Graph graph){ sourceGraph = graph; graph.addGraphListener(this); graphContentsChanged(graph); } public Graph getSource(){ return sourceGraph; } /** * @see org.mediavirus.graphl.graph.GraphListener#graphLayoutUpdated(org.mediavirus.graphl.graph.Graph) */ public void graphLayoutUpdated(Graph graph) { notifyLayoutUpdated(); } /** * @see org.mediavirus.graphl.graph.GraphListener#graphUpdated(org.mediavirus.graphl.graph.Graph) */ public void graphUpdated(Graph graph) { notifyUpdated(); } /** * @see org.mediavirus.graphl.graph.GraphListener#graphContentsChanged(org.mediavirus.graphl.graph.Graph) */ public void graphContentsChanged(Graph graph) { cachedEdges.clear(); cachedNodes.clear(); Collection filteredEdges = filterEdges(graph.getEdges()); if (filteredEdges != null) cachedEdges.addAll(filteredEdges); Collection filteredNodes = filterNodes(graph.getNodes()); if (filteredNodes != null) cachedNodes.addAll(filteredNodes); fireGraphContentsChanged(); } /** * @see org.mediavirus.graphl.graph.GraphListener#elementsAdded(org.mediavirus.graphl.graph.Graph, java.util.Collection, java.util.Collection) */ public void elementsAdded(Graph graph, Collection nodes, Collection edges) { Collection filteredEdges = filterEdges(edges); if (filteredEdges != null) cachedEdges.addAll(filteredEdges); Collection filteredNodes = filterNodes(nodes); if (filteredNodes != null) cachedNodes.addAll(filteredNodes); fireElementsAdded(filteredNodes, filteredEdges); } /** * @param edges */ private Collection filterEdges(Collection edges) { if (edges != null) { List filteredEdges = new ArrayList(); for (Iterator edgesI = edges.iterator(); edgesI.hasNext();) { Edge edge = (Edge) edgesI.next(); if (filterEdge(edge, sourceGraph)) filteredEdges.add(edge); } if (!filteredEdges.isEmpty()) { return filteredEdges; } } return null; } /** * @param nodes */ private Collection filterNodes(Collection nodes) { if (nodes != null) { List filteredNodes = new ArrayList(); for (Iterator nodesI = nodes.iterator(); nodesI.hasNext();) { Node node = (Node) nodesI.next(); if (filterNode(node, sourceGraph)) filteredNodes.add(node); } if (!filteredNodes.isEmpty()) { return filteredNodes; } } return null; } public boolean filterNode(Node node, Graph graph) { for (Iterator edgesI = cachedEdges.iterator(); edgesI.hasNext();) { Edge edge = (Edge) edgesI.next(); if ((edge.getFrom() == node) || (edge.getTo() == node)) { return true; } } for (Iterator filtersI = filters.iterator(); filtersI.hasNext();) { GraphFilter filter = (GraphFilter) filtersI.next(); if (!filter.acceptNode(node, graph)) { return false; } } return true; } public boolean filterEdge(Edge edge, Graph graph) { for (Iterator filtersI = filters.iterator(); filtersI.hasNext();) { GraphFilter filter = (GraphFilter) filtersI.next(); if (!filter.acceptEdge(edge, graph)) return false; } return true; } /** * @see org.mediavirus.graphl.graph.GraphListener#elementsRemoved(org.mediavirus.graphl.graph.Graph, java.util.Collection, java.util.Collection) */ public void elementsRemoved(Graph graph, Collection nodes, Collection edges) { List removedNodes = new ArrayList(); List removedEdges = new ArrayList(); for (Iterator nodesI = nodes.iterator(); nodesI.hasNext();) { Node node = (Node) nodesI.next(); if (cachedNodes.contains(node)) { cachedNodes.remove(node); removedNodes.add(node); } } for (Iterator edgesI = edges.iterator(); edgesI.hasNext();) { Edge edge = (Edge) edgesI.next(); if (cachedEdges.contains(edge)) { cachedEdges.remove(edge); removedEdges.add(edge); } } fireElementsRemoved(removedNodes, removedEdges); } /** * @see org.mediavirus.graphl.graph.Graph#getNodes() */ public List getNodes() { return cachedNodes; } /** * @see org.mediavirus.graphl.graph.Graph#getEdges() */ public List getEdges() { return cachedEdges; } /** * @see org.mediavirus.graphl.graph.Graph#createNode() */ public Node createNode() { return sourceGraph.createNode(); } /** * @see org.mediavirus.graphl.graph.Graph#getNodeOrNew(java.lang.String) */ public Node getNodeOrNew(String id) { return sourceGraph.getNodeOrNew(id); } /** * @see org.mediavirus.graphl.graph.Graph#createEdge(org.mediavirus.graphl.graph.Node, org.mediavirus.graphl.graph.Node) */ public Edge createEdge(Node from, Node to) { return sourceGraph.createEdge(from, to); } } --- NEW FILE: TestFilter.java --- /* * Created on 16.08.2005 */ package org.mediavirus.graphl.graph.filter; import org.mediavirus.graphl.graph.Edge; import org.mediavirus.graphl.graph.Graph; import org.mediavirus.graphl.graph.Node; import org.mediavirus.graphl.vocabulary.NS; /** * @author flo */ public class TestFilter implements GraphFilter { /** * @see org.mediavirus.graphl.graph.filter.GraphFilter#acceptNode(org.mediavirus.graphl.graph.Node, org.mediavirus.graphl.graph.Graph) */ public boolean acceptNode(Node node, Graph graph) { return (node.getNeighbours(NS.graphl + "definedIn", true).isEmpty()); } /** * @see org.mediavirus.graphl.graph.filter.GraphFilter#acceptEdge(org.mediavirus.graphl.graph.Edge, org.mediavirus.graphl.graph.Graph) */ public boolean acceptEdge(Edge edge, Graph graph) { return (edge.getSource() == null); } } |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:52:35
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16424/src/org/mediavirus/graphl/graph/filter Log Message: Directory /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/filter added to the repository |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:51:31
|
Update of /cvsroot/graphl/graphl/graphs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16088/graphs Added Files: wien_small.png Log Message: added satellite map of vienna --- NEW FILE: wien_small.png --- (This appears to be a binary file; contents omitted.) |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:45:13
|
Update of /cvsroot/graphl/graphl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14579 Added Files: graphl.ico Log Message: first attempt for application icon --- NEW FILE: graphl.ico --- (This appears to be a binary file; contents omitted.) |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:43:30
|
Update of /cvsroot/graphl/graphl/web/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14221/web/config Log Message: Directory /cvsroot/graphl/graphl/web/config added to the repository |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:37:31
|
Update of /cvsroot/graphl/graphl/graphs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12759/graphs Removed Files: ff.rdf Log Message: removed project-specific files --- ff.rdf DELETED --- |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:36:46
|
Update of /cvsroot/graphl/graphl/graphs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12594/graphs Added Files: tube_model2.rdf Log Message: added london tube rdf - interesting test case for mapping etc. --- NEW FILE: tube_model2.rdf --- <rdf:RDF xmlns:dc="http://purl.org/dc/1.0/" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:bot="http://frot.org/ontobot/bot.rdf#" xmlns:space="http://frot.org/space/0.1/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:daml="http://www.w3.org/2001/10/daml+oil#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > <rdf:Description rdf:about="http://space.frot.org/london/a_space/Acton_Town_Station"> <space:os_y>179613</space:os_y> <space:type>Tube Station</space:type> <name>Acton Town Station</name> <space:name>Acton Town Station</space:name> <owl:Class rdf:resource="http://space.frot.org/rdf/space.owl#Tube_Station"/> [...10442 lines suppressed...] <rdf:Description rdf:about="http://space.frot.org/a_space/id0898873"> <owl:Class rdf:resource="http://space.frot.org/rdf/space.owl#Tube_Line"/> <rdf:predicate rdf:resource="http://frot.org/space/0.1/connects"/> <rdf:subject rdf:resource="http://space.frot.org/london/a_space/Wapping_Station"/> <space:name>East London Line</space:name> <rdf:object rdf:resource="http://space.frot.org/london/a_space/Shadwell_Station"/> </rdf:Description> <rdf:Description rdf:about="http://space.frot.org/a_space/id4519048"> <owl:Class rdf:resource="http://space.frot.org/rdf/space.owl#Tube_Line"/> <rdf:predicate rdf:resource="http://frot.org/space/0.1/connects"/> <rdf:subject rdf:resource="http://space.frot.org/london/a_space/Shoreditch_Station"/> <space:name>East London Line</space:name> <rdf:object rdf:resource="http://space.frot.org/london/a_space/Shadwell_Station"/> </rdf:Description> </rdf:RDF> |
Update of /cvsroot/graphl/graphl/config/vocabs/SOUPA In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12411/config/vocabs/SOUPA Added Files: device time knowledge meeting document action space policy geo-measurement person img-capture soupa-ontology-2004-06.jpg rcc bdi schedule digital-doc agent location event Log Message: added SOUPA vocabulary --- NEW FILE: img-capture --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY dev "http://pervasive.semanticweb.org/ont/2004/06/device#"> <!ENTITY tme "http://pervasive.semanticweb.org/ont/2004/06/time#"> <!ENTITY spc "http://pervasive.semanticweb.org/ont/2004/06/space#"> <!ENTITY ddc "http://pervasive.semanticweb.org/ont/2004/06/digital-doc#"> <!ENTITY icap "http://pervasive.semanticweb.org/ont/2004/06/img-capture#"> <!ENTITY cam "http://protege.stanford.edu/plugins/owl/owl-library/camera.owl"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:tme = "&tme;" xmlns:spc = "&spc;" xmlns:dev = "&dev;" xmlns:cam = "&cam;" xmlns:ddc = "&ddc;" xmlns = "&icap;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/img-capture"> <owl:Ontology rdf:about="&soupa;img-capture"> <owl:versionInfo>$Revision: 1.1 $, $Date: 2004/05/15 18:55:08 $</owl:versionInfo> <rdfs:label>SOUPA Camera Phone Image Capture Ontology</rdfs:label> <owl:imports rdf:resource="&soupa;time"/> <owl:imports rdf:resource="&soupa;space"/> <owl:imports rdf:resource="&soupa;device"/> <owl:imports rdf:resource="&soupa;digital-doc"/> </owl:Ontology> <owl:Class rdf:ID="ImageCaptureEvent"> <rdfs:label>ImageCaptureEvent</rdfs:label> <rdfs:subClassOf rdf:resource="&tme;TemporalEvent"/> <rdfs:subClassOf rdf:resource="&spc;SpatialThing"/> </owl:Class> <owl:Class rdf:about="&cam;Digital"/> <owl:Class rdf:ID="CameraPhone"> <rdfs:label>CameraPhone</rdfs:label> <rdfs:subClassOf rdf:resource="&cam;Digital"/> <rdfs:subClassOf rdf:resource="&dev;Cellphone"/> </owl:Class> <owl:ObjectProperty rdf:ID="capturedBy"> <rdfs:label>capturedBy</rdfs:label> <rdfs:domain rdf:resource="#ImageCaptureEvent"/> <rdfs:range rdf:resource="#CameraPhone"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="image"> <rdfs:label>image</rdfs:label> <rdfs:domain rdf:resource="#ImageCaptureEvent"/> <rdfs:range rdf:resource="&ddc;ImageFile"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="atLocation"> <rdfs:label>atLocation</rdfs:label> <rdfs:domain rdf:resource="#ImageCaptureEvent"/> <rdfs:range rdf:resource="&spc;SpatialThing"/> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: soupa-ontology-2004-06.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: knowledge --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY know "http://pervasive.semanticweb.org/ont/2004/06/knowledge#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:know = "&know;" xmlns = "&know;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/knowledge"> <owl:Ontology rdf:about="&soupa;knowledge"> <owl:versionInfo>$Revision: 1.1 $, $Date: 2004/05/15 18:55:09 $</owl:versionInfo> <rdfs:label>SOUPA Context Knowledge Ontology</rdfs:label> <rdfs:comment></rdfs:comment> </owl:Ontology> <owl:Class rdf:ID="Knowledge"> <rdfs:label>Knowledge</rdfs:label> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#ConsistentKnowledge"/> <owl:Class rdf:about="#InconsistentKnowledge"/> </owl:unionOf> </owl:Class> <owl:Class rdf:ID="ConsistentKnowledge"> <rdfs:label>ConsistentKnowledge</rdfs:label> <rdfs:subClassOf rdf:resource="#Knowledge"/> <owl:disjointWith rdf:resource="#InconsistentKnowledge"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#inconsistentWith"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">0</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:Class rdf:ID="InconsistentKnowledge"> <rdfs:label>InconsistentKnowledge</rdfs:label> <rdfs:subClassOf rdf:resource="#Knowledge"/> <owl:disjointWith rdf:resource="#ConsistentKnowledge"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#inconsistentWith"/> <owl:minCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:minCardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="inconsistentWith"> <rdfs:label>inconsistentWith</rdfs:label> <rdfs:domain rdf:resource="#Knowledge"/> <rdfs:range rdf:resource="#Knowledge"/> <rdf:type rdf:resource="&owl;SymmetricProperty"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="source"> <rdfs:label>source</rdfs:label> <rdfs:domain rdf:resource="#Knowledge"/> </owl:ObjectProperty> <owl:DatatypeProperty rdf:ID="reliabilityRating"> <rdfs:label>reliabilityRating</rdfs:label> <rdfs:domain rdf:resource="#Knowledge"/> <rdfs:range rdf:resource="&xsd;float"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="inconsistentWithCount"> <rdfs:label>inconsistentWithCounty</rdfs:label> <rdfs:domain rdf:resource="#Knowledge"/> <rdfs:range rdf:resource="&xsd;nonNegativeInteger"/> </owl:DatatypeProperty> </rdf:RDF> --- NEW FILE: schedule --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY tme "http://pervasive.semanticweb.org/ont/2004/06/time#"> <!ENTITY sch "http://pervasive.semanticweb.org/ont/2004/06/schedule#"> <!ENTITY spc "http://pervasive.semanticweb.org/ont/2004/06/space#"> <!ENTITY mtg "http://pervasive.semanticweb.org/ont/2004/06/meeting#"> <!ENTITY per "http://pervasive.semanticweb.org/ont/2004/06/person#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:spc = "&spc;" xmlns:xsd = "&xsd;" xmlns = "&sch;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/schedule"> <owl:Ontology rdf:about="&soupa;schedule"> <owl:imports rdf:resource="&soupa;time"/> <owl:imports rdf:resource="&soupa;person"/> <owl:imports rdf:resource="&soupa;space"/> <owl:imports rdf:resource="&soupa;meeting"/> <owl:versionInfo>cvs:$Revision: 1.3 $, $Date: 2004/03/07 18:26:58 $</owl:versionInfo> <rdfs:label>SOUPA Meeting Schedule Ontology</rdfs:label> <rdfs:comment></rdfs:comment> </owl:Ontology> <owl:Class rdf:ID="MeetingSchedule"> <rdfs:label>MeetingSchedule</rdfs:label> <rdfs:subClassOf rdf:resource="&tme;IntervalThing"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#name"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#location"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#createdBy"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="location"> <rdfs:label>location</rdfs:label> <rdfs:domain rdf:resource="#MeetingSchedule"/> <rdfs:range rdf:resource="&spc;SpaceInAFixedStructure"/> <rdf:type rdf:resource="&owl;FunctionalProperty"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="createdBy"> <rdfs:label>createdBy</rdfs:label> <rdfs:domain rdf:resource="#MeetingSchedule"/> <rdfs:range rdf:resource="&per;Person"/> </owl:ObjectProperty> <owl:DatatypeProperty rdf:ID="name"> <rdfs:label>name</rdfs:label> <rdfs:domain rdf:resource="#MeetingSchedule"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="description"> <rdfs:label>description</rdfs:label> <rdfs:domain rdf:resource="#MeetingSchedule"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:ObjectProperty rdf:ID="invitedParticipant"> <rdfs:label>invitedParticipant</rdfs:label> <rdfs:domain rdf:resource="#MeetingSchedule"/> <rdfs:range rdf:resource="&per;Person"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="scheduleOf"> <rdfs:label>scheduleOf</rdfs:label> <rdfs:domain rdf:resource="#MeetingSchedule"/> <rdfs:range rdf:resource="&mtg;Meeting"/> <rdf:type rdf:resource="&owl;FunctionalProperty"/> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: digital-doc --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY doc "http://pervasive.semanticweb.org/ont/2004/06/document#"> <!ENTITY ddc "http://pervasive.semanticweb.org/ont/2004/06/digital-doc#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:doc = "&doc;" xmlns = "&ddc;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/digital-doc"> <owl:Ontology rdf:about="&soupa;digital-doc"> <owl:imports rdf:resource="&soupa;document"/> <owl:versionInfo>cvs:$Revision: 1.1 $, $Date: 2004/05/15 18:55:08 $</owl:versionInfo> <rdfs:label>SOUPA Digital Document Ontology</rdfs:label> </owl:Ontology> <owl:Class rdf:ID="DigitalDocument"> <rdfs:label>DigitalDocument</rdfs:label> <rdfs:subClassOf rdf:resource="&doc;Document"/> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#ImageFile"/> <owl:Class rdf:about="#VideoFile"/> <owl:Class rdf:about="#AudioFile"/> </owl:unionOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#fileSize"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="sourceURL"> <rdfs:domain rdf:resource="#DigitalDocument"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="fileSize"> <rdfs:label>fileSize</rdfs:label> <rdfs:domain rdf:resource="#DigitalDocument"/> <rdfs:range rdf:resource="#FileSizeDescription"/> </owl:ObjectProperty> <owl:Class rdf:ID="FileSizeDescription"> <rdfs:label>FileSizeDescription</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#unit"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#size"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="unit"> <rdfs:label>unit</rdfs:label> <rdfs:domain rdf:resource="#FileSizeDescription"/> <rdfs:range rdf:resource="#FileSizeUnit"/> </owl:ObjectProperty> <owl:DatatypeProperty rdf:ID="size"> <rdfs:label>size</rdfs:label> <rdfs:domain rdf:resource="#FileSizeDescription"/> <rdfs:range rdf:resource="&xsd;unsignedLong"/> </owl:DatatypeProperty> <owl:Class rdf:ID="FileSizeUnit"> <rdfs:label>FileSizeUnit</rdfs:label> <owl:oneOf rdf:parseType="Collection"> <FileSizeUnit rdf:about="#Bytes"/> <FileSizeUnit rdf:about="#KBytes"/> <FileSizeUnit rdf:about="#MBytes"/> <FileSizeUnit rdf:about="#GBytes"/> <FileSizeUnit rdf:about="#TBytes"/> </owl:oneOf> </owl:Class> <owl:Class rdf:ID="ImageFile"> <rdfs:label>ImageFile</rdfs:label> <rdfs:subClassOf rdf:resource="#DigitalDocument"/> <owl:disjointWith rdf:resource="#AudioFile"/> <owl:disjointWith rdf:resource="#VideoFile"/> </owl:Class> <owl:Class rdf:ID="AudioFile"> <rdfs:label>AudioFile</rdfs:label> <rdfs:subClassOf rdf:resource="#DigitalDocument"/> <owl:disjointWith rdf:resource="#VideoFile"/> </owl:Class> <owl:Class rdf:ID="VideoFile"> <rdfs:label>VideoFile</rdfs:label> <rdfs:subClassOf rdf:resource="#DigitalDocument"/> </owl:Class> </rdf:RDF> --- NEW FILE: space --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY tme "http://pervasive.semanticweb.org/ont/2004/01/time#"> <!ENTITY geom "http://pervasive.semanticweb.org/ont/2004/06/geo-measurement#"> <!ENTITY pol "http://pervasive.semanticweb.org/ont/2004/06/policy#"> <!ENTITY spc "http://pervasive.semanticweb.org/ont/2004/06/space#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:tme = "&tme;" xmlns:geom = "&geom;" xmlns:pol = "&pol;" xmlns = "&spc;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/space"> <owl:Ontology rdf:about="&soupa;space"> <owl:imports rdf:resource="&soupa;time"/> <owl:imports rdf:resource="&soupa;geo-measurement"/> <owl:imports rdf:resource="&soupa;policy"/> <owl:versionInfo>cvs:$Revision: 1.3 $, $Date: 2004/03/07 17:33:18 $</owl:versionInfo> <rdfs:label>SOUPA Space Ontology</rdfs:label> <rdfs:comment></rdfs:comment> </owl:Ontology> <owl:Class rdf:ID="SpatialThing"> <rdfs:label>SpatialThing</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#hasCoordinates"/> <owl:minCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:minCardinality> </owl:Restriction> </rdfs:subClassOf> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#GeographicalSpace"/> <owl:Class rdf:about="#MovableSpatialThing"/> </owl:unionOf> </owl:Class> <owl:ObjectProperty rdf:ID="hasCoordinates"> <rdfs:label>hasCoordinates</rdfs:label> <rdfs:domain rdf:resource="#SpatialThing"/> <rdfs:range rdf:resource="&geom;LocationCoordinates"/> </owl:ObjectProperty> <owl:Class rdf:ID="GeopoliticalEntity"> <rdfs:label>GeopoliticalEntity</rdfs:label> </owl:Class> <owl:DatatypeProperty rdf:ID="officialName"> <rdfs:label>officialName</rdfs:label> <rdf:type rdf:resource="&owl;FunctionalProperty"/> <rdfs:domain rdf:resource="#GeopoliticalEntity"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:ObjectProperty rdf:ID="controls"> <rdfs:label>controls</rdfs:label> <rdfs:domain rdf:resource="#GeopoliticalEntity"/> <rdfs:range rdf:resource="#GeographicalSpace"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="controlledBy"> <rdfs:label>controlledBy</rdfs:label> <owl:inverseOf rdf:resource="#controls"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="definesPolicy"> <rdfs:label>definesPolicy</rdfs:label> <rdfs:domain rdf:resource="#GeopoliticalEntity"/> <rdfs:range rdf:resource="&pol;Policy"/> </owl:ObjectProperty> <owl:Class rdf:ID="GeographicalSpace"> <rdfs:label>GeographicalSpace</rdfs:label> <rdfs:subClassOf rdf:resource="#SpatialThing"/> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#GeographicalRegion"/> <owl:Class rdf:about="#FixedStructure"/> <owl:Class rdf:about="#SpaceInAFixedStructure"/> </owl:unionOf> <owl:disjointWith rdf:resource="#MovableSpatialThing"/> </owl:Class> <owl:DatatypeProperty rdf:ID="name"> <rdfs:label>name</rdfs:label> <rdfs:domain rdf:resource="#GeographicalSpace"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:Class rdf:ID="GeographicalRegion"> <rdfs:label>GeographicalRegion</rdfs:label> <rdfs:subClassOf rdf:resource="#GeographicalSpace"/> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#LandBasedRegion"/> <owl:Class rdf:about="#WaterBasedRegion"/> </owl:unionOf> </owl:Class> <owl:Class rdf:ID="LandBasedRegion"> <rdfs:label>LandBasedRegion</rdfs:label> <rdfs:subClassOf rdf:resource="#GeographicalRegion"/> </owl:Class> <owl:Class rdf:ID="WaterBasedRegion"> <rdfs:label>WaterBasedRegion</rdfs:label> <rdfs:subClassOf rdf:resource="#GeographicalRegion"/> <owl:disjointWith rdf:resource="#LandBasedRegion"/> </owl:Class> <owl:Class rdf:ID="FixedStructure"> <rdfs:label>FixedStructure</rdfs:label> <rdfs:subClassOf rdf:resource="#GeographicalSpace"/> <owl:disjointWith rdf:resource="#GeographicalRegion"/> </owl:Class> <owl:Class rdf:ID="SpaceInAFixedStructure"> <rdfs:label>SpaceInAFixedStructure</rdfs:label> <rdfs:subClassOf rdf:resource="#GeographicalSpace"/> <owl:disjointWith rdf:resource="#GeographicalRegion"/> <owl:disjointWith rdf:resource="#FixedStructure"/> </owl:Class> <owl:ObjectProperty rdf:ID="spatiallySubsumes"> <rdfs:label>spatiallySubsumes</rdfs:label> <rdf:type rdf:resource="&owl;TransitiveProperty"/> <rdfs:domain rdf:resource="#GeographicalSpace"/> <rdfs:range rdf:resource="#GeographicalSpace"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="spatiallySubsumedBy"> <rdfs:label>spatiallySubsumedBy</rdfs:label> <owl:inverseOf rdf:resource="#spatiallySubsumes"/> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: bdi --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY bdi "http://pervasive.semanticweb.org/ont/2004/06/bdi#"> <!ENTITY act "http://pervasive.semanticweb.org/ont/2004/06/action#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:act = "&act;" xmlns = "&bdi;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/bdi"> <owl:Ontology rdf:about="&soupa;bdi"> <owl:versionInfo>$Revision: 1.4 $, $Date: 2004/07/15 15:40:46 $</owl:versionInfo> <rdfs:label>SOUPA Belief-Desire-Intention Ontology</rdfs:label> <rdfs:comment></rdfs:comment> <owl:imports rdf:resource="&soupa;action"/> </owl:Ontology> <owl:Class rdf:ID="Belief"> <rdfs:label>Belief</rdfs:label> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#TrueStatement"/> <owl:Class rdf:about="#FalseStatement"/> </owl:unionOf> </owl:Class> <owl:Class rdf:ID="TrueStatement"> <rdfs:label>TrueStatement</rdfs:label> <rdfs:subClassOf rdf:resource="#Belief"/> <owl:disjointWith rdf:resource="#FalseStatement"/> </owl:Class> <owl:Class rdf:ID="FalseStatement"> <rdfs:label>FalseStatement</rdfs:label> <rdfs:subClassOf rdf:resource="#Belief"/> </owl:Class> <owl:Class rdf:ID="Desire"> <rdfs:label>Desire</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#endState" /> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:Class rdf:ID="ConflictingDesire"> <rdfs:label>ConflictingDesire</rdfs:label> <owl:intersectionOf rdf:parseType="Collection"> <owl:Class rdf:about="#Desire" /> <owl:Restriction> <owl:onProperty rdf:resource="#conflicts"/> <owl:minCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:minCardinality> </owl:Restriction> </owl:intersectionOf> <owl:disjointWith rdf:resource="#NonConflictingDesire"/> </owl:Class> <owl:Class rdf:ID="NonConflictingDesire"> <rdfs:label>NonConflictingDesire</rdfs:label> <rdfs:subClassOf rdf:resource="#Desire" /> <owl:disjointWith rdf:resource="#ConflictingDesire"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#conflicts"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">0</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="reasonForConflict"> <rdfs:label>reasonForConflict</rdfs:label> <rdfs:domain rdf:resource="#ConflictingDesire"/> </owl:ObjectProperty> <owl:Class rdf:ID="AchievableDesire"> <rdfs:label>AchievableDesire</rdfs:label> <owl:intersectionOf rdf:parseType="Collection"> <owl:Class rdf:about="#Desire" /> <owl:Restriction> <owl:onProperty rdf:resource="#canBeAchievedWithPlan" /> <owl:minCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:minCardinality> </owl:Restriction> </owl:intersectionOf> <owl:disjointWith rdf:resource="#NonAchievableDesire"/> </owl:Class> <owl:Class rdf:ID="NonAchievableDesire"> <rdfs:label>NonAchievableDesire</rdfs:label> <rdfs:subClassOf rdf:resource="#Desire" /> <owl:disjointWith rdf:resource="#AchievableDesire"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#canBeAchievedWithPlan"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">0</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:Class rdf:ID="Goal"> <rdfs:label>Goal</rdfs:label> <owl:intersectionOf rdf:parseType="Collection"> <owl:Class rdf:about="#AchievableDesire" /> <owl:Class rdf:about="#NonConflictingDesire" /> </owl:intersectionOf> </owl:Class> <owl:Class rdf:ID="Intention"> <rdfs:label>Intention</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#definedByPlan" /> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="endState"> <rdfs:domain rdf:resource="#Desire" /> <rdfs:range rdf:resource="&owl;Thing" /> </owl:ObjectProperty> <owl:Class rdf:ID="Plan"> <rdfs:label>Plan</rdfs:label> <rdfs:subClassOf rdf:resource="&act;Action" /> </owl:Class> <owl:ObjectProperty rdf:ID="preCondition"> <rdfs:domain rdf:resource="#Plan" /> <rdfs:range rdf:resource="&owl;Thing" /> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="effect"> <rdfs:domain rdf:resource="#Plan" /> <rdfs:range rdf:resource="&owl;Thing" /> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="conflicts"> <rdf:type rdf:resource="&owl;SymmetricProperty" /> <rdfs:domain rdf:resource="&owl;Thing" /> <rdfs:range rdf:resource="&owl;Thing" /> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="canBeAchievedWithPlan"> <rdfs:domain rdf:resource="#Desire"/> <rdfs:range rdf:resource="#Plan"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="definedByPlan"> <rdfs:domain rdf:resource="#Intention"/> <rdfs:range rdf:resource="#Plan"/> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: agent --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY bdi "http://pervasive.semanticweb.org/ont/2004/06/bdi#"> <!ENTITY agt "http://pervasive.semanticweb.org/ont/2004/06/agent#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:bdi = "&bdi;" xmlns = "&agt;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/agent"> <owl:Ontology rdf:about="&soupa;agent"> <owl:versionInfo>cvs:$Revision: 1.4 $, $Date: 2004/03/04 18:16:46 $</owl:versionInfo> <rdfs:label>SOUPA Agent Ontology</rdfs:label> <rdfs:comment></rdfs:comment> <owl:imports rdf:resource="&soupa;bdi"/> </owl:Ontology> <owl:Class rdf:ID="Agent"> <rdfs:label>Agent</rdfs:label> </owl:Class> <owl:ObjectProperty rdf:ID="believes"> <rdfs:label>believes</rdfs:label> <rdfs:domain rdf:resource="#Agent"/> <rdfs:range rdf:resource="&bdi;Belief"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="desires"> <rdfs:label>desires</rdfs:label> <rdfs:domain rdf:resource="#Agent" /> <rdfs:range rdf:resource="&bdi;Desire" /> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="intends"> <rdfs:label>intends</rdfs:label> <rdfs:domain rdf:resource="#Agent" /> <rdfs:range rdf:resource="&bdi;Intention"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="hasGoal"> <rdfs:subPropertyOf rdf:resource="#desires" /> <rdfs:range rdf:resource="&bdi;Goal"/> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: person --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY foaf "http://xmlns.com/foaf/0.1#"> <!ENTITY per "http://pervasive.semanticweb.org/ont/2004/06/person#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:foaf = "&foaf;" xmlns = "&per;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/person"> <owl:Ontology rdf:about="&soupa;person"> <owl:versionInfo>cvs:$Revision: 1.8 $, $Date: 2004/06/19 20:50:17 $</owl:versionInfo> <rdfs:label>SOUPA Person Ontology</rdfs:label> <rdfs:comment></rdfs:comment> </owl:Ontology> <owl:Class rdf:ID="Person"> <rdfs:label>Person</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#gender"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#birthDate"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <owl:equivalentClass> <owl:Class rdf:about="&foaf;Person"/> </owl:equivalentClass> </owl:Class> <owl:DatatypeProperty rdf:ID="name"> <rdfs:label>name</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="firstName"> <rdfs:label>firstName</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="middleName"> <rdfs:label>middleName</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="lastName"> <rdfs:label>lastName</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="givenName"> <rdfs:label>givenName</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;string"/> <owl:equivalentProperty rdf:resource="#firstName"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="familyName"> <rdfs:label>familyName</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;string"/> <owl:equivalentProperty rdf:resource="#lastName"/> </owl:DatatypeProperty> <owl:Class rdf:ID="Gender"> <rdfs:label>Gender</rdfs:label> <owl:oneOf rdf:parseType="Collection"> <Gender rdf:about="#Male"/> <Gender rdf:about="#Female"/> </owl:oneOf> </owl:Class> <owl:ObjectProperty rdf:ID="gender"> <rdfs:label>gender</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="#Gender"/> <rdf:type rdf:resource="&owl;FunctionalProperty" /> </owl:ObjectProperty> <owl:DatatypeProperty rdf:ID="birthDate"> <rdfs:label>birthDate</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;date"/> <rdf:type rdf:resource="&owl;FunctionalProperty" /> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="nickname"> <rdfs:label>nickname</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:ObjectProperty rdf:ID="homepage"> <rdfs:label>homepage</rdfs:label> <rdfs:range rdf:resource="#Homepage"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="workplaceHomepage"> <rdfs:label>workplaceHomepage</rdfs:label> <rdfs:subPropertyOf rdf:resource="#homepage"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="schoolHomepage"> <rdfs:label>schoolHomepage</rdfs:label> <rdfs:subPropertyOf rdf:resource="#homepage"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="hasContactProfile"> <rdfs:label>hasContactProfile</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:range rdf:resource="#ContactProfile"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="hasHomeContactProfile"> <rdfs:label>hasHomeContactProfile</rdfs:label> <rdfs:subPropertyOf rdf:resource="#hasContactProfile"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="hasWorkContactProfile"> <rdfs:label>hasHomeContact</rdfs:label> <rdfs:subPropertyOf rdf:resource="#hasContactProfile"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="hasSchoolContactProfile"> <rdfs:label>hasSchoolContact</rdfs:label> <rdfs:subPropertyOf rdf:resource="#hasContactProfile"/> </owl:ObjectProperty> <owl:Class rdf:ID="ContactProfile"> <rdfs:label>ContactProfile</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#address"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#phone"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#fax"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#homepage"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#email"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#mobile"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#im"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#myagent"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:DatatypeProperty rdf:ID="address"> <rdfs:label>address</rdfs:label> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="phone"> <rdfs:label>phone</rdfs:label> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="fax"> <rdfs:label>fax</rdfs:label> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="mobile"> <rdfs:label>mobile</rdfs:label> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="sms"> <rdfs:label>sms</rdfs:label> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:ObjectProperty rdf:ID="email"> <rdfs:label>email</rdfs:label> <rdfs:range rdf:resource="#Email"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="im"> <rdfs:label>im</rdfs:label> <rdfs:range rdf:resource="#ChatID"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="myagent"> <rdfs:label>im</rdfs:label> <rdfs:range rdf:resource="#JADEAgentID"/> </owl:ObjectProperty> <owl:Class rdf:ID="InternetResourceURL"> <rdfs:label>InternetResourceURL</rdfs:label> </owl:Class> <owl:Class rdf:ID="Document"> <rdfs:label>Document</rdfs:label> <owl:equivalentClass> <owl:Class rdf:about="&foaf;Document"/> </owl:equivalentClass> </owl:Class> <owl:Class rdf:ID="Homepage"> <rdfs:label>Homepage</rdfs:label> <rdfs:subClassOf rdf:resource="#InternetResourceURL"/> <rdfs:subClassOf rdf:resource="#Document"/> </owl:Class> <owl:Class rdf:ID="Email"> <rdfs:label>Email</rdfs:label> <rdfs:subClassOf rdf:resource="#InternetResourceURL"/> </owl:Class> <owl:Class rdf:ID="ChatID"> <rdfs:label>ChatID</rdfs:label> <rdfs:subClassOf rdf:resource="#InternetResourceURL"/> </owl:Class> <owl:Class rdf:ID="JADEAgentID"> <rdfs:label>JADEAgentID</rdfs:label> </owl:Class> <owl:ObjectProperty rdf:ID="providedBy"> <rdfs:label>providedBy</rdfs:label> <rdfs:domain rdf:resource="#ChatID"/> <rdfs:range rdf:resource="#IMProvider"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="hasRegisteredChatID"> <rdfs:label>hasRegisteredChatID</rdfs:label> <owl:inverseOf rdf:resource="#providedBy"/> </owl:ObjectProperty> <owl:Class rdf:ID="IMProvider"> <rdfs:label>IMProvider</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#hasRegisteredChatID"/> <owl:minCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:minCardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="knows"> <rdfs:label>knows</rdfs:label> <rdfs:domain rdf:resource="#Person"/> <rdfs:domain rdf:resource="#Person"/> <rdf:type rdf:resource="&owl;SymmetricProperty"/> <owl:equivalentProperty> <owl:ObjectProperty rdf:about="&foaf;knows"/> </owl:equivalentProperty> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: geo-measurement --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY spc "http://pervasive.semanticweb.org/ont/2004/06/space#"> <!ENTITY geom "http://pervasive.semanticweb.org/ont/2004/06/geo-measurement#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:spc = "&spc;" xmlns = "&geom;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/geo-measurement"> <owl:Ontology rdf:about="&soupa;geo-measurement"> <owl:imports rdf:resource="&soupa;space"/> <owl:versionInfo>cvs:$Revision: 1.2 $, $Date: 2004/03/07 17:58:36 $</owl:versionInfo> <rdfs:label>SOUPA Geographical Measurement Ontology</rdfs:label> <rdfs:comment></rdfs:comment> </owl:Ontology> <owl:Class rdf:ID="LocationCoordinates"> <rdfs:label>LocationCoordinates</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#longitude"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#latitude"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#altitude"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:DatatypeProperty rdf:ID="longitude"> <rdfs:label>longitude</rdfs:label> <rdfs:domain rdf:resource="#LocationCoordinates"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="latitude"> <rdfs:label>latitude</rdfs:label> <rdfs:domain rdf:resource="#LocationCoordinates"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="altitude"> <rdfs:label>altitude</rdfs:label> <rdfs:domain rdf:resource="#LocationCoordinates"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:Class rdf:ID="Distance"> <rdfs:label>Distance</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#fromSpatialThing"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#toSpatialThing"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#distanceValueDescription"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="fromSpatialThing"> <rdfs:label>fromSpatialThing</rdfs:label> <rdfs:domain rdf:resource="#Distance"/> <rdfs:range rdf:resource="&spc;SpatialThing"/> <rdf:type rdf:resource="&owl;FunctionalProperty"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="toSpatialThing"> <rdfs:label>toSpatialThing</rdfs:label> <rdfs:domain rdf:resource="#Distance"/> <rdfs:range rdf:resource="&spc;SpatialThing"/> <rdf:type rdf:resource="&owl;FunctionalProperty"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="distanceValueDescription"> <rdfs:label>distanceValueDescription</rdfs:label> <rdfs:domain rdf:resource="#Distance"/> <rdfs:range rdf:resource="#DistanceValueDescription"/> <rdf:type rdf:resource="&owl;FunctionalProperty"/> </owl:ObjectProperty> <owl:Class rdf:ID="DistanceValueDescription"> <rdfs:label>DistanceValueDescription</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#distanceUnit"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#distanceValue"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#direction"/> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="distanceUnit"> <rdfs:label>distanceUnit</rdfs:label> <rdfs:domain rdf:resource="#DistanceValueDescription"/> <rdfs:range rdf:resource="#DistanceUnit"/> </owl:ObjectProperty> <owl:DatatypeProperty rdf:ID="distanceValue"> <rdfs:label>distanceValue</rdfs:label> <rdfs:domain rdf:resource="#DistanceValueDescription"/> <rdfs:range rdf:resource="&xsd;float"/> </owl:DatatypeProperty> <owl:ObjectProperty rdf:ID="direction"> <rdfs:label>direction</rdfs:label> <rdfs:domain rdf:resource="#DistanceValueDescription"/> <rdfs:range rdf:resource="#Direction"/> </owl:ObjectProperty> <owl:Class rdf:ID="DistanceUnit"> <rdfs:label>DistanceUnit</rdfs:label> <owl:oneOf rdf:parseType="Collection"> <DistanceUnit rdf:about="#Mile"/> <DistanceUnit rdf:about="#Yard"/> <DistanceUnit rdf:about="#Foot"/> <DistanceUnit rdf:about="#Inch"/> <DistanceUnit rdf:about="#Kilometer"/> <DistanceUnit rdf:about="#Meter"/> <DistanceUnit rdf:about="#Centimeter"/> </owl:oneOf> </owl:Class> <owl:Class rdf:ID="Direction"> <rdfs:label>Direction</rdfs:label> <owl:oneOf rdf:parseType="Collection"> <Direction rdf:about="#N"/> <Direction rdf:about="#S"/> <Direction rdf:about="#E"/> <Direction rdf:about="#W"/> <Direction rdf:about="#NW"/> <Direction rdf:about="#NE"/> <Direction rdf:about="#SW"/> <Direction rdf:about="#SE"/> </owl:oneOf> </owl:Class> <owl:Class rdf:ID="SurfaceArea"> <rdfs:label>SurfaceArea</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#surfaceAreaOf"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#areaValueDescription"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="surfaceAreaOf"> <rdfs:label>surfaceAreaOf</rdfs:label> <rdfs:domain rdf:resource="#SurfaceArea"/> <rdfs:range rdf:resource="&spc;SpatialThing"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="areaValueDescription"> <rdfs:label>areValueDescription</rdfs:label> <rdfs:domain rdf:resource="#SurfaceArea"/> <rdfs:range rdf:resource="#AreaValueDescription"/> </owl:ObjectProperty> <owl:Class rdf:ID="AreaValueDescription"> <rdfs:label>AreaValueDescription</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#areaUnit"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#areaValue"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:ObjectProperty rdf:ID="areaUnit"> <rdfs:label>areaUnit</rdfs:label> <rdfs:domain rdf:resource="#AreaValueDescription"/> <rdfs:range rdf:resource="#DistanceUnit"/> </owl:ObjectProperty> <owl:DatatypeProperty rdf:ID="areaValue"> <rdfs:label>areaValue</rdfs:label> <rdfs:domain rdf:resource="#AreaValueDescription"/> <rdfs:range rdf:resource="&xsd;float"/> </owl:DatatypeProperty> <owl:Class rdf:ID="AreaUnit"> <rdfs:label>AreaUnit</rdfs:label> <owl:oneOf rdf:parseType="Collection"> <AreaUnit rdf:about="#MileSq"/> <AreaUnit rdf:about="#YardSq"/> <AreaUnit rdf:about="#FootSq"/> <AreaUnit rdf:about="#InchSq"/> <AreaUnit rdf:about="#KilometerSq"/> <AreaUnit rdf:about="#MeterSq"/> <AreaUnit rdf:about="#CentimeterSq"/> </owl:oneOf> </owl:Class> </rdf:RDF> --- NEW FILE: device --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY dev "http://pervasive.semanticweb.org/ont/2004/06/device#"> <!ENTITY per "http://pervasive.semanticweb.org/ont/2004/06/person#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:per = "&per;" xmlns = "&dev;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/device"> <owl:Ontology rdf:about="&soupa;device"> <owl:versionInfo>$Revision: 1.1 $, $Date: 2004/05/15 18:55:08 $</owl:versionInfo> <rdfs:label>SOUPA Device Ontology</rdfs:label> <rdfs:comment></rdfs:comment> <owl:imports rdf:resource="&soupa;person"/> </owl:Ontology> <owl:Class rdf:ID="Device"> <rdfs:label>Device</rdfs:label> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#modelNumber"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#serialNumber"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#manufacturerHomepage"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:DatatypeProperty rdf:ID="modelNumber"> <rdfs:label>modelNumber</rdfs:label> <rdfs:domain rdf:resource="#Device"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:DatatypeProperty rdf:ID="serialNumber"> <rdfs:label>serialNumber</rdfs:label> <rdfs:domain rdf:resource="#Device"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> <owl:ObjectProperty rdf:ID="manufacturerHomepage"> <rdfs:label>manufacturerHomepage</rdfs:label> <rdfs:domain rdf:resource="#Device"/> <rdfs:range rdf:resource="&per;Homepage"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="hasUser"> <rdfs:label>userOf</rdfs:label> <rdfs:domain rdf:resource="#Device"/> <rdfs:range rdf:resource="&per;Person"/> </owl:ObjectProperty> <owl:Class rdf:ID="Cellphone"> <rdfs:label>Cellphone</rdfs:label> <rdfs:subClassOf rdf:resource="#Device"/> </owl:Class> <owl:Class rdf:ID="NokiaCellphone"> <rdfs:label>NokiaCellphone</rdfs:label> <rdfs:subClassOf rdf:resource="#Cellphone"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#manufacturerHomepage"/> <owl:hasValue rdf:resource="http://www.nokia.com"/> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <per:Homepage rdf:about="http://www.nokia.com"/> <owl:Class rdf:ID="SonyEricssonCellphone"> <rdfs:label>SonyEricssonCellphone</rdfs:label> <rdfs:subClassOf rdf:resource="#Cellphone"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#manufacturerHomepage"/> <owl:hasValue rdf:resource="http://www.sonyericsson.com"/> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <per:Homepage rdf:about="http://www.sonyericsson.com"/> <owl:Class rdf:ID="BluetoothEnabledCellphone"> <rdfs:label>BluetoothEnabledCellphone</rdfs:label> <rdfs:subClassOf rdf:resource="#Cellphone"/> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#bluetoothMAC"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> </owl:Class> <owl:DatatypeProperty rdf:ID="bluetoothMAC"> <rdfs:label>bluetoothMAC</rdfs:label> <rdfs:domain rdf:resource="#BluetoothEnabledCellphone"/> <rdfs:range rdf:resource="&xsd;string"/> </owl:DatatypeProperty> </rdf:RDF> --- NEW FILE: location --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY loc "http://pervasive.semanticweb.org/ont/2004/06/location#"> <!ENTITY tme "http://pervasive.semanticweb.org/ont/2004/06/time#"> <!ENTITY spc "http://pervasive.semanticweb.org/ont/2004/06/space#"> <!ENTITY know "http://pervasive.semanticweb.org/ont/2004/06/knowledge#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:tme = "&tme;" xmlns:spc = "&spc;" xmlns:know = "&know;" xmlns = "&loc;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/location"> <owl:Ontology rdf:about="&soupa;location"> <owl:versionInfo>$Revision: 1.2 $, $Date: 2004/05/15 18:55:09 $</owl:versionInfo> <rdfs:label>SOUPA Location Context Ontology</rdfs:label> <rdfs:comment></rdfs:comment> <owl:imports rdf:resource="&soupa;time"/> <owl:imports rdf:resource="&soupa;space"/> <owl:imports rdf:resource="&soupa;knowledge"/> </owl:Ontology> <owl:Class rdf:ID="LocationContext"> <rdfs:label>LocationContext</rdfs:label> <rdfs:subClassOf rdf:resource="&tme;TemporalEvent"/> <rdfs:subClassOf rdf:resource="&spc;SpatialThing"/> <rdfs:subClassOf rdf:resource="&know;Knowledge"/> </owl:Class> <owl:ObjectProperty rdf:ID="locationContextOf"> <rdfs:label>locationContextOf</rdfs:label> <rdfs:domain rdf:resource="#LocationContext"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="boundedWithin"> <rdfs:label>boundedWithin</rdfs:label> <rdfs:domain rdf:resource="#LocationContext"/> <rdfs:range rdf:resource="&spc;SpatialThing"/> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: action --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY act "http://pervasive.semanticweb.org/ont/action#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:act = "&act;" xmlns = "&act;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/action"> <owl:Ontology rdf:about="&soupa;action"> <owl:versionInfo>$Revision: 1.6 $, $Date: 2004/07/15 15:40:46 $</owl:versionInfo> <rdfs:label>SOUPA Action Ontology</rdfs:label> </owl:Ontology> <owl:Class rdf:ID="Action"> <rdfs:label>Action</rdfs:label> </owl:Class> <owl:ObjectProperty rdf:ID="actor"> <rdfs:label>actor</rdfs:label> <rdfs:domain rdf:resource="#Action"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="recipient"> <rdfs:label>recipient</rdfs:label> <rdfs:domain rdf:resource="#Action"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="target"> <rdfs:domain rdf:resource="#Action"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="location"> <rdfs:domain rdf:resource="#Action"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="time"> <rdfs:domain rdf:resource="#Action"/> </owl:ObjectProperty> <owl:ObjectProperty rdf:ID="instrument"> <rdfs:domain rdf:resource="#Action"/> </owl:ObjectProperty> </rdf:RDF> --- NEW FILE: time --- <?xml version="1.0"?> <!DOCTYPE rdf:RDF [ <!ENTITY soupa "http://pervasive.semanticweb.org/ont/2004/06/"> <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#"> <!ENTITY owl "http://www.w3.org/2002/07/owl#"> <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#"> <!ENTITY tme "http://pervasive.semanticweb.org/ont/2004/06/time#"> <!ENTITY tme1 "http://www.isi.edu/~pan/damltime/time-entry.owl#"> ]> <!-- This ontology document is licensed under the Creative Commons Attribution License. To view a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. --> <rdf:RDF xmlns:rdf = "&rdf;" xmlns:rdfs = "&rdfs;" xmlns:owl = "&owl;" xmlns:xsd = "&xsd;" xmlns:tme1 = "&tme1;" xmlns = "&tme;" xml:base = "http://pervasive.semanticweb.org/ont/2004/06/time"> <owl:Ontology rdf:about="&soupa;time"> <owl:versionInfo>cvs:$Revision: 1.6 $, $Date: 2004/05/25 19:52:44 $</owl:versionInfo> <rdfs:label>SOUPA Time Ontology</rdfs:label> <rdfs:comment></rdfs:comment> </owl:Ontology> <owl:Class rdf:ID="TemporalThing"> <rdfs:label>TemporalThing</rdfs:label> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#Instant" /> <owl:Class rdf:about="#Interval" /> </owl:unionOf> <owl:equivalentClass> <owl:Class rdf:about="&tme1;TemporalThing"/> </owl:equivalentClass> </owl:Class> <owl:Class rdf:ID="TemporalEvent"> <rdfs:label>TemporalEvent</rdfs:label> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#InstantEvent" /> <owl:Class rdf:about="#IntervalEvent" /> </owl:unionOf> <owl:equivalentClass> <owl:Class rdf:about="&tme1;Event"/> </owl:equivalentClass> </owl:Class> <owl:Class rdf:ID="InstantThing"> <rdfs:label>InstantThing</rdfs:label> <rdfs:subClassOf rdf:resource="#TemporalThing"/> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#Instant" /> <owl:Class rdf:about="#InstantEvent" /> </owl:unionOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#at"/> <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality> </owl:Restriction> </rdfs:subClassOf> <owl:equivalentClass> <owl:Class rdf:about="&tme1;InstantThing"/> </owl:equivalentClass> </owl:Class> <owl:Class rdf:ID="IntervalThing"> <rdfs:label>IntervalThing</rdfs:label> <rdfs:subClassOf rdf:resource="#TemporalThing"/> <owl:unionOf rdf:parseType="Collection"> <owl:Class rdf:about="#Interval" /> <owl:Class rdf:about="#IntervalEvent" /> </owl:unionOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#from" /> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <rdfs:subClassOf> <owl:Restriction> <owl:onProperty rdf:resource="#to" /> <owl:maxCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxCardinality> </owl:Restriction> </rdfs:subClassOf> <owl:equivalentClass> <owl:Class rdf:about="&tme1;IntervalThing"/> </owl:equivalentClass> </owl:Class> <owl:Class rdf:ID="InstantEvent"> <rdfs:label>InstantEvent</rdfs:label> <rdfs:subClassOf rdf:resource="#InstantThing"/> <rdfs:subClassOf rdf:resource="#TemporalEvent"/> <owl:equivalentClass> <owl:Class rdf:about="&tme1;InstantEvent"/> </owl:equivalentClass> </owl:Class> <owl:Class rdf:ID="IntervalEvent"> <rdfs:label>IntervalEvent</rdfs:label> <rdfs:subClassOf rdf:resource="#IntervalThing"/> <rdfs:subClassOf rdf:resource="#Tempo... [truncated message content] |
|
From: Flo L. <fl...@us...> - 2005-08-17 15:35:31
|
Update of /cvsroot/graphl/graphl/config/vocabs/SOUPA In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12374/config/vocabs/SOUPA Log Message: Directory /cvsroot/graphl/graphl/config/vocabs/SOUPA added to the repository |
|
From: Flo L. <fl...@us...> - 2005-01-11 13:27:25
|
Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25738/src/org/mediavirus/graphl/graph/rdf Modified Files: RDFNode.java RDFGraph.java Log Message: - FEATURE: implemented generic type menu that reads from RDF vocabs - FEATURE: RDFGraph now imports files referenced with owl:imports statements - BUG: fixed saving of literal properties - BUG: fixed Swing look and feel for JDK 1.5 - CODE: GraphlPane now stores vocabularies - CODE: added first (dummy) implementation of node mainpulator - CODE: added getProperties() mehtod to PropertySet interface Index: RDFNode.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFNode.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RDFNode.java 21 Oct 2004 16:00:48 -0000 1.6 --- RDFNode.java 11 Jan 2005 13:26:40 -0000 1.7 *************** *** 6,9 **** --- 6,10 ---- + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; *************** *** 93,97 **** } else { ! Iterator edges = getEdgesFrom().iterator(); while (edges.hasNext()) { RDFEdge e = (RDFEdge)edges.next(); --- 94,98 ---- } else { ! Iterator edges = new ArrayList(getEdgesFrom()).iterator(); while (edges.hasNext()) { RDFEdge e = (RDFEdge)edges.next(); Index: RDFGraph.java =================================================================== RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFGraph.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RDFGraph.java 30 Nov 2004 09:38:34 -0000 1.7 --- RDFGraph.java 11 Jan 2005 13:26:41 -0000 1.8 *************** *** 17,20 **** --- 17,21 ---- import java.util.Hashtable; import java.util.List; + import java.util.Map; import org.mediavirus.graphl.graph.DefaultGraph; *************** *** 53,60 **** --- 54,75 ---- RDFWriter writer = new RDFWriter(); + // TODO (2) use vocabularies from config for prefix resolution writer.addNamespacePrefix("graphl","http://www.mediavirus.org/graphl#"); + writer.addNamespacePrefix("foaf","http://xmlns.com/foaf/0.1/"); + writer.addNamespacePrefix("rdf","http://www.w3.org/1999/02/22-rdf-syntax-ns#"); + writer.addNamespacePrefix("rdfs","http://www.w3.org/2000/01/rdf-schema#"); + writer.addNamespacePrefix("owl","http://www.w3.org/2002/07/owl#"); + writer.addNamespacePrefix("map","http://fabl.net/vocabularies/geography/map/1.1/"); + writer.addNamespacePrefix("geo","http://www.w3.org/2003/01/geo/wgs84_pos#"); writer.prepareNamespaceCollection(); + writer.collectNamespace("http://www.mediavirus.org/graphl#"); + writer.collectNamespace("http://xmlns.com/foaf/0.1/"); + writer.collectNamespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#"); + writer.collectNamespace("http://www.w3.org/2000/01/rdf-schema#"); + writer.collectNamespace("http://www.w3.org/2002/07/owl#"); + writer.collectNamespace("http://fabl.net/vocabularies/geography/map/1.1/"); + writer.collectNamespace("http://www.w3.org/2003/01/geo/wgs84_pos#"); OutputStreamWriter owriter = new OutputStreamWriter(out); *************** *** 65,69 **** for (Iterator iter = allNodes.iterator(); iter.hasNext();) { RDFNode node = (RDFNode) iter.next(); ! writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#canvasPosition", node.getCenterX() + ":" + node.getCenterY(), null, null, true); List nodeEdges = node.getEdgesFrom(); for (Iterator edgeIter = nodeEdges.iterator(); edgeIter.hasNext();) { --- 80,88 ---- for (Iterator iter = allNodes.iterator(); iter.hasNext();) { RDFNode node = (RDFNode) iter.next(); ! for (Iterator attrs = node.getProperties().keySet().iterator(); attrs.hasNext();) { ! String attr = (String) attrs.next(); ! writer.writeStatement(node.getId(), attr, node.getProperty(attr), null, null, true); ! } ! //writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#canvasPosition", node.getCenterX() + ":" + node.getCenterY(), null, null, true); List nodeEdges = node.getEdgesFrom(); for (Iterator edgeIter = nodeEdges.iterator(); edgeIter.hasNext();) { *************** *** 161,164 **** --- 180,198 ---- addElements(null, Collections.singleton(edge)); if (DEBUG) System.out.println("created edge " + subject + ", " + predicate + ", " + object); + + if (predicate.equals("http://www.w3.org/2002/07/owl#imports")) { + System.out.println("#### " + object); + try { + URL oldBase = baseURL; + URL importURL = new URL(baseURL, object); + System.out.println("importing " + importURL.toString() + " ... "); + readFromURL(importURL); + // restore original base url + baseURL = oldBase; + } + catch (MalformedURLException muex) { + System.out.println("Error importing " + object); + } + } } } |
![http://www.mediavirus.org/graphl/images/default.gif"/>](http://www.mediavirus.org/graphl/images/default.gif"/>){kind=link}