[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/loom Loom.java StatementSel...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] fenfire/org/fenfire/loom Loom.java StatementSel... |
Date: |
Sat, 08 Mar 2003 17:23:00 -0500 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Benja Fallenstein <address@hidden> 03/03/08 17:22:59
Modified files:
org/fenfire/loom: Loom.java StatementSelector.java
Added files:
org/fenfire/loom: ColorScheme.java SimpleOrder.java
SimpleOrder.test
Log message:
refactor
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/ColorScheme.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/SimpleOrder.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/SimpleOrder.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/StatementSelector.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.15
fenfire/org/fenfire/loom/Loom.java:1.16
--- fenfire/org/fenfire/loom/Loom.java:1.15 Sat Mar 8 08:38:30 2003
+++ fenfire/org/fenfire/loom/Loom.java Sat Mar 8 17:22:59 2003
@@ -73,7 +73,7 @@
System.exit(1);
}
- new Loom(file, blue);
+ new Loom(file, ColorScheme.blue);
}
protected NodeView.Nodespec lastFocus;
@@ -88,32 +88,9 @@
final Statement stmt = model.listStatements().next();
final GraphicsAPI api = GraphicsAPI.getInstance();
- final Comparator subjOrder = new Comparator() {
- public int compare(Object o1, Object o2) {
- Statement s1 = (Statement)o1, s2 = (Statement)o2;
- int cmp = s1.getPredicate().toString()
- .compareTo(s2.getPredicate().toString());
- if(cmp == 0)
- cmp = s1.getSubject().toString()
- .compareTo(s2.getSubject().toString());
- return cmp;
- }
- };
- final Comparator objOrder = new Comparator() {
- public int compare(Object o1, Object o2) {
- Statement s1 = (Statement)o1, s2 = (Statement)o2;
- int cmp = s1.getPredicate().toString()
- .compareTo(s2.getPredicate().toString());
- if(cmp == 0)
- cmp = s1.getObject().toString()
- .compareTo(s2.getObject().toString());
- return cmp;
- }
- };
-
final Cursor cursor =
- new Cursor(subjOrder, objOrder,
- new StatementSelector.SimpleSelector(),
+ new Cursor(SimpleOrder.subjOrder, SimpleOrder.objOrder,
+ StatementSelector.simpleSelector,
stmt.getSubject(), 1, stmt.getObject());
final TextStyle style = api.getTextStyle("Serif", 0, 12);
@@ -282,25 +259,4 @@
}
});
}
-
- public interface ColorScheme {
- public Color getBg();
- public Color getCursorColor();
- }
-
- public static class LightColorScheme implements ColorScheme {
- float hue;
- public LightColorScheme(float hue) { this.hue = hue; }
- public Color getBg() {
- return Color.getHSBColor(hue, 0.1f, 1f);
- }
- public Color getCursorColor() {
- return Color.getHSBColor(hue, 0.4f, 1f);
- }
- }
-
- public static final ColorScheme
- green = new LightColorScheme(0.233f),
- blue = new LightColorScheme(0.6f);
-
}
Index: fenfire/org/fenfire/loom/StatementSelector.java
diff -u fenfire/org/fenfire/loom/StatementSelector.java:1.1
fenfire/org/fenfire/loom/StatementSelector.java:1.2
--- fenfire/org/fenfire/loom/StatementSelector.java:1.1 Fri Mar 7 15:48:11 2003
+++ fenfire/org/fenfire/loom/StatementSelector.java Sat Mar 8 17:22:59 2003
@@ -38,6 +38,8 @@
*/
Collection getConnections(Resource focus, int dir);
+ StatementSelector simpleSelector = new SimpleSelector();
+
/** The posward or negward connections of <code>focus</code> to show,
* in order.
* Returns a set of <em>statements</em>, not a set of nodes.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/loom Loom.java StatementSel...,
Benja Fallenstein <=