[Gzz-commits] fenfire/org/fenfire/view/lava Button.java FenPD...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/21 14:07:58

Modified files:
        org/fenfire/view/lava: Button.java FenPDFContext.java 

Log message:
        speedups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/Button.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/lava/Button.java
diff -u fenfire/org/fenfire/view/lava/Button.java:1.1 
fenfire/org/fenfire/view/lava/Button.java:1.2
--- fenfire/org/fenfire/view/lava/Button.java:1.1       Fri May 16 04:55:21 2003
+++ fenfire/org/fenfire/view/lava/Button.java   Wed May 21 14:07:58 2003
@@ -36,15 +36,15 @@
 
     final private VobScene vs;
     final private float scale;
-    final private TextStyle style;
+    final static private TextStyle style =  GraphicsAPI.getInstance().
+                                     getTextStyle("sans", 0, 24);
     final private int into;
     final private float offset;
     private float x,y;
 
-    public Button(VobScene v, int into, TextStyle s,
+    public Button(VobScene v, int into, 
                   float x, float y, float offset) {
        vs = v;
-       style = s;
        scale = style.getScaleByHeight(40);
         this.into = into;
         this.x=x; this.y=y;
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.16 
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.17
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.16       Wed May 21 
13:56:04 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java    Wed May 21 14:07:58 2003
@@ -171,9 +171,7 @@
 
     public void renderContext(VobScene vs, int into)
     {
-       Button b = new Button(vs, 0, GraphicsAPI.getInstance().
-                                     getTextStyle("sans", 0, 24),
-                                     30, 0, 50);
+       Button b = new Button(vs, 0, 30, 0, 50);
         b.add("[Import PS/PDF]", "IMPORT");
         b.add("[New paper]",     "NEW_PAPER");
 
@@ -208,6 +206,7 @@
                fd.show();  // now wait until user makes a desicion
                fd.hide();
                p("ps/pdf to be added: "+fd.getDirectory()+fd.getFile());
+               if (fd.getDirectory() == null) return null;
 
                ScrollBlock sc = alph.addFile(new 
File(fd.getDirectory()+fd.getFile()),
                                              "application/pdf");