[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./Makefile doc/pegboard/pegboard.html doc/p...
|
From: |
Benja Fallenstein |
|
Subject: |
[Gzz-commits] gzz ./Makefile doc/pegboard/pegboard.html doc/p... |
|
Date: |
Fri, 01 Nov 2002 20:23:50 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/11/01 20:23:48
Modified files:
. : Makefile
doc/pegboard : pegboard.html
doc/pegboard/1007: PEG_1007.rst
gzz/client : ClientException.java Fallback.java
gzz/client/awt : AWTAPI.java AWTScreen.java TextSpanVob.java
gzz/client/gl : GLAPI.java GLScreen.java
gzz/gfx/gl : GLVobCoorder.java
gzz/modules/pp : BuoyView.java PlaneView.java Win.java
gzz/view : AbstractViewContext.java BFRaster.java
Cell1DBuoyHook.java CellContentView.java
CellHBox.java CellImageVob.java CellInBox.java
CellInBoxPlugin.java CellPlacementHook.java
CellView.java CellVobFactory.java
CoordinatePlaneView.java DefaultBinder.java
DimDecorator.java FallbackSceneDecorator.java
FullScreenView.java LastOpDecorator.java
LinebrokenCellContentView.java
LollipopCellVobFactory.java MarkDecorator.java
MultitypeCellContentView.java
PlainVanishing.java RowColView.java
TextCellContentView.java VanishingClient.java
View.java ViewContext.java
VobVanishingClient.java ZZViewContext.java
gzz/vob/buoy : Buoy2.java BuoyAnchor.java
gzz/zzutil : Ids.java
lava/test/gzz : TestLava.java
test/gzz/vob : BenchLBChain.java TestLBChain.java
TestVobScene.java TestVobs.java vobcoorder.test
vobmatcher.test
test/tools : gfx.py
Added files:
gzz/vob/impl : DefaultVobMap.java DefaultVobMatcher.java
OrthoCoorder.java OrthoCoordsys.java
OrthoCoordsysMap.java OrthoDepthSorter.java
OrthoRenderInfo.java
gzz/vob/impl/awt: AWTTextStyle.java
gzz/vob/impl/gl: GLTextStyle.java
gzz/vob/linebreaking: DefaultLinebreaker.java HBox.java
HBroken.java HChain.java
LinebreakableChain.java Linebreaker.java
LinebreakingUtil.java
SimpleLinebreaker.java
gzz/vob/vobs : BgTextStyle.java CalendarVob.java DummyVob.java
ImageVob.java LineVob.java OvalBgVob.java
RectBgVob.java SimpleConnection.java
SolidBgVob.java TDecor.java TestSpotVob.java
TextCursorVob.java TextVob.java
Removed files:
gzz/vob : AWTTextStyle.java BgTextStyle.java
CalendarVob.java CharArrayVob.java
CharArrayVobFactory.java CharRangeIter.java
DefaultLinebreaker.java DefaultVobMap.java
DefaultVobMatcher.java DummyVob.java
GLTextStyle.java HBox.java HBroken.java
HChain.java ImageVob.java LineCursor.java
LineCursorFilter.java LineVob.java
LinebreakableChain.java Linebreaker.java
LinebreakingUtil.java OrthoCoorder.java
OrthoCoordsys.java OrthoCoordsysMap.java
OrthoDepthSorter.java OrthoRenderInfo.java
OvalBgVob.java RawTextStyle.java RectBgVob.java
SimpleConnection.java SimpleLinebreaker.java
SolidBgVob.java TDecor.java TestSpotVob.java
TextCursorVob.java TextVob.java VobBox.java
WordBreaker.java
lava/gzz : TestVStreamMap.java TestVStreamSpace.java
VStreamMap.java VStreamSpace.java
lava/gzz/impl : DefaultVStreamMap.java
TestDefaultVStreamMap.java
test/gzz/vob : TestCharArrayVobFactory.java
TestWordBreaker.java
Log message:
PEG 1007 (splitting gzz.vob)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.202&tr2=1.203&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/pegboard.html.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1007/PEG_1007.rst.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/ClientException.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTAPI.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTScreen.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/TextSpanVob.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLAPI.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/BuoyView.java.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PlaneView.java.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Win.java.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/AbstractViewContext.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/BFRaster.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/Cell1DBuoyHook.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellContentView.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellHBox.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellImageVob.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellInBox.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellInBoxPlugin.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellPlacementHook.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellView.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellVobFactory.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CoordinatePlaneView.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DefaultBinder.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DimDecorator.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FallbackSceneDecorator.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FullScreenView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LinebrokenCellContentView.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LollipopCellVobFactory.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/MarkDecorator.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/MultitypeCellContentView.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PlainVanishing.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/RowColView.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/TextCellContentView.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VanishingClient.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/View.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/ViewContext.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/ZZViewContext.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/buoy/Buoy2.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/buoy/BuoyAnchor.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/DefaultVobMap.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/DefaultVobMatcher.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoCoorder.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoCoordsys.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoCoordsysMap.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoDepthSorter.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoRenderInfo.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/awt/AWTTextStyle.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/gl/GLTextStyle.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/DefaultLinebreaker.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/HBox.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/HBroken.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/HChain.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/LinebreakableChain.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/Linebreaker.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/LinebreakingUtil.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/linebreaking/SimpleLinebreaker.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/BgTextStyle.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/CalendarVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/DummyVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/ImageVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/LineVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/OvalBgVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/RectBgVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/SimpleConnection.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/SolidBgVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TDecor.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TestSpotVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TextCursorVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TextVob.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/zzutil/Ids.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/TestLava.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/BenchLBChain.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/TestLBChain.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/TestVobScene.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/TestVobs.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/vobcoorder.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/vobmatcher.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/tools/gfx.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gzz/Makefile
diff -u gzz/Makefile:1.202 gzz/Makefile:1.203
--- gzz/Makefile:1.202 Thu Oct 31 06:50:33 2002
+++ gzz/Makefile Fri Nov 1 20:23:44 2002
@@ -189,7 +189,9 @@
gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java \
gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java \
lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java \
- gzz/modules/email/*.java lava/test/gzz/storm/*.java) $(TESTS) $(PP)
+ gzz/modules/email/*.java lava/test/gzz/storm/*.java gzz/vob/impl/*.java \
+ gzz/vob/vobs/*.java gzz/vob/linebreaking/*.java \
+ gzz/vob/impl/awt/*.java gzz/vob/impl/gl/*.java) $(TESTS) $(PP)
# gzz/impl/zob/*.java
LAVASRC:= $(wildcard lava/gzz/*.java lava/gzz/impl/*.java
lava/gzz/impl/errors/*.java lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java
lava/gzz/util/*.java lava/gzz/util/headers/*.java lava/gzz/storm/impl/*.java)
Index: gzz/doc/pegboard/1007/PEG_1007.rst
diff -u gzz/doc/pegboard/1007/PEG_1007.rst:1.7
gzz/doc/pegboard/1007/PEG_1007.rst:1.8
--- gzz/doc/pegboard/1007/PEG_1007.rst:1.7 Fri Nov 1 03:17:23 2002
+++ gzz/doc/pegboard/1007/PEG_1007.rst Fri Nov 1 20:23:45 2002
@@ -3,9 +3,9 @@
=======================================
:Author: Benja Fallenstein
-:Date: $Date: 2002/11/01 08:17:23 $
-:Revision: $Revision: 1.7 $
-:Status: Accepted
+:Date: $Date: 2002/11/02 01:23:45 $
+:Revision: $Revision: 1.8 $
+:Status: Accepted [mostly implemented]
Tuomas Lukka wrote in "[Gzz] gzz.vob.vobs, gzz.vobs or ???" (2002-08-26):
Index: gzz/doc/pegboard/pegboard.html
diff -u gzz/doc/pegboard/pegboard.html:1.38 gzz/doc/pegboard/pegboard.html:1.39
--- gzz/doc/pegboard/pegboard.html:1.38 Mon Oct 28 04:42:48 2002
+++ gzz/doc/pegboard/pegboard.html Fri Nov 1 20:23:44 2002
@@ -32,11 +32,7 @@
<li><tt>gzz.impl.CellManager</tt></li>
<li><tt>gzz.impl.DimManager</tt></li>
<li><tt>gzz.impl.IdentityManager</tt></li>
- <li><tt>gzz.vob.Vob</tt></li>
- <li><tt>gzz.vob.VobScene</tt></li>
- <li><tt>gzz.vob.VobCoorder</tt></li>
- <li><tt>gzz.vob.VobMap</tt></li>
- <li><tt>gzz.vob.VobPlacer</tt><br>
+ <li><tt>gzz.vob</tt></li>
</li>
</ul>
Index: gzz/gzz/client/ClientException.java
diff -u gzz/gzz/client/ClientException.java:1.1
gzz/gzz/client/ClientException.java:1.2
--- gzz/gzz/client/ClientException.java:1.1 Thu Oct 10 13:28:30 2002
+++ gzz/gzz/client/ClientException.java Fri Nov 1 20:23:45 2002
@@ -22,6 +22,8 @@
*/
package gzz.client;
import gzz.vob.*;
+import gzz.vob.linebreaking.*;
+import gzz.vob.vobs.*;
/** An exception that is not due to a programming error,
** but an incapability to perform the user's request.
Index: gzz/gzz/client/Fallback.java
diff -u gzz/gzz/client/Fallback.java:1.49 gzz/gzz/client/Fallback.java:1.50
--- gzz/gzz/client/Fallback.java:1.49 Wed Oct 30 14:10:17 2002
+++ gzz/gzz/client/Fallback.java Fri Nov 1 20:23:45 2002
@@ -35,6 +35,7 @@
import java.awt.event.MouseEvent;
import org.python.util.PythonInterpreter;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.view.*;
@@ -73,7 +74,7 @@
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
-public static final String rcsid = "$Id: Fallback.java,v 1.49 2002/10/30
19:10:17 tjl Exp $";
+public static final String rcsid = "$Id: Fallback.java,v 1.50 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/client/awt/AWTAPI.java
diff -u gzz/gzz/client/awt/AWTAPI.java:1.12 gzz/gzz/client/awt/AWTAPI.java:1.13
--- gzz/gzz/client/awt/AWTAPI.java:1.12 Thu Sep 26 07:54:07 2002
+++ gzz/gzz/client/awt/AWTAPI.java Fri Nov 1 20:23:45 2002
@@ -29,6 +29,7 @@
import gzz.client.awt.*;
import gzz.mediaserver.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
import java.io.*;
import java.awt.*;
Index: gzz/gzz/client/awt/AWTScreen.java
diff -u gzz/gzz/client/awt/AWTScreen.java:1.24
gzz/gzz/client/awt/AWTScreen.java:1.25
--- gzz/gzz/client/awt/AWTScreen.java:1.24 Tue Oct 15 13:42:19 2002
+++ gzz/gzz/client/awt/AWTScreen.java Fri Nov 1 20:23:45 2002
@@ -23,6 +23,7 @@
import gzz.client.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.impl.*;
import java.awt.*;
import java.awt.event.*;
@@ -35,7 +36,7 @@
public abstract class AWTScreen
extends GraphicsAPI.Window
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
- public static final String rcsid = "$Id: AWTScreen.java,v 1.24 2002/10/15
17:42:19 tjl Exp $";
+ public static final String rcsid = "$Id: AWTScreen.java,v 1.25 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
Index: gzz/gzz/client/awt/TextSpanVob.java
diff -u gzz/gzz/client/awt/TextSpanVob.java:1.8
gzz/gzz/client/awt/TextSpanVob.java:1.9
--- gzz/gzz/client/awt/TextSpanVob.java:1.8 Mon Aug 26 04:08:55 2002
+++ gzz/gzz/client/awt/TextSpanVob.java Fri Nov 1 20:23:45 2002
@@ -25,6 +25,8 @@
import gzz.client.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.linebreaking.*;
+import gzz.vob.vobs.*;
import gzz.media.*;
/** A vob which shows a single span of text.
@@ -32,7 +34,7 @@
*/
public class TextSpanVob extends TextVob implements SpanVob {
-String rcsid = "$Id: TextSpanVob.java,v 1.8 2002/08/26 08:08:55 tjl Exp $";
+String rcsid = "$Id: TextSpanVob.java,v 1.9 2002/11/02 01:23:45 benja Exp $";
protected final TextSpan span;
protected TextSpanVob prev, next;
Index: gzz/gzz/client/gl/GLAPI.java
diff -u gzz/gzz/client/gl/GLAPI.java:1.20 gzz/gzz/client/gl/GLAPI.java:1.21
--- gzz/gzz/client/gl/GLAPI.java:1.20 Thu Sep 26 07:54:07 2002
+++ gzz/gzz/client/gl/GLAPI.java Fri Nov 1 20:23:45 2002
@@ -24,6 +24,8 @@
package gzz.client.gl;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.impl.*;
+import gzz.vob.impl.gl.*;
import gzz.errors.*;
import gzz.impl.*;
import gzz.client.*;
@@ -46,7 +48,7 @@
return new GLScreen(this);
}
public TextStyle getTextStyle(String family, int style, int size) {
- return gzz.vob.GLTextStyle.create(family, style, size);
+ return gzz.vob.impl.gl.GLTextStyle.create(family, style, size);
}
}
Index: gzz/gzz/client/gl/GLScreen.java
diff -u gzz/gzz/client/gl/GLScreen.java:1.37
gzz/gzz/client/gl/GLScreen.java:1.38
--- gzz/gzz/client/gl/GLScreen.java:1.37 Wed Oct 16 03:46:39 2002
+++ gzz/gzz/client/gl/GLScreen.java Fri Nov 1 20:23:45 2002
@@ -21,6 +21,8 @@
package gzz.client.gl;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.impl.*;
+import gzz.vob.impl.gl.*;
import gzz.gfx.gl.*;
import gzz.errors.*;
import gzz.client.*;
@@ -33,7 +35,7 @@
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
-public static final String rcsid = "$Id: GLScreen.java,v 1.37 2002/10/16
07:46:39 tjl Exp $";
+public static final String rcsid = "$Id: GLScreen.java,v 1.38 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -u gzz/gzz/gfx/gl/GLVobCoorder.java:1.51
gzz/gzz/gfx/gl/GLVobCoorder.java:1.52
--- gzz/gzz/gfx/gl/GLVobCoorder.java:1.51 Fri Nov 1 08:10:55 2002
+++ gzz/gzz/gfx/gl/GLVobCoorder.java Fri Nov 1 20:23:45 2002
@@ -23,13 +23,15 @@
package gzz.gfx.gl;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.impl.*;
+import gzz.vob.impl.gl.*;
import gzz.errors.*;
import java.util.HashMap;
import gzz.client.*;
import gzz.client.gl.*;
public class GLVobCoorder extends AffineVobCoorder {
-public static final String rcsid = "$Id: GLVobCoorder.java,v 1.51 2002/11/01
13:10:55 tjl Exp $";
+public static final String rcsid = "$Id: GLVobCoorder.java,v 1.52 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/modules/pp/BuoyView.java
diff -u gzz/gzz/modules/pp/BuoyView.java:1.30
gzz/gzz/modules/pp/BuoyView.java:1.31
--- gzz/gzz/modules/pp/BuoyView.java:1.30 Sun Oct 20 07:45:58 2002
+++ gzz/gzz/modules/pp/BuoyView.java Fri Nov 1 20:23:45 2002
@@ -28,6 +28,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.vob.buoy.*;
import java.util.ArrayList;
import java.util.List;
@@ -50,7 +51,7 @@
*/
public class BuoyView implements View {
-public static final String rcsid = "$Id: BuoyView.java,v 1.30 2002/10/20
11:45:58 tjl Exp $";
+public static final String rcsid = "$Id: BuoyView.java,v 1.31 2002/11/02
01:23: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); }
Index: gzz/gzz/modules/pp/PlaneView.java
diff -u gzz/gzz/modules/pp/PlaneView.java:1.55
gzz/gzz/modules/pp/PlaneView.java:1.56
--- gzz/gzz/modules/pp/PlaneView.java:1.55 Sun Oct 20 07:45:58 2002
+++ gzz/gzz/modules/pp/PlaneView.java Fri Nov 1 20:23:45 2002
@@ -27,6 +27,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.zzutil.Ids;
import gzz.modules.pp.vob.*;
import gzz.modules.pp.vob.TextCursorVob;
@@ -40,7 +41,7 @@
*/
public class PlaneView {
-public static final String rcsid = "$Id: PlaneView.java,v 1.55 2002/10/20
11:45:58 tjl Exp $";
+public static final String rcsid = "$Id: PlaneView.java,v 1.56 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/modules/pp/Win.java
diff -u gzz/gzz/modules/pp/Win.java:1.55 gzz/gzz/modules/pp/Win.java:1.56
--- gzz/gzz/modules/pp/Win.java:1.55 Sun Oct 20 07:45:59 2002
+++ gzz/gzz/modules/pp/Win.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.view.*;
import gzz.impl.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.modules.pp.vob.*;
import java.awt.event.*;
import java.awt.*;
@@ -36,7 +37,7 @@
*/
public class Win extends AbstractBinder implements Shower {
-public static final String rcsid = "$Id: Win.java,v 1.55 2002/10/20 11:45:59
tjl Exp $";
+public static final String rcsid = "$Id: Win.java,v 1.56 2002/11/02 01:23:45
benja Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/AbstractViewContext.java
diff -u gzz/gzz/view/AbstractViewContext.java:1.1
gzz/gzz/view/AbstractViewContext.java:1.2
--- gzz/gzz/view/AbstractViewContext.java:1.1 Wed Oct 30 14:10:17 2002
+++ gzz/gzz/view/AbstractViewContext.java Fri Nov 1 20:23:45 2002
@@ -5,6 +5,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
/** An implementation of ViewContext providing set methods
Index: gzz/gzz/view/BFRaster.java
diff -u gzz/gzz/view/BFRaster.java:1.3 gzz/gzz/view/BFRaster.java:1.4
--- gzz/gzz/view/BFRaster.java:1.3 Tue Oct 15 08:41:49 2002
+++ gzz/gzz/view/BFRaster.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
import java.awt.*;
@@ -34,7 +35,7 @@
*/
public class BFRaster {
-public static final String rcsid = "$Id: BFRaster.java,v 1.3 2002/10/15
12:41:49 tjl Exp $";
+public static final String rcsid = "$Id: BFRaster.java,v 1.4 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = false;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/Cell1DBuoyHook.java
diff -u gzz/gzz/view/Cell1DBuoyHook.java:1.4
gzz/gzz/view/Cell1DBuoyHook.java:1.5
--- gzz/gzz/view/Cell1DBuoyHook.java:1.4 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/Cell1DBuoyHook.java Fri Nov 1 20:23:45 2002
@@ -24,14 +24,16 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
-import gzz.vob.buoy.*;
+import gzz.vob.vobs.*;
+import gzz.vob.*;
+import gzz.vob.vobs.*;
/** Float association buoys for cells placed.
* This class assumes that all cells placed are root clones (!!!).
* XXX Tjl Doc
*/
public class Cell1DBuoyHook implements CellPlacementHook {
-public static final String rcsid = "$Id: Cell1DBuoyHook.java,v 1.4 2002/11/01
19:53:52 tjl Exp $";
+public static final String rcsid = "$Id: Cell1DBuoyHook.java,v 1.5 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/CellContentView.java
diff -u gzz/gzz/view/CellContentView.java:1.7
gzz/gzz/view/CellContentView.java:1.8
--- gzz/gzz/view/CellContentView.java:1.7 Tue Oct 29 02:30:58 2002
+++ gzz/gzz/view/CellContentView.java Fri Nov 1 20:23:45 2002
@@ -24,6 +24,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** A view that shows the contents of a cell in some way.
* For example, this could show some text or an image. It does not
@@ -33,5 +34,5 @@
* with different kinds of boxes.
*/
public abstract class CellContentView extends CellInBox {
-public static final String rcsid = "$Id: CellContentView.java,v 1.7 2002/10/29
07:30:58 tjl Exp $";
+public static final String rcsid = "$Id: CellContentView.java,v 1.8 2002/11/02
01:23:45 benja Exp $";
}
Index: gzz/gzz/view/CellHBox.java
diff -u gzz/gzz/view/CellHBox.java:1.9 gzz/gzz/view/CellHBox.java:1.10
--- gzz/gzz/view/CellHBox.java:1.9 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/CellHBox.java Fri Nov 1 20:23:45 2002
@@ -23,6 +23,8 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.linebreaking.*;
+import gzz.vob.vobs.*;
import java.awt.Dimension;
/** An HBox that contains a cell, using a given CellView.
Index: gzz/gzz/view/CellImageVob.java
diff -u gzz/gzz/view/CellImageVob.java:1.2 gzz/gzz/view/CellImageVob.java:1.3
--- gzz/gzz/view/CellImageVob.java:1.2 Mon Aug 19 10:45:48 2002
+++ gzz/gzz/view/CellImageVob.java Fri Nov 1 20:23:45 2002
@@ -26,13 +26,14 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.client.*;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
public class CellImageVob extends Vob {
-public static final String rcsid = "$Id: CellImageVob.java,v 1.2 2002/08/19
14:45:48 tjl Exp $";
+public static final String rcsid = "$Id: CellImageVob.java,v 1.3 2002/11/02
01:23:45 benja Exp $";
public static final boolean dbg = true;
private static final void p(String s) { if(dbg) System.out.println(s); }
private static final void pa(String s) { System.out.println(s); }
Index: gzz/gzz/view/CellInBox.java
diff -u gzz/gzz/view/CellInBox.java:1.4 gzz/gzz/view/CellInBox.java:1.5
--- gzz/gzz/view/CellInBox.java:1.4 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/CellInBox.java Fri Nov 1 20:23:45 2002
@@ -24,6 +24,7 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** Unify the concepts of cellview and cell content view.
* This is a view that shows a cell in a box.
@@ -34,7 +35,7 @@
* the default implementations call each other.
*/
public abstract class CellInBox {
-public static final String rcsid = "$Id: CellInBox.java,v 1.4 2002/11/01
19:53:52 tjl Exp $";
+public static final String rcsid = "$Id: CellInBox.java,v 1.5 2002/11/02
01:23:45 benja Exp $";
/** Place the contents of one cell into the given coord system.
* The coordsys given shall be a mapping from the rectangle
* (0,w)x(0,h) onto the screen.
Index: gzz/gzz/view/CellInBoxPlugin.java
diff -u gzz/gzz/view/CellInBoxPlugin.java:1.3
gzz/gzz/view/CellInBoxPlugin.java:1.4
--- gzz/gzz/view/CellInBoxPlugin.java:1.3 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/CellInBoxPlugin.java Fri Nov 1 20:23:45 2002
@@ -24,6 +24,7 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** A "plugin" which allows decoration of a CellInBox object by a
CellPlacementHook.
*/
Index: gzz/gzz/view/CellPlacementHook.java
diff -u gzz/gzz/view/CellPlacementHook.java:1.3
gzz/gzz/view/CellPlacementHook.java:1.4
--- gzz/gzz/view/CellPlacementHook.java:1.3 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/CellPlacementHook.java Fri Nov 1 20:23:45 2002
@@ -24,11 +24,12 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** An interface for code to be run when a cell has been placed in a box.
*/
public interface CellPlacementHook {
-String rcsid = "$Id: CellPlacementHook.java,v 1.3 2002/11/01 19:53:52 tjl Exp
$";
+String rcsid = "$Id: CellPlacementHook.java,v 1.4 2002/11/02 01:23:45 benja
Exp $";
/** A cell was placed.
*/
void placed(Cell c, VobScene sc, int b, ViewContext context);
Index: gzz/gzz/view/CellView.java
diff -u gzz/gzz/view/CellView.java:1.7 gzz/gzz/view/CellView.java:1.8
--- gzz/gzz/view/CellView.java:1.7 Tue Oct 29 02:30:58 2002
+++ gzz/gzz/view/CellView.java Fri Nov 1 20:23:45 2002
@@ -23,9 +23,10 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** A view showing a single cell.
*/
public abstract class CellView extends CellInBox {
-public static final String rcsid = "$Id: CellView.java,v 1.7 2002/10/29
07:30:58 tjl Exp $";
+public static final String rcsid = "$Id: CellView.java,v 1.8 2002/11/02
01:23:45 benja Exp $";
}
Index: gzz/gzz/view/CellVobFactory.java
diff -u gzz/gzz/view/CellVobFactory.java:1.28
gzz/gzz/view/CellVobFactory.java:1.29
--- gzz/gzz/view/CellVobFactory.java:1.28 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/CellVobFactory.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.client.*;
import gzz.impl.*;
import java.awt.Font;
@@ -46,7 +47,7 @@
*/
public class CellVobFactory extends CellView {
-public static final String rcsid = "$Id: CellVobFactory.java,v 1.28 2002/11/01
19:53:52 tjl Exp $";
+public static final String rcsid = "$Id: CellVobFactory.java,v 1.29 2002/11/02
01:23: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); }
Index: gzz/gzz/view/CoordinatePlaneView.java
diff -u gzz/gzz/view/CoordinatePlaneView.java:1.2
gzz/gzz/view/CoordinatePlaneView.java:1.3
--- gzz/gzz/view/CoordinatePlaneView.java:1.2 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/CoordinatePlaneView.java Fri Nov 1 20:23:45 2002
@@ -3,7 +3,9 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
-import gzz.vob.buoy.*;
+import gzz.vob.vobs.*;
+import gzz.vob.*;
+import gzz.vob.vobs.*;
/** A view which shows a single rank of cells, at coordinates given
* in the structure.
@@ -12,7 +14,7 @@
*/
public class CoordinatePlaneView implements View {
-public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.2
2002/11/01 19:53:52 tjl Exp $";
+public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.3
2002/11/02 01:23:45 benja Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/DefaultBinder.java
diff -u gzz/gzz/view/DefaultBinder.java:1.10
gzz/gzz/view/DefaultBinder.java:1.11
--- gzz/gzz/view/DefaultBinder.java:1.10 Sun Oct 27 19:17:54 2002
+++ gzz/gzz/view/DefaultBinder.java Fri Nov 1 20:23:45 2002
@@ -29,10 +29,12 @@
import gzz.mediaserver.storage.*;
import java.util.*;
import java.io.*;
-import gzz.vob.VobScene;
+import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.awt.event.*;
import org.python.util.PythonInterpreter;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.index.*;
import gzz.media.*;
import gzz.fuzzy.EnfiladeAligner;
@@ -42,7 +44,7 @@
/** Keybindings for the Fallback client.
*/
public class DefaultBinder implements FallbackBinder {
-public static final String rcsid = "$Id: DefaultBinder.java,v 1.10 2002/10/28
00:17:54 benja Exp $";
+public static final String rcsid = "$Id: DefaultBinder.java,v 1.11 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/DimDecorator.java
diff -u gzz/gzz/view/DimDecorator.java:1.13 gzz/gzz/view/DimDecorator.java:1.14
--- gzz/gzz/view/DimDecorator.java:1.13 Tue Oct 29 10:08:08 2002
+++ gzz/gzz/view/DimDecorator.java Fri Nov 1 20:23:45 2002
@@ -26,13 +26,15 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.impl.*;
+import gzz.vob.vobs.*;
import java.awt.*;
/** A Fallback scene decorator adding the current dimensions into the
* vob scene.
*/
public class DimDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: DimDecorator.java,v 1.13 2002/10/29 15:08:08 tjl Exp $";
+String rcsid = "$Id: DimDecorator.java,v 1.14 2002/11/02 01:23:45 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); }
Index: gzz/gzz/view/FallbackSceneDecorator.java
diff -u gzz/gzz/view/FallbackSceneDecorator.java:1.2
gzz/gzz/view/FallbackSceneDecorator.java:1.3
--- gzz/gzz/view/FallbackSceneDecorator.java:1.2 Mon Aug 19 10:45:48 2002
+++ gzz/gzz/view/FallbackSceneDecorator.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** An object adding additional information into a Fallback vob scene.
* After the view has added its cells into a Fallback client vob scene,
@@ -33,7 +34,7 @@
* the dimensions or the current view.
*/
public interface FallbackSceneDecorator {
-String rcsid = "$Id: FallbackSceneDecorator.java,v 1.2 2002/08/19 14:45:48 tjl
Exp $";
+String rcsid = "$Id: FallbackSceneDecorator.java,v 1.3 2002/11/02 01:23:45
benja Exp $";
/** Put the additional information into the vob scene.
* @param win The Fallback window the scene belongs to.
* @param into The coordinate system to render into.
Index: gzz/gzz/view/FullScreenView.java
diff -u gzz/gzz/view/FullScreenView.java:1.5
gzz/gzz/view/FullScreenView.java:1.6
--- gzz/gzz/view/FullScreenView.java:1.5 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/FullScreenView.java Fri Nov 1 20:23:45 2002
@@ -23,6 +23,7 @@
package gzz.view;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** A view that shows only the accursed cell, full-screen.
*/
Index: gzz/gzz/view/LastOpDecorator.java
diff -u gzz/gzz/view/LastOpDecorator.java:1.20
gzz/gzz/view/LastOpDecorator.java:1.21
--- gzz/gzz/view/LastOpDecorator.java:1.20 Sun Oct 27 19:17:54 2002
+++ gzz/gzz/view/LastOpDecorator.java Fri Nov 1 20:23:45 2002
@@ -26,13 +26,15 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.linebreaking.*;
+import gzz.vob.vobs.*;
import java.awt.*;
/** A Fallback scene decorator showing the last (currently waiting)
* directional op entered.
*/
public class LastOpDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: LastOpDecorator.java,v 1.20 2002/10/28 00:17:54 benja Exp
$";
+String rcsid = "$Id: LastOpDecorator.java,v 1.21 2002/11/02 01:23:45 benja Exp
$";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/LinebrokenCellContentView.java
diff -u gzz/gzz/view/LinebrokenCellContentView.java:1.13
gzz/gzz/view/LinebrokenCellContentView.java:1.14
--- gzz/gzz/view/LinebrokenCellContentView.java:1.13 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/LinebrokenCellContentView.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,8 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.linebreaking.*;
+import gzz.vob.vobs.*;
import gzz.impl.*;
import java.awt.Font;
import java.awt.Dimension;
@@ -38,7 +40,7 @@
*/
public class LinebrokenCellContentView extends CellContentView {
-public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.13
2002/11/01 19:53:52 tjl Exp $";
+public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.14
2002/11/02 01:23: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); }
Index: gzz/gzz/view/LollipopCellVobFactory.java
diff -u gzz/gzz/view/LollipopCellVobFactory.java:1.4
gzz/gzz/view/LollipopCellVobFactory.java:1.5
--- gzz/gzz/view/LollipopCellVobFactory.java:1.4 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/LollipopCellVobFactory.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import gzz.client.*;
import gzz.impl.*;
import java.awt.Font;
@@ -37,7 +38,7 @@
/** A factory for making ball-and-stick aka lollipop cell vobs. */
public class LollipopCellVobFactory extends CellVobFactory {
-public static final String rcsid = "$Id: LollipopCellVobFactory.java,v 1.4
2002/11/01 19:53:52 tjl Exp $";
+public static final String rcsid = "$Id: LollipopCellVobFactory.java,v 1.5
2002/11/02 01:23:45 benja Exp $";
float[] boxwh = new float[2];
/** Add the vobs that make up an image of a cell
Index: gzz/gzz/view/MarkDecorator.java
diff -u gzz/gzz/view/MarkDecorator.java:1.11
gzz/gzz/view/MarkDecorator.java:1.12
--- gzz/gzz/view/MarkDecorator.java:1.11 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/MarkDecorator.java Fri Nov 1 20:23:45 2002
@@ -24,6 +24,8 @@
import gzz.*;
import gzz.client.*;
import gzz.vob.*;
+import gzz.vob.impl.*;
+import gzz.vob.vobs.*;
import java.awt.Font;
/** A scene decorator showing the current mark set.
Index: gzz/gzz/view/MultitypeCellContentView.java
diff -u gzz/gzz/view/MultitypeCellContentView.java:1.6
gzz/gzz/view/MultitypeCellContentView.java:1.7
--- gzz/gzz/view/MultitypeCellContentView.java:1.6 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/MultitypeCellContentView.java Fri Nov 1 20:23:45 2002
@@ -24,6 +24,7 @@
import gzz.*;
import gzz.media.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
/** A cell content view that uses a text- or pagespan view, dependent
* on the type of content.
Index: gzz/gzz/view/PlainVanishing.java
diff -u gzz/gzz/view/PlainVanishing.java:1.2
gzz/gzz/view/PlainVanishing.java:1.3
--- gzz/gzz/view/PlainVanishing.java:1.2 Mon Aug 19 10:45:48 2002
+++ gzz/gzz/view/PlainVanishing.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
import java.awt.*;
@@ -41,7 +42,7 @@
*/
public class PlainVanishing {
-public static final String rcsid = "$Id: PlainVanishing.java,v 1.2 2002/08/19
14:45:48 tjl Exp $";
+public static final String rcsid = "$Id: PlainVanishing.java,v 1.3 2002/11/02
01:23:45 benja Exp $";
public static boolean dbg = false;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/RowColView.java
diff -u gzz/gzz/view/RowColView.java:1.11 gzz/gzz/view/RowColView.java:1.12
--- gzz/gzz/view/RowColView.java:1.11 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/RowColView.java Fri Nov 1 20:23:45 2002
@@ -24,6 +24,7 @@
import gzz.client.*;
import gzz.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.awt.Dimension;
/** A simple row/col zzstructure view.
Index: gzz/gzz/view/TextCellContentView.java
diff -u gzz/gzz/view/TextCellContentView.java:1.20
gzz/gzz/view/TextCellContentView.java:1.21
--- gzz/gzz/view/TextCellContentView.java:1.20 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/TextCellContentView.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,8 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.impl.*;
+import gzz.vob.vobs.*;
import gzz.impl.*;
import java.awt.Font;
import java.awt.Dimension;
@@ -37,7 +39,7 @@
*/
public class TextCellContentView extends CellContentView {
-public static final String rcsid = "$Id: TextCellContentView.java,v 1.20
2002/11/01 19:53:52 tjl Exp $";
+public static final String rcsid = "$Id: TextCellContentView.java,v 1.21
2002/11/02 01:23: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); }
Index: gzz/gzz/view/VanishingClient.java
diff -u gzz/gzz/view/VanishingClient.java:1.2
gzz/gzz/view/VanishingClient.java:1.3
--- gzz/gzz/view/VanishingClient.java:1.2 Mon Aug 19 10:45:48 2002
+++ gzz/gzz/view/VanishingClient.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
import java.awt.*;
Index: gzz/gzz/view/View.java
diff -u gzz/gzz/view/View.java:1.2 gzz/gzz/view/View.java:1.3
--- gzz/gzz/view/View.java:1.2 Mon Aug 19 10:45:48 2002
+++ gzz/gzz/view/View.java Fri Nov 1 20:23:45 2002
@@ -24,9 +24,10 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
public interface View {
-String rcsid = "$Id: View.java,v 1.2 2002/08/19 14:45:48 tjl Exp $";
+String rcsid = "$Id: View.java,v 1.3 2002/11/02 01:23:45 benja Exp $";
/** Draw a representation of the structure into a VobScene.
* @param sc The VobScene to render vobs into.
* @param context Metadata about what to render (e.g. cursor position).
Index: gzz/gzz/view/ViewContext.java
diff -u gzz/gzz/view/ViewContext.java:1.5 gzz/gzz/view/ViewContext.java:1.6
--- gzz/gzz/view/ViewContext.java:1.5 Wed Oct 30 14:10:17 2002
+++ gzz/gzz/view/ViewContext.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
/** An object providing context information to a view, e.g. the current
@@ -41,7 +42,7 @@
*/
public interface ViewContext {
-String rcsid = "$Id: ViewContext.java,v 1.5 2002/10/30 19:10:17 tjl Exp $";
+String rcsid = "$Id: ViewContext.java,v 1.6 2002/11/02 01:23:45 benja Exp $";
/** Get the accursed cell. */
Cell getAccursed();
Index: gzz/gzz/view/VobVanishingClient.java
diff -u gzz/gzz/view/VobVanishingClient.java:1.21
gzz/gzz/view/VobVanishingClient.java:1.22
--- gzz/gzz/view/VobVanishingClient.java:1.21 Fri Nov 1 14:53:52 2002
+++ gzz/gzz/view/VobVanishingClient.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
import java.awt.*;
import gzz.media.*;
Index: gzz/gzz/view/ZZViewContext.java
diff -u gzz/gzz/view/ZZViewContext.java:1.5 gzz/gzz/view/ZZViewContext.java:1.6
--- gzz/gzz/view/ZZViewContext.java:1.5 Wed Oct 30 14:10:17 2002
+++ gzz/gzz/view/ZZViewContext.java Fri Nov 1 20:23:45 2002
@@ -26,6 +26,7 @@
import gzz.*;
import gzz.errors.*;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
/** An implementation of <code>ViewContext</code> reading its data
@@ -38,7 +39,7 @@
*/
public class ZZViewContext implements ViewContext {
-String rcsid = "$Id: ZZViewContext.java,v 1.5 2002/10/30 19:10:17 tjl Exp $";
+String rcsid = "$Id: ZZViewContext.java,v 1.6 2002/11/02 01:23:45 benja Exp $";
public final Cell window;
Index: gzz/gzz/vob/buoy/Buoy2.java
diff -u gzz/gzz/vob/buoy/Buoy2.java:1.1 gzz/gzz/vob/buoy/Buoy2.java:1.2
--- gzz/gzz/vob/buoy/Buoy2.java:1.1 Mon Aug 26 04:21:40 2002
+++ gzz/gzz/vob/buoy/Buoy2.java Fri Nov 1 20:23:46 2002
@@ -22,6 +22,7 @@
*/
package gzz.vob.buoy;
import gzz.vob.*;
+import gzz.vob.vobs.*;
import java.util.*;
import java.util.List;
import java.awt.*;
@@ -40,7 +41,7 @@
* is easier for the deeper ones.
*/
public class Buoy2 {
-public static final String rcsid = "$Id: Buoy2.java,v 1.1 2002/08/26 08:21:40
tjl Exp $";
+public static final String rcsid = "$Id: Buoy2.java,v 1.2 2002/11/02 01:23:46
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); }
Index: gzz/gzz/vob/buoy/BuoyAnchor.java
diff -u gzz/gzz/vob/buoy/BuoyAnchor.java:1.2
gzz/gzz/vob/buoy/BuoyAnchor.java:1.3
--- gzz/gzz/vob/buoy/BuoyAnchor.java:1.2 Sat Sep 21 09:04:56 2002
+++ gzz/gzz/vob/buoy/BuoyAnchor.java Fri Nov 1 20:23:46 2002
@@ -23,13 +23,14 @@
*/
package gzz.vob.buoy;
import gzz.vob.*;
+import gzz.vob.linebreaking.*;
import java.awt.*;
/** An endpoint that a buoy con be anchored to.
*/
public class BuoyAnchor extends HBox.VobHBox {
-String rcsid = "$Id: BuoyAnchor.java,v 1.2 2002/09/21 13:04:56 benja Exp $";
+String rcsid = "$Id: BuoyAnchor.java,v 1.3 2002/11/02 01:23:46 benja Exp $";
static public boolean dbg = false;
static private void p(String s) { if(dbg) System.out.println(s); }
Index: gzz/gzz/zzutil/Ids.java
diff -u gzz/gzz/zzutil/Ids.java:1.6 gzz/gzz/zzutil/Ids.java:1.7
--- gzz/gzz/zzutil/Ids.java:1.6 Tue Oct 29 09:53:42 2002
+++ gzz/gzz/zzutil/Ids.java Fri Nov 1 20:23:46 2002
@@ -53,6 +53,11 @@
public static String d_contain =
"urn:urn-5:FSIhCaqn3MfGI6qE+UQo3WmZNC13:1";
public static String d_contain_list =
"urn:urn-5:FSIhCaqn3MfGI6qE+UQo3WmZNC13:2";
+
+ /** A dimension listing new email, starting at the home cell.
+ * For the email client applitude.
+ */
+ public static String d_email = "urn:urn-5:IMGUcORdRZtSSofhPnbu23Ztrwgh";
// FOR COMPATIBILITY
Index: gzz/lava/test/gzz/TestLava.java
diff -u gzz/lava/test/gzz/TestLava.java:1.1 gzz/lava/test/gzz/TestLava.java:1.2
--- gzz/lava/test/gzz/TestLava.java:1.1 Wed Sep 11 02:17:30 2002
+++ gzz/lava/test/gzz/TestLava.java Fri Nov 1 20:23:48 2002
@@ -32,62 +32,14 @@
*/
public class TestLava {
-public static final String rcsid = "$Id: TestLava.java,v 1.1 2002/09/11
06:17:30 tjl Exp $";
+public static final String rcsid = "$Id: TestLava.java,v 1.2 2002/11/02
01:23:48 benja Exp $";
public static junit.framework.Test suite() {
TestSuite suite = new TestSuite("GZigZag lava tests");
- // suite.addTestSuite(gzz.impl.TestLeo1Dim.class);
- // suite.addTestSuite(gzz.impl.TestLeo4Dim.class);
- suite.addTestSuite(gzz.impl.TestDefaultVStreamMap.class);
suite.addTestSuite(gzz.media.impl.TestPersistentSpanSet.class);
suite.addTestSuite(gzz.impl.TestJythons.class);
- // suite.addTestSuite(TestSimpleSpace.class);
- // suite.addTestSuite(TestLeo4VStream.class);
- // suite.addTestSuite(TestLeo4DimAny.class);
return suite;
}
- /*
-
suite.addTestSuite(gzz.mediaserver.http.server.TestServerHTTPResponse.class);
-
suite.addTestSuite(gzz.mediaserver.http.server.TestServerHTTPRequest.class);
- suite.addTestSuite(gzz.mediaserver.http.TestHTTPUtil.class);
- */
-
- /*
- static gzz.impl.Leo4Impl makeLeo() {
- gzz.impl.Leo4Impl impl = new gzz.impl.Leo4Impl(new
TransientTextScroll());
- gzz.impl.Leo4Backend back = new gzz.impl.Leo4Backend(impl);
- return impl;
- }
- */
-
- /*
- public static class TestSimpleSpace extends TestVStreamSpace {
- public TestSimpleSpace(String s) throws Exception { super(s); }
- public VStreamSpace makeSpace() { return new gzz.impl.SimpleSpace(); }
- }
- */
-
- /*
- public static class TestLeo4VStream extends TestVStreamSpace {
- public TestLeo4VStream(String s) throws Exception { super(s); }
- public VStreamSpace makeSpace() { return makeLeo(); }
- }
-
- public static class TestLeo4DimAny extends TestAnyDim {
- public TestLeo4DimAny(String s) throws Exception { super(s); }
- public void setUp() {
- gzz.impl.Leo4Impl impl = makeLeo();
- d = impl.getDim(impl.N());
-
- c = new Cell[10];
- for(int i=0; i<10; i++)
- c[i] = impl.N();
-
- for(int i=0; i<9; i++)
- d.connect(c[i], c[i+1]);
- }
- }
- */
}
Index: gzz/test/gzz/vob/BenchLBChain.java
diff -u gzz/test/gzz/vob/BenchLBChain.java:1.8
gzz/test/gzz/vob/BenchLBChain.java:1.9
--- gzz/test/gzz/vob/BenchLBChain.java:1.8 Sat Sep 21 09:04:56 2002
+++ gzz/test/gzz/vob/BenchLBChain.java Fri Nov 1 20:23:48 2002
@@ -22,6 +22,7 @@
*/
package gzz.vob;
+import gzz.vob.linebreaking.*;
import java.util.*;
import java.awt.*;
@@ -29,7 +30,7 @@
*/
public class BenchLBChain {
-public static final String rcsid = "$Id: BenchLBChain.java,v 1.8 2002/09/21
13:04:56 benja Exp $";
+public static final String rcsid = "$Id: BenchLBChain.java,v 1.9 2002/11/02
01:23:48 benja Exp $";
static private void p(String s) { System.out.println(s); }
static private class TestVob extends HBox.VobHBox {
Index: gzz/test/gzz/vob/TestLBChain.java
diff -u gzz/test/gzz/vob/TestLBChain.java:1.12
gzz/test/gzz/vob/TestLBChain.java:1.13
--- gzz/test/gzz/vob/TestLBChain.java:1.12 Wed Sep 25 10:45:43 2002
+++ gzz/test/gzz/vob/TestLBChain.java Fri Nov 1 20:23:48 2002
@@ -21,6 +21,8 @@
* Written by Tuomas Lukka
*/
package gzz.vob;
+import gzz.vob.linebreaking.*;
+import gzz.vob.impl.*;
import junit.framework.*;
import java.util.*;
import java.awt.*;
@@ -29,7 +31,7 @@
*/
public class TestLBChain extends TestCase {
-String rcsid = "$Id: TestLBChain.java,v 1.12 2002/09/25 14:45:43 tjl Exp $";
+String rcsid = "$Id: TestLBChain.java,v 1.13 2002/11/02 01:23:48 benja Exp $";
public TestLBChain(String s) { super(s); }
Index: gzz/test/gzz/vob/TestVobScene.java
diff -u gzz/test/gzz/vob/TestVobScene.java:1.14
gzz/test/gzz/vob/TestVobScene.java:1.15
--- gzz/test/gzz/vob/TestVobScene.java:1.14 Tue Oct 15 09:29:19 2002
+++ gzz/test/gzz/vob/TestVobScene.java Fri Nov 1 20:23:48 2002
@@ -21,6 +21,8 @@
* Written by Tuomas Lukka
*/
package gzz.vob;
+import gzz.vob.impl.*;
+import gzz.vob.vobs.*;
import junit.framework.*;
import java.awt.*;
import gzz.client.*;
@@ -29,7 +31,7 @@
*/
abstract public class TestVobScene extends TestCase {
-String rcsid = "$Id: TestVobScene.java,v 1.14 2002/10/15 13:29:19 tjl Exp $";
+String rcsid = "$Id: TestVobScene.java,v 1.15 2002/11/02 01:23:48 benja Exp $";
static boolean dbg = false;
public TestVobScene(String s) { super(s); }
@@ -48,7 +50,7 @@
public void testGetKey() {
VobScene vs = createVobScene();
- Vob vob = new gzz.vob.DummyVob();
+ Vob vob = new gzz.vob.vobs.DummyVob();
vs.put(vob, "v0", 7, 100, 100, 20, 20);
assertEquals(null, vs.getKeyAt(5, 5, null));
@@ -89,9 +91,9 @@
}
public void testGetVob() {
- Vob vob1 = new gzz.vob.DummyVob("1");
- Vob vob2 = new gzz.vob.DummyVob("2");
- Vob vob3 = new gzz.vob.DummyVob("3");
+ Vob vob1 = new gzz.vob.vobs.DummyVob("1");
+ Vob vob2 = new gzz.vob.vobs.DummyVob("2");
+ Vob vob3 = new gzz.vob.vobs.DummyVob("3");
VobMap map = createVobScene().map;
Index: gzz/test/gzz/vob/TestVobs.java
diff -u gzz/test/gzz/vob/TestVobs.java:1.6 gzz/test/gzz/vob/TestVobs.java:1.7
--- gzz/test/gzz/vob/TestVobs.java:1.6 Sun Jun 30 07:31:02 2002
+++ gzz/test/gzz/vob/TestVobs.java Fri Nov 1 20:23:48 2002
@@ -32,13 +32,11 @@
*/
public class TestVobs {
-public static final String rcsid = "$Id: TestVobs.java,v 1.6 2002/06/30
11:31:02 tjl Exp $";
+public static final String rcsid = "$Id: TestVobs.java,v 1.7 2002/11/02
01:23:48 benja Exp $";
public static junit.framework.Test suiteStable() {
TestSuite suite = new TestSuite("Stable Vob tests");
suite.addTestSuite(TestLBChain.class);
- suite.addTestSuite(TestWordBreaker.class);
- suite.addTestSuite(TestCharArrayVobFactory.class);
suite.addTestSuite(TestBuoy2.class);
suite.addTestSuite(TestAWTVobScene.class);
Index: gzz/test/gzz/vob/vobcoorder.test
diff -u gzz/test/gzz/vob/vobcoorder.test:1.5
gzz/test/gzz/vob/vobcoorder.test:1.6
--- gzz/test/gzz/vob/vobcoorder.test:1.5 Fri Nov 1 08:10:55 2002
+++ gzz/test/gzz/vob/vobcoorder.test Fri Nov 1 20:23:48 2002
@@ -1,5 +1,7 @@
from gzz.vob import *
+from gzz.vob.impl import *
+from gzz.vob.vobs import *
from java.awt import Color
from test.tools.gfx import *
Index: gzz/test/gzz/vob/vobmatcher.test
diff -u gzz/test/gzz/vob/vobmatcher.test:1.1
gzz/test/gzz/vob/vobmatcher.test:1.2
--- gzz/test/gzz/vob/vobmatcher.test:1.1 Sun Sep 29 10:47:05 2002
+++ gzz/test/gzz/vob/vobmatcher.test Fri Nov 1 20:23:48 2002
@@ -2,7 +2,7 @@
import java
def testMany():
- v = gzz.vob.DefaultVobMatcher()
+ v = gzz.vob.impl.DefaultVobMatcher()
keys = {}
Index: gzz/test/tools/gfx.py
diff -u gzz/test/tools/gfx.py:1.9 gzz/test/tools/gfx.py:1.10
--- gzz/test/tools/gfx.py:1.9 Fri Nov 1 14:53:53 2002
+++ gzz/test/tools/gfx.py Fri Nov 1 20:23:48 2002
@@ -2,6 +2,7 @@
from java.awt import Color
from gzz.vob import *
+from gzz.vob.vobs import *
import gzz
print "Init test.gfx"
@@ -82,7 +83,7 @@
class CellInBox_ConstFlat(gzz.view.CellInBox):
"""A CellInBox that places white rectbgvobs of constant size.
"""
- bgv = gzz.vob.RectBgVob()
+ bgv = gzz.vob.vobs.RectBgVob()
def __init__(self, w, h):
self.w = w
self.h = h
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./Makefile doc/pegboard/pegboard.html doc/p...,
Benja Fallenstein <=