[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz modules/pp/BuoyView.java modules/pp/Pla...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz/gzz modules/pp/BuoyView.java modules/pp/Pla... |
|
Date: |
Tue, 08 Oct 2002 03:34:54 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/10/08 03:34:54
Modified files:
gzz/modules/pp : BuoyView.java PlaneView.java
gzz/view : DimDecorator.java LastOpDecorator.java
LinebrokenCellContentView.java
MarkDecorator.java TextCellContentView.java
gzz/vob : TextVob.java
Log message:
OOPS\! Forgot to see if other files compiled...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/BuoyView.java.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PlaneView.java.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DimDecorator.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LinebrokenCellContentView.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/MarkDecorator.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/TextCellContentView.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
Patches:
Index: gzz/gzz/modules/pp/BuoyView.java
diff -c gzz/gzz/modules/pp/BuoyView.java:1.27
gzz/gzz/modules/pp/BuoyView.java:1.28
*** gzz/gzz/modules/pp/BuoyView.java:1.27 Sun Oct 6 09:45:46 2002
--- gzz/gzz/modules/pp/BuoyView.java Tue Oct 8 03:34:54 2002
***************
*** 49,55 ****
*/
public class BuoyView implements View {
! public static final String rcsid = "$Id: BuoyView.java,v 1.27 2002/10/06
13:45:46 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 49,55 ----
*/
public class BuoyView implements View {
! public static final String rcsid = "$Id: BuoyView.java,v 1.28 2002/10/08
07:34:54 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 237,243 ****
int dw = (int)style.getWidth(addtext, 1);
int dh = (int)style.getHeight(1);
! into.put(new TextVob(style, 1, addtext),
Win.ADDPAPERKEY,5,x,y,dw,dh);
}
--- 237,243 ----
int dw = (int)style.getWidth(addtext, 1);
int dh = (int)style.getHeight(1);
! into.put(new TextVob(style, addtext),
Win.ADDPAPERKEY,5,x,y,dw,dh);
}
Index: gzz/gzz/modules/pp/PlaneView.java
diff -c gzz/gzz/modules/pp/PlaneView.java:1.49
gzz/gzz/modules/pp/PlaneView.java:1.50
*** gzz/gzz/modules/pp/PlaneView.java:1.49 Mon Oct 7 05:36:17 2002
--- gzz/gzz/modules/pp/PlaneView.java Tue Oct 8 03:34:54 2002
***************
*** 40,46 ****
*/
public class PlaneView {
! public static final String rcsid = "$Id: PlaneView.java,v 1.49 2002/10/07
09:36:17 tjl Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
--- 40,46 ----
*/
public class PlaneView {
! public static final String rcsid = "$Id: PlaneView.java,v 1.50 2002/10/08
07:34:54 tjl Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
***************
*** 92,98 ****
int dw = (int)style.getWidth(note.t(), 1);
int dh = (int)style.getHeight(1);
! Vob v = new TextVob(style, 1, note.t());
int cs = vs.coordsys(into, note, 5, notex, notey, 10, 10);
vs.map.put(v, cs);
--- 92,98 ----
int dw = (int)style.getWidth(note.t(), 1);
int dh = (int)style.getHeight(1);
! Vob v = new TextVob(style, note.t(), true);
int cs = vs.coordsys(into, note, 5, notex, notey, 10, 10);
vs.map.put(v, cs);
Index: gzz/gzz/view/DimDecorator.java
diff -c gzz/gzz/view/DimDecorator.java:1.10 gzz/gzz/view/DimDecorator.java:1.11
*** gzz/gzz/view/DimDecorator.java:1.10 Mon Oct 7 13:27:02 2002
--- gzz/gzz/view/DimDecorator.java Tue Oct 8 03:34:54 2002
***************
*** 32,38 ****
* vob scene.
*/
public class DimDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: DimDecorator.java,v 1.10 2002/10/07 17:27:02 benja 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); }
--- 32,38 ----
* vob scene.
*/
public class DimDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: DimDecorator.java,v 1.11 2002/10/08 07:34:54 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); }
***************
*** 77,83 ****
int cs = sc.coordsys(targ[i], dimKeys[i], 0, 5, 5, 2, 2);
int cs_wh = sc.coords.coordsys(0, 0, 0, 0, w-10, h-10);
((DefaultVobMatcher)sc.matcher).addSub(cs, cs_wh, whKey);
! sc.map.put(new TextVob(style, 1, dims[i].name), cs, cs_wh);
}
View view = fallback.viewList[win.viewIndex];
--- 77,83 ----
int cs = sc.coordsys(targ[i], dimKeys[i], 0, 5, 5, 2, 2);
int cs_wh = sc.coords.coordsys(0, 0, 0, 0, w-10, h-10);
((DefaultVobMatcher)sc.matcher).addSub(cs, cs_wh, whKey);
! sc.map.put(new TextVob(style, dims[i].name), cs, cs_wh);
}
View view = fallback.viewList[win.viewIndex];
***************
*** 90,96 ****
int cs = sc.coordsys(into, viewKey, 0, vx, 10, 2, 2);
int cs_wh = sc.coords.coordsys(0, 0, 0, 0, vw, vh);
((DefaultVobMatcher)sc.matcher).addSub(cs, cs_wh, whKey);
! sc.map.put(new TextVob(style, 1.6f, name), cs, cs_wh);
}
}
}
--- 90,96 ----
int cs = sc.coordsys(into, viewKey, 0, vx, 10, 2, 2);
int cs_wh = sc.coords.coordsys(0, 0, 0, 0, vw, vh);
((DefaultVobMatcher)sc.matcher).addSub(cs, cs_wh, whKey);
! sc.map.put(new TextVob(style, name), cs, cs_wh);
}
}
}
Index: gzz/gzz/view/LastOpDecorator.java
diff -c gzz/gzz/view/LastOpDecorator.java:1.14
gzz/gzz/view/LastOpDecorator.java:1.15
*** gzz/gzz/view/LastOpDecorator.java:1.14 Wed Oct 2 14:40:43 2002
--- gzz/gzz/view/LastOpDecorator.java Tue Oct 8 03:34:54 2002
***************
*** 32,38 ****
* directional op entered.
*/
public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.14 2002/10/02 18:40:43 benja
Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 32,38 ----
* directional op entered.
*/
public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.15 2002/10/08 07:34:54 tjl Exp
$";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 123,129 ****
/** Get the HBox for some text. */
HBox text(String s, int i) {
! return new TextVob(style, 1.0f, s, new Integer(i));
}
HBox text(String s) { return text(s, 1); }
--- 123,129 ----
/** Get the HBox for some text. */
HBox text(String s, int i) {
! return new TextVob(style, s, true, new Integer(i));
}
HBox text(String s) { return text(s, 1); }
Index: gzz/gzz/view/LinebrokenCellContentView.java
diff -c gzz/gzz/view/LinebrokenCellContentView.java:1.8
gzz/gzz/view/LinebrokenCellContentView.java:1.9
*** gzz/gzz/view/LinebrokenCellContentView.java:1.8 Sun Sep 29 10:53:45 2002
--- gzz/gzz/view/LinebrokenCellContentView.java Tue Oct 8 03:34:54 2002
***************
*** 38,44 ****
*/
public class LinebrokenCellContentView implements CellContentView {
! public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.8
2002/09/29 14:53:45 benja Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 38,44 ----
*/
public class LinebrokenCellContentView implements CellContentView {
! public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.9
2002/10/08 07:34:54 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 134,140 ****
s = ""+s;
if(dbg) pa("addVobs: "+start+" "+end+" '"+s+"'");
! TextVob vob = new TextVob(style, scale, s, key);
ch.addBox(vob);
}
}
--- 134,140 ----
s = ""+s;
if(dbg) pa("addVobs: "+start+" "+end+" '"+s+"'");
! TextVob vob = new TextVob(style, s, true, key);
ch.addBox(vob);
}
}
Index: gzz/gzz/view/MarkDecorator.java
diff -c gzz/gzz/view/MarkDecorator.java:1.4 gzz/gzz/view/MarkDecorator.java:1.5
*** gzz/gzz/view/MarkDecorator.java:1.4 Tue Oct 1 10:06:36 2002
--- gzz/gzz/view/MarkDecorator.java Tue Oct 8 03:34:54 2002
***************
*** 71,76 ****
x += box.width - w;
int cs = sc.coordsys(into, TEXT_KEY, 0, x, y, 2, 2);
! sc.map.put(new TextVob(style, 1, str), cs);
}
}
--- 71,76 ----
x += box.width - w;
int cs = sc.coordsys(into, TEXT_KEY, 0, x, y, 2, 2);
! sc.map.put(new TextVob(style, str), cs);
}
}
Index: gzz/gzz/view/TextCellContentView.java
diff -c gzz/gzz/view/TextCellContentView.java:1.15
gzz/gzz/view/TextCellContentView.java:1.16
*** gzz/gzz/view/TextCellContentView.java:1.15 Sun Sep 29 12:21:11 2002
--- gzz/gzz/view/TextCellContentView.java Tue Oct 8 03:34:54 2002
***************
*** 37,43 ****
*/
public class TextCellContentView implements CellContentView {
! public static final String rcsid = "$Id: TextCellContentView.java,v 1.15
2002/09/29 16:21:11 benja Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 37,43 ----
*/
public class TextCellContentView implements CellContentView {
! public static final String rcsid = "$Id: TextCellContentView.java,v 1.16
2002/10/08 07:34:54 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 94,100 ****
static Object WH_KEY = new Object();
protected void placeVob(Cell c, VobScene v, int cs, float w, float h, int
start, int end,
int offs, ViewContext context, float scale) {
! TextVob vob = new TextVob(style, scale, c.t().substring(start, end));
int cs_wh = v.coords.coordsys(0, 0, 0, 0, w, h);
((DefaultVobMatcher)v.matcher).addSub(cs, cs_wh, WH_KEY);
v.map.put(vob, cs, cs_wh);
--- 94,100 ----
static Object WH_KEY = new Object();
protected void placeVob(Cell c, VobScene v, int cs, float w, float h, int
start, int end,
int offs, ViewContext context, float scale) {
! TextVob vob = new TextVob(style, c.t().substring(start, end));
int cs_wh = v.coords.coordsys(0, 0, 0, 0, w, h);
((DefaultVobMatcher)v.matcher).addSub(cs, cs_wh, WH_KEY);
v.map.put(vob, cs, cs_wh);
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.38 gzz/gzz/vob/TextVob.java:1.39
*** gzz/gzz/vob/TextVob.java:1.38 Tue Oct 8 03:30:12 2002
--- gzz/gzz/vob/TextVob.java Tue Oct 8 03:34:54 2002
***************
*** 31,37 ****
* from these and use a LineBreaker.
*/
public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.38 2002/10/08 07:30:12 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 31,37 ----
* from these and use a LineBreaker.
*/
public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.39 2002/10/08 07:34:54 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 46,51 ****
--- 46,55 ----
this.style = style;
this.baselined = baselined;
this.text = text;
+ }
+
+ public TextVob(TextStyle style, String text) {
+ this(style, text, false);
}
public TextVob(TextStyle style, String text, boolean baselined, Object
key) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz modules/pp/BuoyView.java modules/pp/Pla...,
Tuomas J. Lukka <=