[Gzz-commits] fenfire/org/fenfire/loom DefaultNodeView.java L...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/22 15:27:13

Modified files:
        org/fenfire/loom: DefaultNodeView.java Loom.java 
                          LoomBindings.java 

Log message:
        Refactor, remove stupid-looking debug output (argh)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/DefaultNodeView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/LoomBindings.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/loom/DefaultNodeView.java
diff -u fenfire/org/fenfire/loom/DefaultNodeView.java:1.1 
fenfire/org/fenfire/loom/DefaultNodeView.java:1.2
--- fenfire/org/fenfire/loom/DefaultNodeView.java:1.1   Sat Mar 22 15:18:55 2003
+++ fenfire/org/fenfire/loom/DefaultNodeView.java       Sat Mar 22 15:27:13 2003
@@ -1,5 +1,5 @@
 /*
-Loom.java
+DefaultNodeView.java
  *
  *    Copyright (c) 2003 by Benja Fallenstein
  *
@@ -26,17 +26,16 @@
  */
 package org.fenfire.loom;
 import org.nongnu.libvob.*;
-import org.nongnu.libvob.impl.DefaultVobMatcher;
 import org.nongnu.libvob.vobs.*;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
+import java.awt.Color;
+//import java.awt.event.*;
+//import java.io.*;
 import java.util.*;
 import java.util.List;
 
 import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.mem.*;
+//import com.hp.hpl.mesa.rdf.jena.mem.*;
 
 /** The default node view for Loom.
  *  Not tested at this time [XXX fix!!!].
@@ -44,13 +43,20 @@
 public class DefaultNodeView implements NodeView {
     protected Loom loom;
     protected TextStyle style;
+    protected Vob resourceVob, literalVob, selResourceVob, selLiteralVob;
     
     public DefaultNodeView(Loom loom) {
        this.loom = loom;
        style = GraphicsAPI.getInstance()
            .getTextStyle("Serif", 0, 12);
+       resourceVob = new OvalBgVob(new Color(102, 255, 102), false, null);
+       literalVob = new RectBgVob(new Color(255, 204, 51), false, null);
+       selResourceVob = new OvalBgVob(new Color(102, 255, 102), true,
+                                      loom.colors.getCursorBorderColor());
+       selLiteralVob = new RectBgVob(new Color(255, 204, 51), true,
+                                     loom.colors.getCursorBorderColor());
     }
-    
+
     public void render(VobScene sc, int into, Nodespec spec) {
        RDFNode node = spec.node;
        Property prop = spec.prop;
@@ -58,13 +64,15 @@
        
        boolean selected = spec.equals(loom.cursor.getRotationNodespec(dir));
        if(node instanceof Resource) {
-           OvalBgVob bg = new OvalBgVob(new Color(102, 255, 102), selected,
-                                        loom.colors.getCursorBorderColor());
-           sc.map.put(bg, into);
+           if(selected)
+               sc.map.put(selResourceVob, into);
+           else
+               sc.map.put(resourceVob, into);
        } else {
-           RectBgVob bg = new RectBgVob(new Color(255, 204, 51), selected,
-                                        loom.colors.getCursorBorderColor());
-           sc.map.put(bg, into);
+           if(selected)
+               sc.map.put(selLiteralVob, into);
+           else
+               sc.map.put(literalVob, into);
        }
        
        String s;
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.42 
fenfire/org/fenfire/loom/Loom.java:1.43
--- fenfire/org/fenfire/loom/Loom.java:1.42     Sat Mar 22 15:18:55 2003
+++ fenfire/org/fenfire/loom/Loom.java  Sat Mar 22 15:27:13 2003
@@ -58,13 +58,9 @@
        NamespaceMap names;
        try {
            Model my_model = new ModelMem();
-           System.out.println("!");
            my_model.read(new java.io.FileReader(file), "");
-           System.out.println("@");
            names = new NamespaceMap();
-           System.out.println("#");
            names.loadMappings(new java.io.FileReader(file));
-           System.out.println("$");
 
            model = my_model;
        } catch(Throwable _) {
Index: fenfire/org/fenfire/loom/LoomBindings.java
diff -u fenfire/org/fenfire/loom/LoomBindings.java:1.1 
fenfire/org/fenfire/loom/LoomBindings.java:1.2
--- fenfire/org/fenfire/loom/LoomBindings.java:1.1      Sat Mar 22 15:18:55 2003
+++ fenfire/org/fenfire/loom/LoomBindings.java  Sat Mar 22 15:27:13 2003
@@ -1,5 +1,5 @@
 /*
-Loom.java
+LoomBindings.java
  *
  *    Copyright (c) 2003 by Benja Fallenstein
  *
@@ -26,17 +26,12 @@
  */
 package org.fenfire.loom;
 import org.nongnu.libvob.*;
-import org.nongnu.libvob.impl.DefaultVobMatcher;
-import org.nongnu.libvob.vobs.*;
 
-import java.awt.*;
 import java.awt.event.*;
-import java.io.*;
 import java.util.*;
 import java.util.List;
 
 import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.mem.*;
 
 /** The key and mouse bindings for Loom.
  *  Not tested at this time.