deweese 2004/01/24 17:49:47
Modified: . build.xml
sources/org/apache/batik/script/rhino RhinoInterpreter.java
sources/org/apache/batik/swing JSVGScrollPane.java
sources/org/apache/batik/swing/svg JSVGComponent.java
Log:
1) Patch for using Rhino in Applet.
2) Patch to allow more 'normal' scroll bar usage.
Check out ScrollExample for details.
Revision Changes Path
1.149 +10 -10 xml-batik/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-batik/build.xml,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- build.xml 22 Jan 2004 01:49:57 -0000 1.148
+++ build.xml 25 Jan 2004 01:49:46 -0000 1.149
@@ -60,17 +60,17 @@
<target name="init" depends="init-args">
<tstamp/>
- <property name="Project" value="Batik"/>
- <property name="project" value="batik"/>
- <property name="year" value="2002"/>
- <property name="version" value="1.5.1"/>
- <property name="revisionType" value="rc"/>
- <property name="revisionNumber" value="2" />
+ <property name="Project" value="Batik"/>
+ <property name="project" value="batik"/>
+ <property name="year" value="2004"/>
+ <property name="version" value="1.5.1"/>
+ <property name="revisionType" value=""/>
+ <property name="revisionNumber" value="" />
<property file="build.properties"/>
- <property name="debug" value="off"/>
- <property name="optimize" value="on"/>
- <property name="deprecation" value="on"/>
+ <property name="debug" value="off"/>
+ <property name="optimize" value="on"/>
+ <property name="deprecation" value="on"/>
<property name="src" value="sources"/>
<property name="resources" value="resources"/>
1.36 +7 -3
xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java
Index: RhinoInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- RhinoInterpreter.java 8 Sep 2003 11:07:48 -0000 1.35
+++ RhinoInterpreter.java 25 Jan 2004 01:49:46 -0000 1.36
@@ -163,8 +163,12 @@
* @see org.apache.batik.script.InterpreterPool
*/
public RhinoInterpreter(URL documentURL) {
- rhinoClassLoader = new RhinoClassLoader(documentURL,
- getClass().getClassLoader());
+ try {
+ rhinoClassLoader = new RhinoClassLoader
+ (documentURL, getClass().getClassLoader());
+ } catch (SecurityException se) {
+ rhinoClassLoader = null;
+ }
// entering a context
Context ctx = enterContext();
try {
1.4 +11 -12 xml-batik/sources/org/apache/batik/swing/JSVGScrollPane.java
Index: JSVGScrollPane.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/JSVGScrollPane.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JSVGScrollPane.java 24 Nov 2003 23:37:30 -0000 1.3
+++ JSVGScrollPane.java 25 Jan 2004 01:49:47 -0000 1.4
@@ -79,13 +79,11 @@
import org.apache.batik.bridge.ViewBox;
import org.apache.batik.swing.JSVGCanvas;
-
+import org.apache.batik.swing.gvt.JGVTComponentListener;
import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
-
-import org.apache.batik.swing.gvt.JGVTComponentListener;
-import org.apache.batik.swing.gvt.GVTTreeRendererListener;
-import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
+import org.apache.batik.swing.svg.GVTTreeBuilderListener;
+import org.apache.batik.swing.svg.GVTTreeBuilderEvent;
import org.apache.batik.util.SVGConstants;
@@ -176,7 +174,7 @@
ScrollListener xlistener = new ScrollListener();
canvas.addJGVTComponentListener(xlistener);
this.addComponentListener(xlistener);
- canvas.addGVTTreeRendererListener(xlistener);
+ canvas.addGVTTreeBuilderListener(xlistener);
}// JSVGScrollPane()
@@ -379,7 +377,7 @@
/** Handle scroll, zoom, and resize events */
protected class ScrollListener extends ComponentAdapter
- implements JGVTComponentListener, GVTTreeRendererListener
+ implements JGVTComponentListener, GVTTreeBuilderListener
{
protected boolean isReady = false;
@@ -397,29 +395,30 @@
}// componentResized()
- public void gvtRenderingCompleted(GVTTreeRendererEvent e)
+ public void gvtBuildCompleted(GVTTreeBuilderEvent e)
{
isReady = true;
+ resizeScrollBars();
}// gvtRenderingCompleted()
- public void gvtRenderingCancelled(GVTTreeRendererEvent e)
+ public void gvtBuildCancelled(GVTTreeBuilderEvent e)
{
// do nothing
}// gvtRenderingCancelled()
- public void gvtRenderingFailed(GVTTreeRendererEvent e)
+ public void gvtBuildFailed(GVTTreeBuilderEvent e)
{
// do nothing
}// gvtRenderingFailed()
- public void gvtRenderingPrepare(GVTTreeRendererEvent e)
+ public void gvtBuildPrepare(GVTTreeBuilderEvent e)
{
// do nothing
}// gvtRenderingPrepare()
- public void gvtRenderingStarted(GVTTreeRendererEvent e)
+ public void gvtBuildStarted(GVTTreeBuilderEvent e)
{
// do nothing
}// gvtRenderingStarted()
1.94 +16 -10 xml-batik/sources/org/apache/batik/swing/svg/JSVGComponent.java
Index: JSVGComponent.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/svg/JSVGComponent.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- JSVGComponent.java 23 Nov 2003 20:54:25 -0000 1.93
+++ JSVGComponent.java 25 Jan 2004 01:49:47 -0000 1.94
@@ -768,12 +768,9 @@
(int)dim.getHeight());
JSVGComponent.this.setMySize(mySz);
SVGSVGElement elt = svgDocument.getRootElement();
- Dimension d = getSize();
- prevComponentSize = d;
- if (d.width < 1) d.width = 1;
- if (d.height < 1) d.height = 1;
- AffineTransform at = ViewBox.getViewTransform
- (fragmentIdentifier, elt, d.width, d.height);
+ prevComponentSize = getSize();
+ AffineTransform at = calculateViewingTransform
+ (fragmentIdentifier, elt);
CanvasGraphicsNode cgn = getCanvasGraphicsNode(gn);
cgn.setViewingTransform(at);
initialTransform = new AffineTransform();
@@ -881,6 +878,15 @@
return ret;
}
+ protected AffineTransform calculateViewingTransform
+ (String fragIdent, SVGSVGElement svgElt) {
+ Dimension d = getSize();
+ if (d.width < 1) d.width = 1;
+ if (d.height < 1) d.height = 1;
+ return ViewBox.getViewTransform
+ (fragIdent, svgElt, d.width, d.height);
+ }
+
/**
* Updates the value of the transform used for rendering.
* Return true if a repaint is required, otherwise false.
@@ -897,8 +903,8 @@
prevComponentSize = d;
if (d.width < 1) d.width = 1;
if (d.height < 1) d.height = 1;
- AffineTransform at = ViewBox.getViewTransform
- (fragmentIdentifier, elt, d.width, d.height);
+ AffineTransform at = calculateViewingTransform
+ (fragmentIdentifier, elt);
CanvasGraphicsNode cgn = getCanvasGraphicsNode();
AffineTransform vt = cgn.getViewingTransform();
if (at.equals(vt)) {
@@ -1132,7 +1138,7 @@
protected JSVGComponentListener jsvgComponentListener =
new JSVGComponentListener();
- class JSVGComponentListener extends ComponentAdapter
+ protected class JSVGComponentListener extends ComponentAdapter
implements JGVTComponentListener {
float prevScale = 0;
float prevTransX = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
