[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/view DefaultNodeView.java L...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire/view DefaultNodeView.java L... |
Date: |
Wed, 23 Apr 2003 16:58:09 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/23 16:58:08
Modified files:
org/fenfire/view: DefaultNodeView.java LinebrokenText.java
PageHandler.java SpatialPlane.java
TextState.java
Added files:
org/fenfire/view: PageContext.java SimplePage.java
Log message:
make better page handler.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageContext.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SimplePage.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/DefaultNodeView.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/LinebrokenText.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageHandler.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextState.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/view/DefaultNodeView.java
diff -u fenfire/org/fenfire/view/DefaultNodeView.java:1.6
fenfire/org/fenfire/view/DefaultNodeView.java:1.7
--- fenfire/org/fenfire/view/DefaultNodeView.java:1.6 Wed Apr 23 16:24:57 2003
+++ fenfire/org/fenfire/view/DefaultNodeView.java Wed Apr 23 16:58:08 2003
@@ -11,14 +11,14 @@
import java.awt.*;
public class DefaultNodeView extends NodeView {
-private static final String rcsid = "$Id: DefaultNodeView.java,v 1.6
2003/04/23 20:24:57 mudyc Exp $";
+private static final String rcsid = "$Id: DefaultNodeView.java,v 1.7
2003/04/23 20:58:08 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("DefaultNodeView::"+s); }
public DefaultNodeView(Fen f) {
fen = f;
text = new LinebrokenText();
- page = new PageHandler() { };
+ page = new SimplePage();
}
public void place(Object node, VobScene vs, int box) {
Index: fenfire/org/fenfire/view/LinebrokenText.java
diff -u fenfire/org/fenfire/view/LinebrokenText.java:1.1
fenfire/org/fenfire/view/LinebrokenText.java:1.2
--- fenfire/org/fenfire/view/LinebrokenText.java:1.1 Wed Apr 23 16:24:57 2003
+++ fenfire/org/fenfire/view/LinebrokenText.java Wed Apr 23 16:58:08 2003
@@ -45,7 +45,7 @@
* Doesn't scroll, currently.
*/
public class LinebrokenText extends TextHandler {
-public static final String rcsid = "$Id: LinebrokenText.java,v 1.1 2003/04/23
20:24:57 mudyc Exp $";
+public static final String rcsid = "$Id: LinebrokenText.java,v 1.2 2003/04/23
20:58:08 mudyc Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) {
System.out.println("LinebrokenText::"+s); }
@@ -184,7 +184,7 @@
s = s.substring(start, end);
if(dbg) pa("addVobs: "+start+" "+end+" '"+s+"'");
- //TextVob vob = new TextVob(style, s, baselined, key, getColor());
+ // XXX TextVob vob = new TextVob(style, s, baselined, key, getColor());
TextVob vob = new TextVob(style, s, baselined, key);
ch.addBox(vob);
}
Index: fenfire/org/fenfire/view/PageHandler.java
diff -u fenfire/org/fenfire/view/PageHandler.java:1.2
fenfire/org/fenfire/view/PageHandler.java:1.3
--- fenfire/org/fenfire/view/PageHandler.java:1.2 Wed Apr 16 02:59:31 2003
+++ fenfire/org/fenfire/view/PageHandler.java Wed Apr 23 16:58:08 2003
@@ -3,30 +3,27 @@
package org.fenfire.view;
import org.fenfire.*;
import org.nongnu.libvob.*;
+import org.nongnu.libvob.gl.*;
import org.nongnu.libvob.util.CachingMap;
import org.nongnu.alph.*;
import java.awt.Color;
import com.hp.hpl.mesa.rdf.jena.model.*;
-public abstract class PageHandler implements ContentHandler { // , PageState {
//, PageContext
+public abstract class PageHandler implements ContentHandler, PageContext { //
, PageState
- CachingMap map = new CachingMap(50);
- private PageSpanLayout getPageSpanLayout(Enfilade1D enf) {
- PageSpanLayout res = (PageSpanLayout)map.get(enf);
- if(res == null) {
- res = new PageSpanLayout(enf);
- map.put(enf, res);
- }
- return res;
+ public PageHandler() {
+ setFrameVisible(true);
}
+
public void place(VobScene vs, int box, Enfilade1D enf) {
- getPageSpanLayout(enf).place(vs, box, 1, 1);
+ throw new Error("Not implemented");
}
public void getSize(Enfilade1D enf, float[] size) {
- PageSpanLayout l = getPageSpanLayout(enf);
- size[0] = l.w;
- size[1] = l.h;
+ throw new Error("Not implemented");
}
+ protected boolean visibleFrame;
+ public boolean frameVisible() { return visibleFrame; }
+ public void setFrameVisible(boolean b) { visibleFrame = b; }
}
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.24
fenfire/org/fenfire/view/SpatialPlane.java:1.25
--- fenfire/org/fenfire/view/SpatialPlane.java:1.24 Wed Apr 23 16:24:57 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Wed Apr 23 16:58:08 2003
@@ -25,15 +25,12 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.24 2003/04/23
20:24:57 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.25 2003/04/23
20:58:08 mudyc Exp $";
public static boolean dbg = false;
private static void p(String s) { if (dbg) pa(s); }
private static void pa(String s) { System.out.println("SpatialPlane::"+s);
}
- static private Vob frame = null;
-
-
private Object cType;
private Object cont;
public SpatialPlane(Object contentType, Object containment) {
@@ -119,21 +116,6 @@
{
p("render GL, node: "+ node);
- if (frame == null) {
- frame = GLRen.createCallListBoxCoorded(
- "PushAttrib ENABLE_BIT\n" +
- "Color 0 0 0\n" +
- "Disable TEXTURE_2D\n" +
- "LineWidth 1\n" +
- "Begin LINE_LOOP\n" +
- "Vertex 0 0\n" +
- "Vertex 0 1\n" +
- "Vertex 1 1\n" +
- "Vertex 1 0\n" +
- "End\n" +
- "PopAttrib"
- );
- }
Object current = node;
Object container = current;
@@ -169,7 +151,5 @@
if(current.equals(n))
cursorBox = box;
}
-
}
-
}
Index: fenfire/org/fenfire/view/TextState.java
diff -u fenfire/org/fenfire/view/TextState.java:1.3
fenfire/org/fenfire/view/TextState.java:1.4
--- fenfire/org/fenfire/view/TextState.java:1.3 Wed Apr 23 16:24:57 2003
+++ fenfire/org/fenfire/view/TextState.java Wed Apr 23 16:58:08 2003
@@ -13,6 +13,7 @@
float getScale();
void setScale(float fontScale);
+ // style
void setStyle(TextStyle style);
TextStyle getStyle();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/view DefaultNodeView.java L...,
Matti Katila <=