[Gzz-commits] gzz/gzz/view DimDecorator.java LastOpDecorator....

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/07 04:37:52

Modified files:
        gzz/view       : DimDecorator.java LastOpDecorator.java 
                         MarkDecorator.java 

Log message:
        Make it run with OpenGL again. Mustn't create OpenGL text styles before 
GraphicsAPI is initialized.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DimDecorator.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/MarkDecorator.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gzz/gzz/view/DimDecorator.java
diff -u gzz/gzz/view/DimDecorator.java:1.22 gzz/gzz/view/DimDecorator.java:1.23
--- gzz/gzz/view/DimDecorator.java:1.22 Mon Jan  6 19:57:00 2003
+++ gzz/gzz/view/DimDecorator.java      Tue Jan  7 04:37:51 2003
@@ -34,13 +34,12 @@
  *  vob scene.
  */
 public class DimDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: DimDecorator.java,v 1.22 2003/01/07 00:57:00 benja Exp $";
+String rcsid = "$Id: DimDecorator.java,v 1.23 2003/01/07 09:37:51 tjl Exp $";
     public static boolean dbg = true;
     private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { System.err.println(s); }
 
-    static TextStyle style = 
-       GraphicsAPI.getInstance().getTextStyle("SansSerif", 
java.awt.Font.PLAIN, 12);
+    static TextStyle style = null;
 
     static Vob bg = new RectBgVob();
     static Vob conn = new SimpleConnection(0.5f, 0.5f, 0.5f, 0.5f, Color.red);
@@ -54,6 +53,8 @@
     int space = 2;
 
     public void render(VobScene sc, int into, Fallback fallback, Fallback.Win 
win) {
+       if(style == null)
+           style = GraphicsAPI.getInstance().getTextStyle("SansSerif", 
Font.PLAIN, 12);
         //p("Placing DimDecorations");
 
        int ndims = win.dimsIndices.length;
Index: gzz/gzz/view/LastOpDecorator.java
diff -u gzz/gzz/view/LastOpDecorator.java:1.24 
gzz/gzz/view/LastOpDecorator.java:1.25
--- gzz/gzz/view/LastOpDecorator.java:1.24      Thu Dec  5 20:03:51 2002
+++ gzz/gzz/view/LastOpDecorator.java   Tue Jan  7 04:37:52 2003
@@ -34,18 +34,19 @@
  *  directional op entered.
  */
 public class LastOpDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: LastOpDecorator.java,v 1.24 2002/12/06 01:03:51 benja Exp 
$";
+String rcsid = "$Id: LastOpDecorator.java,v 1.25 2003/01/07 09:37:52 tjl Exp 
$";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
-    static TextStyle style =
-       GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 16);
+    static TextStyle style = null;
     static Object key = new Object();
     static SimpleLinebreaker breaker = new SimpleLinebreaker();
 
     int padding = 15;
 
     public void render(VobScene sc, int into, Fallback fallback, Fallback.Win 
win) {
+       if(style == null) 
+           style = GraphicsAPI.getInstance().getTextStyle("SansSerif", 
Font.PLAIN, 16);
        if(!(fallback.binder instanceof DefaultBinder)) return;
        DefaultBinder binder = (DefaultBinder)fallback.binder;
 
Index: gzz/gzz/view/MarkDecorator.java
diff -u gzz/gzz/view/MarkDecorator.java:1.16 
gzz/gzz/view/MarkDecorator.java:1.17
--- gzz/gzz/view/MarkDecorator.java:1.16        Thu Dec  5 20:03:51 2002
+++ gzz/gzz/view/MarkDecorator.java     Tue Jan  7 04:37:52 2003
@@ -33,13 +33,14 @@
 public class MarkDecorator implements FallbackSceneDecorator {
     static Object KEY = new Object(), TEXT_KEY = new Object();
     static final int PAD = 10;
-    static TextStyle style =
-       GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 12);
+    static TextStyle style = null;
     static String str = "Marked cells:";
 
 
     public void render(VobScene vs, int into, Fallback fallback,
                        Fallback.Win win) {
+       if(style == null)
+           style = GraphicsAPI.getInstance().getTextStyle("SansSerif", 
Font.PLAIN, 12);
        float[] size = new float[2];
 
        CellView cv = win.getCellView();