[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire modules/pp/PPActions.java m...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire/org/fenfire modules/pp/PPActions.java m... |
|
Date: |
Wed, 26 Mar 2003 09:00:25 -0500 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/03/26 09:00:25
Modified files:
org/fenfire/modules/pp: PPActions.java PPActionsImpl.java
PPActionsImpl.test PPCanvasNode.java
org/fenfire/util: ShortRDF.java
org/fenfire/view: CoordinatePlaneView.java
org/fenfire/view/buoy: PPLinker.java PPLinker.test
org/fenfire/vocab: PP.java
Log message:
blaah
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActions.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CoordinatePlaneView.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/PP.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPActions.java
diff -u fenfire/org/fenfire/modules/pp/PPActions.java:1.2
fenfire/org/fenfire/modules/pp/PPActions.java:1.3
--- fenfire/org/fenfire/modules/pp/PPActions.java:1.2 Sat Mar 8 20:28:20 2003
+++ fenfire/org/fenfire/modules/pp/PPActions.java Wed Mar 26 09:00:24 2003
@@ -21,13 +21,6 @@
void deletePaper(String paperURI)
throws RemoteException;
- /** Create a clone note of other note.
- * @param noteURI if null cloneNote acts like newNote()
- * @see newNote()
- */
- String cloneNote(String paperURI, String noteURI,
- int x, int y, String text)
- throws RemoteException;
/** Create a new note and optionally place some text into it.
* @param text (Optional, may be null) The text to be placed
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.java
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.11
fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.12
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.java:1.11 Tue Mar 25
18:27:15 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.java Wed Mar 26 09:00:24 2003
@@ -1,7 +1,8 @@
//(c): Tuomas J. Lukka and Matti Katila
package org.fenfire.modules.pp;
-import org.fenfire.util.URN5Namespace;
+import org.fenfire.vocab.*;
+import org.fenfire.util.*;
import java.io.IOException;
import java.rmi.*;
import java.rmi.server.*;
@@ -12,12 +13,11 @@
/** The implementation of PPActions.
*/
public class PPActionsImpl extends UnicastRemoteObject implements PPActions {
-public static final String rcsid = "$Id: PPActionsImpl.java,v 1.11 2003/03/25
23:27:15 mudyc Exp $";
+public static final String rcsid = "$Id: PPActionsImpl.java,v 1.12 2003/03/26
14:00:24 mudyc Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.out.println(s); }
- private PPVocab PP = new PPVocab();
private Model model;
public void setModel(Model model) { this.model = model; }
@@ -38,11 +38,11 @@
Resource paper = model.createResource(uri);
// and resource must be also paper..
- paper.addProperty(RDF.type, PP.PaperType);
+ paper.addProperty(RDF.type, PP.paperType);
// set creation time
// XXX we need iso 8601 time presentation here
- paper.addProperty(PP.CreationTime, "123");
+ paper.addProperty(PP.creationTime, "123");
return uri;
} catch (RDFException e) {
@@ -70,10 +70,10 @@
}}
- public String cloneNote(String paperURI, String noteURI,
- int x, int y, String text)
+
+ public String newNote(String paperURI, int x, int y, String text)
throws RemoteException
- { synchronized(model) { try {
+ { synchronized(model) { try {
// find the paper
Resource paper = model.getResource(paperURI);
@@ -81,61 +81,31 @@
// note doesn't exist so we need to make one
String note_uri = URN5Namespace.instance.generateId();
Resource note = model.createResource(note_uri);
- note.addProperty(RDF.type, PP.NoteType);
+ note.addProperty(RDF.type, PP.noteType);
// set note to paper
- paper.addProperty(PP.Contains, note);
+ paper.addProperty(PP.contains, note);
// set coords
- note.addProperty(PP.CoordX, ""+x);
- note.addProperty(PP.CoordY, ""+y);
+ note.addProperty(SPATIAL.coordX, ""+x);
+ note.addProperty(SPATIAL.coordY, ""+y);
// set depth...
- note.addProperty(PP.Depth, "10");
+ note.addProperty(PP.depth, "10");
// scale etc.. XXX
- // content
- if (noteURI == null) {
- // then handle as a new note
-
- // ref to real data must be created
- String data_uri = URN5Namespace.instance.generateId();
- Resource data = model.createResource(data_uri);
-
- note.addProperty(PP.LinkToContentRef, data);
- data.addProperty(PP.Data, text);
- data.addProperty(RDF.type, PP.DataType);
-
- } else {
- // check if uri really exists?
- // XXX maybe RDFException ?
- Resource clone = model.getResource(noteURI);
- Resource data = null;
- NodeIterator iter =
- model.listObjectsOfProperty(clone, PP.LinkToContentRef);
- while (iter.hasNext()) {
- data = (Resource) iter.next();
- }
- if (data == null)
- throw new Error("No data available when cloning!!!");
- note.addProperty(PP.LinkToContentRef, data);
- }
+ // XXX use real Alph!!!!
+ note.addProperty(ALPH.content, text);
return note_uri;
+
} catch (RDFException e) {
- pa("Fault doing a clone/new note: "+e);
+ pa("Fault creating a new note: "+e);
return "";
}}}
- public String newNote(String paperURI, int x, int y, String text)
- throws RemoteException
- { synchronized(model) {
- return cloneNote(paperURI, null, x,y,text);
- }}
-
-
public void deleteNote(String noteURI)
throws RemoteException
{ synchronized(model) { try {
@@ -188,25 +158,12 @@
if (note == null) return;
// delete all old coords
- RDFNode empty = null;
- Selector selector = new SelectorImpl(note, PP.CoordX, empty);
- StmtIterator it = model.listStatements(selector);
- while (it.hasNext()) {
- Statement stmt = it.next();
- p("deleting X: "+stmt);
- model.remove(stmt);
- }
- selector = new SelectorImpl(note, PP.CoordY, empty);
- it = model.listStatements(selector);
- while (it.hasNext()) {
- Statement stmt = it.next();
- p("deleting Y"+stmt);
- model.remove(stmt);
- }
+ ShortRDF.rmObj(model, note, SPATIAL.coordX);
+ ShortRDF.rmObj(model, note, SPATIAL.coordY);
// set coords
- note.addProperty(PP.CoordX, ""+x);
- note.addProperty(PP.CoordX, ""+x);
+ note.addProperty(SPATIAL.coordX, ""+x);
+ note.addProperty(SPATIAL.coordX, ""+x);
} catch (RDFException e) {
pa("Fault moving note: "+e);
}}}
@@ -225,26 +182,22 @@
if (side < 0) {
// check if already associated
- Selector slctr = new SelectorImpl(assoc, PP.Association, note);
- StmtIterator iter = model.listStatements(slctr);
- if (iter.hasNext()) {
+ if (((ModelCom)model).contains(assoc, PP.association,
(RDFNode)note)) {
pa("Already associated!");
return;
}
// assoc
- assoc.addProperty(PP.Association, note);
+ assoc.addProperty(PP.association, note);
} else {
// check if already associated
- Selector slctr = new SelectorImpl(note, PP.Association, assoc);
- StmtIterator iter = model.listStatements(slctr);
- if (iter.hasNext()) {
+ if (((ModelCom)model).contains(note, PP.association,
(RDFNode)assoc)) {
pa("Already associated!");
return;
}
// assoc
- note.addProperty(PP.Association, assoc);
+ note.addProperty(PP.association, assoc);
}
} catch (RDFException e) {
pa("Fault associationing notes: "+e);
@@ -281,13 +234,13 @@
public void insertText(String noteURI, int offs, String text)
throws RemoteException
- { synchronized(model) { try {
+ { synchronized(model) { //try {
/*
Cell note = space.getCell(noteId);
note.insertText(offs, text);
*/
-
+ /*
Resource note = model.getResource(noteURI);
// find actual data
@@ -318,17 +271,19 @@
} catch (RDFException e) {
pa("Fault inserting text to note: "+e);
- }}}
+ } */
+ }}
public void deleteText(String noteURI, int begin, int end)
throws RemoteException
- { synchronized(model) { try {
+ { synchronized(model) { // try {
/*
Cell note = space.getCell(noteId);
note.deleteText(begin, end);
*/
+ /*
Resource note = model.getResource(noteURI);
// find actual data
@@ -359,5 +314,7 @@
} catch (RDFException e) {
pa("Fault deleting text from the note: "+e);
- }}}
+ }
+ */
+ }}
}
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.2
fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.3
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.2 Tue Mar 25
18:27:15 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.test Wed Mar 26 09:00:24 2003
@@ -1,21 +1,21 @@
#(c): Matti Katila
+from org.fenfire.vocab import PP, SPATIAL
from org.fenfire.modules.pp import *
from org.fenfire.util import URN5Namespace
from com.hp.hpl.mesa.rdf import jena
from com.hp.hpl.mesa.rdf.jena.vocabulary import RDF
def setUp():
- global model, ppact, PP
+ global model, ppact
model = jena.mem.ModelMem()
ppact = PPActionsImpl(model)
- PP = PPVocab()
def testNewPaper():
paper = ppact.newPaper()
assert paper != ''
- slctr = jena.common.SelectorImpl(None, RDF.type, PP.PaperType)
+ slctr = jena.common.SelectorImpl(None, RDF.type, PP.paperType)
iter = model.listStatements(slctr)
assert iter.hasNext() == 1
stmt = iter.next()
@@ -23,130 +23,44 @@
assert stmt.getSubject().toString() == paper
# XXX does not check creation time
-
-def testNewNote():
- newNoteCheck()
- paper = URN5Namespace.instance.generateId()
- paperRes = jena.common.ResourceImpl(paper)
- note = ppact.newNote(paper, 123, 456, 'This is a new note')
- noteRes = jena.common.ResourceImpl(note)
-
- # note1 -.
- # >-> lintoReal data -> data
- # note2 -'
-
- # check link to real data
- slctr = jena.common.SelectorImpl(noteRes, PP.LinkToContentRef, None)
+def checkIter(slctr):
iter = model.listStatements(slctr)
assert iter.hasNext() == 1
stmt = iter.next()
assert iter.hasNext() == 0
- assert stmt.getSubject().toString() == note
-
- datalink = stmt.getObject()
-
- # check data
- slctr = jena.common.SelectorImpl(datalink, PP.Data, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
- assert stmt.getObject().toString() == 'This is a new note'
-
- # check type of data
- slctr = jena.common.SelectorImpl(datalink, RDF.type, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
- assert stmt.getSubject() == datalink
- assert stmt.getObject() == PP.DataType
-
-
-def testCloneNote():
- newNoteCheck()
-
- paper = URN5Namespace.instance.generateId()
- orig = ppact.newNote(paper, 123, 456, 'This is the original note')
- origRes = jena.common.ResourceImpl(orig)
- clone = ppact.cloneNote(paper, orig, 123, 456, 'This is a new clone')
- cloneRes = jena.common.ResourceImpl(clone)
-
- # note -.
- # >-> lintoReal data -> data
- # clone -'
-
- # check link to real data
- slctr = jena.common.SelectorImpl(cloneRes, PP.LinkToContentRef, None)
- iter = model.listStatements(slctr)
-
- slctr2 = jena.common.SelectorImpl(origRes, PP.LinkToContentRef, None)
- iter2 = model.listStatements(slctr2)
-
- assert iter.hasNext() == 1
- assert iter2.hasNext() == 1
-
- stmt = iter.next()
- stmt2 = iter2.next()
-
- assert iter.hasNext() == 0
- assert iter2.hasNext() == 0
-
- assert stmt.getObject() == stmt2.getObject()
-
- slctr = jena.common.SelectorImpl(stmt.getObject(), PP.Data, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
- assert stmt.getObject().toString() == 'This is the original note'
-
-def newNoteCheck():
+ return stmt
+
+def testNewNote():
paper = URN5Namespace.instance.generateId()
paperRes = jena.common.ResourceImpl(paper)
note = ppact.newNote(paper, -123, 456, 'This is a new note')
noteRes = jena.common.ResourceImpl(note)
# type test - NoteType
- slctr = jena.common.SelectorImpl(noteRes, RDF.type, PP.NoteType)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(noteRes, RDF.type, PP.noteType)
+ stmt = checkIter(slctr)
assert stmt.getSubject().toString() == note
# is node on paper?
- slctr = jena.common.SelectorImpl(paperRes, PP.Contains, noteRes)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(paperRes, PP.contains, noteRes)
+ stmt = checkIter(slctr)
assert stmt.getSubject().toString() == paper
assert stmt.getObject().toString() == note
# x coord ok?
- slctr = jena.common.SelectorImpl(noteRes, PP.CoordX, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(noteRes, SPATIAL.coordX, None)
+ stmt = checkIter(slctr)
assert stmt.getObject().toString() == '-123'
# y coord ok?
- slctr = jena.common.SelectorImpl(noteRes, PP.CoordY, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(noteRes, SPATIAL.coordY, None)
+ stmt = checkIter(slctr)
assert stmt.getObject().toString() == '456'
- # deth ok?
- slctr = jena.common.SelectorImpl(noteRes, PP.Depth, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ # depth ok?
+ slctr = jena.common.SelectorImpl(noteRes, PP.depth, None)
+ stmt = checkIter(slctr)
assert stmt.getObject().toString() == '10'
def testAssoc():
@@ -163,27 +77,21 @@
ppact.assocNotes(noteA, 1, noteB)
# noteA -> ?
- slctr = jena.common.SelectorImpl(None, PP.Association, noteARes)
+ slctr = jena.common.SelectorImpl(None, PP.association, noteARes)
iter = model.listStatements(slctr)
assert iter.hasNext() == 0
- slctr = jena.common.SelectorImpl(noteARes, PP.Association, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(noteARes, PP.association, None)
+ stmt = checkIter(slctr)
assert stmt.getObject().toString() == noteB
# ? <- noteB
- slctr = jena.common.SelectorImpl(noteBRes, PP.Association, None)
+ slctr = jena.common.SelectorImpl(noteBRes, PP.association, None)
iter = model.listStatements(slctr)
assert iter.hasNext() == 0
- slctr = jena.common.SelectorImpl(None, PP.Association, noteBRes)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(None, PP.association, noteBRes)
+ stmt = checkIter(slctr)
assert stmt.getSubject().toString() == noteA
@@ -197,27 +105,21 @@
ppact.assocNotes(noteA, -1, noteB)
# noteA -> ?
- slctr = jena.common.SelectorImpl(noteARes, PP.Association, None)
+ slctr = jena.common.SelectorImpl(noteARes, PP.association, None)
iter = model.listStatements(slctr)
assert iter.hasNext() == 0
- slctr = jena.common.SelectorImpl(None, PP.Association, noteARes)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(None, PP.association, noteARes)
+ stmt = checkIter(slctr)
assert stmt.getSubject().toString() == noteB
# ? <- noteB
- slctr = jena.common.SelectorImpl(None, PP.Association, noteBRes)
+ slctr = jena.common.SelectorImpl(None, PP.association, noteBRes)
iter = model.listStatements(slctr)
assert iter.hasNext() == 0
- slctr = jena.common.SelectorImpl(noteBRes, PP.Association, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ slctr = jena.common.SelectorImpl(noteBRes, PP.association, None)
+ stmt = checkIter(slctr)
assert stmt.getObject().toString() == noteA
@@ -230,32 +132,11 @@
ppact.insertText(note, 5, 'FOO! ')
# insert test
- slctr = jena.common.SelectorImpl(noteRes, PP.LinkToContentRef, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
-
- slctr = jena.common.SelectorImpl(stmt.getObject(), PP.Data, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
-
- assert stmt.getObject().toString() == 'This FOO! is a test'
+ #assert stmt.getObject().toString() == 'This FOO! is a test'
#delete test
ppact.deleteText(note, 5, 8)
- slctr = jena.common.SelectorImpl(noteRes, PP.LinkToContentRef, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
+ #assert stmt.getObject().toString() == 'This ! is a test'
- slctr = jena.common.SelectorImpl(stmt.getObject(), PP.Data, None)
- iter = model.listStatements(slctr)
- assert iter.hasNext() == 1
- stmt = iter.next()
- assert iter.hasNext() == 0
-
- assert stmt.getObject().toString() == 'This ! is a test'
+ print 'XXX untested, unimplemented'
+
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.1
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.2
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.1 Tue Mar 25
19:36:06 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java Wed Mar 26 09:00:24 2003
@@ -1,6 +1,8 @@
//(c): Matti J. Katila
package org.fenfire.modules.pp;
+import org.fenfire.vocab.*;
+import org.fenfire.util.*;
import org.fenfire.view.*;
import org.fenfire.view.buoy.*;
import org.nongnu.libvob.*;
@@ -10,13 +12,12 @@
import com.hp.hpl.mesa.rdf.jena.vocabulary.*;
public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.1 2003/03/26
00:36:06 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.2 2003/03/26
14:00:24 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
private Model model;
private GraphicsAPI.Window win;
- private PPVocab PP = new PPVocab();
public PPCanvasNode(Model m, GraphicsAPI.Window w) {
this.model = m;
this.win = w;
@@ -26,29 +27,16 @@
/** True if this view "owns" a certain node.
*/
public boolean ownsNode(RDFNode node)
- { try {
+ {
// check if node is a note
- Selector slctr = new SelectorImpl((Resource)node, RDF.type, (RDFNode)
null);
- StmtIterator iter = model.listStatements(slctr);
- while (iter.hasNext()) {
- Statement stmt = iter.next();
- if (stmt.getSubject() == PP.NoteType) return true;
- }
+ if (ShortRDF.isNodeType(model, node, PP.noteType)) return true;
// or if node is a paper
- slctr = new SelectorImpl((Resource)node, RDF.type, (RDFNode) null);
- iter = model.listStatements(slctr);
- while (iter.hasNext()) {
- Statement stmt = iter.next();
- if (stmt.getSubject() == PP.PaperType) return true;
- }
+ if (ShortRDF.isNodeType(model, node, PP.paperType)) return true;
// otherwise
return false;
- } catch (RDFException e) {
- pa("Exception!: "+e);
- throw new Error("Error in PPCanvas");
- }}
+ }
/** Get the ideal size for this buoy.
* (mudyc): Just and idea if vobscene width and height is passed in wh...
@@ -118,28 +106,11 @@
private int[] getCoords(RDFNode node) {
- try {
- int [] ints = new int[2];
-
- Selector slctr = new SelectorImpl((Resource)node, PP.CoordX,
(RDFNode) null);
- StmtIterator iter = model.listStatements(slctr);
- if (iter.hasNext()) {
- Statement stmt = iter.next();
- ints[0] = stmt.getInt();
- }
-
- slctr = new SelectorImpl((Resource)node, PP.CoordY, (RDFNode) null);
- iter = model.listStatements(slctr);
- if (iter.hasNext()) {
- Statement stmt = iter.next();
- ints[1] = stmt.getInt();
- }
-
- return ints;
- } catch (RDFException e) {
- pa("Exception!: "+e);
- throw new Error("Error in PPCanvas");
- }
+ int [] ints = new int[2];
+
+ ints[0] = ShortRDF.getInt(model, node, SPATIAL.coordX);
+ ints[1] = ShortRDF.getInt(model, node, SPATIAL.coordY);
+ return ints;
}
}
Index: fenfire/org/fenfire/util/ShortRDF.java
diff -u fenfire/org/fenfire/util/ShortRDF.java:1.4
fenfire/org/fenfire/util/ShortRDF.java:1.5
--- fenfire/org/fenfire/util/ShortRDF.java:1.4 Wed Mar 26 07:18:51 2003
+++ fenfire/org/fenfire/util/ShortRDF.java Wed Mar 26 09:00:25 2003
@@ -1,13 +1,14 @@
//(c): Matti Katila
package org.fenfire.util;
+import org.fenfire.vocab.*;
import com.hp.hpl.mesa.rdf.jena.vocabulary.RDF;
import com.hp.hpl.mesa.rdf.jena.model.*;
import com.hp.hpl.mesa.rdf.jena.common.*;
public class ShortRDF {
-public static final String rcsid = "$Id: ShortRDF.java,v 1.4 2003/03/26
12:18:51 mudyc Exp $";
+public static final String rcsid = "$Id: ShortRDF.java,v 1.5 2003/03/26
14:00:25 mudyc Exp $";
private static void pa(String s) { System.out.println("ShortRDF"+s); }
public static Resource getRes(Model model, RDFNode node, Property
predicate)
@@ -53,4 +54,22 @@
pa("Exception ocurred!: "+e);
throw new Error("ShortRDF has RDFException!");
}}
+
+
+ /** Check if node is specified type
+ */
+ public static boolean isNodeType(Model model, RDFNode node, RDFNode type)
+ { try {
+ Selector selector = new SelectorImpl((Resource)node, RDF.type,
(RDFNode)null);
+ StmtIterator iter = model.listStatements(selector);
+ while (iter.hasNext()) {
+ Statement stmt = iter.next();
+ if ((RDFNode)stmt.getObject() == type) return true;
+ }
+ return false;
+ } catch (RDFException e) {
+ pa("Exception ocurred!: "+e);
+ throw new Error("ShortRDF has RDFException!");
+ }}
+
}
Index: fenfire/org/fenfire/view/CoordinatePlaneView.java
diff -u fenfire/org/fenfire/view/CoordinatePlaneView.java:1.2
fenfire/org/fenfire/view/CoordinatePlaneView.java:1.3
--- fenfire/org/fenfire/view/CoordinatePlaneView.java:1.2 Wed Mar 26
04:12:24 2003
+++ fenfire/org/fenfire/view/CoordinatePlaneView.java Wed Mar 26 09:00:25 2003
@@ -3,6 +3,7 @@
package org.fenfire.view;
import org.fenfire.modules.pp.*;
import org.fenfire.view.buoy.*;
+import org.fenfire.vocab.*;
import org.fenfire.util.*;
import org.nongnu.libvob.*;
import org.nongnu.libvob.gl.*;
@@ -21,13 +22,12 @@
*/
public class CoordinatePlaneView {
-public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.2
2003/03/26 09:12:24 mudyc Exp $";
+public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.3
2003/03/26 14:00:25 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("CoordinatePlaneView"+s); }
static private Vob frame = null;
private int cursorBox;
- private PPVocab PP = new PPVocab();
public CoordinatePlaneView() {
if (frame == null) {
this.frame = GLRen.createCallListBoxCoorded(
@@ -82,7 +82,7 @@
if (!ok) throw new Error("Not a papertype on planeview!");
*/
- Selector slctr = new SelectorImpl((Resource)node, PP.Contains,
(RDFNode) null);
+ Selector slctr = new SelectorImpl((Resource)node, PP.contains,
(RDFNode) null);
StmtIterator iter = model.listStatements(slctr);
Statement stmt = null;
while (iter.hasNext()) {
@@ -92,8 +92,8 @@
int[] coords = new int[2];
// get coords
- coords[0] = ShortRDF.getInt(model, note, PP.CoordX);
- coords[1] = ShortRDF.getInt(model, note, PP.CoordY);
+ coords[0] = ShortRDF.getInt(model, note, SPATIAL.coordX);
+ coords[1] = ShortRDF.getInt(model, note, SPATIAL.coordY);
// get size XXX
boolean drawFrame = false;
Index: fenfire/org/fenfire/view/buoy/PPLinker.java
diff -u fenfire/org/fenfire/view/buoy/PPLinker.java:1.1
fenfire/org/fenfire/view/buoy/PPLinker.java:1.2
--- fenfire/org/fenfire/view/buoy/PPLinker.java:1.1 Tue Mar 25 10:58:56 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.java Wed Mar 26 09:00:25 2003
@@ -3,6 +3,7 @@
package org.fenfire.modules.pp;
import org.fenfire.view.buoy.*;
import org.fenfire.util.*;
+import org.fenfire.vocab.*;
import org.nongnu.libvob.*;
import org.nongnu.libvob.buoy.*;
import com.hp.hpl.mesa.rdf.jena.model.*;
@@ -11,16 +12,13 @@
/** Make the kinds of links familiar from PP structure.
*/
public class PPLinker implements BuoyNodeViewLinker {
-public static final String rcsid = "$Id: PPLinker.java,v 1.1 2003/03/25
15:58:56 mudyc Exp $";
+public static final String rcsid = "$Id: PPLinker.java,v 1.2 2003/03/26
14:00:25 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPLinker:"+s); }
private Model model;
- private PPVocab PP;
-
- public PPLinker(Model model, PPVocab voc) {
+ public PPLinker(Model model) {
this.model = model;
- this.PP = voc;
}
public void doLinks(RDFNode node, VobScene vs, int cs,
@@ -37,7 +35,7 @@
Resource n = (Resource)node;
// Right links!
- Selector slctr = new SelectorImpl(n, PP.Association, (RDFNode) null);
+ Selector slctr = new SelectorImpl(n, PP.association, (RDFNode) null);
StmtIterator iter = model.listStatements(slctr);
Statement stmt = null;
@@ -49,7 +47,7 @@
}
// Left links!
- slctr = new SelectorImpl(null, PP.Association, n);
+ slctr = new SelectorImpl(null, PP.association, n);
iter = model.listStatements(slctr);
while (iter.hasNext()) {
stmt = iter.next();
Index: fenfire/org/fenfire/view/buoy/PPLinker.test
diff -u fenfire/org/fenfire/view/buoy/PPLinker.test:1.2
fenfire/org/fenfire/view/buoy/PPLinker.test:1.3
--- fenfire/org/fenfire/view/buoy/PPLinker.test:1.2 Tue Mar 25 13:05:43 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.test Wed Mar 26 09:00:25 2003
@@ -1,6 +1,7 @@
#(c): Matti Katila
from org.fenfire.modules.pp import *
+from org.fenfire.vocab import PP
import org.fenfire.view.buoy
from org.fenfire.util import URN5Namespace, Pair
from org.nongnu.libvob.buoy import BuoyViewNodeType,\
@@ -11,9 +12,8 @@
def setUp():
- global model, PP
+ global model
model = jena.mem.ModelMem()
- PP = PPVocab()
global uriA, uriB
global nodeA, nodeB
@@ -24,10 +24,10 @@
nodeB = model.createResource(uriB)
# assoc
- nodeA.addProperty(PP.Association, nodeB)
+ nodeA.addProperty(PP.association, nodeB)
global ppLinker
- ppLinker = PPLinker(model, PP)
+ ppLinker = PPLinker(model)
class NodeType(BuoyViewNodeType):
def getSizde(self, linkId, anchor, wh):
Index: fenfire/org/fenfire/vocab/PP.java
diff -u fenfire/org/fenfire/vocab/PP.java:1.1
fenfire/org/fenfire/vocab/PP.java:1.2
--- fenfire/org/fenfire/vocab/PP.java:1.1 Wed Mar 26 07:46:50 2003
+++ fenfire/org/fenfire/vocab/PP.java Wed Mar 26 09:00:25 2003
@@ -5,11 +5,11 @@
import com.hp.hpl.mesa.rdf.jena.common.*;
/** Family Portal scheme vocabulary
- * Spatial
-
+ * Spatial canvases whic have notes and two of those
+ * notes can be associated together.
*/
public class PP {
-public static final String rcsid = "$Id: PP.java,v 1.1 2003/03/26 12:46:50
mudyc Exp $";
+public static final String rcsid = "$Id: PP.java,v 1.2 2003/03/26 14:00:25
mudyc Exp $";
protected static void pa(String s) { System.out.println("PP: "+s); }
// Propertys
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire modules/pp/PPActions.java m...,
Matti Katila <=