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 ss...@apache.org on 2016/09/01 13:02:30 UTC
svn commit: r1758773 [1/2] - in /xmlgraphics/fop/trunk:
fop-core/src/main/codegen/fonts/ fop-core/src/main/java/org/apache/fop/afp/
fop-core/src/main/java/org/apache/fop/afp/fonts/
fop-core/src/main/java/org/apache/fop/area/ fop-core/src/main/java/org/...
Author: ssteiner
Date: Thu Sep 1 13:02:29 2016
New Revision: 1758773
URL: http://svn.apache.org/viewvc?rev=1758773&view=rev
Log:
FOP-2643: Java 9 warnings
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/codegen/fonts/font-file.xsl
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/AFPResourceLevelDefaults.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/fonts/RasterFont.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/Trait.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/CharIterator.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/NumericProperty.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyParser.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/CharacterProperty.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/NumberProperty.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyCache.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDFull.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontCache.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontInfo.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SimpleSingleByteEncoding.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SingleByteFont.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Typeface.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/PFMReader.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMFile.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMParser.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PFMFile.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/TraitSetter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFArray.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFont.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColor.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFDictionary.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFEmbeddedFile.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFontNonBase14.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFormXObject.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFGState.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFImageXObject.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFLink.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFNumber.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPage.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFT1Stream.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/PrintRenderer.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/awt/viewer/Command.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DFontMetrics.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryElement.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFObjectExtension.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderCCITTFax.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSDocumentHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/border/BorderManager.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/text/BidiAttributedCharacterIterator.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/TestConverter.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/XMLUtil.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/memory/MemoryEater.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
xmlgraphics/fop/trunk/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java
xmlgraphics/fop/trunk/fop/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java
Modified: xmlgraphics/fop/trunk/fop-core/src/main/codegen/fonts/font-file.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/codegen/fonts/font-file.xsl?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/codegen/fonts/font-file.xsl (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/codegen/fonts/font-file.xsl Thu Sep 1 13:02:29 2016
@@ -235,7 +235,7 @@ public class <xsl:value-of select="class
boundingBoxes[0x<xsl:value-of select="$char-num"/>] = new Rectangle(<xsl:value-of select="@llx"/>, <xsl:value-of select="@lly"/>, <xsl:value-of select="@urx - @llx"/>, <xsl:value-of select="@ury - @lly"/>);</xsl:if></xsl:template>
<xsl:template match="kerning">
- first = new Integer(<xsl:value-of select="@kpx1"/>);
+ first = <xsl:value-of select="@kpx1"/>;
pairs = (Map)kerning.get(first);
if (pairs == null) {
pairs = new java.util.HashMap();
@@ -244,8 +244,8 @@ public class <xsl:value-of select="class
<xsl:apply-templates select="pair"/></xsl:template>
<xsl:template match="pair">
- second = new Integer(<xsl:value-of select="@kpx2"/>);
- pairs.put(second, new Integer(<xsl:value-of select="@kern"/>));
+ second = <xsl:value-of select="@kpx2"/>;
+ pairs.put(second, <xsl:value-of select="@kern"/>);
</xsl:template>
</xsl:stylesheet>
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/AFPResourceLevelDefaults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/AFPResourceLevelDefaults.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/AFPResourceLevelDefaults.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/AFPResourceLevelDefaults.java Thu Sep 1 13:02:29 2016
@@ -39,7 +39,7 @@ public class AFPResourceLevelDefaults {
}
private static void registerResourceTypeName(String name, byte type) {
- RESOURCE_TYPE_NAMES.put(name.toLowerCase(), new Byte(type));
+ RESOURCE_TYPE_NAMES.put(name.toLowerCase(), type);
}
private static byte getResourceType(String resourceTypeName) {
@@ -77,7 +77,7 @@ public class AFPResourceLevelDefaults {
* @param level the resource level
*/
public void setDefaultResourceLevel(byte type, AFPResourceLevel level) {
- this.defaultResourceLevels.put(new Byte(type), level);
+ this.defaultResourceLevels.put(type, level);
}
/**
@@ -86,7 +86,7 @@ public class AFPResourceLevelDefaults {
* @return the default resource level
*/
public AFPResourceLevel getDefaultResourceLevel(byte type) {
- AFPResourceLevel result = (AFPResourceLevel)this.defaultResourceLevels.get(new Byte(type));
+ AFPResourceLevel result = (AFPResourceLevel)this.defaultResourceLevels.get(type);
if (result == null) {
result = AFPResourceInfo.DEFAULT_LEVEL;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/fonts/RasterFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/fonts/RasterFont.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/fonts/RasterFont.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/fonts/RasterFont.java Thu Sep 1 13:02:29 2016
@@ -62,7 +62,7 @@ public class RasterFont extends AFPFont
*/
public void addCharacterSet(int size, CharacterSet characterSet) {
//TODO: replace with Integer.valueOf() once we switch to Java 5
- this.charSets.put(new Integer(size), characterSet);
+ this.charSets.put(size, characterSet);
this.charSet = characterSet;
}
@@ -74,7 +74,7 @@ public class RasterFont extends AFPFont
*/
public CharacterSet getCharacterSet(int sizeInMpt) {
- Integer requestedSize = Integer.valueOf(sizeInMpt);
+ Integer requestedSize = sizeInMpt;
CharacterSet csm = charSets.get(requestedSize);
double sizeInPt = sizeInMpt / 1000.0;
@@ -101,9 +101,9 @@ public class RasterFont extends AFPFont
Integer fontSize;
if (!smallerSizes.isEmpty()
&& (sizeInMpt - smallerSize) <= (largerSize - sizeInMpt)) {
- fontSize = Integer.valueOf(smallerSize);
+ fontSize = smallerSize;
} else {
- fontSize = Integer.valueOf(largerSize);
+ fontSize = largerSize;
}
csm = charSets.get(fontSize);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java Thu Sep 1 13:02:29 2016
@@ -1085,7 +1085,7 @@ public class AreaTreeParser {
if (value != null) {
Class cl = Trait.getTraitClass(trait);
if (cl == Integer.class) {
- area.addTrait(trait, new Integer(value));
+ area.addTrait(trait, Integer.valueOf(value));
} else if (cl == Boolean.class) {
area.addTrait(trait, Boolean.valueOf(value));
} else if (cl == String.class) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/Trait.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/area/Trait.java Thu Sep 1 13:02:29 2016
@@ -48,7 +48,7 @@ public final class Trait implements Seri
}
/** Id reference line, not resolved. (not sure if this is needed.) */
- //public static final Integer ID_LINK = new Integer(0);
+ //public static final Integer ID_LINK = Integer.valueOf(0);
/**
* Internal link trait.
@@ -84,10 +84,10 @@ public final class Trait implements Seri
public static final Integer LINETHROUGH = 12;
/** Shadow offset. */
- //public static final Integer OFFSET = new Integer(13);
+ //public static final Integer OFFSET = Integer.valueOf(13);
/** The shadow for text. */
- //public static final Integer SHADOW = new Integer(14);
+ //public static final Integer SHADOW = Integer.valueOf(14);
/** The border start. */
public static final Integer BORDER_START = 15;
@@ -120,10 +120,10 @@ public final class Trait implements Seri
public static final Integer SPACE_END = 24;
/** break before */
- //public static final Integer BREAK_BEFORE = new Integer(25);
+ //public static final Integer BREAK_BEFORE = Integer.valueOf(25);
/** break after */
- //public static final Integer BREAK_AFTER = new Integer(26);
+ //public static final Integer BREAK_AFTER = Integer.valueOf(26);
/** The start-indent trait. */
public static final Integer START_INDENT = 27;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java Thu Sep 1 13:02:29 2016
@@ -602,11 +602,11 @@ public class CommandLineOptions {
for (int j = 0; j < parts.length; j++) {
String s = parts[j];
if (s.matches("\\d+")) {
- renderingOptions.put(PrintRenderer.START_PAGE, new Integer(s));
+ renderingOptions.put(PrintRenderer.START_PAGE, Integer.valueOf(s));
} else if (s.matches("\\d+-\\d+")) {
String[] startend = s.split("-");
- renderingOptions.put(PrintRenderer.START_PAGE, new Integer(startend[0]));
- renderingOptions.put(PrintRenderer.END_PAGE, new Integer(startend[1]));
+ renderingOptions.put(PrintRenderer.START_PAGE, Integer.valueOf(startend[0]));
+ renderingOptions.put(PrintRenderer.END_PAGE, Integer.valueOf(startend[1]));
} else {
PagesMode mode = PagesMode.byName(s);
renderingOptions.put(PrintRenderer.PAGES_MODE, mode);
@@ -623,7 +623,7 @@ public class CommandLineOptions {
|| (isOption(args[i + 1]))) {
throw new FOPException("you must specify the number of copies");
} else {
- renderingOptions.put(PrintRenderer.COPIES, new Integer(args[i + 1]));
+ renderingOptions.put(PrintRenderer.COPIES, Integer.valueOf(args[i + 1]));
return 1;
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java Thu Sep 1 13:02:29 2016
@@ -159,10 +159,10 @@ public final class GlyphClassTable exten
/** {@inheritDoc} */
public List getEntries() {
List entries = new java.util.ArrayList();
- entries.add(Integer.valueOf(firstGlyph));
+ entries.add(firstGlyph);
if (gca != null) {
for (int i = 0, n = gca.length; i < n; i++) {
- entries.add(Integer.valueOf(gca [ i ]));
+ entries.add(gca[i]);
}
}
return entries;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java Thu Sep 1 13:02:29 2016
@@ -147,7 +147,7 @@ public final class GlyphCoverageTable ex
List entries = new java.util.ArrayList();
if (map != null) {
for (int i = 0, n = map.length; i < n; i++) {
- entries.add(Integer.valueOf(map [ i ]));
+ entries.add(map[i]);
}
}
return entries;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java Thu Sep 1 13:02:29 2016
@@ -535,8 +535,8 @@ public class GlyphPositioningTable exten
List entries = new ArrayList(5);
entries.add(cdt1);
entries.add(cdt2);
- entries.add(Integer.valueOf(nc1));
- entries.add(Integer.valueOf(nc2));
+ entries.add(nc1);
+ entries.add(nc2);
entries.add(pvm);
return entries;
} else {
@@ -796,7 +796,7 @@ public class GlyphPositioningTable exten
if ((bct != null) && (maa != null) && (nmc > 0) && (bam != null)) {
List entries = new ArrayList(4);
entries.add(bct);
- entries.add(Integer.valueOf(nmc));
+ entries.add(nmc);
entries.add(maa);
entries.add(bam);
return entries;
@@ -942,8 +942,8 @@ public class GlyphPositioningTable exten
if (lam != null) {
List entries = new ArrayList(5);
entries.add(lct);
- entries.add(Integer.valueOf(nmc));
- entries.add(Integer.valueOf(mxc));
+ entries.add(nmc);
+ entries.add(mxc);
entries.add(maa);
entries.add(lam);
return entries;
@@ -1086,7 +1086,7 @@ public class GlyphPositioningTable exten
if ((mct2 != null) && (maa != null) && (nmc > 0) && (mam != null)) {
List entries = new ArrayList(4);
entries.add(mct2);
- entries.add(Integer.valueOf(nmc));
+ entries.add(nmc);
entries.add(maa);
entries.add(mam);
return entries;
@@ -1293,7 +1293,7 @@ public class GlyphPositioningTable exten
if (rsa != null) {
List entries = new ArrayList(3);
entries.add(cdt);
- entries.add(Integer.valueOf(ngc));
+ entries.add(ngc);
entries.add(rsa);
return entries;
} else {
@@ -1608,7 +1608,7 @@ public class GlyphPositioningTable exten
entries.add(icdt);
entries.add(bcdt);
entries.add(lcdt);
- entries.add(Integer.valueOf(ngc));
+ entries.add(ngc);
entries.add(rsa);
return entries;
} else {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java Thu Sep 1 13:02:29 2016
@@ -287,7 +287,7 @@ public class GlyphSubstitutionTable exte
/** {@inheritDoc} */
public List getEntries() {
List entries = new ArrayList(1);
- entries.add(Integer.valueOf(delta));
+ entries.add(delta);
return entries;
}
/** {@inheritDoc} */
@@ -325,7 +325,7 @@ public class GlyphSubstitutionTable exte
public List getEntries() {
List entries = new ArrayList(glyphs.length);
for (int i = 0, n = glyphs.length; i < n; i++) {
- entries.add(Integer.valueOf(glyphs[i]));
+ entries.add(glyphs[i]);
}
return entries;
}
@@ -822,7 +822,7 @@ public class GlyphSubstitutionTable exte
if (rsa != null) {
List entries = new ArrayList(3);
entries.add(cdt);
- entries.add(Integer.valueOf(ngc));
+ entries.add(ngc);
entries.add(rsa);
return entries;
} else {
@@ -1138,7 +1138,7 @@ public class GlyphSubstitutionTable exte
entries.add(icdt);
entries.add(bcdt);
entries.add(lcdt);
- entries.add(Integer.valueOf(ngc));
+ entries.add(ngc);
entries.add(rsa);
return entries;
} else {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java Thu Sep 1 13:02:29 2016
@@ -557,7 +557,7 @@ public final class OTFAdvancedTypographi
for (int i = 0, n = ng; i < n; i++) {
int g = in.readTTFUShort();
ga[i] = g;
- entries.add(Integer.valueOf(g));
+ entries.add(g);
}
// dump info if debugging
if (log.isDebugEnabled()) {
@@ -613,7 +613,7 @@ public final class OTFAdvancedTypographi
in.skip(2);
// read start glyph
int sg = in.readTTFUShort();
- entries.add(Integer.valueOf(sg));
+ entries.add(sg);
// read glyph count
int ng = in.readTTFUShort();
// read glyph classes
@@ -621,7 +621,7 @@ public final class OTFAdvancedTypographi
for (int i = 0, n = ng; i < n; i++) {
int gc = in.readTTFUShort();
ca[i] = gc;
- entries.add(Integer.valueOf(gc));
+ entries.add(gc);
}
// dump info if debugging
if (log.isDebugEnabled()) {
@@ -687,7 +687,7 @@ public final class OTFAdvancedTypographi
}
// read coverage table
seMapping = readCoverageTable(tableTag + " single substitution coverage", subtableOffset + co);
- seEntries.add(Integer.valueOf(dg));
+ seEntries.add(dg);
}
private void readSingleSubTableFormat2(int lookupType, int lookupFlags, long subtableOffset, int subtableFormat) throws IOException {
@@ -715,7 +715,7 @@ public final class OTFAdvancedTypographi
log.debug(tableTag + " single substitution glyph[" + i + "]: " + gs);
}
gsa[i] = gs;
- seEntries.add(Integer.valueOf(gs));
+ seEntries.add(gs);
}
}
@@ -1101,7 +1101,7 @@ public final class OTFAdvancedTypographi
// store results
seMapping = ct;
seEntries.add(cdt);
- seEntries.add(Integer.valueOf(ngc));
+ seEntries.add(ngc);
seEntries.add(rsa);
}
@@ -1397,7 +1397,7 @@ public final class OTFAdvancedTypographi
seEntries.add(icdt);
seEntries.add(bcdt);
seEntries.add(lcdt);
- seEntries.add(Integer.valueOf(ngc));
+ seEntries.add(ngc);
seEntries.add(rsa);
}
@@ -1999,8 +1999,8 @@ public final class OTFAdvancedTypographi
seMapping = ct;
seEntries.add(cdt1);
seEntries.add(cdt2);
- seEntries.add(Integer.valueOf(nc1));
- seEntries.add(Integer.valueOf(nc2));
+ seEntries.add(nc1);
+ seEntries.add(nc2);
seEntries.add(pvm);
}
@@ -2225,7 +2225,7 @@ public final class OTFAdvancedTypographi
// store results
seMapping = mct;
seEntries.add(bct);
- seEntries.add(Integer.valueOf(nmc));
+ seEntries.add(nmc);
seEntries.add(maa);
seEntries.add(bam);
}
@@ -2359,8 +2359,8 @@ public final class OTFAdvancedTypographi
// store results
seMapping = mct;
seEntries.add(lct);
- seEntries.add(Integer.valueOf(nmc));
- seEntries.add(Integer.valueOf(mxc));
+ seEntries.add(nmc);
+ seEntries.add(mxc);
seEntries.add(maa);
seEntries.add(lam);
}
@@ -2466,7 +2466,7 @@ public final class OTFAdvancedTypographi
// store results
seMapping = mct1;
seEntries.add(mct2);
- seEntries.add(Integer.valueOf(nmc));
+ seEntries.add(nmc);
seEntries.add(maa);
seEntries.add(mam);
}
@@ -2660,7 +2660,7 @@ public final class OTFAdvancedTypographi
// store results
seMapping = ct;
seEntries.add(cdt);
- seEntries.add(Integer.valueOf(ngc));
+ seEntries.add(ngc);
seEntries.add(rsa);
}
@@ -2956,7 +2956,7 @@ public final class OTFAdvancedTypographi
seEntries.add(icdt);
seEntries.add(bcdt);
seEntries.add(lcdt);
- seEntries.add(Integer.valueOf(ngc));
+ seEntries.add(ngc);
seEntries.add(rsa);
}
@@ -3755,12 +3755,12 @@ public final class OTFAdvancedTypographi
if (seEntries != null) {
if ((tableType == GlyphTable.GLYPH_TABLE_TYPE_DEFINITION) || (seEntries.size() > 0)) {
if (seSubtables != null) {
- Integer tt = Integer.valueOf(tableType);
- Integer lt = Integer.valueOf(lookupType);
- Integer ln = Integer.valueOf(lookupSequence);
- Integer lf = Integer.valueOf(lookupFlags);
- Integer sn = Integer.valueOf(subtableSequence);
- Integer sf = Integer.valueOf(subtableFormat);
+ Integer tt = tableType;
+ Integer lt = lookupType;
+ Integer ln = lookupSequence;
+ Integer lf = lookupFlags;
+ Integer sn = subtableSequence;
+ Integer sf = subtableFormat;
seSubtables.add(new Object[] { tt, lt, ln, lf, sn, sf, seMapping, seEntries });
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java Thu Sep 1 13:02:29 2016
@@ -708,7 +708,7 @@ public final class CharScript {
public static int[] scriptsOf(CharSequence cs) {
Set s = new HashSet();
for (int i = 0, n = cs.length(); i < n; i++) {
- s.add(Integer.valueOf(scriptOf(cs.charAt(i))));
+ s.add(scriptOf(cs.charAt(i)));
}
int[] sa = new int [ s.size() ];
int ns = 0;
@@ -729,12 +729,12 @@ public final class CharScript {
for (int i = 0, n = cs.length(); i < n; i++) {
int c = cs.charAt(i);
int s = scriptOf(c);
- Integer k = Integer.valueOf(s);
+ Integer k = s;
Integer v = (Integer) m.get(k);
if (v != null) {
- m.put(k, Integer.valueOf(v.intValue() + 1));
+ m.put(k, v.intValue() + 1);
} else {
- m.put(k, Integer.valueOf(0));
+ m.put(k, 0);
}
}
int sMax = -1;
@@ -818,7 +818,7 @@ public final class CharScript {
Map<Integer, String> m = getScriptTagsMap();
if (m != null) {
String tag;
- if ((tag = m.get(Integer.valueOf(code))) != null) {
+ if ((tag = m.get(code)) != null) {
return tag;
} else {
return "";
@@ -855,8 +855,8 @@ public final class CharScript {
assert tag.length() != 0;
assert code >= 0;
assert code < 2000;
- tm.put(Integer.valueOf(code), tag);
- cm.put(tag, Integer.valueOf(code));
+ tm.put(code, tag);
+ cm.put(tag, code);
}
private static void makeScriptMaps() {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/CharIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/CharIterator.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/CharIterator.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/CharIterator.java Thu Sep 1 13:02:29 2016
@@ -45,7 +45,7 @@ public abstract class CharIterator imple
* {@inheritDoc}
*/
public Object next() throws NoSuchElementException {
- return new Character(nextChar());
+ return nextChar();
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/NumericProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/NumericProperty.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/NumericProperty.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/NumericProperty.java Thu Sep 1 13:02:29 2016
@@ -87,7 +87,7 @@ public class NumericProperty extends Pro
/** {@inheritDoc} */
public Number getNumber() {
- return new Double(value);
+ return value;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyParser.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyParser.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/expr/PropertyParser.java Thu Sep 1 13:02:29 2016
@@ -256,11 +256,11 @@ public final class PropertyParser extend
break;
case TOK_FLOAT:
- prop = NumberProperty.getInstance(new Double(currentTokenValue));
+ prop = NumberProperty.getInstance(Double.valueOf(currentTokenValue));
break;
case TOK_INTEGER:
- prop = NumberProperty.getInstance(new Integer(currentTokenValue));
+ prop = NumberProperty.getInstance(Integer.valueOf(currentTokenValue));
break;
case TOK_PERCENT:
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/CharacterProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/CharacterProperty.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/CharacterProperty.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/CharacterProperty.java Thu Sep 1 13:02:29 2016
@@ -76,7 +76,7 @@ public final class CharacterProperty ext
* @return this.character cast as an Object
*/
public Object getObject() {
- return new Character(character);
+ return character;
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/NumberProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/NumberProperty.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/NumberProperty.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/NumberProperty.java Thu Sep 1 13:02:29 2016
@@ -121,12 +121,12 @@ public final class NumberProperty extend
//if possible
if (num == Math.floor(num)) {
if (num < Integer.MAX_VALUE) {
- this.number = new Integer((int)num);
+ this.number = (int) num;
} else {
- this.number = new Long((long)num);
+ this.number = (long) num;
}
} else {
- this.number = new Double(num);
+ this.number = num;
}
}
@@ -135,7 +135,7 @@ public final class NumberProperty extend
* @param num integer numeric value for property
*/
private NumberProperty(int num) {
- this.number = new Integer(num);
+ this.number = num;
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyCache.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyCache.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyCache.java Thu Sep 1 13:02:29 2016
@@ -116,7 +116,7 @@ public final class PropertyCache<T> {
return null;
}
- Integer hashCode = Integer.valueOf(obj.hashCode());
+ Integer hashCode = obj.hashCode();
WeakReference<T> weakRef = map.get(hashCode);
if (weakRef == null) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDFull.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDFull.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDFull.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDFull.java Thu Sep 1 13:02:29 2016
@@ -91,7 +91,7 @@ public class CIDFull implements CIDSet {
int nextBitSet = 0;
for (int j = 0; j < glyphIndices.cardinality(); j++) {
nextBitSet = glyphIndices.nextSetBit(nextBitSet);
- glyphs.put(Integer.valueOf(nextBitSet), Integer.valueOf(nextBitSet));
+ glyphs.put(nextBitSet, nextBitSet);
nextBitSet++;
}
return Collections.unmodifiableMap(glyphs);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontCache.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontCache.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontCache.java Thu Sep 1 13:02:29 2016
@@ -433,7 +433,7 @@ public final class FontCache implements
public void registerFailedFont(String embedUrl, long lastModified) {
synchronized (changeLock) {
if (!getFailedFontMap().containsKey(embedUrl)) {
- getFailedFontMap().put(embedUrl, new Long(lastModified));
+ getFailedFontMap().put(embedUrl, lastModified);
changed = true;
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontInfo.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontInfo.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/FontInfo.java Thu Sep 1 13:02:29 2016
@@ -143,7 +143,7 @@ public class FontInfo {
}
}
this.triplets.put(triplet, internalFontKey);
- this.tripletPriorities.put(triplet, Integer.valueOf(newPriority));
+ this.tripletPriorities.put(triplet, newPriority);
}
/**
@@ -304,7 +304,7 @@ public class FontInfo {
sizes = new HashMap<Integer, Font>();
getFontInstanceCache().put(triplet, sizes);
}
- Integer size = Integer.valueOf(fontSize);
+ Integer size = fontSize;
Font font = sizes.get(size);
if (font == null) {
String fontKey = getInternalFontKey(triplet);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SimpleSingleByteEncoding.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SimpleSingleByteEncoding.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SimpleSingleByteEncoding.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SimpleSingleByteEncoding.java Thu Sep 1 13:02:29 2016
@@ -54,7 +54,7 @@ public class SimpleSingleByteEncoding im
/** {@inheritDoc} */
public char mapChar(char c) {
- Character nc = charMap.get(Character.valueOf(c));
+ Character nc = charMap.get(c);
if (nc != null) {
return nc.charValue();
}
@@ -119,7 +119,7 @@ public class SimpleSingleByteEncoding im
}
char newSlot = (char)(getLastChar() + 1);
this.mapping.add(ch);
- this.charMap.put(Character.valueOf(ch.getSingleUnicodeValue()), Character.valueOf(newSlot));
+ this.charMap.put(ch.getSingleUnicodeValue(), newSlot);
return newSlot;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SingleByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SingleByteFont.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SingleByteFont.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/SingleByteFont.java Thu Sep 1 13:02:29 2016
@@ -122,7 +122,7 @@ public class SingleByteFont extends Cust
int codePoint = i % 256;
NamedCharacter nc = encoding.getCharacterForIndex(codePoint);
UnencodedCharacter uc
- = this.unencodedCharacters.get(Character.valueOf(nc.getSingleUnicodeValue()));
+ = this.unencodedCharacters.get(nc.getSingleUnicodeValue());
return size * uc.getWidth();
}
return 0;
@@ -147,7 +147,7 @@ public class SingleByteFont extends Cust
SimpleSingleByteEncoding encoding = getAdditionalEncoding(encodingIndex);
int codePoint = glyphIndex % 256;
NamedCharacter nc = encoding.getCharacterForIndex(codePoint);
- UnencodedCharacter uc = this.unencodedCharacters.get(Character.valueOf(nc.getSingleUnicodeValue()));
+ UnencodedCharacter uc = this.unencodedCharacters.get(nc.getSingleUnicodeValue());
bbox = uc.getBBox();
}
return bbox == null ? null : new Rectangle(bbox.x * size, bbox.y * size, bbox.width * size, bbox.height * size);
@@ -255,7 +255,7 @@ public class SingleByteFont extends Cust
private char mapUnencodedChar(char ch) {
if (this.unencodedCharacters != null) {
- UnencodedCharacter unencoded = this.unencodedCharacters.get(Character.valueOf(ch));
+ UnencodedCharacter unencoded = this.unencodedCharacters.get(ch);
if (unencoded != null) {
if (this.additionalEncodings == null) {
this.additionalEncodings = new ArrayList<SimpleSingleByteEncoding>();
@@ -384,7 +384,7 @@ public class SingleByteFont extends Cust
}
if (ch.hasSingleUnicodeValue()) {
UnencodedCharacter uc = new UnencodedCharacter(ch, width, bbox);
- this.unencodedCharacters.put(Character.valueOf(ch.getSingleUnicodeValue()), uc);
+ this.unencodedCharacters.put(ch.getSingleUnicodeValue(), uc);
} else {
//Cannot deal with unicode sequences, so ignore this character
}
@@ -452,7 +452,7 @@ public class SingleByteFont extends Cust
for (int i = 0, c = arr.length; i < c; i++) {
NamedCharacter nc = enc.getCharacterForIndex(enc.getFirstChar() + i);
UnencodedCharacter uc = this.unencodedCharacters.get(
- Character.valueOf(nc.getSingleUnicodeValue()));
+ nc.getSingleUnicodeValue());
arr[i] = uc.getWidth();
}
return arr;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Typeface.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Typeface.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Typeface.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Typeface.java Thu Sep 1 13:02:29 2016
@@ -125,7 +125,7 @@ public abstract class Typeface implement
*/
protected void warnMissingGlyph(char c) {
// Give up, character is not available
- Character ch = new Character(c);
+ Character ch = c;
if (warnedChars == null) {
warnedChars = new HashSet<Character>();
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/PFMReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/PFMReader.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/PFMReader.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/PFMReader.java Thu Sep 1 13:02:29 2016
@@ -233,22 +233,22 @@ public class PFMReader extends AbstractF
el = doc.createElement("cap-height");
root.appendChild(el);
- Integer value = new Integer(pfm.getCapHeight());
+ Integer value = pfm.getCapHeight();
el.appendChild(doc.createTextNode(value.toString()));
el = doc.createElement("x-height");
root.appendChild(el);
- value = new Integer(pfm.getXHeight());
+ value = pfm.getXHeight();
el.appendChild(doc.createTextNode(value.toString()));
el = doc.createElement("ascender");
root.appendChild(el);
- value = new Integer(pfm.getLowerCaseAscent());
+ value = pfm.getLowerCaseAscent();
el.appendChild(doc.createTextNode(value.toString()));
el = doc.createElement("descender");
root.appendChild(el);
- value = new Integer(pfm.getLowerCaseDescent());
+ value = pfm.getLowerCaseDescent();
el.appendChild(doc.createTextNode(value.toString()));
Element bbox = doc.createElement("bbox");
@@ -258,33 +258,33 @@ public class PFMReader extends AbstractF
for (int i = 0; i < names.length; i++) {
el = doc.createElement(names[i]);
bbox.appendChild(el);
- value = new Integer(bb[i]);
+ value = bb[i];
el.appendChild(doc.createTextNode(value.toString()));
}
el = doc.createElement("flags");
root.appendChild(el);
- value = new Integer(pfm.getFlags());
+ value = pfm.getFlags();
el.appendChild(doc.createTextNode(value.toString()));
el = doc.createElement("stemv");
root.appendChild(el);
- value = new Integer(pfm.getStemV());
+ value = pfm.getStemV();
el.appendChild(doc.createTextNode(value.toString()));
el = doc.createElement("italicangle");
root.appendChild(el);
- value = new Integer(pfm.getItalicAngle());
+ value = pfm.getItalicAngle();
el.appendChild(doc.createTextNode(value.toString()));
el = doc.createElement("first-char");
root.appendChild(el);
- value = new Integer(pfm.getFirstChar());
+ value = (int) pfm.getFirstChar();
el.appendChild(doc.createTextNode(value.toString()));
el = doc.createElement("last-char");
root.appendChild(el);
- value = new Integer(pfm.getLastChar());
+ value = (int) pfm.getLastChar();
el.appendChild(doc.createTextNode(value.toString()));
Element widths = doc.createElement("widths");
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java Thu Sep 1 13:02:29 2016
@@ -275,8 +275,8 @@ public abstract class OpenFont {
UnicodeMapping(OpenFont font, int glyphIndex, int unicodeIndex) {
this.unicodeIndex = unicodeIndex;
this.glyphIndex = glyphIndex;
- font.glyphToUnicodeMap.put(new Integer(glyphIndex), new Integer(unicodeIndex));
- font.unicodeToGlyphMap.put(new Integer(unicodeIndex), new Integer(glyphIndex));
+ font.glyphToUnicodeMap.put(glyphIndex, unicodeIndex);
+ font.unicodeToGlyphMap.put(unicodeIndex, glyphIndex);
}
/**
@@ -535,7 +535,7 @@ public abstract class OpenFont {
& 0xffff;
//mtxTab[glyphIdx].setName(mtxTab[glyphIdx].getName() + " - "+(char)j);
unicodeMappings.add(new UnicodeMapping(this, glyphIdx, j));
- mtxTab[glyphIdx].getUnicodeIndex().add(new Integer(j));
+ mtxTab[glyphIdx].getUnicodeIndex().add(j);
if (encodingID == 0 && j >= 0xF020 && j <= 0xF0FF) {
//Experimental: Mapping 0xF020-0xF0FF to 0x0020-0x00FF
@@ -545,12 +545,12 @@ public abstract class OpenFont {
if (!eightBitGlyphs.get(mapped)) {
//Only map if Unicode code point hasn't been mapped before
unicodeMappings.add(new UnicodeMapping(this, glyphIdx, mapped));
- mtxTab[glyphIdx].getUnicodeIndex().add(new Integer(mapped));
+ mtxTab[glyphIdx].getUnicodeIndex().add(mapped);
}
}
// Also add winAnsiWidth
- List<Integer> v = ansiIndex.get(new Integer(j));
+ List<Integer> v = ansiIndex.get(j);
if (v != null) {
for (Integer aIdx : v) {
ansiWidth[aIdx.intValue()]
@@ -576,7 +576,7 @@ public abstract class OpenFont {
glyphIdx = (j + cmapDeltas[i]) & 0xffff;
if (glyphIdx < mtxTab.length) {
- mtxTab[glyphIdx].getUnicodeIndex().add(new Integer(j));
+ mtxTab[glyphIdx].getUnicodeIndex().add(j);
} else {
log.debug("Glyph " + glyphIdx
+ " out of range: "
@@ -585,7 +585,7 @@ public abstract class OpenFont {
unicodeMappings.add(new UnicodeMapping(this, glyphIdx, j));
if (glyphIdx < mtxTab.length) {
- mtxTab[glyphIdx].getUnicodeIndex().add(new Integer(j));
+ mtxTab[glyphIdx].getUnicodeIndex().add(j);
} else {
log.debug("Glyph " + glyphIdx
+ " out of range: "
@@ -593,7 +593,7 @@ public abstract class OpenFont {
}
// Also add winAnsiWidth
- List<Integer> v = ansiIndex.get(new Integer(j));
+ List<Integer> v = ansiIndex.get(j);
if (v != null) {
for (Integer aIdx : v) {
ansiWidth[aIdx.intValue()] = mtxTab[glyphIdx].getWx();
@@ -685,8 +685,8 @@ public abstract class OpenFont {
// same char (eg bullet) is repeated more than one place
ansiIndex = new HashMap<Integer, List<Integer>>();
for (int i = 32; i < Glyphs.WINANSI_ENCODING.length; i++) {
- Integer ansi = new Integer(i);
- Integer uni = new Integer(Glyphs.WINANSI_ENCODING[i]);
+ Integer ansi = i;
+ Integer uni = (int) Glyphs.WINANSI_ENCODING[i];
List<Integer> v = ansiIndex.get(uni);
if (v == null) {
@@ -1614,7 +1614,7 @@ public abstract class OpenFont {
if (adjTab == null) {
adjTab = new HashMap<Integer, Integer>();
}
- adjTab.put(u2, new Integer(convertTTFUnit2PDFUnit(kpx)));
+ adjTab.put(u2, convertTTFUnit2PDFUnit(kpx));
kerningTab.put(iObj, adjTab);
}
}
@@ -1852,7 +1852,7 @@ public abstract class OpenFont {
List<Integer> ret = new ArrayList<Integer>();
for (int i = 32; i < Glyphs.WINANSI_ENCODING.length; i++) {
if (unicode == Glyphs.WINANSI_ENCODING[i]) {
- ret.add(new Integer(i));
+ ret.add(i);
}
}
return ret.toArray(new Integer[ret.size()]);
@@ -1898,7 +1898,7 @@ public abstract class OpenFont {
* @return unicode code point
*/
private Integer glyphToUnicode(int glyphIndex) {
- return glyphToUnicodeMap.get(new Integer(glyphIndex));
+ return glyphToUnicodeMap.get(glyphIndex);
}
/**
@@ -1909,7 +1909,7 @@ public abstract class OpenFont {
*/
private Integer unicodeToGlyph(int unicodeIndex) throws IOException {
final Integer result
- = unicodeToGlyphMap.get(new Integer(unicodeIndex));
+ = unicodeToGlyphMap.get(unicodeIndex);
if (result == null) {
throw new IOException(
"Glyph index not found for unicode value " + unicodeIndex);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMFile.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMFile.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMFile.java Thu Sep 1 13:02:29 2016
@@ -430,7 +430,7 @@ public class AFMFile {
continue;
}
if (container == null) {
- Integer k1 = Integer.valueOf(chm1.getCharCode());
+ Integer k1 = chm1.getCharCode();
container = m.get(k1);
if (container == null) {
container = new java.util.HashMap<Integer, Integer>();
@@ -438,8 +438,8 @@ public class AFMFile {
}
}
Dimension2D dim = entryTo.getValue();
- container.put(Integer.valueOf(chm2.getCharCode()),
- Integer.valueOf((int)Math.round(dim.getWidth())));
+ container.put(chm2.getCharCode(),
+ (int) Math.round(dim.getWidth()));
}
}
return m;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMParser.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMParser.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/AFMParser.java Thu Sep 1 13:02:29 2016
@@ -148,8 +148,8 @@ public class AFMParser {
VALUE_PARSERS.put(KPY, new NotImplementedYet(KPY));
PARSE_MODE_CHANGES = new HashMap<String, Integer>();
- PARSE_MODE_CHANGES.put(START_CHAR_METRICS, new Integer(PARSE_CHAR_METRICS));
- PARSE_MODE_CHANGES.put(END_CHAR_METRICS, new Integer(PARSE_NORMAL));
+ PARSE_MODE_CHANGES.put(START_CHAR_METRICS, PARSE_CHAR_METRICS);
+ PARSE_MODE_CHANGES.put(END_CHAR_METRICS, PARSE_NORMAL);
}
/**
@@ -278,9 +278,9 @@ public class AFMParser {
protected Number getNumberValue(String line, int startpos) {
try {
- return new Integer(getIntegerValue(line, startpos));
+ return getIntegerValue(line, startpos);
} catch (NumberFormatException nfe) {
- return new Double(getDoubleValue(line, startpos));
+ return getDoubleValue(line, startpos);
}
}
@@ -384,7 +384,7 @@ public class AFMParser {
public void parse(String line, int startpos, Stack<Object> stack) throws IOException {
int value = getIntegerValue(line, startpos);
- setValue(getContextObject(stack), int.class, new Integer(value));
+ setValue(getContextObject(stack), int.class, value);
}
}
@@ -395,7 +395,7 @@ public class AFMParser {
public void parse(String line, int startpos, Stack<Object> stack) throws IOException {
double value = getDoubleValue(line, startpos);
- setValue(getContextObject(stack), double.class, new Double(value));
+ setValue(getContextObject(stack), double.class, value);
}
}
@@ -429,7 +429,7 @@ public class AFMParser {
public void parse(String line, int startpos, Stack<Object> stack) throws IOException {
double value = getDoubleValue(line, startpos);
- setValue(getContextObject(stack), double.class, new Double(value));
+ setValue(getContextObject(stack), double.class, value);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PFMFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PFMFile.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PFMFile.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PFMFile.java Thu Sep 1 13:02:29 2016
@@ -235,12 +235,12 @@ public class PFMFile {
log.trace("glyphs: " + glyph1 + ", " + glyph2);
}
- Map<Integer, Integer> adjTab = kerningTab.get(Integer.valueOf(g1));
+ Map<Integer, Integer> adjTab = kerningTab.get(g1);
if (adjTab == null) {
adjTab = new HashMap<Integer, Integer>();
}
- adjTab.put(Integer.valueOf(g2), Integer.valueOf(adj));
- kerningTab.put(Integer.valueOf(g1), adjTab);
+ adjTab.put(g2, adj);
+ kerningTab.put(g1, adjTab);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/TraitSetter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/TraitSetter.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/TraitSetter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/TraitSetter.java Thu Sep 1 13:02:29 2016
@@ -558,8 +558,8 @@ public final class TraitSetter {
*/
public static void addBreaks(Area area, int breakBefore, int breakAfter) {
/* Currently disabled as these traits are never used by the renderers
- area.addTrait(Trait.BREAK_AFTER, new Integer(breakAfter));
- area.addTrait(Trait.BREAK_BEFORE, new Integer(breakBefore));
+ area.addTrait(Trait.BREAK_AFTER, Integer.valueOf(breakAfter));
+ area.addTrait(Trait.BREAK_BEFORE, Integer.valueOf(breakBefore));
*/
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Thu Sep 1 13:02:29 2016
@@ -1510,7 +1510,7 @@ public class LineLayoutManager extends I
lineArea.addTrait(Trait.START_INDENT, lbp.startIndent);
}
if (lbp.endIndent != 0) {
- lineArea.addTrait(Trait.END_INDENT, new Integer(lbp.endIndent));
+ lineArea.addTrait(Trait.END_INDENT, lbp.endIndent);
}
lineArea.setBPD(lbp.lineHeight);
lineArea.setIPD(lbp.lineWidth);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java Thu Sep 1 13:02:29 2016
@@ -525,7 +525,7 @@ class RowPainter {
* below.
*/
for (int i = rowOffsets.size(); i <= rowIndex - firstRowIndex; i++) {
- rowOffsets.add(new Integer(offset));
+ rowOffsets.add(offset);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/AbstractPDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/AbstractPDFStream.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/AbstractPDFStream.java Thu Sep 1 13:02:29 2016
@@ -199,7 +199,7 @@ public abstract class AbstractPDFStream
OutputStream filteredOutput = getFilterList().applyFilters(cout);
outputRawStreamData(filteredOutput);
filteredOutput.close();
- refLength.setNumber(Integer.valueOf(cout.getCount()));
+ refLength.setNumber(cout.getCount());
bytesWritten += cout.getCount();
//Stream trailer
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFArray.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFArray.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFArray.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFArray.java Thu Sep 1 13:02:29 2016
@@ -62,7 +62,7 @@ public class PDFArray extends PDFObject
super(parent);
for (int i = 0, c = values.length; i < c; i++) {
- this.values.add(Integer.valueOf(values[i]));
+ this.values.add(values[i]);
}
}
@@ -76,7 +76,7 @@ public class PDFArray extends PDFObject
super(parent);
for (int i = 0, c = values.length; i < c; i++) {
- this.values.add(new Double(values[i]));
+ this.values.add(values[i]);
}
}
@@ -156,7 +156,7 @@ public class PDFArray extends PDFObject
* @param value the new value
*/
public void set(int index, double value) {
- this.values.set(index, new Double(value));
+ this.values.set(index, value);
}
/**
@@ -187,7 +187,7 @@ public class PDFArray extends PDFObject
* @param value the value
*/
public void add(double value) {
- this.values.add(new Double(value));
+ this.values.add(value);
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFont.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFont.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFont.java Thu Sep 1 13:02:29 2016
@@ -106,7 +106,7 @@ public class PDFCIDFont extends PDFObjec
this.basefont = basefont;
this.cidtype = cidtype;
- this.dw = new Integer(dw);
+ this.dw = dw;
this.w = w;
this.dw2 = null;
this.w2 = null;
@@ -122,7 +122,7 @@ public class PDFCIDFont extends PDFObjec
* @param dw the default width
*/
public void setDW(int dw) {
- this.dw = new Integer(dw);
+ this.dw = dw;
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java Thu Sep 1 13:02:29 2016
@@ -46,7 +46,7 @@ public class PDFCIDFontDescriptor extend
super(basefont, fontBBox[3], fontBBox[1], capHeight, flags,
new PDFRectangle(fontBBox), italicAngle, stemV);
- put("MissingWidth", new Integer(500));
+ put("MissingWidth", Integer.valueOf(500));
if (lang != null) {
put("Lang", lang);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColor.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColor.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColor.java Thu Sep 1 13:02:29 2016
@@ -131,19 +131,19 @@ public class PDFColor extends PDFPathPai
List theColorVector = new ArrayList();
if (this.colorSpace.getColorSpace() == PDFDeviceColorSpace.DEVICE_RGB) {
// RGB
- theColorVector.add(new Double(this.red));
- theColorVector.add(new Double(this.green));
- theColorVector.add(new Double(this.blue));
+ theColorVector.add(this.red);
+ theColorVector.add(this.green);
+ theColorVector.add(this.blue);
} else if (this.colorSpace.getColorSpace()
== PDFDeviceColorSpace.DEVICE_CMYK) {
// CMYK
- theColorVector.add(new Double(this.cyan));
- theColorVector.add(new Double(this.magenta));
- theColorVector.add(new Double(this.yellow));
- theColorVector.add(new Double(this.black));
+ theColorVector.add(this.cyan);
+ theColorVector.add(this.magenta);
+ theColorVector.add(this.yellow);
+ theColorVector.add(this.black);
} else {
// GRAY
- theColorVector.add(new Double(this.black));
+ theColorVector.add(this.black);
}
return (theColorVector);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFDictionary.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFDictionary.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFDictionary.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFDictionary.java Thu Sep 1 13:02:29 2016
@@ -87,7 +87,7 @@ public class PDFDictionary extends PDFOb
if (!entries.containsKey(name)) {
this.order.add(name);
}
- this.entries.put(name, Integer.valueOf(value));
+ this.entries.put(name, value);
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFEmbeddedFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFEmbeddedFile.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFEmbeddedFile.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFEmbeddedFile.java Thu Sep 1 13:02:29 2016
@@ -55,7 +55,7 @@ public class PDFEmbeddedFile extends PDF
super.populateStreamDict(lengthEntry);
try {
PDFDictionary dict = (PDFDictionary)get("Params");
- dict.put("Size", new Integer(data.getSize()));
+ dict.put("Size", Integer.valueOf(data.getSize()));
} catch (IOException ioe) {
//ignore and just skip this entry as it's optional
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java Thu Sep 1 13:02:29 2016
@@ -1398,8 +1398,8 @@ public class PDFFactory {
public PDFSeparationColorSpace makeSeparationColorSpace(PDFResourceContext res,
NamedColorSpace ncs) {
String colorName = ncs.getColorName();
- final Double zero = new Double(0d);
- final Double one = new Double(1d);
+ final Double zero = 0d;
+ final Double one = 1d;
List domain = Arrays.asList(new Double[] {zero, one});
List range = Arrays.asList(new Double[] {zero, one, zero, one, zero, one});
float[] cZero = new float[] {1f, 1f, 1f};
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFontNonBase14.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFontNonBase14.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFontNonBase14.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFontNonBase14.java Thu Sep 1 13:02:29 2016
@@ -52,8 +52,8 @@ public abstract class PDFFontNonBase14 e
*/
public void setWidthMetrics(int firstChar, int lastChar,
PDFArray widths) {
- put("FirstChar", new Integer(firstChar));
- put("LastChar", new Integer(lastChar));
+ put("FirstChar", Integer.valueOf(firstChar));
+ put("LastChar", Integer.valueOf(lastChar));
put("Widths", widths);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFormXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFormXObject.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFormXObject.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFormXObject.java Thu Sep 1 13:02:29 2016
@@ -50,7 +50,7 @@ public class PDFFormXObject extends PDFX
put("Type", new PDFName("XObject"));
put("Subtype", new PDFName("Form"));
- put("FormType", new Integer(1));
+ put("FormType", 1);
setMatrix(new AffineTransform());
if (resources != null) {
put("Resources", resources);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFGState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFGState.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFGState.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFGState.java Thu Sep 1 13:02:29 2016
@@ -90,18 +90,18 @@ public class PDFGState extends PDFObject
DEFAULT = new PDFGState();
Map vals = DEFAULT.values;
/*vals.put(LW, new Float(1.0));
- vals.put(LC, new Integer(0));
- vals.put(LJ, new Integer(0));
+ vals.put(LC, Integer.valueOf(0));
+ vals.put(LJ, Integer.valueOf(0));
vals.put(ML, new Float(10.0));
vals.put(D, "0 []");
vals.put(RI, "RelativeColorimetric");
vals.put(OP, Boolean.FALSE);
vals.put(op, Boolean.FALSE);
- vals.put(OPM, new Integer(1));
+ vals.put(OPM, Integer.valueOf(1));
vals.put(Font, "");*/
- vals.put(GSTATE_ALPHA_STROKE, new Float(1.0));
- vals.put(GSTATE_ALPHA_NONSTROKE, new Float(1.0));
+ vals.put(GSTATE_ALPHA_STROKE, 1.0f);
+ vals.put(GSTATE_ALPHA_NONSTROKE, 1.0f);
}
private Map values = new java.util.HashMap();
@@ -126,9 +126,9 @@ public class PDFGState extends PDFObject
*/
public void setAlpha(float val, boolean fill) {
if (fill) {
- values.put(GSTATE_ALPHA_NONSTROKE, new Float(val));
+ values.put(GSTATE_ALPHA_NONSTROKE, val);
} else {
- values.put(GSTATE_ALPHA_STROKE, new Float(val));
+ values.put(GSTATE_ALPHA_STROKE, val);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFImageXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFImageXObject.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFImageXObject.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFImageXObject.java Thu Sep 1 13:02:29 2016
@@ -96,9 +96,9 @@ public class PDFImageXObject extends PDF
private void populateDictionaryFromImage() {
put("Subtype", new PDFName("Image"));
- put("Width", new Integer(pdfimage.getWidth()));
- put("Height", new Integer(pdfimage.getHeight()));
- put("BitsPerComponent", new Integer(pdfimage.getBitsPerComponent()));
+ put("Width", pdfimage.getWidth());
+ put("Height", pdfimage.getHeight());
+ put("BitsPerComponent", pdfimage.getBitsPerComponent());
PDFICCStream pdfICCStream = pdfimage.getICCStream();
if (pdfICCStream != null) {
@@ -114,8 +114,8 @@ public class PDFImageXObject extends PDF
* this will invert the values - too bad if it's not
* a PhotoShop image...
*/
- final Float zero = new Float(0.0f);
- final Float one = new Float(1.0f);
+ final Float zero = 0.0f;
+ final Float one = 1.0f;
PDFArray decode = new PDFArray(this);
for (int i = 0, c = pdfimage.getColorSpace().getNumComponents(); i < c; i++) {
decode.add(one);
@@ -128,15 +128,15 @@ public class PDFImageXObject extends PDF
PDFColor transp = pdfimage.getTransparentColor();
PDFArray mask = new PDFArray(this);
if (pdfimage.getColorSpace().isGrayColorSpace()) {
- mask.add(new Integer(transp.red255()));
- mask.add(new Integer(transp.red255()));
+ mask.add(Integer.valueOf(transp.red255()));
+ mask.add(Integer.valueOf(transp.red255()));
} else {
- mask.add(new Integer(transp.red255()));
- mask.add(new Integer(transp.red255()));
- mask.add(new Integer(transp.green255()));
- mask.add(new Integer(transp.green255()));
- mask.add(new Integer(transp.blue255()));
- mask.add(new Integer(transp.blue255()));
+ mask.add(Integer.valueOf(transp.red255()));
+ mask.add(Integer.valueOf(transp.red255()));
+ mask.add(Integer.valueOf(transp.green255()));
+ mask.add(Integer.valueOf(transp.green255()));
+ mask.add(Integer.valueOf(transp.blue255()));
+ mask.add(Integer.valueOf(transp.blue255()));
}
put("Mask", mask);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFLink.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFLink.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFLink.java Thu Sep 1 13:02:29 2016
@@ -77,7 +77,7 @@ public class PDFLink extends PDFObject {
* @param structParent key in the structure parent tree
*/
public void setStructParent(int structParent) {
- this.structParent = new Integer(structParent);
+ this.structParent = structParent;
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFNumber.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFNumber.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFNumber.java Thu Sep 1 13:02:29 2016
@@ -30,7 +30,7 @@ public class PDFNumber extends PDFObject
private Number number;
public PDFNumber() {
- this.number = Integer.valueOf(0);
+ this.number = 0;
}
public PDFNumber(Number number) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPage.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPage.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPage.java Thu Sep 1 13:02:29 2016
@@ -142,7 +142,7 @@ public class PDFPage extends PDFResource
* @param tr the transition dictionary
*/
public void setTransition(int dur, TransitionDictionary tr) {
- put("Dur", new Integer(dur));
+ put("Dur", Integer.valueOf(dur));
put("Trans", tr);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java Thu Sep 1 13:02:29 2016
@@ -239,9 +239,9 @@ public class PDFPattern extends PDFPathP
}
p.append("] \n");
}
- p.append("/XStep " + PDFNumber.doubleOut(new Double(this.xStep))
+ p.append("/XStep " + PDFNumber.doubleOut(Double.valueOf(this.xStep))
+ " \n");
- p.append("/YStep " + PDFNumber.doubleOut(new Double(this.yStep))
+ p.append("/YStep " + PDFNumber.doubleOut(Double.valueOf(this.yStep))
+ " \n");
if (this.matrix != null) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFT1Stream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFT1Stream.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFT1Stream.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFT1Stream.java Thu Sep 1 13:02:29 2016
@@ -63,9 +63,9 @@ public class PDFT1Stream extends Abstrac
/** {@inheritDoc} */
protected void populateStreamDict(Object lengthEntry) {
super.populateStreamDict(lengthEntry);
- put("Length1", new Integer(pfb.getLength1()));
- put("Length2", new Integer(pfb.getLength2()));
- put("Length3", new Integer(pfb.getLength3()));
+ put("Length1", pfb.getLength1());
+ put("Length2", pfb.getLength2());
+ put("Length3", pfb.getLength3());
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/PrintRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/PrintRenderer.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/PrintRenderer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/PrintRenderer.java Thu Sep 1 13:02:29 2016
@@ -143,13 +143,13 @@ public abstract class PrintRenderer exte
context.setUserAgent(userAgent);
context.setProperty(RendererContextConstants.WIDTH,
- new Integer(width));
+ width);
context.setProperty(RendererContextConstants.HEIGHT,
- new Integer(height));
+ height);
context.setProperty(RendererContextConstants.XPOS,
- new Integer(x));
+ x);
context.setProperty(RendererContextConstants.YPOS,
- new Integer(y));
+ y);
context.setProperty(RendererContextConstants.PAGE_VIEWPORT,
getCurrentPageViewport());
if (foreignAttributes != null) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java Thu Sep 1 13:02:29 2016
@@ -865,7 +865,7 @@ public class AFPPainter extends Abstract
hints.put(ImageHandlerUtil.CONVERSION_MODE, ImageHandlerUtil.CONVERSION_MODE_BITMAP);
hints.put("TARGET_RESOLUTION",
- Integer.valueOf(context.getPaintingState().getResolution()));
+ context.getPaintingState().getResolution());
try {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/awt/viewer/Command.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/awt/viewer/Command.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/awt/viewer/Command.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/awt/viewer/Command.java Thu Sep 1 13:02:29 2016
@@ -51,7 +51,7 @@ public class Command extends AbstractAct
super(name);
putValue(SHORT_DESCRIPTION, name);
if (mnemonic > 0) {
- putValue(MNEMONIC_KEY, new Integer(mnemonic));
+ putValue(MNEMONIC_KEY, mnemonic);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org