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

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/03/27 04:30:57

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

Log message:
        thanks benja!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/ShortRDF.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/ShortRDF.java
diff -u fenfire/org/fenfire/util/ShortRDF.java:1.11 
fenfire/org/fenfire/util/ShortRDF.java:1.12
--- fenfire/org/fenfire/util/ShortRDF.java:1.11 Thu Mar 27 04:10:26 2003
+++ fenfire/org/fenfire/util/ShortRDF.java      Thu Mar 27 04:30:57 2003
@@ -8,7 +8,7 @@
 
 
 public class ShortRDF {
-public static final String rcsid = "$Id: ShortRDF.java,v 1.11 2003/03/27 
09:10:26 mudyc Exp $";
+public static final String rcsid = "$Id: ShortRDF.java,v 1.12 2003/03/27 
09:30:57 mudyc Exp $";
     private static void pa(String s) { System.out.println("ShortRDF"+s); }
 
     public static Resource getRes(Model model, RDFNode node, Property 
predicate) 
@@ -60,15 +60,10 @@
      */
     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();
-           pa("type: "+ stmt.getObject().toString());
-           if ((RDFNode)stmt.getObject() == type) return true;
-       }
-       pa(" Return from isNodeType");
-       return false;
+       if ( ((Resource)node).getProperty(RDF.type).equals((Resource)type))
+           return true;
+       else
+           return false;
     } catch (RDFException e) {
        pa("Exception ocurred!: "+e);
        throw new Error("ShortRDF has RDFException!");
@@ -146,27 +141,28 @@
 
 
     static public RDFNode getDataNode(Model model, RDFNode node)
-    {
-       if (isNodeType(model, node, ALPH.dataType))
+    { try {
+
+       if ( ((Resource)node).getProperty(RDF.type).equals(ALPH.dataType))
            return node;
 
-       if (isNodeType(model, node, ALPH.xuType)){
-           pa("Right???");
+       if ( ((Resource)node).getProperty(RDF.type).equals(ALPH.xuType))
            return node;
-       }
-       if (isNodeType(model, node, ALPH.xuLinkType)){
-           pa("JEEEE!!! ");
+
+       if ( ((Resource)node).getProperty(RDF.type).equals(ALPH.xuLinkType))
            return node;
-       }
 
-       if (!isNodeType(model, node, ALPH.cloneType))
+       if ( ((Resource)node).getProperty(RDF.type).equals(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 {