Author: ssteiner
Date: Fri Sep 16 10:43:45 2016
New Revision: 1761019
URL: http://svn.apache.org/viewvc?rev=1761019&view=rev
Log:
FOP-2648: Code cleanup
Modified:
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/apps/FOUserAgent.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/scripts/DevanagariScriptProcessor.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.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/complexscripts/util/NumberConverter.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/CIDSubset.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Font.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/XMLFontMetricsReader.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/TTFReader.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontQualifier.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/truetype/TTFSubSetFile.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/PostscriptParser.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/render/PrintRenderer.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererContext.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.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/intermediate/IFSerializer.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/print/PageableRenderer.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/ps/PSRenderingUtil.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FOPRtfAttributes.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/PageAttributesConverter.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/TextAttributesConverter.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/RtfFontManager.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.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/RtfTable.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.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/TXTRenderer.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/ACIUtils.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.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/font/FOPGVTGlyphVector.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/RunTest.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/XMLUtil.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.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/fotreetest/FOTreeTestCase.java
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -47,7 +47,7 @@ public class AFPResourceLevelDefaults {
if (result == null) {
throw new IllegalArgumentException("Unknown resource type name: " + resourceTypeName);
}
- return result.byteValue();
+ return result;
}
private Map defaultResourceLevels = new java.util.HashMap();
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -94,9 +94,9 @@ public class RasterFont extends AFPFont
SortedMap<Integer, CharacterSet> smallerSizes = charSets.headMap(requestedSize);
SortedMap<Integer, CharacterSet> largerSizes = charSets.tailMap(requestedSize);
int smallerSize = smallerSizes.isEmpty() ? 0
- : smallerSizes.lastKey().intValue();
+ : smallerSizes.lastKey();
int largerSize = largerSizes.isEmpty() ? Integer.MAX_VALUE
- : largerSizes.firstKey().intValue();
+ : largerSizes.firstKey();
Integer fontSize;
if (!smallerSizes.isEmpty()
@@ -115,9 +115,9 @@ public class RasterFont extends AFPFont
}
substitutionCharSets.put(requestedSize, csm);
// do not output the warning if the font size is closer to an integer less than 0.1
- if (!(Math.abs(fontSize.intValue() / 1000.0 - sizeInPt) < 0.1)) {
+ if (!(Math.abs(fontSize / 1000.0 - sizeInPt) < 0.1)) {
String msg = "No " + sizeInPt + "pt font " + getFontName()
- + " found, substituted with " + fontSize.intValue() / 1000f + "pt font";
+ + " found, substituted with " + fontSize / 1000f + "pt font";
LOG.warn(msg);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java Fri Sep 16 10:43:45 2016
@@ -716,7 +716,7 @@ public class FOUserAgent {
public boolean isAccessibilityEnabled() {
Boolean enabled = (Boolean)this.getRendererOptions().get(Accessibility.ACCESSIBILITY);
if (enabled != null) {
- return enabled.booleanValue();
+ return enabled;
} else {
return false;
}
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -196,7 +196,7 @@ public final class GlyphClassTable exten
if (it.hasNext()) {
Object o = it.next();
if (o instanceof Integer) {
- firstGlyph = ((Integer) o) .intValue();
+ firstGlyph = (Integer) o;
} else {
throw new AdvancedTypographicTableFormatException("illegal entry, first entry must be Integer denoting first glyph value, but is: " + o);
}
@@ -209,7 +209,7 @@ public final class GlyphClassTable exten
while (it.hasNext()) {
Object o = it.next();
if (o instanceof Integer) {
- int gc = ((Integer) o) .intValue();
+ int gc = (Integer) o;
gca [ i++ ] = gc;
if (gc > gcMax) {
gcMax = gc;
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -181,7 +181,7 @@ public final class GlyphCoverageTable ex
for (Iterator it = entries.iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof Integer) {
- int gid = ((Integer) o) .intValue();
+ int gid = (Integer) o;
if ((gid >= 0) && (gid < 65536)) {
if (gid > gidMax) {
map [ i++ ] = gidMax = gid;
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -579,12 +579,12 @@ public class GlyphPositioningTable exten
if (((o = entries.get(2)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, third entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- nc1 = ((Integer)(o)).intValue();
+ nc1 = (Integer) (o);
}
if (((o = entries.get(3)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, fourth entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- nc2 = ((Integer)(o)).intValue();
+ nc2 = (Integer) (o);
}
if (((o = entries.get(4)) == null) || !(o instanceof PairValues[][])) {
throw new AdvancedTypographicTableFormatException("illegal entries, fifth entry must be a PairValues[][], but is: " + ((o != null) ? o.getClass() : null));
@@ -840,7 +840,7 @@ public class GlyphPositioningTable exten
if (((o = entries.get(1)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, second entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- nmc = ((Integer)(o)).intValue();
+ nmc = (Integer) (o);
}
if (((o = entries.get(2)) == null) || !(o instanceof MarkAnchor[])) {
throw new AdvancedTypographicTableFormatException("illegal entries, third entry must be a MarkAnchor[], but is: " + ((o != null) ? o.getClass() : null));
@@ -994,12 +994,12 @@ public class GlyphPositioningTable exten
if (((o = entries.get(1)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, second entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- nmc = ((Integer)(o)).intValue();
+ nmc = (Integer) (o);
}
if (((o = entries.get(2)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, third entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- mxc = ((Integer)(o)).intValue();
+ mxc = (Integer) (o);
}
if (((o = entries.get(3)) == null) || !(o instanceof MarkAnchor[])) {
throw new AdvancedTypographicTableFormatException("illegal entries, fourth entry must be a MarkAnchor[], but is: " + ((o != null) ? o.getClass() : null));
@@ -1130,7 +1130,7 @@ public class GlyphPositioningTable exten
if (((o = entries.get(1)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, second entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- nmc = ((Integer)(o)).intValue();
+ nmc = (Integer) (o);
}
if (((o = entries.get(2)) == null) || !(o instanceof MarkAnchor[])) {
throw new AdvancedTypographicTableFormatException("illegal entries, third entry must be a MarkAnchor[], but is: " + ((o != null) ? o.getClass() : null));
@@ -1372,7 +1372,7 @@ public class GlyphPositioningTable exten
if (((o = entries.get(1)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, second entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- ngc = ((Integer)(o)).intValue();
+ ngc = (Integer) (o);
}
if (((o = entries.get(2)) == null) || !(o instanceof RuleSet[])) {
throw new AdvancedTypographicTableFormatException("illegal entries, third entry must be an RuleSet[], but is: " + ((o != null) ? o.getClass() : null));
@@ -1676,7 +1676,7 @@ public class GlyphPositioningTable exten
if (((o = entries.get(3)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, fourth entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- ngc = ((Integer)(o)).intValue();
+ ngc = (Integer) (o);
}
if (((o = entries.get(4)) == null) || !(o instanceof RuleSet[])) {
throw new AdvancedTypographicTableFormatException("illegal entries, fifth entry must be an RuleSet[], but is: " + ((o != null) ? o.getClass() : null));
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -305,7 +305,7 @@ public class GlyphSubstitutionTable exte
Object o = entries.get(0);
int delta = 0;
if (o instanceof Integer) {
- delta = ((Integer) o) .intValue();
+ delta = (Integer) o;
} else {
throw new AdvancedTypographicTableFormatException("illegal entries entry, must be Integer, but is: " + o);
}
@@ -346,7 +346,7 @@ public class GlyphSubstitutionTable exte
for (Iterator it = entries.iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof Integer) {
- int gid = ((Integer) o) .intValue();
+ int gid = (Integer) o;
if ((gid >= 0) && (gid < 65536)) {
glyphs [ i++ ] = gid;
} else {
@@ -901,7 +901,7 @@ public class GlyphSubstitutionTable exte
if (((o = entries.get(1)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, second entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- ngc = ((Integer)(o)).intValue();
+ ngc = (Integer) (o);
}
if (((o = entries.get(2)) == null) || !(o instanceof RuleSet[])) {
throw new AdvancedTypographicTableFormatException("illegal entries, third entry must be an RuleSet[], but is: " + ((o != null) ? o.getClass() : null));
@@ -1206,7 +1206,7 @@ public class GlyphSubstitutionTable exte
if (((o = entries.get(3)) == null) || !(o instanceof Integer)) {
throw new AdvancedTypographicTableFormatException("illegal entries, fourth entry must be an Integer, but is: " + ((o != null) ? o.getClass() : null));
} else {
- ngc = ((Integer)(o)).intValue();
+ ngc = (Integer) (o);
}
if (((o = entries.get(4)) == null) || !(o instanceof RuleSet[])) {
throw new AdvancedTypographicTableFormatException("illegal entries, fifth entry must be an RuleSet[], but is: " + ((o != null) ? o.getClass() : null));
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -3647,12 +3647,12 @@ public final class OTFAdvancedTypographi
Integer sf = (Integer) stp[5]; // subtable format
GlyphMappingTable mapping = (GlyphMappingTable) stp[6];
List entries = (List) stp[7];
- if (tt.intValue() == GlyphTable.GLYPH_TABLE_TYPE_DEFINITION) {
+ if (tt == GlyphTable.GLYPH_TABLE_TYPE_DEFINITION) {
int type = GDEFLookupType.getSubtableType(lt.intValue());
- String lid = "lu" + ln.intValue();
- int sequence = sn.intValue();
- int flags = lf.intValue();
- int format = sf.intValue();
+ String lid = "lu" + ln;
+ int sequence = sn;
+ int flags = lf;
+ int format = sf;
st = GlyphDefinitionTable.createSubtable(type, lid, sequence, flags, format, mapping, entries);
}
return st;
@@ -3683,12 +3683,12 @@ public final class OTFAdvancedTypographi
Integer sf = (Integer) stp[5]; // subtable format
GlyphCoverageTable coverage = (GlyphCoverageTable) stp[6];
List entries = (List) stp[7];
- if (tt.intValue() == GlyphTable.GLYPH_TABLE_TYPE_SUBSTITUTION) {
+ if (tt == GlyphTable.GLYPH_TABLE_TYPE_SUBSTITUTION) {
int type = GSUBLookupType.getSubtableType(lt.intValue());
- String lid = "lu" + ln.intValue();
- int sequence = sn.intValue();
- int flags = lf.intValue();
- int format = sf.intValue();
+ String lid = "lu" + ln;
+ int sequence = sn;
+ int flags = lf;
+ int format = sf;
st = GlyphSubstitutionTable.createSubtable(type, lid, sequence, flags, format, coverage, entries);
}
return st;
@@ -3719,12 +3719,12 @@ public final class OTFAdvancedTypographi
Integer sf = (Integer) stp[5]; // subtable format
GlyphCoverageTable coverage = (GlyphCoverageTable) stp[6];
List entries = (List) stp[7];
- if (tt.intValue() == GlyphTable.GLYPH_TABLE_TYPE_POSITIONING) {
+ if (tt == GlyphTable.GLYPH_TABLE_TYPE_POSITIONING) {
int type = GSUBLookupType.getSubtableType(lt.intValue());
- String lid = "lu" + ln.intValue();
- int sequence = sn.intValue();
- int flags = lf.intValue();
- int format = sf.intValue();
+ String lid = "lu" + ln;
+ int sequence = sn;
+ int flags = lf;
+ int format = sf;
st = GlyphPositioningTable.createSubtable(type, lid, sequence, flags, format, coverage, entries);
}
return st;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java Fri Sep 16 10:43:45 2016
@@ -106,7 +106,7 @@ public class DevanagariScriptProcessor e
private static boolean containsHalfConsonant(GlyphSequence gs, int k) {
Boolean half = (Boolean) gs.getAssociation(k) .getPredication("half");
- return (half != null) ? half.booleanValue() : false;
+ return (half != null) ? half : false;
}
@Override
@@ -156,7 +156,7 @@ public class DevanagariScriptProcessor e
private static boolean containsReph(GlyphSequence gs, int k) {
Boolean rphf = (Boolean) gs.getAssociation(k) .getPredication("rphf");
- return (rphf != null) ? rphf.booleanValue() : false;
+ return (rphf != null) ? rphf : false;
}
private static boolean containsMatra(GlyphSequence gs, int k) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java Fri Sep 16 10:43:45 2016
@@ -106,7 +106,7 @@ public class GujaratiScriptProcessor ext
private static boolean containsHalfConsonant(GlyphSequence gs, int k) {
Boolean half = (Boolean) gs.getAssociation(k) .getPredication("half");
- return (half != null) ? half.booleanValue() : false;
+ return (half != null) ? half : false;
}
@Override
@@ -156,7 +156,7 @@ public class GujaratiScriptProcessor ext
private static boolean containsReph(GlyphSequence gs, int k) {
Boolean rphf = (Boolean) gs.getAssociation(k) .getPredication("rphf");
- return (rphf != null) ? rphf.booleanValue() : false;
+ return (rphf != null) ? rphf : false;
}
private static boolean containsMatra(GlyphSequence gs, int k) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java Fri Sep 16 10:43:45 2016
@@ -106,7 +106,7 @@ public class GurmukhiScriptProcessor ext
private static boolean containsHalfConsonant(GlyphSequence gs, int k) {
Boolean half = (Boolean) gs.getAssociation(k) .getPredication("half");
- return (half != null) ? half.booleanValue() : false;
+ return (half != null) ? half : false;
}
@Override
@@ -156,7 +156,7 @@ public class GurmukhiScriptProcessor ext
private static boolean containsReph(GlyphSequence gs, int k) {
Boolean rphf = (Boolean) gs.getAssociation(k) .getPredication("rphf");
- return (rphf != null) ? rphf.booleanValue() : false;
+ return (rphf != null) ? rphf : false;
}
private static boolean containsMatra(GlyphSequence gs, int k) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java Fri Sep 16 10:43:45 2016
@@ -106,7 +106,7 @@ public class TamilScriptProcessor extend
private static boolean containsHalfConsonant(GlyphSequence gs, int k) {
Boolean half = (Boolean) gs.getAssociation(k).getPredication("half");
- return (half != null) ? half.booleanValue() : false;
+ return (half != null) ? half : false;
}
@Override
@@ -156,7 +156,7 @@ public class TamilScriptProcessor extend
private static boolean containsReph(GlyphSequence gs, int k) {
Boolean rphf = (Boolean) gs.getAssociation(k).getPredication("rphf");
- return (rphf != null) ? rphf.booleanValue() : false;
+ return (rphf != null) ? rphf : false;
}
private static boolean containsMatra(GlyphSequence gs, int k) {
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -713,7 +713,7 @@ public final class CharScript {
int[] sa = new int [ s.size() ];
int ns = 0;
for (Iterator it = s.iterator(); it.hasNext();) {
- sa [ ns++ ] = ((Integer) it.next()) .intValue();
+ sa [ ns++ ] = (Integer) it.next();
}
Arrays.sort(sa);
return sa;
@@ -732,7 +732,7 @@ public final class CharScript {
Integer k = s;
Integer v = (Integer) m.get(k);
if (v != null) {
- m.put(k, v.intValue() + 1);
+ m.put(k, v + 1);
} else {
m.put(k, 0);
}
@@ -742,7 +742,7 @@ public final class CharScript {
for (Iterator it = m.entrySet().iterator(); it.hasNext();) {
Map.Entry e = (Map.Entry) it.next();
Integer k = (Integer) e.getKey();
- int s = k.intValue();
+ int s = k;
switch (s) {
case SCRIPT_UNDETERMINED:
case SCRIPT_UNCODED:
@@ -750,7 +750,7 @@ public final class CharScript {
default:
Integer v = (Integer) e.getValue();
assert v != null;
- int c = v.intValue();
+ int c = v;
if (c > cMax) {
cMax = c;
sMax = s;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/NumberConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/NumberConverter.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/NumberConverter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/complexscripts/util/NumberConverter.java Fri Sep 16 10:43:45 2016
@@ -254,7 +254,7 @@ public class NumberConverter {
if (number < 0) {
throw new IllegalArgumentException("number must be non-negative");
} else if (token.length == 1) {
- int s = token[0].intValue();
+ int s = token[0];
switch (s) {
case (int) '1':
fn = formatNumberAsDecimal(number, (int) '1', 1);
@@ -282,7 +282,7 @@ public class NumberConverter {
} else if ((token.length == 2) && (token[0] == (int) 'W') && (token[1] == (int) 'w')) {
fn = formatNumberAsWord(number, Character.TITLECASE_LETTER);
} else if (isPaddedOne(token)) {
- int s = token [ token.length - 1 ].intValue();
+ int s = token[token.length - 1];
fn = formatNumberAsDecimal(number, s, token.length);
} else {
throw new IllegalArgumentException("invalid format token: \"" + UTF32.fromUTF32(token) + "\"");
@@ -503,7 +503,7 @@ public class NumberConverter {
}
private static int getDecimalValue(Integer scalar) {
- int s = scalar.intValue();
+ int s = scalar;
if (Character.getType(s) == Character.DECIMAL_DIGIT_NUMBER) {
return Character.getNumericValue(s);
} else {
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -79,8 +79,7 @@ public final class PropertyCache<T> {
boolean useCache;
try {
useCache = Boolean.valueOf(
- System.getProperty("org.apache.fop.fo.properties.use-cache", "true"))
- .booleanValue();
+ System.getProperty("org.apache.fop.fo.properties.use-cache", "true"));
} catch (SecurityException e) {
useCache = true;
LOG.info("Unable to access org.apache.fop.fo.properties.use-cache"
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDSubset.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDSubset.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDSubset.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/CIDSubset.java Fri Sep 16 10:43:45 2016
@@ -84,7 +84,7 @@ public class CIDSubset implements CIDSet
public char getUnicode(int index) {
Character mapValue = usedCharsIndex.get(index);
if (mapValue != null) {
- return mapValue.charValue();
+ return mapValue;
} else {
return CharUtilities.NOT_A_CHARACTER;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Font.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Font.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Font.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/Font.java Fri Sep 16 10:43:45 2016
@@ -199,7 +199,7 @@ public class Font implements Substitutab
if (kernPair != null) {
Integer width = kernPair.get((int) ch2);
if (width != null) {
- return width.intValue() * getFontSize() / 1000;
+ return width * getFontSize() / 1000;
}
}
return 0;
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -408,7 +408,7 @@ public final class FontCache implements
synchronized (changeLock) {
if (getFailedFontMap().containsKey(embedUrl)) {
long failedLastModified = getFailedFontMap().get(
- embedUrl).longValue();
+ embedUrl);
if (lastModified != failedLastModified) {
// this font has been changed so lets remove it
// from failed font map for now
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -134,7 +134,7 @@ public class FontInfo {
String oldName = triplets.get(triplet);
int newPriority = triplet.getPriority();
if (oldName != null) {
- int oldPriority = tripletPriorities.get(triplet).intValue();
+ int oldPriority = tripletPriorities.get(triplet);
if (oldPriority < newPriority) {
logDuplicateFont(triplet, false, oldName, oldPriority, internalFontKey, newPriority);
return;
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -56,7 +56,7 @@ public class SimpleSingleByteEncoding im
public char mapChar(char c) {
Character nc = charMap.get(c);
if (nc != null) {
- return nc.charValue();
+ return nc;
}
return NOT_FOUND_CODE_POINT;
}
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -247,7 +247,7 @@ public class SingleByteFont extends Cust
private char getUnicode(int index) {
Character mapValue = usedCharsIndex.get(index);
if (mapValue != null) {
- return mapValue.charValue();
+ return mapValue;
} else {
return CharUtilities.NOT_A_CHARACTER;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/XMLFontMetricsReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/XMLFontMetricsReader.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/XMLFontMetricsReader.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/XMLFontMetricsReader.java Fri Sep 16 10:43:45 2016
@@ -291,7 +291,7 @@ public class XMLFontMetricsReader extend
int[] wds = new int[cidWidths.size()];
int j = 0;
for (int count = 0; count < cidWidths.size(); count++) {
- wds[j++] = cidWidths.get(count).intValue();
+ wds[j++] = cidWidths.get(count);
}
//multiFont.addCIDWidthEntry(cidWidthIndex, wds);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/TTFReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/TTFReader.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/TTFReader.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/apps/TTFReader.java Fri Sep 16 10:43:45 2016
@@ -464,7 +464,7 @@ public class TTFReader extends AbstractF
for (Map.Entry<Integer, Integer> e : h2.entrySet()) {
Integer kpx2 = e.getKey();
- if (isCid || kpx2.intValue() < 256) {
+ if (isCid || kpx2 < 256) {
el2 = doc.createElement("pair");
el2.setAttribute("kpx2", kpx2.toString());
Integer val = e.getValue();
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontQualifier.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontQualifier.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontQualifier.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontQualifier.java Fri Sep 16 10:43:45 2016
@@ -189,7 +189,7 @@ public class FontQualifier {
}
} else if (weightObj instanceof Integer) {
Integer fontWeightInteger = (Integer)weightObj;
- int fontWeightValue = fontWeightInteger.intValue();
+ int fontWeightValue = fontWeightInteger;
if (fontWeightValue == fontWeight) {
weightMatched = true;
}
@@ -272,7 +272,7 @@ public class FontQualifier {
triplets.add(new FontTriplet(name, style, weight));
} else if (weightObj instanceof Integer) {
Integer weightInteger = (Integer)weightObj;
- int weight = weightInteger.intValue();
+ int weight = weightInteger;
triplets.add(new FontTriplet(name, style, weight));
}
}
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -553,14 +553,14 @@ public abstract class OpenFont {
List<Integer> v = ansiIndex.get(j);
if (v != null) {
for (Integer aIdx : v) {
- ansiWidth[aIdx.intValue()]
+ ansiWidth[aIdx]
= mtxTab[glyphIdx].getWx();
if (log.isTraceEnabled()) {
log.trace("Added width "
+ mtxTab[glyphIdx].getWx()
+ " uni: " + j
- + " ansi: " + aIdx.intValue());
+ + " ansi: " + aIdx);
}
}
}
@@ -596,7 +596,7 @@ public abstract class OpenFont {
List<Integer> v = ansiIndex.get(j);
if (v != null) {
for (Integer aIdx : v) {
- ansiWidth[aIdx.intValue()] = mtxTab[glyphIdx].getWx();
+ ansiWidth[aIdx] = mtxTab[glyphIdx].getWx();
}
}
@@ -1633,13 +1633,13 @@ public abstract class OpenFont {
for (Map.Entry<Integer, Integer> e : ckpx.entrySet()) {
Integer unicodeKey2 = e.getKey();
- Integer cidKey2 = unicodeToGlyph(unicodeKey2.intValue());
+ Integer cidKey2 = unicodeToGlyph(unicodeKey2);
Integer kern = e.getValue();
- Iterator uniMap = mtxTab[cidKey2.intValue()].getUnicodeIndex().listIterator();
+ Iterator uniMap = mtxTab[cidKey2].getUnicodeIndex().listIterator();
while (uniMap.hasNext()) {
Integer unicodeKey = (Integer)uniMap.next();
- Integer[] ansiKeys = unicodeToWinAnsi(unicodeKey.intValue());
+ Integer[] ansiKeys = unicodeToWinAnsi(unicodeKey);
for (int u = 0; u < ansiKeys.length; u++) {
akpx.put(ansiKeys[u], kern);
}
@@ -1647,10 +1647,10 @@ public abstract class OpenFont {
}
if (akpx.size() > 0) {
- Iterator uniMap = mtxTab[cidKey1.intValue()].getUnicodeIndex().listIterator();
+ Iterator uniMap = mtxTab[cidKey1].getUnicodeIndex().listIterator();
while (uniMap.hasNext()) {
Integer unicodeKey = (Integer)uniMap.next();
- Integer[] ansiKeys = unicodeToWinAnsi(unicodeKey.intValue());
+ Integer[] ansiKeys = unicodeToWinAnsi(unicodeKey);
for (int u = 0; u < ansiKeys.length; u++) {
ansiKerningTab.put(ansiKeys[u], akpx);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java Fri Sep 16 10:43:45 2016
@@ -435,10 +435,10 @@ public class TTFSubSetFile extends TTFFi
Integer origIndex = glyph.getKey();
Integer subsetIndex = glyph.getValue();
- writeUShort(currentPos + subsetIndex.intValue() * 4,
- mtxTab[origIndex.intValue()].getWx());
- writeUShort(currentPos + subsetIndex.intValue() * 4 + 2,
- mtxTab[origIndex.intValue()].getLsb());
+ writeUShort(currentPos + subsetIndex * 4,
+ mtxTab[origIndex].getWx());
+ writeUShort(currentPos + subsetIndex * 4 + 2,
+ mtxTab[origIndex].getLsb());
}
updateCheckSum(currentPos, hmtxSize, hmtx);
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -202,7 +202,7 @@ public class AFMParser {
}
Integer newParseMode = PARSE_MODE_CHANGES.get(key);
if (newParseMode != null) {
- parseMode = newParseMode.intValue();
+ parseMode = newParseMode;
}
}
return (AFMFile)stack.pop();
@@ -528,7 +528,7 @@ public class AFMParser {
private static class IsBaseFont extends AbstractValueHandler {
public void parse(String line, int startpos, Stack<Object> stack) throws IOException {
- if (getBooleanValue(line, startpos).booleanValue()) {
+ if (getBooleanValue(line, startpos)) {
throw new IOException("Only base fonts are currently supported!");
}
}
@@ -536,7 +536,7 @@ public class AFMParser {
private static class IsCIDFont extends AbstractValueHandler {
public void parse(String line, int startpos, Stack<Object> stack) throws IOException {
- if (getBooleanValue(line, startpos).booleanValue()) {
+ if (getBooleanValue(line, startpos)) {
throw new IOException("CID fonts are currently not supported!");
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PostscriptParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PostscriptParser.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PostscriptParser.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/type1/PostscriptParser.java Fri Sep 16 10:43:45 2016
@@ -244,7 +244,7 @@ public class PostscriptParser {
private void parseToken(int pos) throws UnsupportedEncodingException {
byte[] bytesToken = new byte[token.size()];
for (int i = 0; i < token.size(); i++) {
- bytesToken[i] = token.get(i).byteValue();
+ bytesToken[i] = token.get(i);
}
parseToken(new String(bytesToken, "ASCII"), pos);
token.clear();
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -536,7 +536,7 @@ class RowPainter {
* @return its y-offset on the page
*/
private int getRowOffset(int rowIndex) {
- return ((Integer) rowOffsets.get(rowIndex - firstRowIndex)).intValue();
+ return (Integer) rowOffsets.get(rowIndex - firstRowIndex);
}
// TODO get rid of that
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -116,7 +116,7 @@ public abstract class PrintRenderer exte
*/
protected Font getFontFromArea(Area area) {
FontTriplet triplet = (FontTriplet)area.getTrait(Trait.FONT);
- int size = ((Integer)area.getTrait(Trait.FONT_SIZE)).intValue();
+ int size = (Integer) area.getTrait(Trait.FONT_SIZE);
return fontInfo.getFontInstance(triplet, size);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererContext.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererContext.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererContext.java Fri Sep 16 10:43:45 2016
@@ -151,22 +151,22 @@ public class RendererContext {
/** @return the currentXPosition */
public int getCurrentXPosition() {
- return ((Integer)context.getProperty(RendererContextConstants.XPOS)).intValue();
+ return (Integer) context.getProperty(RendererContextConstants.XPOS);
}
/** @return the currentYPosition */
public int getCurrentYPosition() {
- return ((Integer)context.getProperty(RendererContextConstants.YPOS)).intValue();
+ return (Integer) context.getProperty(RendererContextConstants.YPOS);
}
/** @return the width of the image */
public int getWidth() {
- return ((Integer)context.getProperty(RendererContextConstants.WIDTH)).intValue();
+ return (Integer) context.getProperty(RendererContextConstants.WIDTH);
}
/** @return the height of the image */
public int getHeight() {
- return ((Integer)context.getProperty(RendererContextConstants.HEIGHT)).intValue();
+ return (Integer) context.getProperty(RendererContextConstants.HEIGHT);
}
/** @return the foreign attributes */
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java Fri Sep 16 10:43:45 2016
@@ -54,10 +54,10 @@ public class AFPRendererContext extends
*/
public AFPInfo getInfo() {
AFPInfo info = new AFPInfo();
- info.setWidth(((Integer)getProperty(RendererContextConstants.WIDTH)).intValue());
- info.setHeight(((Integer)getProperty(RendererContextConstants.HEIGHT)).intValue());
- info.setX(((Integer)getProperty(RendererContextConstants.XPOS)).intValue());
- info.setY(((Integer)getProperty(RendererContextConstants.YPOS)).intValue());
+ info.setWidth((Integer) getProperty(RendererContextConstants.WIDTH));
+ info.setHeight((Integer) getProperty(RendererContextConstants.HEIGHT));
+ info.setX((Integer) getProperty(RendererContextConstants.XPOS));
+ info.setY((Integer) getProperty(RendererContextConstants.YPOS));
info.setHandlerConfiguration((Configuration)getProperty(
RendererContextConstants.HANDLER_CONFIGURATION));
info.setFontInfo((org.apache.fop.fonts.FontInfo)getProperty(
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java Fri Sep 16 10:43:45 2016
@@ -432,13 +432,13 @@ public abstract class AbstractIFPainter<
state.setFontStyle(style);
}
if (weight != null) {
- state.setFontWeight(weight.intValue());
+ state.setFontWeight(weight);
}
if (variant != null) {
state.setFontVariant(variant);
}
if (size != null) {
- state.setFontSize(size.intValue());
+ state.setFontSize(size);
}
if (color != null) {
state.setTextColor(color);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java Fri Sep 16 10:43:45 2016
@@ -956,7 +956,7 @@ public class IFRenderer extends Abstract
boolean idRefOK = idRef != null && idRef.length() > 0;
if (pvKeyOK && idRefOK) {
Integer pageIndex = (Integer)pageIndices.get(pvKey);
- action = getGoToActionForID(idRef, (pageIndex != null ? pageIndex.intValue() : -1));
+ action = getGoToActionForID(idRef, (pageIndex != null ? pageIndex : -1));
} else {
//Warnings already issued by AreaTreeHandler
}
@@ -1038,7 +1038,7 @@ public class IFRenderer extends Abstract
beginTextObject();
String fontName = getInternalFontNameForArea(text);
- int size = ((Integer) text.getTrait(Trait.FONT_SIZE)).intValue();
+ int size = (Integer) text.getTrait(Trait.FONT_SIZE);
StructureTreeElement structElem
= (StructureTreeElement) text.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
establishStructureTreeElement(structElem);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java Fri Sep 16 10:43:45 2016
@@ -728,9 +728,9 @@ implements IFConstants, IFPainter, IFDoc
}
}
if (weight != null) {
- changed = (weight.intValue() != state.getFontWeight());
+ changed = (weight != state.getFontWeight());
if (changed) {
- state.setFontWeight(weight.intValue());
+ state.setFontWeight(weight);
addAttribute(atts, "weight", weight.toString());
}
}
@@ -742,9 +742,9 @@ implements IFConstants, IFPainter, IFDoc
}
}
if (size != null) {
- changed = (size.intValue() != state.getFontSize());
+ changed = (size != state.getFontSize());
if (changed) {
- state.setFontSize(size.intValue());
+ state.setFontSize(size);
addAttribute(atts, "size", size.toString());
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DSVGHandler.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DSVGHandler.java Fri Sep 16 10:43:45 2016
@@ -69,10 +69,10 @@ public class Java2DSVGHandler extends Ab
public static Java2DInfo getJava2DInfo(RendererContext context) {
Java2DInfo pdfi = new Java2DInfo();
pdfi.state = (Java2DGraphicsState)context.getProperty(JAVA2D_STATE);
- pdfi.width = ((Integer)context.getProperty(WIDTH)).intValue();
- pdfi.height = ((Integer)context.getProperty(HEIGHT)).intValue();
- pdfi.currentXPosition = ((Integer)context.getProperty(XPOS)).intValue();
- pdfi.currentYPosition = ((Integer)context.getProperty(YPOS)).intValue();
+ pdfi.width = (Integer) context.getProperty(WIDTH);
+ pdfi.height = (Integer) context.getProperty(HEIGHT);
+ pdfi.currentXPosition = (Integer) context.getProperty(XPOS);
+ pdfi.currentYPosition = (Integer) context.getProperty(YPOS);
Map foreign = (Map)context.getProperty(RendererContextConstants.FOREIGN_ATTRIBUTES);
pdfi.paintAsBitmap = ImageHandlerUtil.isConversionModeBitmap(foreign);
return pdfi;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java Fri Sep 16 10:43:45 2016
@@ -766,9 +766,9 @@ class PDFRenderingUtil {
private static boolean booleanValueOf(Object obj) {
if (obj instanceof Boolean) {
- return ((Boolean)obj).booleanValue();
+ return (Boolean) obj;
} else if (obj instanceof String) {
- return Boolean.valueOf((String)obj).booleanValue();
+ return Boolean.valueOf((String) obj);
} else {
throw new IllegalArgumentException("Boolean or \"true\" or \"false\" expected.");
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java Fri Sep 16 10:43:45 2016
@@ -62,13 +62,13 @@ public class PDFSVGHandler extends Abstr
pdfi.pdfPage = (PDFPage)context.getProperty(PDF_PAGE);
pdfi.pdfContext = (PDFResourceContext)context.getProperty(PDF_CONTEXT);
//pdfi.currentStream = (PDFStream)context.getProperty(PDF_STREAM);
- pdfi.width = ((Integer)context.getProperty(WIDTH)).intValue();
- pdfi.height = ((Integer)context.getProperty(HEIGHT)).intValue();
+ pdfi.width = (Integer) context.getProperty(WIDTH);
+ pdfi.height = (Integer) context.getProperty(HEIGHT);
pdfi.fi = (FontInfo)context.getProperty(PDF_FONT_INFO);
pdfi.currentFontName = (String)context.getProperty(PDF_FONT_NAME);
- pdfi.currentFontSize = ((Integer)context.getProperty(PDF_FONT_SIZE)).intValue();
- pdfi.currentXPosition = ((Integer)context.getProperty(XPOS)).intValue();
- pdfi.currentYPosition = ((Integer)context.getProperty(YPOS)).intValue();
+ pdfi.currentFontSize = (Integer) context.getProperty(PDF_FONT_SIZE);
+ pdfi.currentXPosition = (Integer) context.getProperty(XPOS);
+ pdfi.currentYPosition = (Integer) context.getProperty(YPOS);
pdfi.cfg = (Configuration)context.getProperty(HANDLER_CONFIGURATION);
Map foreign = (Map)context.getProperty(RendererContextConstants.FOREIGN_ATTRIBUTES);
pdfi.paintAsBitmap = ImageHandlerUtil.isConversionModeBitmap(foreign);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/print/PageableRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/print/PageableRenderer.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/print/PageableRenderer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/print/PageableRenderer.java Fri Sep 16 10:43:45 2016
@@ -123,11 +123,11 @@ public class PageableRenderer extends Ja
protected int getPositiveInteger(Object o) {
if (o instanceof Integer) {
Integer i = (Integer)o;
- if (i.intValue() < 1) {
+ if (i < 1) {
throw new IllegalArgumentException(
"Value must be a positive Integer");
}
- return i.intValue();
+ return i;
} else if (o instanceof String) {
return Integer.parseInt((String)o);
} else {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSDocumentHandler.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSDocumentHandler.java Fri Sep 16 10:43:45 2016
@@ -332,7 +332,7 @@ public class PSDocumentHandler extends A
gen.getResourceTracker().notifyResourceUsageOnPage(PSProcSets.STD_PROCSET);
gen.writeDSCComment(DSCConstants.PAGE, new Object[]
{name,
- Integer.valueOf(this.currentPageNumber)});
+ this.currentPageNumber});
double pageWidth = size.width / 1000.0;
double pageHeight = size.height / 1000.0;
@@ -383,20 +383,20 @@ public class PSDocumentHandler extends A
if (rotate) {
pageBoundingBox.setRect(0, 0, pageHeight, pageWidth);
gen.writeDSCComment(DSCConstants.PAGE_BBOX, new Object[] {
- zero, zero, Long.valueOf(Math.round(pageHeight)),
- Long.valueOf(Math.round(pageWidth)) });
+ zero, zero, Math.round(pageHeight),
+ Math.round(pageWidth)});
gen.writeDSCComment(DSCConstants.PAGE_HIRES_BBOX, new Object[] {
- zero, zero, Double.valueOf(pageHeight),
- Double.valueOf(pageWidth) });
+ zero, zero, pageHeight,
+ pageWidth});
gen.writeDSCComment(DSCConstants.PAGE_ORIENTATION, "Landscape");
} else {
pageBoundingBox.setRect(0, 0, pageWidth, pageHeight);
gen.writeDSCComment(DSCConstants.PAGE_BBOX, new Object[] {
- zero, zero, Long.valueOf(Math.round(pageWidth)),
- Long.valueOf(Math.round(pageHeight)) });
+ zero, zero, Math.round(pageWidth),
+ Math.round(pageHeight)});
gen.writeDSCComment(DSCConstants.PAGE_HIRES_BBOX, new Object[] {
- zero, zero, Double.valueOf(pageWidth),
- Double.valueOf(pageHeight) });
+ zero, zero, pageWidth,
+ pageHeight});
if (psUtil.isAutoRotateLandscape()) {
gen.writeDSCComment(DSCConstants.PAGE_ORIENTATION,
"Portrait");
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java Fri Sep 16 10:43:45 2016
@@ -90,9 +90,9 @@ public class PSRenderingUtil {
private boolean booleanValueOf(Object obj) {
if (obj instanceof Boolean) {
- return ((Boolean)obj).booleanValue();
+ return (Boolean) obj;
} else if (obj instanceof String) {
- return Boolean.valueOf((String)obj).booleanValue();
+ return Boolean.valueOf((String) obj);
} else {
throw new IllegalArgumentException("Boolean or \"true\" or \"false\" expected.");
}
@@ -100,7 +100,7 @@ public class PSRenderingUtil {
private int intValueOf(Object obj) {
if (obj instanceof Integer) {
- return ((Integer)obj).intValue();
+ return (Integer) obj;
} else if (obj instanceof String) {
return Integer.parseInt((String)obj);
} else {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java Fri Sep 16 10:43:45 2016
@@ -72,10 +72,10 @@ public class PSSVGHandler extends Abstra
PSInfo psi = new PSInfo();
psi.psGenerator = (PSGenerator)context.getProperty(PS_GENERATOR);
psi.fontInfo = (org.apache.fop.fonts.FontInfo) context.getProperty(PS_FONT_INFO);
- psi.width = ((Integer)context.getProperty(WIDTH)).intValue();
- psi.height = ((Integer)context.getProperty(HEIGHT)).intValue();
- psi.currentXPosition = ((Integer)context.getProperty(XPOS)).intValue();
- psi.currentYPosition = ((Integer)context.getProperty(YPOS)).intValue();
+ psi.width = (Integer) context.getProperty(WIDTH);
+ psi.height = (Integer) context.getProperty(HEIGHT);
+ psi.currentXPosition = (Integer) context.getProperty(XPOS);
+ psi.currentYPosition = (Integer) context.getProperty(YPOS);
psi.cfg = (Configuration)context.getProperty(HANDLER_CONFIGURATION);
return psi;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FOPRtfAttributes.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FOPRtfAttributes.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FOPRtfAttributes.java Fri Sep 16 10:43:45 2016
@@ -78,7 +78,7 @@ public class FOPRtfAttributes extends Rt
int greenComponent = color.getGreen();
int blueComponent = color.getBlue();
set(name, RtfColorTable.getInstance().getColorNumber(
- redComponent, greenComponent, blueComponent).intValue());
+ redComponent, greenComponent, blueComponent));
return this;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/FoUnitsConverter.java Fri Sep 16 10:43:45 2016
@@ -101,7 +101,7 @@ final class FoUnitsConverter {
// convert number to integer
try {
if (number != null && number.trim().length() > 0) {
- result = Float.valueOf(number).floatValue();
+ result = Float.valueOf(number);
}
} catch (Exception e) {
throw new FOPException("number format error: cannot convert '"
@@ -114,7 +114,7 @@ final class FoUnitsConverter {
if (factor == null) {
throw new FOPException("conversion factor not found for '" + units + "' units");
}
- result *= factor.floatValue();
+ result *= factor;
}
return result;
@@ -132,7 +132,7 @@ final class FoUnitsConverter {
float result = 0;
size = size.substring(0, size.length() - sFONTSUFFIX.length());
try {
- result = (Float.valueOf(size).floatValue());
+ result = (Float.valueOf(size));
} catch (Exception e) {
throw new FOPException("Invalid font size value '" + size + "'");
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/PageAttributesConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/PageAttributesConverter.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/PageAttributesConverter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/PageAttributesConverter.java Fri Sep 16 10:43:45 2016
@@ -67,7 +67,7 @@ final class PageAttributesConverter {
Object widthRaw = attrib.getValue(RtfPage.PAGE_WIDTH);
Object heightRaw = attrib.getValue(RtfPage.PAGE_HEIGHT);
if ((widthRaw instanceof Integer) && (heightRaw instanceof Integer)
- && ((Integer) widthRaw).intValue() > ((Integer) heightRaw).intValue()) {
+ && (Integer) widthRaw > (Integer) heightRaw) {
attrib.set(RtfPage.LANDSCAPE);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java Fri Sep 16 10:43:45 2016
@@ -249,8 +249,8 @@ public class RTFHandler extends FOEventH
int useAblePageWidth = pagemaster.getPageWidth().getValue()
- pagemaster.getCommonMarginBlock().marginLeft.getValue()
- pagemaster.getCommonMarginBlock().marginRight.getValue()
- - sect.getRtfAttributes().getValueAsInteger(RtfPage.MARGIN_LEFT).intValue()
- - sect.getRtfAttributes().getValueAsInteger(RtfPage.MARGIN_RIGHT).intValue();
+ - sect.getRtfAttributes().getValueAsInteger(RtfPage.MARGIN_LEFT)
+ - sect.getRtfAttributes().getValueAsInteger(RtfPage.MARGIN_RIGHT);
percentManager.setDimension(pageSeq, useAblePageWidth);
bHeaderSpecified = false;
@@ -778,7 +778,7 @@ public class RTFHandler extends FOEventH
//while the current column is in row-spanning, act as if
//a vertical merged cell would have been specified.
while (tctx.getNumberOfColumns() > tctx.getColumnIndex()
- && tctx.getColumnRowSpanningNumber().intValue() > 0) {
+ && tctx.getColumnRowSpanningNumber() > 0) {
RtfTableCell vCell = row.newTableCellMergedVertically(
(int)tctx.getColumnWidth(),
tctx.getColumnRowSpanningAttrs());
@@ -819,7 +819,7 @@ public class RTFHandler extends FOEventH
//while the current column is in row-spanning, act as if
//a vertical merged cell would have been specified.
while (tctx.getNumberOfColumns() > tctx.getColumnIndex()
- && tctx.getColumnRowSpanningNumber().intValue() > 0) {
+ && tctx.getColumnRowSpanningNumber() > 0) {
RtfTableCell vCell = row.newTableCellMergedVertically(
(int)tctx.getColumnWidth(),
tctx.getColumnRowSpanningAttrs());
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/TextAttributesConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/TextAttributesConverter.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/TextAttributesConverter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/TextAttributesConverter.java Fri Sep 16 10:43:45 2016
@@ -529,6 +529,6 @@ final class TextAttributesConverter {
int greenComponent = fopColor.getGreen();
int blueComponent = fopColor.getBlue();
return RtfColorTable.getInstance().getColorNumber(redComponent,
- greenComponent, blueComponent).intValue();
+ greenComponent, blueComponent);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java Fri Sep 16 10:43:45 2016
@@ -59,7 +59,7 @@ public class RtfAttributes implements Cl
if (value == null) {
set(name);
} else {
- set(name, value.intValue());
+ set(name, value);
}
} else if (attrs.getValue(name) instanceof String) {
String value = (String)attrs.getValue(name);
@@ -234,7 +234,7 @@ public class RtfAttributes implements Cl
*/
public void addIntegerValue(int addValue, String name) {
Integer value = (Integer) getValue(name);
- int v = (value != null) ? value.intValue() : 0;
+ int v = (value != null) ? value : 0;
set(name, v + addValue);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java Fri Sep 16 10:43:45 2016
@@ -96,14 +96,14 @@ public final class RtfColorTable {
* Initialize the color table.
*/
private void init() {
- addNamedColor("black", getColorNumber(0, 0, 0).intValue());
- addNamedColor("white", getColorNumber(255, 255, 255).intValue());
- addNamedColor("red", getColorNumber(255, 0, 0).intValue());
- addNamedColor("green", getColorNumber(0, 255, 0).intValue());
- addNamedColor("blue", getColorNumber(0, 0, 255).intValue());
- addNamedColor("cyan", getColorNumber(0, 255, 255).intValue());
- addNamedColor("magenta", getColorNumber(255, 0, 255).intValue());
- addNamedColor("yellow", getColorNumber(255, 255, 0).intValue());
+ addNamedColor("black", getColorNumber(0, 0, 0));
+ addNamedColor("white", getColorNumber(255, 255, 255));
+ addNamedColor("red", getColorNumber(255, 0, 0));
+ addNamedColor("green", getColorNumber(0, 255, 0));
+ addNamedColor("blue", getColorNumber(0, 0, 255));
+ addNamedColor("cyan", getColorNumber(0, 255, 255));
+ addNamedColor("magenta", getColorNumber(255, 0, 255));
+ addNamedColor("yellow", getColorNumber(255, 255, 0));
getColorNumber(0, 0, 128);
getColorNumber(0, 128, 128);
@@ -115,7 +115,7 @@ public final class RtfColorTable {
// Added by Normand Masse
// Gray color added
- addNamedColor("gray", getColorNumber(128, 128, 128).intValue());
+ addNamedColor("gray", getColorNumber(128, 128, 128));
getColorNumber(192, 192, 192);
}
@@ -163,7 +163,7 @@ public final class RtfColorTable {
//The color was found. Before returning the index, increment
//it by one. Because index 0 is reserved for auto-colored, but
//is not contained in colorTable.
- retVal = ((Integer) o).intValue() + 1;
+ retVal = (Integer) o + 1;
}
return retVal;
@@ -192,7 +192,7 @@ public final class RtfColorTable {
int len = colorTable.size();
for (int i = 0; i < len; i++) {
- int identifier = ((Integer) colorTable.get(i)).intValue();
+ int identifier = (Integer) colorTable.get(i);
header.newLine();
header.write("\\red" + determineColorLevel(identifier, RED));
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java Fri Sep 16 10:43:45 2016
@@ -122,7 +122,7 @@ public final class RtfFontManager {
retVal = fontTable.size() - 1;
} else {
- retVal = ((Integer)o).intValue();
+ retVal = (Integer) o;
}
return retVal;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java Fri Sep 16 10:43:45 2016
@@ -91,7 +91,7 @@ extends RtfContainer {
Object heightRaw = attrib.getValue(PAGE_HEIGHT);
if ((widthRaw instanceof Integer) && (heightRaw instanceof Integer)
- && ((Integer) widthRaw).intValue() > ((Integer) heightRaw).intValue()) {
+ && (Integer) widthRaw > (Integer) heightRaw) {
writeControlWord(LANDSCAPE);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java Fri Sep 16 10:43:45 2016
@@ -73,7 +73,7 @@ public class RtfSpaceSplitter {
}
commonAttributes.unset(key);
- return i.intValue();
+ return i;
}
/** @return attributes, applicable to whole block. */
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.