[Gzz-commits] fenfire/org/fenfire/util ShortRDF.java ShortRDF...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/03/27 05:10:39

Modified files:
        org/fenfire/util: ShortRDF.java ShortRDF.test 

Log message:
        jippii

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/ShortRDF.java
diff -u fenfire/org/fenfire/util/ShortRDF.java:1.14 
fenfire/org/fenfire/util/ShortRDF.java:1.15
--- fenfire/org/fenfire/util/ShortRDF.java:1.14 Thu Mar 27 05:02:36 2003
+++ fenfire/org/fenfire/util/ShortRDF.java      Thu Mar 27 05:10:38 2003
@@ -8,7 +8,7 @@
 
 
 public class ShortRDF {
-public static final String rcsid = "$Id: ShortRDF.java,v 1.14 2003/03/27 
10:02:36 tjl Exp $";
+public static final String rcsid = "$Id: ShortRDF.java,v 1.15 2003/03/27 
10:10:38 mudyc Exp $";
     private static void pa(String s) { System.out.println("ShortRDF"+s); }
 
     public static Resource getRes(Model model, RDFNode node, Property 
predicate) 
@@ -145,28 +145,31 @@
 
 
     static public RDFNode getDataNode(Model model, RDFNode node)
-    { try {
+    { //try {
 
-       if ( ((Resource)node).getProperty(RDF.type).equals(ALPH.dataType))
+       if (isNodeType(model,node,ALPH.dataType))
            return node;
-
-       if ( ((Resource)node).getProperty(RDF.type).equals(ALPH.xuType))
+       if (isNodeType(model,node,ALPH.xuType))
            return node;
-
-       if ( ((Resource)node).getProperty(RDF.type).equals(ALPH.xuLinkType))
+       if (isNodeType(model,node,ALPH.xuLinkType))
+           return node;
+       if (isNodeType(model,node,ALPH.xuLinkTo))
+           return node;
+       if (isNodeType(model,node,ALPH.xuLinkFrom))
            return node;
 
-       if ( ((Resource)node).getProperty(RDF.type).equals(ALPH.cloneType))
+       if (isNodeType(model,node,ALPH.cloneType))
            throw new Error("Wrong type!");
 
        RDFNode data = getRes(model, (Resource)node, ALPH.clone);
        if (!isNodeType(model, node, ALPH.dataType))
        throw new Error("Wrong type!");
        return data;
+       /*
     } catch (RDFException e) {
        pa("Exception ocurred!: "+e);
        throw new Error("ShortRDF has RDFException!");
-    }}
+       }*/}
 
     static public RDFNode getDataClone(Model model, RDFNode node)
     { try {
Index: fenfire/org/fenfire/util/ShortRDF.test
diff -u fenfire/org/fenfire/util/ShortRDF.test:1.2 
fenfire/org/fenfire/util/ShortRDF.test:1.3
--- fenfire/org/fenfire/util/ShortRDF.test:1.2  Thu Mar 27 04:58:51 2003
+++ fenfire/org/fenfire/util/ShortRDF.test      Thu Mar 27 05:10:38 2003
@@ -25,6 +25,7 @@
     print node
     res.addProperty(RDF.type, type);
     print res
+    print res.getProperty(RDF.type)