nsochele 2003/03/14 13:53:22
Modified: sources/org/apache/batik/util UnitProcessor.java
sources/org/apache/batik/swing/svg JSVGComponent.java
SVGUserAgent.java
sources/org/apache/batik/gvt/text
AttributedCharacterSpanIterator.java
GlyphLayout.java
sources/org/apache/batik/gvt/font FontFamilyResolver.java
sources/org/apache/batik/dom/svg SVGContext.java
SVGOMAnimatedString.java
sources/org/apache/batik/css/engine/value/svg
MarkerShorthandManager.java
sources/org/apache/batik/css/engine CSSContext.java
sources/org/apache/batik/css/dom CSSOMSVGColor.java
sources/org/apache/batik/bridge
AbstractGraphicsNodeBridge.java
BaseScriptingEnvironment.java BridgeContext.java
ScriptingEnvironment.java SVGTextElementBridge.java
UnitProcessor.java UserAgent.java
UserAgentAdapter.java
sources/org/apache/batik/apps/svgbrowser Application.java
JSVGViewerFrame.java Main.java
Log:
fixed javadoc warnings
Revision Changes Path
1.18 +2 -2 xml-batik/sources/org/apache/batik/util/UnitProcessor.java
Index: UnitProcessor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/UnitProcessor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- UnitProcessor.java 5 Jun 2002 21:14:48 -0000 1.17
+++ UnitProcessor.java 14 Mar 2003 21:53:19 -0000 1.18
@@ -418,7 +418,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
float getPixelToMM();
1.66 +3 -3 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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- JSVGComponent.java 7 Mar 2003 12:36:30 -0000 1.65
+++ JSVGComponent.java 14 Mar 2003 21:53:19 -0000 1.66
@@ -1913,7 +1913,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMM() { return getPixelUnitToMillimeter(); }
@@ -2549,7 +2549,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMM() { return getPixelUnitToMillimeter(); }
1.13 +2 -2 xml-batik/sources/org/apache/batik/swing/svg/SVGUserAgent.java
Index: SVGUserAgent.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/svg/SVGUserAgent.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SVGUserAgent.java 5 Sep 2002 12:58:19 -0000 1.12
+++ SVGUserAgent.java 14 Mar 2003 21:53:19 -0000 1.13
@@ -68,7 +68,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
float getPixelToMM();
1.6 +2 -2
xml-batik/sources/org/apache/batik/gvt/text/AttributedCharacterSpanIterator.java
Index: AttributedCharacterSpanIterator.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/gvt/text/AttributedCharacterSpanIterator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributedCharacterSpanIterator.java 29 Oct 2001 21:13:41 -0000 1.5
+++ AttributedCharacterSpanIterator.java 14 Mar 2003 21:53:19 -0000 1.6
@@ -65,7 +65,7 @@
* Get the value of the named attribute for the current
* character.
*/
- public Object getAttribute(Attribute attribute) {
+ public Object getAttribute(AttributedCharacterIterator.Attribute attribute) {
return aci.getAttribute(attribute);
}
1.50 +2 -2 xml-batik/sources/org/apache/batik/gvt/text/GlyphLayout.java
Index: GlyphLayout.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/text/GlyphLayout.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- GlyphLayout.java 4 Mar 2003 12:11:58 -0000 1.49
+++ GlyphLayout.java 14 Mar 2003 21:53:19 -0000 1.50
@@ -2395,7 +2395,7 @@
* over space in the flow rect and scaling that value by 1.0 to
* align to the bottom, 0.5 for middle and 0.0 for top.
*
- * @param verticalAlignOffset the [EMAIL PROTECTED] Point2D.Float} object that
+ * @param verticalAlignOffset the [EMAIL PROTECTED]
java.awt.geom.Point2D.Float} object that
* is storing the alignment offset.
* @param currentRegion the [EMAIL PROTECTED] RegionInfo} object that we
* are rendering into.
1.7 +8 -2
xml-batik/sources/org/apache/batik/gvt/font/FontFamilyResolver.java
Index: FontFamilyResolver.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/gvt/font/FontFamilyResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FontFamilyResolver.java 6 Feb 2002 16:43:03 -0000 1.6
+++ FontFamilyResolver.java 14 Mar 2003 21:53:20 -0000 1.7
@@ -11,6 +11,7 @@
import java.util.Map;
import java.util.HashMap;
import java.util.Collection;
+import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.util.StringTokenizer;
import java.util.Iterator;
@@ -59,7 +60,12 @@
GraphicsEnvironment env;
env = GraphicsEnvironment.getLocalGraphicsEnvironment();
- String fontNames[] = env.getAvailableFontFamilyNames();
+ String fontNames[] = null;
+ Font[] list = env.getAllFonts();
+ fontNames = new String[list.length];
+ for(int i = 0 ; i < list.length ; i++ ){
+ fontNames[i] = list[i].getName();
+ }
int nFonts = fontNames != null ? fontNames.length : 0;
for(int i=0; i<nFonts; i++){
fonts.put(fontNames[i].toLowerCase(), fontNames[i]);
1.11 +2 -2 xml-batik/sources/org/apache/batik/dom/svg/SVGContext.java
Index: SVGContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGContext.java 24 Feb 2003 18:25:53 -0000 1.10
+++ SVGContext.java 14 Mar 2003 21:53:20 -0000 1.11
@@ -27,7 +27,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
float getPixelToMM();
1.5 +2 -2
xml-batik/sources/org/apache/batik/dom/svg/SVGOMAnimatedString.java
Index: SVGOMAnimatedString.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMAnimatedString.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGOMAnimatedString.java 15 Apr 2002 10:16:12 -0000 1.4
+++ SVGOMAnimatedString.java 14 Mar 2003 21:53:20 -0000 1.5
@@ -59,7 +59,7 @@
}
/**
- * <b>DOM</b>: Implements [EMAIL PROTECTED]
SVGAnimatedString#setBaseVal(string)}.
+ * <b>DOM</b>: Implements [EMAIL PROTECTED]
SVGAnimatedString#setBaseVal(String)}.
*/
public void setBaseVal(String baseVal) throws DOMException {
element.setAttributeNS(namespaceURI, localName, baseVal);
1.2 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/MarkerShorthandManager.java
Index: MarkerShorthandManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/MarkerShorthandManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MarkerShorthandManager.java 18 Mar 2002 10:28:23 -0000 1.1
+++ MarkerShorthandManager.java 14 Mar 2003 21:53:20 -0000 1.2
@@ -46,7 +46,7 @@
* Implements [EMAIL PROTECTED]
ShorthandManager#setValues(CSSEngine,ShorthandManager.PropertyHandler,LexicalUnit,boolean)}.
*/
public void setValues(CSSEngine eng,
- PropertyHandler ph,
+ ShorthandManager.PropertyHandler ph,
LexicalUnit lu,
boolean imp)
throws DOMException {
1.5 +2 -2 xml-batik/sources/org/apache/batik/css/engine/CSSContext.java
Index: CSSContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/engine/CSSContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CSSContext.java 5 Sep 2002 12:58:19 -0000 1.4
+++ CSSContext.java 14 Mar 2003 21:53:20 -0000 1.5
@@ -51,7 +51,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
float getPixelToMillimeter();
1.3 +4 -4 xml-batik/sources/org/apache/batik/css/dom/CSSOMSVGColor.java
Index: CSSOMSVGColor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/dom/CSSOMSVGColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CSSOMSVGColor.java 11 Apr 2002 16:51:35 -0000 1.2
+++ CSSOMSVGColor.java 14 Mar 2003 21:53:20 -0000 1.3
@@ -93,7 +93,7 @@
/**
* <b>DOM</b>: Implements [EMAIL PROTECTED]
- * org.w3c.dom.svg.CSSValue#setCssText(String)}.
+ * org.w3c.dom.css.CSSValue#setCssText(String)}.
*/
public void setCssText(String cssText) throws DOMException {
if (handler == null) {
@@ -107,7 +107,7 @@
/**
* <b>DOM</b>: Implements [EMAIL PROTECTED]
- * org.w3c.dom.svg.CSSValue#getCssValueType()}.
+ * org.w3c.dom.css.CSSValue#getCssValueType()}.
*/
public short getCssValueType() {
return CSS_CUSTOM;
@@ -231,7 +231,7 @@
// SVGICCColor //////////////////////////////////////////////////
/**
- * <b>DOM</b>: Implements [EMAIL PROTECTED] SVGICCColor.getColorProfile()}.
+ * <b>DOM</b>: Implements [EMAIL PROTECTED]
org.w3c.dom.svg.SVGICCColor#getColorProfile()}.
*/
public String getColorProfile() {
if (getColorType() != SVG_COLORTYPE_RGBCOLOR_ICCCOLOR) {
1.29 +2 -2
xml-batik/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java
Index: AbstractGraphicsNodeBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AbstractGraphicsNodeBridge.java 24 Feb 2003 18:25:52 -0000 1.28
+++ AbstractGraphicsNodeBridge.java 14 Mar 2003 21:53:20 -0000 1.29
@@ -288,7 +288,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMM() {
return getPixelUnitToMillimeter();
1.17 +5 -3
xml-batik/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java
Index: BaseScriptingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BaseScriptingEnvironment.java 26 Feb 2003 11:13:45 -0000 1.16
+++ BaseScriptingEnvironment.java 14 Mar 2003 21:53:20 -0000 1.17
@@ -591,7 +591,7 @@
* @param uri The URI where the data is located.
* @param h A handler called when the data is available.
*/
- public void getURL(String uri, GetURLHandler h) {
+ public void getURL(String uri, org.apache.batik.script.Window.GetURLHandler
h) {
}
/**
@@ -600,7 +600,9 @@
* @param h A handler called when the data is available.
* @param enc The character encoding of the data.
*/
- public void getURL(String uri, GetURLHandler h, String enc) {
+ public void getURL(String uri,
+ org.apache.batik.script.Window.GetURLHandler h,
+ String enc) {
}
/**
1.57 +2 -2 xml-batik/sources/org/apache/batik/bridge/BridgeContext.java
Index: BridgeContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/BridgeContext.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- BridgeContext.java 24 Feb 2003 18:25:52 -0000 1.56
+++ BridgeContext.java 14 Mar 2003 21:53:20 -0000 1.57
@@ -1122,7 +1122,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMillimeter() {
return getPixelUnitToMillimeter();
1.35 +5 -5
xml-batik/sources/org/apache/batik/bridge/ScriptingEnvironment.java
Index: ScriptingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/ScriptingEnvironment.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ScriptingEnvironment.java 24 Jul 2002 01:19:31 -0000 1.34
+++ ScriptingEnvironment.java 14 Mar 2003 21:53:20 -0000 1.35
@@ -735,18 +735,18 @@
/**
* Implements [EMAIL PROTECTED]
- * org.apache.batik.script.Window#getURL(String,GetURLHandler)}.
+ *
org.apache.batik.script.Window#getURL(String,org.apache.batik.script.Window.GetURLHandler)}.
*/
- public void getURL(String uri, GetURLHandler h) {
+ public void getURL(String uri, org.apache.batik.script.Window.GetURLHandler
h) {
getURL(uri, h, "UTF8");
}
/**
* Implements [EMAIL PROTECTED]
- * org.apache.batik.script.Window#getURL(String,GetURLHandler,String)}.
+ *
org.apache.batik.script.Window#getURL(String,org.apache.batik.script.Window.GetURLHandler,String)}.
*/
public void getURL(final String uri,
- final GetURLHandler h,
+ final org.apache.batik.script.Window.GetURLHandler h,
final String enc) {
Thread t = new Thread() {
public void run() {
1.76 +2 -2
xml-batik/sources/org/apache/batik/bridge/SVGTextElementBridge.java
Index: SVGTextElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGTextElementBridge.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- SVGTextElementBridge.java 4 Mar 2003 18:22:19 -0000 1.75
+++ SVGTextElementBridge.java 14 Mar 2003 21:53:20 -0000 1.76
@@ -1862,7 +1862,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMM() {
return getPixelUnitToMillimeter();
1.10 +2 -2 xml-batik/sources/org/apache/batik/bridge/UnitProcessor.java
Index: UnitProcessor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/UnitProcessor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UnitProcessor.java 5 Jun 2002 21:14:47 -0000 1.9
+++ UnitProcessor.java 14 Mar 2003 21:53:20 -0000 1.10
@@ -353,7 +353,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMM() {
return getPixelUnitToMillimeter();
1.26 +2 -2 xml-batik/sources/org/apache/batik/bridge/UserAgent.java
Index: UserAgent.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/UserAgent.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- UserAgent.java 24 Feb 2003 18:25:52 -0000 1.25
+++ UserAgent.java 14 Mar 2003 21:53:20 -0000 1.26
@@ -78,7 +78,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
float getPixelToMM();
1.13 +2 -2 xml-batik/sources/org/apache/batik/bridge/UserAgentAdapter.java
Index: UserAgentAdapter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/UserAgentAdapter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- UserAgentAdapter.java 24 Feb 2003 18:25:52 -0000 1.12
+++ UserAgentAdapter.java 14 Mar 2003 21:53:21 -0000 1.13
@@ -112,7 +112,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMM() {
return getPixelUnitToMillimeter();
1.11 +2 -2
xml-batik/sources/org/apache/batik/apps/svgbrowser/Application.java
Index: Application.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/Application.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Application.java 9 Sep 2002 13:02:07 -0000 1.10
+++ Application.java 14 Mar 2003 21:53:22 -0000 1.11
@@ -99,7 +99,7 @@
* Returns the allowed origins for external
* resources.
*
- * @see ResourceOrigin.
+ * @see ResourceOrigin
*/
int getAllowedExternalResourceOrigin();
1.91 +2 -2
xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
Index: JSVGViewerFrame.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- JSVGViewerFrame.java 4 Mar 2003 12:11:57 -0000 1.90
+++ JSVGViewerFrame.java 14 Mar 2003 21:53:22 -0000 1.91
@@ -2238,7 +2238,7 @@
/**
* Returns the size of a px CSS unit in millimeters.
* This will be removed after next release.
- * @see #getPixelUnitToMillimeter();
+ * @see #getPixelUnitToMillimeter()
*/
public float getPixelToMM() {
return getPixelUnitToMillimeter();
1.46 +2 -2 xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Main.java 8 Oct 2002 14:48:32 -0000 1.45
+++ Main.java 14 Mar 2003 21:53:22 -0000 1.46
@@ -779,7 +779,7 @@
/**
* Returns the allowed origins for external
* resources.
- * @see ResourceOrigin.
+ * @see ResourceOrigin
*/
public int getAllowedExternalResourceOrigin() {
int ret = preferenceManager.getInteger
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
