[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] loom/org/fenfire/loom DefaultNodeView.java Loom...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] loom/org/fenfire/loom DefaultNodeView.java Loom... |
Date: |
Sat, 05 Apr 2003 16:09:51 -0500 |
CVSROOT: /cvsroot/loom
Module name: loom
Changes by: Benja Fallenstein <address@hidden> 03/04/05 16:09:51
Modified files:
org/fenfire/loom: DefaultNodeView.java Loom.java
LoomBindings.java
Log message:
Marking
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/loom/loom/org/fenfire/loom/DefaultNodeView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/loom/loom/org/fenfire/loom/Loom.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/loom/loom/org/fenfire/loom/LoomBindings.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: loom/org/fenfire/loom/DefaultNodeView.java
diff -u loom/org/fenfire/loom/DefaultNodeView.java:1.1
loom/org/fenfire/loom/DefaultNodeView.java:1.2
--- loom/org/fenfire/loom/DefaultNodeView.java:1.1 Mon Mar 31 17:41:23 2003
+++ loom/org/fenfire/loom/DefaultNodeView.java Sat Apr 5 16:09:51 2003
@@ -40,19 +40,42 @@
public class DefaultNodeView implements NodeView {
protected Loom loom;
protected TextStyle style;
- protected Vob resourceVob, literalVob, selResourceVob, selLiteralVob;
+
+ protected Color resourceColor = new Color(102, 255, 102);
+ protected Color literalColor = new Color(255, 204, 51);
+
+ protected OvalBgVob resourceVob;
+ protected RectBgVob literalVob;
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());
+ resourceVob = new OvalBgVob(Color.white, false, null);
+ resourceVob.addColor(resourceColor);
+ literalVob = new RectBgVob(Color.white, false, null);
+ literalVob.addColor(literalColor);
+ }
+
+ protected Vob getBgVob(boolean isResource, boolean isSelected,
+ boolean isMarked) {
+ if(!isSelected && !isMarked)
+ return isResource ? (Vob)resourceVob : (Vob)literalVob;
+
+ Color bg = isSelected ? loom.colors.getCursorBorderColor() : null;
+ if(isResource) {
+ OvalBgVob vob = new OvalBgVob(Color.white, isSelected, bg);
+ vob.addColor(resourceColor);
+ if(isMarked) vob.addColor(Color.red);
+ return vob;
+ } else {
+ RectBgVob vob = new RectBgVob(Color.white, isSelected, bg);
+ vob.addColor(literalColor);
+ if(isMarked) vob.addColor(Color.red);
+ return vob;
+ }
}
+
/** Argh-- global variable because getText()
* can only return one thing :-( :-(
@@ -114,18 +137,9 @@
int dir = spec.dir;
boolean selected = spec.equals(loom.cursor.getRotationNodespec(dir));
- if(node instanceof Resource) {
- if(selected)
- sc.map.put(selResourceVob, into);
- else
- sc.map.put(resourceVob, into);
- } else {
- if(selected)
- sc.map.put(selLiteralVob, into);
- else
- sc.map.put(literalVob, into);
- }
-
+ sc.map.put(getBgVob(node instanceof Resource, selected,
+ loom.markedNodes.contains(node)), into);
+
String s = getText(node, true);
if(s.length() > 17) {
Index: loom/org/fenfire/loom/Loom.java
diff -u loom/org/fenfire/loom/Loom.java:1.1 loom/org/fenfire/loom/Loom.java:1.2
--- loom/org/fenfire/loom/Loom.java:1.1 Mon Mar 31 17:41:23 2003
+++ loom/org/fenfire/loom/Loom.java Sat Apr 5 16:09:51 2003
@@ -54,6 +54,8 @@
protected Cursor cursor;
protected RDFVocab rdf;
+ protected Set markedNodes;
+
protected PropertiesBox propertiesBox = new PropertiesBox();
public void load(File file) throws RDFException, IOException,
@@ -90,6 +92,8 @@
stmt.getSubject(), 1, stmt.getObject());
menuBar.setModel(model, names);
+
+ markedNodes = new HashSet();
}
protected Frame propFrame;
Index: loom/org/fenfire/loom/LoomBindings.java
diff -u loom/org/fenfire/loom/LoomBindings.java:1.1
loom/org/fenfire/loom/LoomBindings.java:1.2
--- loom/org/fenfire/loom/LoomBindings.java:1.1 Mon Mar 31 17:41:23 2003
+++ loom/org/fenfire/loom/LoomBindings.java Sat Apr 5 16:09:51 2003
@@ -52,18 +52,26 @@
if(s.equals("Ctrl-Q"))
System.exit(0);
if(loom.model == null) return;
+
+ if(s.equals("m")) {
+ Resource r = loom.cursor.focus;
+ if(!loom.markedNodes.contains(r))
+ loom.markedNodes.add(r);
+ else
+ loom.markedNodes.remove(r);
+ }
if(loom.view.isWheelView()) {
if(s.equals("i") || s.equals("Up") ||
s.equals(",") || s.equals("Down")) return;
- if(s.equals("m") || s.equals("n") || s.equals("o"))
+ if(s.equals("n") || s.equals("o"))
s = "Up";
else if(s.equals("u") || s.equals("."))
s = "Down";
} else if(loom.view.isSimpleView()) {
if(s.equals("u") || s.equals("o"))
s = "Up";
- else if(s.equals("m") || s.equals("n") || s.equals("."))
+ else if(s.equals("n") || s.equals("."))
s = "Down";
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] loom/org/fenfire/loom DefaultNodeView.java Loom...,
Benja Fallenstein <=