You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2010/09/09 12:02:18 UTC
svn commit: r995366 - in /xmlgraphics/commons/trunk: ./
src/java/org/apache/xmlgraphics/image/loader/impl/
src/java/org/apache/xmlgraphics/java2d/
src/java/org/apache/xmlgraphics/java2d/ps/
src/java/org/apache/xmlgraphics/ps/ src/java/org/apache/xmlgra...
Author: jeremias
Date: Thu Sep 9 10:02:17 2010
New Revision: 995366
URL: http://svn.apache.org/viewvc?rev=995366&view=rev
Log:
Bugzilla #49703:
Addressed compilation and javadoc issues.
Unified TODO style.
Submitted by: Glenn Adams <glenn.at.skynav.com>
Changes to patch:
- Removed deprecated TextHandler method and old PDF/A XMP schema.
- TODO style changed to "//TODO" instead of "@asf.todo"
Removed:
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/schemas/pdf/PDFAOldXMPSchema.java
Modified:
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TextHandler.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/DSCConstants.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPArray.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPConstants.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaRegistry.java
xmlgraphics/commons/trunk/status.xml
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java Thu Sep 9 10:02:17 2010
@@ -43,7 +43,6 @@ public class ImageRendered extends Abstr
* @param info the image info object
* @param red the RenderedImage instance
* @param transparentColor the transparent color or null
- * @param iccProfile an ICC color profile or null if no profile is associated
*/
public ImageRendered(ImageInfo info, RenderedImage red, Color transparentColor) {
super(info);
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java Thu Sep 9 10:02:17 2010
@@ -23,30 +23,22 @@ import java.awt.Graphics2D;
import java.awt.Shape;
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
+import java.io.IOException;
/**
* Default TextHandler implementation which paints text using graphics primitives (shapes).
*/
public class StrokingTextHandler implements TextHandler {
- private AbstractGraphics2D g2d;
-
/**
- * Legacy constructor.
- * @param g2d a graphics 2d implementation
- * @deprecated Use default constructor instead
+ * Default constructor.
*/
- public StrokingTextHandler(AbstractGraphics2D g2d) {
- this();
- this.g2d = g2d;
- }
-
public StrokingTextHandler() {
//nop
}
/** {@inheritDoc} */
- public void drawString(Graphics2D g2d, String text, float x, float y) {
+ public void drawString(Graphics2D g2d, String text, float x, float y) throws IOException {
java.awt.Font awtFont = g2d.getFont();
FontRenderContext frc = g2d.getFontRenderContext();
GlyphVector gv = awtFont.createGlyphVector(frc, text);
@@ -54,12 +46,4 @@ public class StrokingTextHandler impleme
g2d.fill(glyphOutline);
}
- /** {@inheritDoc} */
- public void drawString(String text, float x, float y) {
- if (g2d == null) {
- throw new NullPointerException(
- "Use legacy constructor when calling this deprecated method!");
- }
- drawString(this.g2d, text, x, y);
- }
}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TextHandler.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TextHandler.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TextHandler.java Thu Sep 9 10:02:17 2010
@@ -37,13 +37,4 @@ public interface TextHandler {
*/
void drawString(Graphics2D g2d, String text, float x, float y) throws IOException;
- /**
- * Draw some text.
- * @param text the text to paint
- * @param x the x-coordinate where the <code>String</code> should be rendered
- * @param y the y-coordinate where the <code>String</code> should be rendered
- * @throws IOException In case of an I/O error
- * @deprecated Use {@code #drawString(Graphics2D, String, float, float)} instead.
- */
- void drawString(String text, float x, float y) throws IOException;
}
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java Thu Sep 9 10:02:17 2010
@@ -21,10 +21,12 @@ package org.apache.xmlgraphics.java2d.ps
import java.io.IOException;
+import org.apache.xmlgraphics.java2d.TextHandler;
+
/**
* Interface which the Graphics2D class delegates text painting to for Postscript.
*/
-public interface PSTextHandler extends org.apache.xmlgraphics.java2d.TextHandler {
+public interface PSTextHandler extends TextHandler {
/**
* Is called by when the "Setup" or "Prolog" of the PostScript document is generated.
* Subclasses can do font registration, for example.
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/DSCConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/DSCConstants.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/DSCConstants.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/DSCConstants.java Thu Sep 9 10:02:17 2010
@@ -146,7 +146,6 @@ public class DSCConstants {
// ----==== Requirements Conventions ====----
- /**@todo Add the missing comments */
/**
* This comment indicates all types of paper media (paper sizes, weight, color)
* this document requires.
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java Thu Sep 9 10:02:17 2010
@@ -198,7 +198,7 @@ public class PSGenerator implements PSCo
* @exception IOException In case of an I/O problem
*/
public void write(String cmd) throws IOException {
- /* @todo Check disabled until clarification.
+ /* TODO Check disabled until clarification.
if (cmd.length() > 255) {
throw new RuntimeException("PostScript command exceeded limit of 255 characters");
} */
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPArray.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPArray.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPArray.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPArray.java Thu Sep 9 10:02:17 2010
@@ -27,9 +27,9 @@ import org.xml.sax.helpers.AttributesImp
/**
* Represents an XMP array as defined by the XMP specification.
- * @todo Property qualifiers are currently not supported, yet.
*/
public class XMPArray extends XMPComplexValue {
+ //TODO Property qualifiers are currently not supported, yet.
private XMPArrayType type;
private List values = new java.util.ArrayList();
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPConstants.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPConstants.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPConstants.java Thu Sep 9 10:02:17 2010
@@ -54,13 +54,6 @@ public interface XMPConstants {
*/
String PDF_A_IDENTIFICATION = "http://www.aiim.org/pdfa/ns/id/";
- /**
- * Namespace URI for the PDF/A Identification Schema
- * (from an older draft of ISO 19005-1, used by Adobe Acrobat)
- * @deprecated Outdated, please use PDF_A_IDENTIFICATION instead.
- */
- String PDF_A_IDENTIFICATION_OLD = "http://www.aiim.org/pdfa/ns/id.html";
-
/** Default language for the xml:lang property */
String DEFAULT_LANGUAGE = "x-default";
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaAdapter.java Thu Sep 9 10:02:17 2010
@@ -214,9 +214,9 @@ public class XMPSchemaAdapter {
* Parses an ISO 8601 date and time value.
* @param dt the date and time value as an ISO 8601 string
* @return the parsed date/time
- * @todo Parse formats other than yyyy-mm-ddThh:mm:ssZ
*/
public static Date parseISO8601Date(final String dt) {
+ //TODO Parse formats other than yyyy-mm-ddThh:mm:ssZ
int offset = 0;
String parsablePart;
if (dt.endsWith("Z")) {
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaRegistry.java?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaRegistry.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/xmp/XMPSchemaRegistry.java Thu Sep 9 10:02:17 2010
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.xmlgraphics.xmp.schemas.DublinCoreSchema;
import org.apache.xmlgraphics.xmp.schemas.XMPBasicSchema;
import org.apache.xmlgraphics.xmp.schemas.pdf.AdobePDFSchema;
-import org.apache.xmlgraphics.xmp.schemas.pdf.PDFAOldXMPSchema;
import org.apache.xmlgraphics.xmp.schemas.pdf.PDFAXMPSchema;
/**
@@ -51,7 +50,6 @@ public class XMPSchemaRegistry {
private void init() {
addSchema(new DublinCoreSchema());
addSchema(new PDFAXMPSchema());
- addSchema(new PDFAOldXMPSchema());
addSchema(new XMPBasicSchema());
addSchema(new AdobePDFSchema());
}
Modified: xmlgraphics/commons/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/status.xml?rev=995366&r1=995365&r2=995366&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/status.xml (original)
+++ xmlgraphics/commons/trunk/status.xml Thu Sep 9 10:02:17 2010
@@ -40,6 +40,12 @@
</contexts>
<changes>
<release version="Trunk" date="n/a">
+ <action context="Code" dev="JM" type="remove">
+ Removal of the deprecated <code>TextHandler.drawString(String, float, float)</code> method.
+ </action>
+ <action context="Code" dev="JM" type="update" fixes-bug="49703" due-to="Glenn Adams">
+ Various code style fixes
+ </action>
<action context="Code" dev="JM" type="fix" fixes-bug="49696" due-to="Joshua Marquart">
Allow to override priority when registering an ImageWriter on the ImageWriterRegistry.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org