You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by sp...@apache.org on 2007/09/25 16:31:37 UTC
svn commit: r579260 [6/11] - in
/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./
src/documentation/content/xdocs/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inline/
src/java/org/apache/fop/...
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/LazyFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/LazyFont.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/LazyFont.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/LazyFont.java Tue Sep 25 07:31:06 2007
@@ -49,9 +49,7 @@
/**
* Main constructor
- * @param fontEmbedPath path to embeddable file (may be null)
- * @param metricsFileName path to the metrics XML file
- * @param useKerning True, if kerning should be enabled
+ * @param fontInfo the font info to embed
* @param resolver the font resolver to handle font URIs
*/
public LazyFont(EmbedFontInfo fontInfo, FontResolver resolver) {
@@ -150,7 +148,7 @@
// ---- Font ----
/**
- * @see org.apache.fop.fonts.Typeface#getEncoding()
+ * {@inheritDoc}
*/
public String getEncoding() {
load(true);
@@ -158,7 +156,7 @@
}
/**
- * @see org.apache.fop.fonts.Typeface#mapChar(char)
+ * {@inheritDoc}
*/
public char mapChar(char c) {
load(true);
@@ -166,7 +164,7 @@
}
/**
- * @see org.apache.fop.fonts.Typeface#hasChar(char)
+ * {@inheritDoc}
*/
public boolean hasChar(char c) {
load(true);
@@ -174,7 +172,7 @@
}
/**
- * @see org.apache.fop.fonts.Typeface#isMultiByte()
+ * {@inheritDoc}
*/
public boolean isMultiByte() {
load(true);
@@ -183,7 +181,7 @@
// ---- FontMetrics interface ----
/**
- * @see org.apache.fop.fonts.FontMetrics#getFontName()
+ * {@inheritDoc}
*/
public String getFontName() {
load(true);
@@ -191,7 +189,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getMaxAscent(int)
+ * {@inheritDoc}
*/
public int getMaxAscent(int size) {
load(true);
@@ -199,7 +197,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getAscender(int)
+ * {@inheritDoc}
*/
public int getAscender(int size) {
load(true);
@@ -207,7 +205,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getCapHeight(int)
+ * {@inheritDoc}
*/
public int getCapHeight(int size) {
load(true);
@@ -215,7 +213,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getDescender(int)
+ * {@inheritDoc}
*/
public int getDescender(int size) {
load(true);
@@ -223,7 +221,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getXHeight(int)
+ * {@inheritDoc}
*/
public int getXHeight(int size) {
load(true);
@@ -231,7 +229,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getWidth(int, int)
+ * {@inheritDoc}
*/
public int getWidth(int i, int size) {
load(true);
@@ -239,7 +237,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getWidths()
+ * {@inheritDoc}
*/
public int[] getWidths() {
load(true);
@@ -247,7 +245,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#hasKerningInfo()
+ * {@inheritDoc}
*/
public boolean hasKerningInfo() {
load(true);
@@ -255,7 +253,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getKerningInfo()
+ * {@inheritDoc}
*/
public Map getKerningInfo() {
load(true);
@@ -264,7 +262,7 @@
// ---- FontDescriptor interface ----
/**
- * @see org.apache.fop.fonts.FontDescriptor#getCapHeight()
+ * {@inheritDoc}
*/
public int getCapHeight() {
load(true);
@@ -272,7 +270,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#getDescender()
+ * {@inheritDoc}
*/
public int getDescender() {
load(true);
@@ -280,7 +278,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#getAscender()
+ * {@inheritDoc}
*/
public int getAscender() {
load(true);
@@ -288,7 +286,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#getFlags()
+ * {@inheritDoc}
*/
public int getFlags() {
load(true);
@@ -296,7 +294,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#getFontBBox()
+ * {@inheritDoc}
*/
public int[] getFontBBox() {
load(true);
@@ -304,7 +302,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#getItalicAngle()
+ * {@inheritDoc}
*/
public int getItalicAngle() {
load(true);
@@ -312,7 +310,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#getStemV()
+ * {@inheritDoc}
*/
public int getStemV() {
load(true);
@@ -320,7 +318,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#getFontType()
+ * {@inheritDoc}
*/
public FontType getFontType() {
load(true);
@@ -328,7 +326,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#isEmbeddable()
+ * {@inheritDoc}
*/
public boolean isEmbeddable() {
load(true);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/MultiByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/MultiByteFont.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/MultiByteFont.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/MultiByteFont.java Tue Sep 25 07:31:06 2007
@@ -67,35 +67,35 @@
}
/**
- * @see org.apache.fop.fonts.CIDFont#getDefaultWidth()
+ * {@inheritDoc}
*/
public int getDefaultWidth() {
return defaultWidth;
}
/**
- * @see org.apache.fop.fonts.CIDFont#getRegistry()
+ * {@inheritDoc}
*/
public String getRegistry() {
return "Adobe";
}
/**
- * @see org.apache.fop.fonts.CIDFont#getOrdering()
+ * {@inheritDoc}
*/
public String getOrdering() {
return "UCS";
}
/**
- * @see org.apache.fop.fonts.CIDFont#getSupplement()
+ * {@inheritDoc}
*/
public int getSupplement() {
return 0;
}
/**
- * @see org.apache.fop.fonts.CIDFont#getCIDType()
+ * {@inheritDoc}
*/
public CIDFontType getCIDType() {
return cidType;
@@ -114,7 +114,7 @@
}
/**
- * @see org.apache.fop.fonts.CIDFont#getCidBaseFont()
+ * {@inheritDoc}
*/
public String getCidBaseFont() {
if (isEmbeddable()) {
@@ -125,21 +125,21 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#isEmbeddable()
+ * {@inheritDoc}
*/
public boolean isEmbeddable() {
return !(getEmbedFileName() == null && getEmbedResourceName() == null);
}
/**
- * @see org.apache.fop.fonts.Typeface#getEncoding()
+ * {@inheritDoc}
*/
public String getEncoding() {
return encoding;
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getFontName()
+ * {@inheritDoc}
*/
public String getFontName() {
if (isEmbeddable()) {
@@ -150,7 +150,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getWidth(int, int)
+ * {@inheritDoc}
*/
public int getWidth(int i, int size) {
if (isEmbeddable()) {
@@ -162,7 +162,7 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getWidths()
+ * {@inheritDoc}
*/
public int[] getWidths() {
int[] arr = new int[width.length];
@@ -211,7 +211,7 @@
}
/**
- * @see org.apache.fop.fonts.Typeface#mapChar(char)
+ * {@inheritDoc}
*/
public char mapChar(char c) {
int retIdx = findGlyphIndex(c);
@@ -238,7 +238,7 @@
}
/**
- * @see org.apache.fop.fonts.Typeface#hasChar(char)
+ * {@inheritDoc}
*/
public boolean hasChar(char c) {
return (findGlyphIndex(c) > 0);
@@ -308,7 +308,7 @@
* that need to return an invalid character. */
public static final char INVALID_UNICODE_CHAR = 0xFFFF;
- /** @see org.apache.fop.fonts.CIDFont#getCharsUsed() */
+ /** {@inheritDoc} */
public char[] getCharsUsed() {
if (!isEmbeddable()) {
return null;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/SingleByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/SingleByteFont.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/SingleByteFont.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/SingleByteFont.java Tue Sep 25 07:31:06 2007
@@ -19,11 +19,17 @@
package org.apache.fop.fonts;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Generic SingleByte font
*/
public class SingleByteFont extends CustomFont {
+ /** logger */
+ private static Log log = LogFactory.getLog(SingleByteFont.class);
+
private CodePointMapping mapping;
private String encoding = "WinAnsiEncoding";
@@ -45,7 +51,7 @@
}
/**
- * @see org.apache.fop.fonts.FontDescriptor#isEmbeddable()
+ * {@inheritDoc}
*/
public boolean isEmbeddable() {
return (getEmbedFileName() == null && getEmbedResourceName() == null) ? false
@@ -53,7 +59,7 @@
}
/**
- * @see org.apache.fop.fonts.Typeface#getEncoding()
+ * {@inheritDoc}
*/
public String getEncoding() {
return encoding;
@@ -69,14 +75,14 @@
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getWidth(int, int)
+ * {@inheritDoc}
*/
public int getWidth(int i, int size) {
return size * width[i];
}
/**
- * @see org.apache.fop.fonts.FontMetrics#getWidths()
+ * {@inheritDoc}
*/
public int[] getWidths() {
int[] arr = new int[width.length];
@@ -85,19 +91,21 @@
}
/**
- * @see org.apache.fop.fonts.Typeface#mapChar(char)
+ * {@inheritDoc}
*/
public char mapChar(char c) {
char d = mapping.mapChar(c);
if (d != 0) {
return d;
} else {
+ log.warn("Glyph " + (int) c + " not available in font "
+ + getFontName());
return '#';
}
}
/**
- * @see org.apache.fop.fonts.Typeface#hasChar(char)
+ * {@inheritDoc}
*/
public boolean hasChar(char c) {
return (mapping.mapChar(c) > 0);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/Typeface.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/Typeface.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/Typeface.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/Typeface.java Tue Sep 25 07:31:06 2007
@@ -55,7 +55,7 @@
return false;
}
- /** @see org.apache.fop.fonts.FontMetrics#getMaxAscent(int) */
+ /** {@inheritDoc} */
public int getMaxAscent(int size) {
return getAscender(size);
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java Tue Sep 25 07:31:06 2007
@@ -86,7 +86,7 @@
* @param depth recursion depth
* @param results collection
* @return whether directory should be handled
- * @see org.apache.commons.io.DirectoryWalker#handleDirectory(File, int, Collection)
+ * {@inheritDoc}
*/
protected boolean handleDirectory(File directory, int depth, Collection results) {
return true;
@@ -96,7 +96,7 @@
* @param file file to handle
* @param depth recursion depth
* @param results collection
- * @see org.apache.commons.io.DirectoryWalker#handleFile(File, int, Collection)
+ * {@inheritDoc}
*/
protected void handleFile(File file, int depth, Collection results) {
results.add(file);
@@ -106,7 +106,7 @@
* @param directory the directory being processed
* @param depth the current directory level
* @param results the colleciton of results objects
- * @see org.apache.commons.io.DirectoryWalker.handleDirectoryEnd
+ * {@inheritDoc}
*/
protected void handleDirectoryEnd(File directory, int depth, Collection results) {
if (log.isDebugEnabled()) {
@@ -120,7 +120,7 @@
*
* @return list of font files
* @throws IOException io exception
- * @see org.apache.fop.fonts.autodetect.FontFinder#find()
+ * {@inheritDoc}
*/
public List find() throws IOException {
final FontFinder fontDirFinder;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java Tue Sep 25 07:31:06 2007
@@ -30,7 +30,7 @@
/**
* Generic method used by Mac and Unix font finders.
* @return list of natively existing font directories
- * @see FontFinder#find()
+ * {@inheritDoc}
*/
public List find() {
List fontDirList = new java.util.ArrayList();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java Tue Sep 25 07:31:06 2007
@@ -48,7 +48,7 @@
}
/**
- * @see FontFinder#find()
+ * {@inheritDoc}
* @return a list of detected font files
*/
public List find() {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java Tue Sep 25 07:31:06 2007
@@ -42,7 +42,7 @@
}
/**
- * @see java.lang.Object#equals(Object)
+ * {@inheritDoc}
*/
public boolean equals(Object o) {
if (o instanceof TTFCmapEntry) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFile.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFile.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFile.java Tue Sep 25 07:31:06 2007
@@ -20,7 +20,6 @@
package org.apache.fop.fonts.truetype;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.List;
@@ -110,8 +109,8 @@
// internal mapping of glyph indexes to unicode indexes
// used for quick mappings in this class
- private Map glyphToUnicodeMap = new HashMap();
- private Map unicodeToGlyphMap = new HashMap();
+ private Map glyphToUnicodeMap = new java.util.HashMap();
+ private Map unicodeToGlyphMap = new java.util.HashMap();
private TTFDirTabEntry currentDirTab;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java Tue Sep 25 07:31:06 2007
@@ -49,7 +49,7 @@
}
/**
- * @see FontLoader#read()
+ * {@inheritDoc}
*/
protected void read() throws IOException {
TTFFile ttf = new TTFFile();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/PFBData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/PFBData.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/PFBData.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/PFBData.java Tue Sep 25 07:31:06 2007
@@ -149,7 +149,7 @@
/**
- * @see java.lang.Object#toString()
+ * {@inheritDoc}
*/
public String toString() {
return "PFB: format=" + getPFBFormat()
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java Tue Sep 25 07:31:06 2007
@@ -48,7 +48,7 @@
}
/**
- * @see FontLoader#read()
+ * {@inheritDoc}
*/
protected void read() throws IOException {
pfm = new PFMFile();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/hyphenation/PatternParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/hyphenation/PatternParser.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/hyphenation/PatternParser.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/hyphenation/PatternParser.java Tue Sep 25 07:31:06 2007
@@ -254,7 +254,7 @@
//
/**
- * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+ * {@inheritDoc}
*/
public void startElement(String uri, String local, String raw,
Attributes attrs) {
@@ -283,7 +283,7 @@
}
/**
- * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
+ * {@inheritDoc}
*/
public void endElement(String uri, String local, String raw) {
@@ -320,7 +320,7 @@
}
/**
- * @see org.xml.sax.ContentHandler#characters(char[], int, int)
+ * {@inheritDoc}
*/
public void characters(char ch[], int start, int length) {
StringBuffer chars = new StringBuffer(length);
@@ -354,7 +354,7 @@
//
/**
- * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
+ * {@inheritDoc}
*/
public void warning(SAXParseException ex) {
errMsg = "[Warning] " + getLocationString(ex) + ": "
@@ -362,14 +362,14 @@
}
/**
- * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
+ * {@inheritDoc}
*/
public void error(SAXParseException ex) {
errMsg = "[Error] " + getLocationString(ex) + ": " + ex.getMessage();
}
/**
- * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
+ * {@inheritDoc}
*/
public void fatalError(SAXParseException ex) throws SAXException {
errMsg = "[Fatal Error] " + getLocationString(ex) + ": "
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/AbstractFopImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/AbstractFopImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/AbstractFopImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/AbstractFopImage.java Tue Sep 25 07:31:06 2007
@@ -29,11 +29,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.datatypes.Length;
/**
* Base class to implement the FopImage interface.
- * @author Eric SCHAEFFER
- * @author Modified by Eric Dalquist - 9/14/2001 - ebdalqui@mtu.edu
+ *
* @see FopImage
*/
public abstract class AbstractFopImage implements FopImage {
@@ -140,7 +140,7 @@
return imageInfo.mimeType;
}
- /** @see org.apache.fop.image.FopImage#getOriginalURI() */
+ /** {@inheritDoc} */
public String getOriginalURI() {
return this.imageInfo.originalURI;
}
@@ -248,22 +248,27 @@
return this.height;
}
- /** @see org.apache.fop.image.FopImage#getIntrinsicWidth() */
+ /** {@inheritDoc} */
public int getIntrinsicWidth() {
return (int)(getWidth() * 72000 / getHorizontalResolution());
}
- /** @see org.apache.fop.image.FopImage#getIntrinsicHeight() */
+ /** {@inheritDoc} */
public int getIntrinsicHeight() {
return (int)(getHeight() * 72000 / getVerticalResolution());
}
+
+ /** {@inheritDoc} */
+ public Length getIntrinsicAlignmentAdjust() {
+ return this.imageInfo.alignmentAdjust;
+ }
- /** @see org.apache.fop.image.FopImage#getHorizontalResolution() */
+ /** {@inheritDoc} */
public double getHorizontalResolution() {
return this.dpiHorizontal;
}
- /** @see org.apache.fop.image.FopImage#getVerticalResolution() */
+ /** {@inheritDoc} */
public double getVerticalResolution() {
return this.dpiVertical;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/BmpImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/BmpImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/BmpImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/BmpImage.java Tue Sep 25 07:31:06 2007
@@ -29,7 +29,6 @@
* Bitmap image.
* This supports loading a bitmap image into bitmap data.
*
- * @author Art WELCH
* @see AbstractFopImage
* @see FopImage
*/
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/EmfImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/EmfImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/EmfImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/EmfImage.java Tue Sep 25 07:31:06 2007
@@ -19,13 +19,10 @@
package org.apache.fop.image;
-import org.apache.commons.io.IOUtils;
-
/**
* Enhanced metafile image.
* This supports loading a EMF image.
*
- * @author Peter Herweg
* @see AbstractFopImage
* @see FopImage
*/
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImage.java Tue Sep 25 07:31:06 2007
@@ -24,10 +24,10 @@
import java.awt.color.ICC_Profile;
import java.awt.Color;
+import org.apache.fop.datatypes.Length;
+
/**
* Fop image interface for loading images.
- *
- * @author Eric SCHAEFFER
*/
public interface FopImage {
/**
@@ -90,6 +90,12 @@
int getIntrinsicHeight();
/**
+ * @return the intrinsic alignment-adjust value or NULL if the image does
+ * not have one.
+ */
+ Length getIntrinsicAlignmentAdjust();
+
+ /**
* @return the horizontal bitmap resolution (in dpi)
*/
double getHorizontalResolution();
@@ -193,6 +199,8 @@
public String mimeType;
/** implementation-specific String (ex. the namespace for XML-based images) */
public String str;
+ /** intrinsic alignment-adjust or null if there is none */
+ public Length alignmentAdjust;
}
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImageConsumer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImageConsumer.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImageConsumer.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/FopImageConsumer.java Tue Sep 25 07:31:06 2007
@@ -28,7 +28,6 @@
/**
* ImageConsumer implementation for FopImage classes.
- * @author Eric SCHAEFFER
*/
public class FopImageConsumer implements ImageConsumer {
@@ -56,7 +55,7 @@
}
/**
- * @see java.awt.image.ImageConsumer#imageComplete(int)
+ * {@inheritDoc}
*/
public void imageComplete(int status) {
/*
@@ -91,7 +90,7 @@
}
/**
- * @see java.awt.image.ImageConsumer#setColorModel(ColorModel)
+ * {@inheritDoc}
*/
public void setColorModel(ColorModel model) {
// log.error("setColorModel: " + model);
@@ -99,7 +98,7 @@
}
/**
- * @see java.awt.image.ImageConsumer#setDimensions(int, int)
+ * {@inheritDoc}
*/
public void setDimensions(int width, int height) {
// log.error("setDimension: w=" + width + " h=" + height);
@@ -108,7 +107,7 @@
}
/**
- * @see java.awt.image.ImageConsumer#setHints(int)
+ * {@inheritDoc}
*/
public void setHints(int hintflags) {
// log.error("setHints: " + hintflags);
@@ -116,7 +115,7 @@
}
/**
- * @see java.awt.image.ImageConsumer#setProperties(Hashtable)
+ * {@inheritDoc}
*/
public void setProperties(Hashtable props) {
// log.error("setProperties: " + props);
@@ -124,14 +123,14 @@
}
/**
- * @see java.awt.image.ImageConsumer#setPixels(int, int, int, int, ColorModel, byte[], int, int)
+ * {@inheritDoc}
*/
public void setPixels(int x, int y, int w, int h, ColorModel model,
byte[] pixels, int off, int scansize) {
}
/**
- * @see java.awt.image.ImageConsumer#setPixels(int, int, int, int, ColorModel, int[], int, int)
+ * {@inheritDoc}
*/
public void setPixels(int x, int y, int w, int h, ColorModel model,
int[] pixels, int off, int scansize) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/GifImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/GifImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/GifImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/GifImage.java Tue Sep 25 07:31:06 2007
@@ -33,8 +33,7 @@
/**
* FopImage object for GIF images, using Java native classes.
- * @author Eric SCHAEFFER
- * @author Modified by Eric Dalquist - 9/14/2001 - ebdalqui@mtu.edu
+ *
* @see AbstractFopImage
* @see FopImage
*/
@@ -166,7 +165,7 @@
return true;
}
- /** @see org.apache.fop.image.AbstractFopImage#loadOriginalData() */
+ /** {@inheritDoc} */
protected boolean loadOriginalData() {
return loadDefaultOriginalData();
}
@@ -183,28 +182,28 @@
}
/**
- * @see java.net.URLConnection#getInputStream()
+ * {@inheritDoc}
*/
public InputStream getInputStream() throws IOException {
return inputStream;
}
/**
- * @see java.net.URLConnection#connect()
+ * {@inheritDoc}
*/
public void connect() throws IOException {
// do nothing
}
/**
- * @see java.net.URLConnection#getContentType()
+ * {@inheritDoc}
*/
public String getContentType() {
return "image/gif";
}
/**
- * @see java.net.URLConnection#getContentLength()
+ * {@inheritDoc}
*/
public int getContentLength() {
try {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/ImageFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/ImageFactory.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/ImageFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/ImageFactory.java Tue Sep 25 07:31:06 2007
@@ -339,7 +339,7 @@
// do nothing
}
- /** @see org.apache.fop.image.ImageCache#clearAll() */
+ /** {@inheritDoc} */
public void clearAll() {
invalid.clear();
}
@@ -549,7 +549,7 @@
}
- /** @see org.apache.fop.image.ImageCache#clearAll() */
+ /** {@inheritDoc} */
public void clearAll() {
this.refStore.clear();
this.invalid.clear();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JAIImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JAIImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JAIImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JAIImage.java Tue Sep 25 07:31:06 2007
@@ -35,7 +35,7 @@
/**
* FopImage object using JAI.
- * @author Eric SCHAEFFER
+ *
* @see AbstractFopImage
* @see FopImage
*/
@@ -51,7 +51,7 @@
}
/**
- * @see org.apache.fop.image.AbstractFopImage#loadDimensions()
+ * {@inheritDoc}
*/
protected boolean loadDimensions() {
if (this.bitmaps == null) {
@@ -61,7 +61,7 @@
}
/**
- * @see org.apache.fop.image.AbstractFopImage#loadBitmap()
+ * {@inheritDoc}
*/
protected boolean loadBitmap() {
if (this.bitmaps == null) {
@@ -185,7 +185,7 @@
}
}
- /** @see org.apache.fop.image.AbstractFopImage#loadOriginalData() */
+ /** {@inheritDoc} */
protected boolean loadOriginalData() {
return loadDefaultOriginalData();
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JimiImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JimiImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JimiImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JimiImage.java Tue Sep 25 07:31:06 2007
@@ -34,7 +34,7 @@
/**
* FopImage object for several images types, using Jimi.
* See Jimi documentation for supported image types.
- * @author Eric SCHAEFFER
+ *
* @see AbstractFopImage
* @see FopImage
*/
@@ -50,7 +50,7 @@
}
/**
- * @see org.apache.fop.image.AbstractFopImage#loadDimensions()
+ * {@inheritDoc}
*/
protected boolean loadDimensions() {
if (this.bitmaps == null) {
@@ -61,7 +61,7 @@
}
/**
- * @see org.apache.fop.image.AbstractFopImage#loadBitmap()
+ * {@inheritDoc}
*/
protected boolean loadBitmap() {
if (this.bitmaps == null) {
@@ -177,7 +177,7 @@
}
}
- /** @see org.apache.fop.image.AbstractFopImage#loadOriginalData() */
+ /** {@inheritDoc} */
protected boolean loadOriginalData() {
return loadDefaultOriginalData();
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JpegImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JpegImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JpegImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/JpegImage.java Tue Sep 25 07:31:06 2007
@@ -30,7 +30,7 @@
/**
* FopImage object for JPEG images, Using Java native classes.
- * @author Eric Dalquist
+ *
* @see AbstractFopImage
* @see FopImage
*/
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/PNGImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/PNGImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/PNGImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/PNGImage.java Tue Sep 25 07:31:06 2007
@@ -29,7 +29,7 @@
/**
* FopImage object using PNG
- * @author Eric SCHAEFFER
+ *
* @see AbstractFopImage
* @see FopImage
*/
@@ -45,8 +45,7 @@
}
/**
- * @see org.apache.fop.image.XmlGraphicsCommonsImage#decodeImage(
- * org.apache.xmlgraphics.image.codec.util.SeekableStream)
+ * {@inheritDoc}
*/
protected CachableRed decodeImage(SeekableStream stream) throws IOException {
PNGDecodeParam param = new PNGDecodeParam();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/TIFFImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/TIFFImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/TIFFImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/TIFFImage.java Tue Sep 25 07:31:06 2007
@@ -65,7 +65,7 @@
}
/**
- * @see org.apache.fop.image.XmlGraphicsCommonsImage#decodeImage(
+ * {@inheritDoc}
* org.apache.xmlgraphics.image.codec.util.SeekableStream)
*/
protected CachableRed decodeImage(SeekableStream stream) throws IOException {
@@ -128,7 +128,7 @@
* This loads only strip 1 of the original TIFF data.
*
* @return true if loaded false for any error
- * @see org.apache.fop.image.AbstractFopImage#loadOriginalData()
+ * {@inheritDoc}
*/
protected boolean loadOriginalData() {
if (loadDimensions()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java Tue Sep 25 07:31:06 2007
@@ -38,6 +38,7 @@
/**
* Abstract FopImage implementation which uses the internal codecs from XML Graphics Commons.
+ *
* @see AbstractFopImage
* @see FopImage
*/
@@ -64,7 +65,7 @@
}
/**
- * @see org.apache.fop.image.AbstractFopImage#loadDimensions()
+ * {@inheritDoc}
*/
protected boolean loadDimensions() {
if (seekableInput == null && inputStream != null) {
@@ -128,7 +129,7 @@
}
/**
- * @see org.apache.fop.image.AbstractFopImage#loadBitmap()
+ * {@inheritDoc}
*/
protected boolean loadBitmap() {
if (this.bitmaps == null) {
@@ -139,7 +140,7 @@
}
/**
- * @see org.apache.fop.image.FopImage#hasSoftMask()
+ * {@inheritDoc}
*/
public boolean hasSoftMask() {
if (this.bitmaps == null && this.raw == null) {
@@ -150,7 +151,7 @@
}
/**
- * @see org.apache.fop.image.FopImage#getSoftMask()
+ * {@inheritDoc}
*/
public byte[] getSoftMask() {
if (this.bitmaps == null) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/BMPReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/BMPReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/BMPReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/BMPReader.java Tue Sep 25 07:31:06 2007
@@ -47,7 +47,7 @@
/** offset to vertical res */
private static final int VRES_OFFSET = 42;
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream bis,
FOUserAgent ua) throws IOException {
byte[] header = getDefaultHeader(bis);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EMFReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EMFReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EMFReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EMFReader.java Tue Sep 25 07:31:06 2007
@@ -52,7 +52,7 @@
/** offset to vertical resolution in mm */
private static final int VRES_MM_OFFSET = 84;
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream bis,
FOUserAgent ua) throws IOException {
byte[] header = getDefaultHeader(bis);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EPSReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EPSReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EPSReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/EPSReader.java Tue Sep 25 07:31:06 2007
@@ -42,7 +42,7 @@
//private static final byte[] HIRESBOUNDINGBOX = "%%HiResBoundingBox: ".getBytes();
//TODO Implement HiResBoundingBox, ImageInfo probably needs some changes for that
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream bis,
FOUserAgent ua) throws IOException {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/GIFReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/GIFReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/GIFReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/GIFReader.java Tue Sep 25 07:31:06 2007
@@ -37,7 +37,7 @@
private static final int GIF_SIG_LENGTH = 10;
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream bis,
FOUserAgent ua) throws IOException {
byte[] header = getDefaultHeader(bis);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/JPEGReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/JPEGReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/JPEGReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/JPEGReader.java Tue Sep 25 07:31:06 2007
@@ -54,7 +54,7 @@
private static final int SOI = 0xd8; // start of Image
private static final int JPG_SIG_LENGTH = 2;
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream fis,
FOUserAgent ua) throws IOException {
byte[] header = getDefaultHeader(fis);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/PNGReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/PNGReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/PNGReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/PNGReader.java Tue Sep 25 07:31:06 2007
@@ -37,7 +37,7 @@
private static final int PNG_SIG_LENGTH = 24;
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream bis,
FOUserAgent ua) throws IOException {
byte[] header = getDefaultHeader(bis);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/SVGReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/SVGReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/SVGReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/SVGReader.java Tue Sep 25 07:31:06 2007
@@ -58,7 +58,7 @@
private boolean batik = true;
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream fis,
FOUserAgent ua) throws IOException {
FopImage.ImageInfo info = loadImage(uri, fis, ua);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/TIFFReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/TIFFReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/TIFFReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/TIFFReader.java Tue Sep 25 07:31:06 2007
@@ -37,7 +37,7 @@
private static final int TIFF_SIG_LENGTH = 8;
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream bis,
FOUserAgent ua) throws IOException {
byte[] header = getDefaultHeader(bis);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/XMLReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/XMLReader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/XMLReader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/XMLReader.java Tue Sep 25 07:31:06 2007
@@ -59,7 +59,7 @@
converters.put(ns, conv);
}
- /** @see org.apache.fop.image.analyser.ImageReader */
+ /** {@inheritDoc} */
public FopImage.ImageInfo verifySignature(String uri, InputStream fis,
FOUserAgent ua)
throws IOException {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -70,7 +70,7 @@
// --------- Property Resolution related functions --------- //
/**
- * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
if (fobj == this.fobj) {
@@ -204,9 +204,7 @@
}
/**
- * Returns the IPD of the content area
- * @return the IPD of the content area
- * @see LayoutManager#getContentAreaIPD
+ * {@inheritDoc}
*/
public int getContentAreaIPD() {
log.error("getContentAreaIPD called when it should have been overwritten");
@@ -214,9 +212,7 @@
}
/**
- * Returns the BPD of the content area
- * @return the BPD of the content area
- * @see LayoutManager#getContentAreaBPD
+ * {@inheritDoc}
*/
public int getContentAreaBPD() {
log.error("getContentAreaBPD called when it should have been overwritten");
@@ -224,7 +220,7 @@
}
/**
- * @see LayoutManager#getGeneratesReferenceArea
+ * {@inheritDoc}
*/
public boolean getGeneratesReferenceArea() {
return generatesReferenceArea;
@@ -241,7 +237,7 @@
}
/**
- * @see LayoutManager#getGeneratesBlockArea
+ * {@inheritDoc}
*/
public boolean getGeneratesBlockArea() {
return generatesBlockArea;
@@ -257,14 +253,14 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesLineArea
+ * {@inheritDoc}
*/
public boolean getGeneratesLineArea() {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getFObj
+ * {@inheritDoc}
*/
public FObj getFObj() {
return fobj;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -86,17 +86,17 @@
childLMiter = new LMiter(this);
}
- /** @see LayoutManager#setParent(LayoutManager) */
+ /** {@inheritDoc} */
public void setParent(LayoutManager lm) {
this.parentLM = lm;
}
- /** @see LayoutManager#getParent */
+ /** {@inheritDoc} */
public LayoutManager getParent() {
return this.parentLM;
}
- /** @see LayoutManager#initialize */
+ /** {@inheritDoc} */
public void initialize() {
// Empty
}
@@ -160,7 +160,7 @@
}
}
- /** @see LayoutManager#resetPosition(Position) */
+ /** {@inheritDoc} */
public void resetPosition(Position resetPos) {
// if (resetPos == null) {
// reset(null);
@@ -185,15 +185,13 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addAreas(
- * org.apache.fop.layoutmgr.PositionIterator
- * , org.apache.fop.layoutmgr.LayoutContext)
+ * {@inheritDoc}
*/
public void addAreas(PositionIterator posIter, LayoutContext context) {
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int)
+ * {@inheritDoc}
*/
public LinkedList getNextKnuthElements(LayoutContext context,
int alignment) {
@@ -203,7 +201,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(List, int)
+ * {@inheritDoc}
*/
public LinkedList getChangedKnuthElements(List oldList,
int alignment) {
@@ -265,14 +263,14 @@
}
/**
- * @see org.apache.fop.layoutmgr.PageSequenceLayoutManager#getPSLM
+ * {@inheritDoc}
*/
public PageSequenceLayoutManager getPSLM() {
return parentLM.getPSLM();
}
/**
- * @see org.apache.fop.layoutmgr.PageSequenceLayoutManager#getCurrentPage
+ * @see PageSequenceLayoutManager#getCurrentPage()
*/
public Page getCurrentPage() {
return getPSLM().getCurrentPage();
@@ -284,7 +282,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs
+ * {@inheritDoc}
*/
public boolean createNextChildLMs(int pos) {
List newLMs = createChildLMs(pos + 1 - childLMs.size());
@@ -293,7 +291,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChildLMs
+ * {@inheritDoc}
*/
public List getChildLMs() {
if (childLMs == null) {
@@ -303,7 +301,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildLM
+ * {@inheritDoc}
*/
public void addChildLM(LayoutManager lm) {
if (lm == null) {
@@ -319,7 +317,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildLMs
+ * {@inheritDoc}
*/
public void addChildLMs(List newLMs) {
if (newLMs == null || newLMs.size() == 0) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java Tue Sep 25 07:31:06 2007
@@ -36,7 +36,7 @@
private int idealPartLen;
public BalancingColumnBreakingAlgorithm(LayoutManager topLevelLM,
- PageProvider pageProvider,
+ PageProvider pageProvider,
PageBreakingLayoutListener layoutListener,
int alignment, int alignmentLast,
MinOptMax footnoteSeparatorLength,
@@ -49,7 +49,7 @@
this.considerTooShort = true; //This is important!
}
- /** @see org.apache.fop.layoutmgr.BreakingAlgorithm */
+ /** {@inheritDoc} */
protected double computeDemerits(KnuthNode activeNode,
KnuthElement element, int fitnessClass, double r) {
double dem = super.computeDemerits(activeNode, element, fitnessClass, r);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -94,7 +94,7 @@
super(node);
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
+ /** {@inheritDoc} */
public void initialize() {
abProps = getBlockContainerFO().getCommonAbsolutePosition();
foBlockSpaceBefore = new SpaceVal(getBlockContainerFO().getCommonMarginBlock()
@@ -179,7 +179,7 @@
return (abProps.absolutePosition == EN_FIXED);
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getContentAreaBPD() */
+ /** {@inheritDoc} */
public int getContentAreaBPD() {
if (autoHeight) {
return -1;
@@ -188,7 +188,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
resetSpaces();
if (isAbsoluteOrFixed()) {
@@ -556,19 +556,19 @@
this.ipd = ipd;
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#observeElementList(java.util.List) */
+ /** {@inheritDoc} */
protected void observeElementList(List elementList) {
ElementListObserver.observe(elementList, "block-container",
bclm.getBlockContainerFO().getId());
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#isPartOverflowRecoveryActivated() */
+ /** {@inheritDoc} */
protected boolean isPartOverflowRecoveryActivated() {
//For block-containers, this must be disabled because of wanted overflow.
return false;
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#isSinglePartFavored() */
+ /** {@inheritDoc} */
protected boolean isSinglePartFavored() {
return true;
}
@@ -674,7 +674,7 @@
return new Point(x, y);
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public void addAreas(PositionIterator parentIter,
LayoutContext layoutContext) {
getParentArea(null);
@@ -862,7 +862,7 @@
* This returns the current block container area
* and creates it if required.
*
- * @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
+ * {@inheritDoc}
*/
public Area getParentArea(Area childArea) {
if (referenceArea == null) {
@@ -933,7 +933,7 @@
/**
* Add the child to the block container.
*
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+ * {@inheritDoc}
*/
public void addChildArea(Area childArea) {
if (referenceArea != null) {
@@ -942,7 +942,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#resetPosition(org.apache.fop.layoutmgr.Position)
+ * {@inheritDoc}
*/
public void resetPosition(Position resetPos) {
if (resetPos == null) {
@@ -952,7 +952,7 @@
/**
* Force current area to be added to parent area.
- * @see org.apache.fop.layoutmgr.BlockStackingLayoutManager#flush()
+ * {@inheritDoc}
*/
protected void flush() {
viewportBlockArea.addBlock(referenceArea, autoHeight);
@@ -973,20 +973,20 @@
}
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager */
+ /** {@inheritDoc} */
public int negotiateBPDAdjustment(int adj, KnuthElement lastElement) {
// TODO Auto-generated method stub
return 0;
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager */
+ /** {@inheritDoc} */
public void discardSpace(KnuthGlue spaceGlue) {
// TODO Auto-generated method stub
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether()
+ * {@inheritDoc}
*/
public boolean mustKeepTogether() {
//TODO Keeps will have to be more sophisticated sooner or later
@@ -999,7 +999,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious()
+ * {@inheritDoc}
*/
public boolean mustKeepWithPrevious() {
return !getBlockContainerFO().getKeepWithPrevious().getWithinPage().isAuto()
@@ -1007,7 +1007,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext()
+ * {@inheritDoc}
*/
public boolean mustKeepWithNext() {
return !getBlockContainerFO().getKeepWithNext().getWithinPage().isAuto()
@@ -1024,20 +1024,20 @@
// --------- Property Resolution related functions --------- //
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesReferenceArea
+ * {@inheritDoc}
*/
public boolean getGeneratesReferenceArea() {
return true;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesBlockArea
+ * {@inheritDoc}
*/
public boolean getGeneratesBlockArea() {
return true;
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifySpace(RelSide side, MinOptMax effectiveLength) {
if (RelSide.BEFORE == side) {
if (log.isDebugEnabled()) {
@@ -1054,7 +1054,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyBorder(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
@@ -1068,7 +1068,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyPadding(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java Tue Sep 25 07:31:06 2007
@@ -44,31 +44,23 @@
super(list);
}
- /* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.KnuthList#isInlineSequence()
- */
+ /** {@inheritDoc} */
public boolean isInlineSequence() {
return false;
}
- /* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.KnuthList#canAppendSequence(org.apache.fop.layoutmgr.KnuthSequence)
- */
+ /** {@inheritDoc} */
public boolean canAppendSequence(KnuthSequence sequence) {
return !sequence.isInlineSequence() && !isClosed;
}
- /* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.KnuthList#appendSequence(org.apache.fop.layoutmgr.KnuthSequence,)
- */
+ /** {@inheritDoc} */
public boolean appendSequence(KnuthSequence sequence) {
// log.debug("Cannot append a sequence without a BreakElement");
return false;
}
- /* (non-Javadoc)
- * @see KnuthList#appendSequence(KnuthSequence, boolean, BreakElement)
- */
+ /** {@inheritDoc} */
public boolean appendSequence(KnuthSequence sequence, boolean keepTogether,
BreakElement breakElement) {
if (!canAppendSequence(sequence)) {
@@ -85,9 +77,7 @@
return true;
}
- /* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.KnuthSequence#endSequence()
- */
+ /** {@inheritDoc} */
public KnuthSequence endSequence() {
isClosed = true;
return this;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -55,7 +55,7 @@
private int lead = 12000;
private Length lineHeight;
private int follow = 2000;
- private int middleShift = 0;
+ //private int middleShift = 0;
private boolean discardBorderBefore;
private boolean discardBorderAfter;
@@ -83,7 +83,7 @@
lead = fs.getAscender();
follow = -fs.getDescender();
- middleShift = -fs.getXHeight() / 2;
+ //middleShift = -fs.getXHeight() / 2;
lineHeight = getBlockFO().getLineHeight().getOptimum(this).getLength();
startIndent = getBlockFO().getCommonMarginBlock().startIndent.getValue(this);
endIndent = getBlockFO().getCommonMarginBlock().endIndent.getValue(this);
@@ -107,7 +107,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.BlockStackingLayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
resetSpaces();
return super.getNextKnuthElements(context, alignment);
@@ -160,7 +160,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs
+ * {@inheritDoc}
*/
public boolean createNextChildLMs(int pos) {
@@ -204,7 +204,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether()
+ * {@inheritDoc}
*/
public boolean mustKeepTogether() {
// TODO Keeps will have to be more sophisticated sooner or later
@@ -219,7 +219,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious()
+ * {@inheritDoc}
*/
public boolean mustKeepWithPrevious() {
return !getBlockFO().getKeepWithPrevious().getWithinPage().isAuto()
@@ -227,7 +227,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext()
+ * {@inheritDoc}
*/
public boolean mustKeepWithNext() {
return !getBlockFO().getKeepWithNext().getWithinPage().isAuto()
@@ -235,7 +235,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addAreas(org.apache.fop.layoutmgr.PositionIterator, org.apache.fop.layoutmgr.LayoutContext)
+ * {@inheritDoc}
*/
public void addAreas(PositionIterator parentIter,
LayoutContext layoutContext) {
@@ -452,7 +452,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+ * {@inheritDoc}
*/
public void addChildArea(Area childArea) {
if (curBlockArea != null) {
@@ -466,7 +466,7 @@
/**
* Force current area to be added to parent area.
- * @see org.apache.fop.layoutmgr.BlockStackingLayoutManager#flush()
+ * {@inheritDoc}
*/
protected void flush() {
if (curBlockArea != null) {
@@ -478,7 +478,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#resetPosition(org.apache.fop.layoutmgr.Position)
+ * {@inheritDoc}
*/
public void resetPosition(Position resetPos) {
if (resetPos == null) {
@@ -524,13 +524,13 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesBlockArea
+ * {@inheritDoc}
*/
public boolean getGeneratesBlockArea() {
return true;
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifySpace(RelSide side, MinOptMax effectiveLength) {
if (RelSide.BEFORE == side) {
if (log.isDebugEnabled()) {
@@ -547,7 +547,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyBorder(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
@@ -561,7 +561,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyPadding(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -192,6 +192,7 @@
* Determines and sets the content area IPD based on available reference area IPD, start- and
* end-indent properties.
* end-indent is adjusted based on overconstrained geometry rules, if necessary.
+ *
* @return the resulting content area IPD
*/
protected int updateContentAreaIPDwithOverconstrainedAdjust() {
@@ -210,6 +211,7 @@
/**
* Sets the content area IPD by directly supplying the value.
* end-indent is adjusted based on overconstrained geometry rules, if necessary.
+ *
* @return the resulting content area IPD
*/
protected int updateContentAreaIPDwithOverconstrainedAdjust(int contentIPD) {
@@ -224,7 +226,7 @@
}
/**
- * @see LayoutManager#getNextKnuthElements(LayoutContext, int)
+ * {@inheritDoc}
*/
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
//log.debug("BLM.getNextKnuthElements> keep-together = "
@@ -400,7 +402,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#negotiateBPDAdjustment(int, org.apache.fop.layoutmgr.KnuthElement)
+ * {@inheritDoc}
*/
public int negotiateBPDAdjustment(int adj, KnuthElement lastElement) {
/*LF*/ //log.debug(" BLM.negotiateBPDAdjustment> " + adj);
@@ -483,7 +485,7 @@
}
/**
- * @see BlockLevelLayoutManager#discardSpace(KnuthGlue)
+ * {@inheritDoc}
*/
public void discardSpace(KnuthGlue spaceGlue) {
//log.debug(" BLM.discardSpace> " + spaceGlue.getPosition().getClass().getName());
@@ -513,7 +515,7 @@
}
/**
- * @see LayoutManager#getChangedKnuthElements(List, int)
+ * {@inheritDoc}
*/
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
/*LF*/ //log.debug("");
@@ -726,7 +728,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether()
+ * {@inheritDoc}
*/
// default action: ask parentLM
public boolean mustKeepTogether() {
@@ -737,14 +739,14 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious()
+ * {@inheritDoc}
*/
public boolean mustKeepWithPrevious() {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext()
+ * {@inheritDoc}
*/
public boolean mustKeepWithNext() {
return false;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderElement.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderElement.java Tue Sep 25 07:31:06 2007
@@ -43,7 +43,7 @@
super(position, condLength, side, isFirst, isLast, context);
}
- /** @see org.apache.fop.layoutmgr.UnresolvedListElementWithLength */
+ /** {@inheritDoc} */
public void notifyLayoutManager(MinOptMax effectiveLength) {
LayoutManager lm = getOriginatingLayoutManager();
if (lm instanceof ConditionalElementListener) {
@@ -55,7 +55,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("Border[");
sb.append(super.toString());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java Tue Sep 25 07:31:06 2007
@@ -45,7 +45,7 @@
condLength.isDiscard(), isFirst, isLast);
}
- /** @see org.apache.fop.layoutmgr.UnresolvedListElementWithLength */
+ /** {@inheritDoc} */
public abstract void notifyLayoutManager(MinOptMax effectiveLength);
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakElement.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakElement.java Tue Sep 25 07:31:06 2007
@@ -62,12 +62,12 @@
this.pendingAfterMarks = context.getPendingAfterMarks();
}
- /** @see org.apache.fop.layoutmgr.UnresolvedListElement#isConditional() */
+ /** {@inheritDoc} */
public boolean isConditional() {
return false; //Does not really apply here
}
- /** @see org.apache.fop.layoutmgr.ListElement#isPenalty() */
+ /** {@inheritDoc} */
/*
public boolean isPenalty() {
return true; //not entirely true but a BreakElement will generate a penalty later
@@ -91,7 +91,7 @@
this.penaltyValue = p;
}
- /** @see org.apache.fop.layoutmgr.ListElement#isForcedBreak() */
+ /** {@inheritDoc} */
public boolean isForcedBreak() {
return penaltyValue == -KnuthElement.INFINITE;
}
@@ -119,7 +119,7 @@
return this.pendingAfterMarks;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("BreakPossibility[p:");
@@ -143,6 +143,8 @@
}
sb.append(")");
}
+ sb.append("; w:");
+ sb.append(penaltyWidth);
sb.append("]");
return sb.toString();
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Tue Sep 25 07:31:06 2007
@@ -151,7 +151,7 @@
protected BestRecords best;
- /** @see #isPartOverflowRecoveryActivated() */
+ /** {@inheritDoc} */
private boolean partOverflowRecoveryActivated = true;
private KnuthNode lastRecovered;
@@ -396,9 +396,10 @@
}
/** @see #findBreakingPoints(KnuthSequence, int, double, boolean, int) */
- public int findBreakingPoints(KnuthSequence par, /*int lineWidth,*/
- double threshold, boolean force,
- int allowedBreaks) {
+ public int findBreakingPoints(KnuthSequence par,
+ double threshold,
+ boolean force,
+ int allowedBreaks) {
return findBreakingPoints(par, 0, threshold, force, allowedBreaks);
}
@@ -412,7 +413,6 @@
* @param allowedBreaks one of ONLY_FORCED_BREAKS, NO_FLAGGED_PENALTIES, ALL_BREAKS
*/
public int findBreakingPoints(KnuthSequence par, int startIndex,
- /*int lineWidth,*/
double threshold, boolean force,
int allowedBreaks) {
this.par = par;
@@ -652,7 +652,7 @@
/** Creates a new active node for a break from the best active node of the given
* fitness class to the element at the given position.
- * @see #createNode(int, int, int, int, int, int, double, int, int, int, double, KnuthNode)
+ * @see #createNode(int, int, int, int, int, int, double, int, int, int, double, org.apache.fop.layoutmgr.BreakingAlgorithm.KnuthNode)
* @see BreakingAlgorithm.BestRecords
*/
protected KnuthNode createNode(int position, int line, int fitness,
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -61,7 +61,7 @@
setParent(pslm);
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
// currently active LM
@@ -169,7 +169,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager
+ * {@inheritDoc}
*/
public int negotiateBPDAdjustment(int adj, KnuthElement lastElement) {
log.debug(" FLM.negotiateBPDAdjustment> " + adj);
@@ -189,7 +189,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager
+ * {@inheritDoc}
*/
public void discardSpace(KnuthGlue spaceGlue) {
log.debug(" FLM.discardSpace> ");
@@ -203,23 +203,23 @@
}
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether() */
+ /** {@inheritDoc} */
public boolean mustKeepTogether() {
return false;
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious() */
+ /** {@inheritDoc} */
public boolean mustKeepWithPrevious() {
return false;
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext() */
+ /** {@inheritDoc} */
public boolean mustKeepWithNext() {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(java.util.List, int)
+ * {@inheritDoc}
*/
public LinkedList getChangedKnuthElements(List oldList, /*int flaggedPenalty,*/ int alignment) {
ListIterator oldListIterator = oldList.listIterator();
@@ -295,7 +295,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addAreas(PositionIterator, LayoutContext)
+ * {@inheritDoc}
*/
public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
AreaAdditionUtil.addAreas(this, parentIter, layoutContext);
@@ -306,7 +306,8 @@
* Add child area to a the correct container, depending on its
* area class. A Flow can fill at most one area container of any class
* at any one time. The actual work is done by BlockStackingLM.
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+ *
+ * @param childArea the area to add
*/
public void addChildArea(Area childArea) {
getParentArea(childArea);
@@ -315,7 +316,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
+ * {@inheritDoc}
*/
public Area getParentArea(Area childArea) {
BlockParent parentArea = null;
@@ -338,7 +339,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#resetPosition(Position)
+ * {@inheritDoc}
*/
public void resetPosition(Position resetPos) {
if (resetPos == null) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -37,7 +37,7 @@
super(body);
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
LayoutManager childLM = null;
LayoutManager lastLM = null;
@@ -80,7 +80,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(org.apache.fop.area.Area) */
+ /** {@inheritDoc} */
public void addChildArea(Area childArea) {
childArea.setAreaClass(Area.CLASS_FOOTNOTE);
parentLM.addChildArea(childArea);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java Tue Sep 25 07:31:06 2007
@@ -58,14 +58,14 @@
}
/* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.KnuthSequence#canAppendSequence(org.apache.fop.layoutmgr.KnuthSequence)
+ * {@inheritDoc}
*/
public boolean canAppendSequence(KnuthSequence sequence) {
return sequence.isInlineSequence() && !isClosed;
}
/* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.KnuthSequence#appendSequence(org.apache.fop.layoutmgr.KnuthSequence)
+ * {@inheritDoc}
*/
public boolean appendSequence(KnuthSequence sequence) {
if (!canAppendSequence(sequence)) {
@@ -84,7 +84,7 @@
}
/* (non-Javadoc)
- * @see KnuthSequence#appendSequence(KnuthSequence, boolean, BreakElement)
+ * {@inheritDoc}
*/
public boolean appendSequence(KnuthSequence sequence, boolean keepTogether,
BreakElement breakElement) {
@@ -93,7 +93,7 @@
/* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.KnuthSequence#endSequence()
+ * {@inheritDoc}
*/
public KnuthSequence endSequence() {
if (!isClosed) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org