You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by hi...@apache.org on 2001/05/04 14:13:48 UTC
cvs commit: xml-batik/sources/org/apache/batik/swing/gvt JGVTComponent.java
hillion 01/05/04 05:13:47
Modified: . build.xml
sources/org/apache/batik/apps/svgbrowser Resources.java
sources/org/apache/batik/dom/traversal DOMNodeIterator.java
sources/org/apache/batik/ext/swing Resources.java
sources/org/apache/batik/i18n LocalizableSupport.java
sources/org/apache/batik/swing JSVGCanvas.java
sources/org/apache/batik/swing/gvt JGVTComponent.java
Added: sources batik-bean.mf
Log:
- 'build.sh bean' creates batik-bean.jar, a jar suitable for use in GUI builders,
- miscellaneaous fixes.
Revision Changes Path
1.62 +40 -2 xml-batik/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-batik/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- build.xml 2001/04/30 05:31:31 1.61
+++ build.xml 2001/05/04 12:13:04 1.62
@@ -44,7 +44,7 @@
[win32] .\build.bat help
- $Id: build.xml,v 1.61 2001/04/30 05:31:31 vhardy Exp $
+ $Id: build.xml,v 1.62 2001/05/04 12:13:04 hillion Exp $
-->
@@ -278,7 +278,7 @@
</target>
- <!-- All batik in a jar (dependencies: none) -->
+ <!-- All batik in a single jar (dependencies: none) -->
<target name="all-jar" depends="compile, prepare-build">
<jar jarfile="${build}/lib/${project}-all.jar">
<fileset dir="${dest}">
@@ -290,6 +290,44 @@
</jar>
</target>
+
+ <!-- What is needed to the JSVGCanvas bean in a jar,
+ including the XML parser -->
+ <target name="bean" depends="compile, prepare-build">
+ <mkdir dir="${build}/tmp"/>
+ <unjar src="lib/crimson-parser.jar" dest="${build}/tmp"/>
+ <jar jarfile="${build}/lib/${project}-bean.jar"
+ manifest="${src}/${project}-bean.mf">
+ <fileset dir="${dest}">
+ <include name="org/w3c/**"/>
+ <include name="org/xml/**"/>
+ <include name="${package-prefix}/bridge/*.class"/>
+ <include name="${package-prefix}/css/**/*.class"/>
+ <include name="${package-prefix}/dom/**/*.class"/>
+ <include name="${package-prefix}/ext/**/*.class"/>
+ <include name="${package-prefix}/gvt/**/*.class"/>
+ <include name="${package-prefix}/i18n/**/*.class"/>
+ <include name="${package-prefix}/parser/**/*.class"/>
+ <include name="${package-prefix}/script/**/*.class"/>
+ <include name="${package-prefix}/swing/**/*.class"/>
+ <include name="${package-prefix}/util/*.class"/>
+ <include name="${package-prefix}/xml/*.class"/>
+ </fileset>
+ <fileset dir="${resources}">
+ <include name="${package-prefix}/bridge/**"/>
+ <include name="${package-prefix}/css/**"/>
+ <include name="${package-prefix}/dom/**"/>
+ <include name="${package-prefix}/ext/**"/>
+ <include name="${package-prefix}/parser/**"/>
+ <include name="${package-prefix}/swing/**"/>
+ <include name="${package-prefix}/util/resources/**"/>
+ </fileset>
+ <fileset dir="${build}/tmp">
+ <include name="org/**"/>
+ </fileset>
+ </jar>
+ <delete dir="${build}/tmp"/>
+ </target>
<!-- External packages (dependencies: none) -->
<target name="ext-jar" depends="compile, prepare-build">
1.1 xml-batik/sources/batik-bean.mf
Index: batik-bean.mf
===================================================================
Manifest-Version: $Id: batik-bean.mf,v 1.1 2001/05/04 12:13:11 hillion Exp $
Name: org/apache/batik/swing/JSVGCanvas.class
Java-Bean: True
1.2 +12 -4 xml-batik/sources/org/apache/batik/apps/svgbrowser/Resources.java
Index: Resources.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/Resources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resources.java 2001/05/04 00:55:15 1.1
+++ Resources.java 2001/05/04 12:13:17 1.2
@@ -12,12 +12,13 @@
import java.util.MissingResourceException;
import org.apache.batik.i18n.Localizable;
import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.batik.util.gui.resource.ResourceManager;
/**
* This class manages the message for the Swing extensions.
*
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
- * @version $Id: Resources.java,v 1.1 2001/05/04 00:55:15 vhardy Exp $
+ * @version $Id: Resources.java,v 1.2 2001/05/04 12:13:17 hillion Exp $
*/
public class Resources {
@@ -39,10 +40,17 @@
new LocalizableSupport(RESOURCES);
/**
+ * The resource manager to decode messages.
+ */
+ protected static ResourceManager resourceManager =
+ new ResourceManager(localizableSupport.getResourceBundle());
+
+ /**
* Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
*/
public static void setLocale(Locale l) {
localizableSupport.setLocale(l);
+ resourceManager = new ResourceManager(localizableSupport.getResourceBundle());
}
/**
@@ -63,16 +71,16 @@
public static String getString(String key)
throws MissingResourceException {
- return formatMessage(key, null);
+ return resourceManager.getString(key);
}
public static int getInteger(String key)
throws MissingResourceException {
- return localizableSupport.getResourceManager().getInteger(key);
+ return resourceManager.getInteger(key);
}
public static int getCharacter(String key)
throws MissingResourceException {
- return localizableSupport.getResourceManager().getCharacter(key);
+ return resourceManager.getCharacter(key);
}
}
1.2 +2 -1 xml-batik/sources/org/apache/batik/dom/traversal/DOMNodeIterator.java
Index: DOMNodeIterator.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/traversal/DOMNodeIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNodeIterator.java 2000/11/22 16:27:01 1.1
+++ DOMNodeIterator.java 2001/05/04 12:13:23 1.2
@@ -20,7 +20,7 @@
* interface.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: DOMNodeIterator.java,v 1.1 2000/11/22 16:27:01 hillion Exp $
+ * @version $Id: DOMNodeIterator.java,v 1.2 2001/05/04 12:13:23 hillion Exp $
*/
public class DOMNodeIterator implements NodeIterator {
@@ -314,6 +314,7 @@
// The previous of root is null
if (referenceNode == root) {
+ referenceNode = null;
return;
}
1.2 +11 -3 xml-batik/sources/org/apache/batik/ext/swing/Resources.java
Index: Resources.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/swing/Resources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resources.java 2001/05/03 18:10:34 1.1
+++ Resources.java 2001/05/04 12:13:28 1.2
@@ -12,12 +12,13 @@
import java.util.MissingResourceException;
import org.apache.batik.i18n.Localizable;
import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.batik.util.gui.resource.ResourceManager;
/**
* This class manages the message for the Swing extensions.
*
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
- * @version $Id: Resources.java,v 1.1 2001/05/03 18:10:34 vhardy Exp $
+ * @version $Id: Resources.java,v 1.2 2001/05/04 12:13:28 hillion Exp $
*/
public class Resources {
@@ -39,10 +40,17 @@
new LocalizableSupport(RESOURCES);
/**
+ * The resource manager to decode messages.
+ */
+ protected static ResourceManager resourceManager =
+ new ResourceManager(localizableSupport.getResourceBundle());
+
+ /**
* Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
*/
public static void setLocale(Locale l) {
localizableSupport.setLocale(l);
+ resourceManager = new ResourceManager(localizableSupport.getResourceBundle());
}
/**
@@ -63,11 +71,11 @@
public static String getString(String key)
throws MissingResourceException {
- return formatMessage(key, null);
+ return resourceManager.getString(key);
}
public static int getInteger(String key)
throws MissingResourceException {
- return localizableSupport.getResourceManager().getInteger(key);
+ return resourceManager.getInteger(key);
}
}
1.5 +1 -18 xml-batik/sources/org/apache/batik/i18n/LocalizableSupport.java
Index: LocalizableSupport.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/i18n/LocalizableSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalizableSupport.java 2001/05/03 18:10:44 1.4
+++ LocalizableSupport.java 2001/05/04 12:13:32 1.5
@@ -12,8 +12,6 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import org.apache.batik.util.gui.resource.ResourceManager;
-
/**
* This class provides a default implementation of the Localizable interface.
* You can use it as a base class or as a member field and delegates various
@@ -65,7 +63,7 @@
* default group common to each instance of LocalizableSupport.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: LocalizableSupport.java,v 1.4 2001/05/03 18:10:44 vhardy Exp $
+ * @version $Id: LocalizableSupport.java,v 1.5 2001/05/04 12:13:32 hillion Exp $
*/
public class LocalizableSupport implements Localizable {
/**
@@ -99,11 +97,6 @@
protected ResourceBundle resourceBundle;
/**
- * The resource manager
- */
- protected ResourceManager resourceManager;
-
- /**
* Same as LocalizableSupport(s, null).
*/
public LocalizableSupport(String s) {
@@ -132,7 +125,6 @@
if (locale != l) {
locale = l;
resourceBundle = null;
- resourceManager = null;
}
}
@@ -192,7 +184,6 @@
*/
public ResourceBundle getResourceBundle() {
Locale l;
- ResourceBundle oldBundle = resourceBundle;
if (resourceBundle == null) {
if (locale == null) {
@@ -239,14 +230,6 @@
}
}
- if(oldBundle != resourceBundle){
- resourceManager = new ResourceManager(resourceBundle);
- }
-
return resourceBundle;
- }
-
- public ResourceManager getResourceManager(){
- return resourceManager;
}
}
1.22 +5 -7 xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java
Index: JSVGCanvas.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JSVGCanvas.java 2001/05/02 13:12:29 1.21
+++ JSVGCanvas.java 2001/05/04 12:13:37 1.22
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: JSVGCanvas.java,v 1.21 2001/05/02 13:12:29 hillion Exp $
+ * @version $Id: JSVGCanvas.java,v 1.22 2001/05/04 12:13:37 hillion Exp $
*/
public class JSVGCanvas extends JSVGComponent {
@@ -102,12 +102,10 @@
new AbstractResetTransformInteractor() {
public boolean startInteraction(InputEvent ie) {
int mods = ie.getModifiers();
- if (ie.getID() != KeyEvent.KEY_PRESSED) {
- return false;
- }
- int key = ((KeyEvent)ie).getKeyCode();
return
- key == KeyEvent.VK_T &&
+ ie.getID() == MouseEvent.MOUSE_CLICKED &&
+ (mods & ie.BUTTON3_MASK) != 0 &&
+ (mods & ie.SHIFT_MASK) != 0 &&
(mods & ie.CTRL_MASK) != 0;
}
};
@@ -335,7 +333,7 @@
* Returns true if the reset transform interactor is enabled, false otherwise.
*/
public boolean getEnableResetTransformInteractor() {
- return isRotateInteractorEnabled;
+ return isResetTransformInteractorEnabled;
}
/**
1.12 +2 -2 xml-batik/sources/org/apache/batik/swing/gvt/JGVTComponent.java
Index: JGVTComponent.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/gvt/JGVTComponent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JGVTComponent.java 2001/05/02 13:12:32 1.11
+++ JGVTComponent.java 2001/05/04 12:13:43 1.12
@@ -52,7 +52,7 @@
* This class represents a component which can display a GVT tree.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: JGVTComponent.java,v 1.11 2001/05/02 13:12:32 hillion Exp $
+ * @version $Id: JGVTComponent.java,v 1.12 2001/05/04 12:13:43 hillion Exp $
*/
public class JGVTComponent extends JComponent {
@@ -235,7 +235,7 @@
* Resets the rendering transform to its initial value.
*/
public void resetRenderingTransform() {
- renderingTransform = initialTransform;
+ setRenderingTransform(initialTransform);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org