Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java Thu Sep 1 13:02:29 2016
@@ -47,10 +47,10 @@ public final class GradientMaker {
Point2D startPoint = gp.getStartPoint();
Point2D endPoint = gp.getEndPoint();
List<Double> coords = new java.util.ArrayList<Double>(4);
- coords.add(Double.valueOf(startPoint.getX()));
- coords.add(Double.valueOf(startPoint.getY()));
- coords.add(Double.valueOf(endPoint.getX()));
- coords.add(Double.valueOf(endPoint.getY()));
+ coords.add(startPoint.getX());
+ coords.add(startPoint.getY());
+ coords.add(endPoint.getX());
+ coords.add(endPoint.getY());
return makeGradient(gp, coords, baseTransform, transform);
}
@@ -70,12 +70,12 @@ public final class GradientMaker {
dy *= scale;
}
List<Double> coords = new java.util.ArrayList<Double>(6);
- coords.add(Double.valueOf(center.getX() + dx));
- coords.add(Double.valueOf(center.getY() + dy));
- coords.add(Double.valueOf(0));
- coords.add(Double.valueOf(center.getX()));
- coords.add(Double.valueOf(center.getY()));
- coords.add(Double.valueOf(radius));
+ coords.add(center.getX() + dx);
+ coords.add(center.getY() + dy);
+ coords.add(0d);
+ coords.add(center.getX());
+ coords.add(center.getY());
+ coords.add(radius);
return makeGradient(gradient, coords, baseTransform, transform);
}
@@ -101,7 +101,7 @@ public final class GradientMaker {
double[] m = new double[6];
gradientTransform.getMatrix(m);
for (double d : m) {
- matrix.add(Double.valueOf(d));
+ matrix.add(d);
}
return matrix;
}
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -567,7 +567,7 @@ public class IFRenderer extends Abstract
log.trace("renderPage() " + page);
}
try {
- pageIndices.put(page.getKey(), new Integer(page.getPageIndex()));
+ pageIndices.put(page.getKey(), page.getPageIndex());
Rectangle viewArea = page.getViewArea();
Dimension dim = new Dimension(viewArea.width, viewArea.height);
@@ -1048,8 +1048,8 @@ public class IFRenderer extends Abstract
FontTriplet triplet = (FontTriplet)text.getTrait(Trait.FONT);
try {
- painter.setFont(triplet.getName(), triplet.getStyle(), new Integer(triplet.getWeight()),
- "normal", new Integer(size), ct);
+ painter.setFont(triplet.getName(), triplet.getStyle(), triplet.getWeight(),
+ "normal", size, ct);
} catch (IFException e) {
handleIFException(e);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DFontMetrics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DFontMetrics.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DFontMetrics.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DFontMetrics.java Thu Sep 1 13:02:29 2016
@@ -296,7 +296,7 @@ public class Java2DFontMetrics {
if ((style & Font.ITALIC) != 0) {
atts.put(TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE);
}
- atts.put(TextAttribute.SIZE, new Float(size)); //size in pt
+ atts.put(TextAttribute.SIZE, size); //size in pt
return new Font(atts);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java Thu Sep 1 13:02:29 2016
@@ -308,7 +308,7 @@ public abstract class AbstractImageAdapt
icm.getBlues(blues);
for (int i = 0; i < icm.getMapSize(); i++) {
if ((alphas[i] & 0xFF) == 0) {
- return Integer.valueOf(i);
+ return i;
}
}
return null;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java Thu Sep 1 13:02:29 2016
@@ -253,7 +253,7 @@ public class PDFDocumentHandler extends
pdfUtil.generatePageLabel(index, name);
currentPageRef = new PageReference(currentPage, size);
- this.pageReferences.put(Integer.valueOf(index), currentPageRef);
+ this.pageReferences.put(index, currentPageRef);
this.generator = new PDFContentGenerator(this.pdfDoc, this.outputStream,
this.currentPage);
@@ -335,7 +335,7 @@ public class PDFDocumentHandler extends
}
PageReference getPageReference(int pageIndex) {
- return this.pageReferences.get(Integer.valueOf(pageIndex));
+ return this.pageReferences.get(pageIndex);
}
static final class PageReference {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryElement.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryElement.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFCollectionEntryElement.java Thu Sep 1 13:02:29 2016
@@ -124,9 +124,9 @@ public class PDFCollectionEntryElement e
try {
double d = Double.parseDouble(value);
if (Math.abs(Math.floor(d) - d) < 1E-10) {
- extension.setValue(Long.valueOf((long) d));
+ extension.setValue((long) d);
} else {
- extension.setValue(Double.valueOf(d));
+ extension.setValue(d);
}
} catch (NumberFormatException e) {
invalidPropertyValueError("<value>", value, null);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFObjectExtension.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFObjectExtension.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFObjectExtension.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFObjectExtension.java Thu Sep 1 13:02:29 2016
@@ -70,12 +70,12 @@ public class PDFObjectExtension {
} else if (value instanceof String) {
double d = Double.parseDouble((String) value);
if (Math.abs(Math.floor(d) - d) < 1E-10) {
- return Long.valueOf((long) d);
+ return (long) d;
} else {
- return Double.valueOf(d);
+ return d;
}
} else {
- return Integer.valueOf(0);
+ return 0;
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderCCITTFax.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderCCITTFax.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderCCITTFax.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderCCITTFax.java Thu Sep 1 13:02:29 2016
@@ -50,17 +50,17 @@ public class ImageEncoderCCITTFax implem
/** {@inheritDoc} */
public String getImplicitFilter() {
PSDictionary dict = new PSDictionary();
- dict.put("/Columns", new Integer(ccitt.getSize().getWidthPx()));
+ dict.put("/Columns", ccitt.getSize().getWidthPx());
int compression = ccitt.getCompression();
switch (compression) {
case TIFFImage.COMP_FAX_G3_1D :
- dict.put("/K", new Integer(0));
+ dict.put("/K", 0);
break;
case TIFFImage.COMP_FAX_G3_2D :
- dict.put("/K", new Integer(1));
+ dict.put("/K", 1);
break;
case TIFFImage.COMP_FAX_G4_2D :
- dict.put("/K", new Integer(-1));
+ dict.put("/K", -1);
break;
default:
throw new IllegalStateException(
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -211,7 +211,7 @@ public class PSDocumentHandler extends A
gen.writeln(DSCConstants.PS_ADOBE_30);
gen.writeDSCComment(DSCConstants.CREATOR, new String[] {getUserAgent().getProducer()});
gen.writeDSCComment(DSCConstants.CREATION_DATE, new Object[] {new java.util.Date()});
- gen.writeDSCComment(DSCConstants.LANGUAGE_LEVEL, new Integer(gen.getPSLevel()));
+ gen.writeDSCComment(DSCConstants.LANGUAGE_LEVEL, gen.getPSLevel());
gen.writeDSCComment(DSCConstants.PAGES, new Object[] {DSCConstants.ATEND});
gen.writeDSCComment(DSCConstants.BBOX, DSCConstants.ATEND);
gen.writeDSCComment(DSCConstants.HIRES_BBOX, DSCConstants.ATEND);
@@ -259,7 +259,7 @@ public class PSDocumentHandler extends A
//Write trailer
gen.writeDSCComment(DSCConstants.TRAILER);
writeExtensions(COMMENT_DOCUMENT_TRAILER);
- gen.writeDSCComment(DSCConstants.PAGES, new Integer(this.currentPageNumber));
+ gen.writeDSCComment(DSCConstants.PAGES, this.currentPageNumber);
new DSCCommentBoundingBox(this.documentBoundingBox).generate(gen);
new DSCCommentHiResBoundingBox(this.documentBoundingBox).generate(gen);
gen.getResourceTracker().writeResources(false, gen);
@@ -332,7 +332,7 @@ public class PSDocumentHandler extends A
gen.getResourceTracker().notifyResourceUsageOnPage(PSProcSets.STD_PROCSET);
gen.writeDSCComment(DSCConstants.PAGE, new Object[]
{name,
- new Integer(this.currentPageNumber)});
+ Integer.valueOf(this.currentPageNumber)});
double pageWidth = size.width / 1000.0;
double pageHeight = size.height / 1000.0;
@@ -340,11 +340,11 @@ public class PSDocumentHandler extends A
List pageSizes = new java.util.ArrayList();
if (this.psUtil.isAutoRotateLandscape() && (pageHeight < pageWidth)) {
rotate = true;
- pageSizes.add(new Long(Math.round(pageHeight)));
- pageSizes.add(new Long(Math.round(pageWidth)));
+ pageSizes.add(Math.round(pageHeight));
+ pageSizes.add(Math.round(pageWidth));
} else {
- pageSizes.add(new Long(Math.round(pageWidth)));
- pageSizes.add(new Long(Math.round(pageHeight)));
+ pageSizes.add(Math.round(pageWidth));
+ pageSizes.add(Math.round(pageHeight));
}
pageDeviceDictionary.put("/PageSize", pageSizes);
this.currentPageDefinition = new PageDefinition(
@@ -378,25 +378,25 @@ public class PSDocumentHandler extends A
}
}*/
- final Integer zero = new Integer(0);
+ final Integer zero = 0;
Rectangle2D pageBoundingBox = new Rectangle2D.Double();
if (rotate) {
pageBoundingBox.setRect(0, 0, pageHeight, pageWidth);
gen.writeDSCComment(DSCConstants.PAGE_BBOX, new Object[] {
- zero, zero, new Long(Math.round(pageHeight)),
- new Long(Math.round(pageWidth)) });
+ zero, zero, Long.valueOf(Math.round(pageHeight)),
+ Long.valueOf(Math.round(pageWidth)) });
gen.writeDSCComment(DSCConstants.PAGE_HIRES_BBOX, new Object[] {
- zero, zero, new Double(pageHeight),
- new Double(pageWidth) });
+ zero, zero, Double.valueOf(pageHeight),
+ Double.valueOf(pageWidth) });
gen.writeDSCComment(DSCConstants.PAGE_ORIENTATION, "Landscape");
} else {
pageBoundingBox.setRect(0, 0, pageWidth, pageHeight);
gen.writeDSCComment(DSCConstants.PAGE_BBOX, new Object[] {
- zero, zero, new Long(Math.round(pageWidth)),
- new Long(Math.round(pageHeight)) });
+ zero, zero, Long.valueOf(Math.round(pageWidth)),
+ Long.valueOf(Math.round(pageHeight)) });
gen.writeDSCComment(DSCConstants.PAGE_HIRES_BBOX, new Object[] {
- zero, zero, new Double(pageWidth),
- new Double(pageHeight) });
+ zero, zero, Double.valueOf(pageWidth),
+ Double.valueOf(pageHeight) });
if (psUtil.isAutoRotateLandscape()) {
gen.writeDSCComment(DSCConstants.PAGE_ORIENTATION,
"Portrait");
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -49,10 +49,10 @@ final class FoUnitsConverter {
/** conversion factors keyed by xsl:fo units names */
private static final Map TWIP_FACTORS = new HashMap();
static {
- TWIP_FACTORS.put(FixedLength.MM, new Float(MM_TO_TWIPS));
- TWIP_FACTORS.put(FixedLength.CM, new Float(CM_TO_TWIPS));
- TWIP_FACTORS.put(FixedLength.POINT, new Float(POINT_TO_TWIPS));
- TWIP_FACTORS.put(FixedLength.INCH, new Float(IN_TO_TWIPS));
+ TWIP_FACTORS.put(FixedLength.MM, MM_TO_TWIPS);
+ TWIP_FACTORS.put(FixedLength.CM, CM_TO_TWIPS);
+ TWIP_FACTORS.put(FixedLength.POINT, POINT_TO_TWIPS);
+ TWIP_FACTORS.put(FixedLength.INCH, IN_TO_TWIPS);
}
/** singleton pattern */
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -588,10 +588,10 @@ public class RTFHandler extends FOEventH
percentManager.setDimension(tc, iWidth);
//convert to twips
- Float width = new Float(FoUnitsConverter.getInstance().convertMptToTwips(iWidth));
+ Float width = FoUnitsConverter.getInstance().convertMptToTwips(iWidth);
builderContext.getTableContext().setNextColumnWidth(width);
builderContext.getTableContext().setNextColumnRowSpanning(
- new Integer(0), null);
+ 0, null);
builderContext.getTableContext().setNextFirstSpanningCol(false);
} catch (Exception e) {
log.error("startColumn: " + e.getMessage());
@@ -844,11 +844,11 @@ public class RTFHandler extends FOEventH
cell.setVMerge(RtfTableCell.MERGE_START);
// set the number of rows spanned
- tctx.setCurrentColumnRowSpanning(new Integer(numberRowsSpanned),
+ tctx.setCurrentColumnRowSpanning(numberRowsSpanned,
cell.getRtfAttributes());
} else {
tctx.setCurrentColumnRowSpanning(
- new Integer(numberRowsSpanned), null);
+ numberRowsSpanned, null);
}
//process number-columns-spanned attribute
@@ -873,11 +873,11 @@ public class RTFHandler extends FOEventH
// set the number of rows spanned
tctx.setCurrentColumnRowSpanning(
- new Integer(numberRowsSpanned),
+ numberRowsSpanned,
cell.getRtfAttributes());
} else {
tctx.setCurrentColumnRowSpanning(
- new Integer(numberRowsSpanned), cell.getRtfAttributes());
+ numberRowsSpanned, cell.getRtfAttributes());
}
}
}
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -129,7 +129,7 @@ public class RtfAttributes implements Cl
* @return this (which now contains the new entry), for chaining calls
*/
public RtfAttributes set(String name, int value) {
- values.put(name, new Integer(value));
+ values.put(name, value);
return this;
}
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -122,7 +122,7 @@ public final class RtfColorTable {
/** define a named color for getColorNumber(String) */
private void addNamedColor(String name, int colorNumber) {
- namedColors.put(name.toLowerCase(), new Integer(colorNumber));
+ namedColors.put(name.toLowerCase(), colorNumber);
}
//////////////////////////////////////////////////
@@ -147,7 +147,7 @@ public final class RtfColorTable {
* @return The number of the color in the table
*/
public Integer getColorNumber(int red, int green, int blue) {
- Integer identifier = new Integer(determineIdentifier(red, green, blue));
+ Integer identifier = determineIdentifier(red, green, blue);
Object o = colorIndex.get(identifier);
int retVal;
@@ -166,7 +166,7 @@ public final class RtfColorTable {
retVal = ((Integer) o).intValue() + 1;
}
- return new Integer(retVal);
+ return retVal;
}
/**
@@ -215,7 +215,7 @@ public final class RtfColorTable {
* @param i Identifier of color
*/
private void addColor(Integer i) {
- colorIndex.put(i, new Integer(colorTable.size()));
+ colorIndex.put(i, colorTable.size());
colorTable.addElement(i);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java Thu Sep 1 13:02:29 2016
@@ -519,16 +519,16 @@ public class RtfExternalGraphic extends
}
if (this.cropValues[0] != 0) {
- writeOneAttribute("piccropl", new Integer(this.cropValues[0]));
+ writeOneAttribute("piccropl", this.cropValues[0]);
}
if (this.cropValues[1] != 0) {
- writeOneAttribute("piccropt", new Integer(this.cropValues[1]));
+ writeOneAttribute("piccropt", this.cropValues[1]);
}
if (this.cropValues[2] != 0) {
- writeOneAttribute("piccropr", new Integer(this.cropValues[2]));
+ writeOneAttribute("piccropr", this.cropValues[2]);
}
if (this.cropValues[3] != 0) {
- writeOneAttribute("piccropb", new Integer(this.cropValues[3]));
+ writeOneAttribute("piccropb", this.cropValues[3]);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java Thu Sep 1 13:02:29 2016
@@ -106,7 +106,7 @@ extends RtfContainer {
if (listTable != null) {
return listTable;
} else {
- listTable = new RtfListTable(this, writer, new Integer(listNum), attr);
+ listTable = new RtfListTable(this, writer, listNum, attr);
listTableContainer.addChild(listTable);
}
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -174,7 +174,7 @@ public final class RtfFontManager {
* @param family Identifier of font
*/
private void addFont(String family) {
- fontIndex.put(getFontKey(family), new Integer(fontTable.size()));
+ fontIndex.put(getFontKey(family), fontTable.size());
fontTable.addElement(family);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java Thu Sep 1 13:02:29 2016
@@ -51,8 +51,8 @@ public class RtfList extends RtfContaine
super(parent, w, attr);
//random number generator for ids
- listId = new Integer(listIdGenerator.nextInt());
- listTemplateId = new Integer(listIdGenerator.nextInt());
+ listId = listIdGenerator.nextInt();
+ listTemplateId = listIdGenerator.nextInt();
//create a new list table entry for the list
listTable = getRtfFile().startListTable(attr);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java Thu Sep 1 13:02:29 2016
@@ -189,7 +189,7 @@ public class RtfListItem extends RtfCont
getRtfListStyle().writeListPrefix(this);
writeGroupMark(false);
- writeOneAttribute(RtfListTable.LIST_NUMBER, new Integer(number));
+ writeOneAttribute(RtfListTable.LIST_NUMBER, number);
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java Thu Sep 1 13:02:29 2016
@@ -44,7 +44,7 @@ public class RtfListStyleBullet extends
// bulleted list
item.writeControlWord("pnlvlblt");
item.writeControlWord("ilvl0");
- item.writeOneAttribute(RtfListTable.LIST_NUMBER, new Integer(item.getNumber()));
+ item.writeOneAttribute(RtfListTable.LIST_NUMBER, item.getNumber());
item.writeOneAttribute("pnindent",
item.getParentList().attrib.getValue(RtfListTable.LIST_INDENT));
item.writeControlWord("pnf1");
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java Thu Sep 1 13:02:29 2016
@@ -46,7 +46,7 @@ public class RtfListStyleNumber extends
item.writeControlWord("ilvl0");
item.writeOneAttribute(RtfListTable.LIST_NUMBER, "0");
item.writeControlWord("pndec");
- item.writeOneAttribute("pnstart", new Integer(1));
+ item.writeOneAttribute("pnstart", 1);
item.writeOneAttribute("pnindent",
item.attrib.getValue(RtfListTable.LIST_INDENT));
item.writeControlWord("pntxta.");
@@ -79,7 +79,7 @@ public class RtfListStyleNumber extends
public void writeLevelGroup(RtfElement element)
throws IOException {
element.writeOneAttributeNS(
- RtfListTable.LIST_START_AT, new Integer(1));
+ RtfListTable.LIST_START_AT, 1);
element.attrib.set(RtfListTable.LIST_NUMBER_TYPE, 0);
element.writeGroupMark(true);
@@ -92,6 +92,6 @@ public class RtfListStyleNumber extends
RtfListTable.LIST_NUM_POSITION, "\\'01;");
element.writeGroupMark(false);
- element.writeOneAttribute(RtfListTable.LIST_FONT_TYPE, new Integer(0));
+ element.writeOneAttribute(RtfListTable.LIST_FONT_TYPE, 0);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java Thu Sep 1 13:02:29 2016
@@ -54,7 +54,7 @@ public class RtfListStyleText extends Rt
// bulleted list
item.writeControlWord("pnlvlblt");
item.writeControlWord("ilvl0");
- item.writeOneAttribute(RtfListTable.LIST_NUMBER, new Integer(item.getNumber()));
+ item.writeOneAttribute(RtfListTable.LIST_NUMBER, item.getNumber());
item.writeOneAttribute("pnindent",
item.getParentList().attrib.getValue(RtfListTable.LIST_INDENT));
item.writeControlWord("pnf1");
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java Thu Sep 1 13:02:29 2016
@@ -155,8 +155,8 @@ public class RtfListTable extends RtfCon
writeGroupMark(true);
writeOneAttributeNS(LIST_ID, style.getRtfList().getListId().toString());
- writeOneAttributeNS(LIST_OVR_COUNT, new Integer(0));
- writeOneAttributeNS(LIST_NUMBER, new Integer(z++));
+ writeOneAttributeNS(LIST_OVR_COUNT, 0);
+ writeOneAttributeNS(LIST_NUMBER, z++);
writeGroupMark(false);
writeGroupMark(false);
@@ -191,7 +191,7 @@ public class RtfListTable extends RtfCon
writeOneAttributeNS(LIST_JUSTIFICATION, attrib.getValue(LIST_JUSTIFICATION));
writeOneAttributeNS(LIST_FOLLOWING_CHAR, attrib.getValue(LIST_FOLLOWING_CHAR));
- writeOneAttributeNS(LIST_SPACE, new Integer(0));
+ writeOneAttributeNS(LIST_SPACE, 0);
writeOneAttributeNS(LIST_INDENT, attrib.getValue(LIST_INDENT));
RtfListItem item = (RtfListItem)list.getChildren().get(0);
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=1758773&r1=1758772&r2=1758773&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 Thu Sep 1 13:02:29 2016
@@ -69,7 +69,7 @@ public class RtfSpaceSplitter {
public int split(String key) {
Integer i = (Integer) commonAttributes.getValue(key);
if (i == null) {
- i = new Integer(0);
+ i = 0;
}
commonAttributes.unset(key);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java Thu Sep 1 13:02:29 2016
@@ -41,20 +41,20 @@ public final class RtfStringConverter {
private static final RtfStringConverter INSTANCE = new RtfStringConverter();
private static final Map SPECIAL_CHARS;
- private static final Character DBLQUOTE = new Character('\"');
- private static final Character QUOTE = new Character('\'');
- private static final Character SPACE = new Character(' ');
+ private static final Character DBLQUOTE = '\"';
+ private static final Character QUOTE = '\'';
+ private static final Character SPACE = ' ';
/** List of characters to escape with corresponding replacement strings */
static {
SPECIAL_CHARS = new HashMap();
- SPECIAL_CHARS.put(new Character('\t'), "tab");
- SPECIAL_CHARS.put(new Character('\n'), "line");
- SPECIAL_CHARS.put(new Character('\''), "rquote");
- SPECIAL_CHARS.put(new Character('\"'), "rdblquote");
- SPECIAL_CHARS.put(new Character('\\'), "\\");
- SPECIAL_CHARS.put(new Character('{'), "{");
- SPECIAL_CHARS.put(new Character('}'), "}");
+ SPECIAL_CHARS.put('\t', "tab");
+ SPECIAL_CHARS.put('\n', "line");
+ SPECIAL_CHARS.put('\'', "rquote");
+ SPECIAL_CHARS.put('\"', "rdblquote");
+ SPECIAL_CHARS.put('\\', "\\");
+ SPECIAL_CHARS.put('{', "{");
+ SPECIAL_CHARS.put('}', "}");
}
/** singleton pattern */
@@ -96,13 +96,13 @@ public final class RtfStringConverter {
StringBuffer sb = new StringBuffer(Math.max(16, str.length()));
// TODO: could be made more efficient (binary lookup, etc.)
for (int i = 0; i < str.length(); i++) {
- final Character c = new Character(str.charAt(i));
+ final Character c = str.charAt(i);
Character d;
String replacement;
if (i != 0) {
- d = new Character(str.charAt(i - 1));
+ d = str.charAt(i - 1);
} else {
- d = new Character(SPACE);
+ d = SPACE;
}
//This section modified by Chris Scott
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java Thu Sep 1 13:02:29 2016
@@ -148,7 +148,7 @@ public final class RtfStyleSheetTable {
if (attrs != null) {
attrTable.put(name, attrs);
}
- styles.put(name, new Integer(nameTable.size() - 1 + startIndex));
+ styles.put(name, nameTable.size() - 1 + startIndex);
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java Thu Sep 1 13:02:29 2016
@@ -281,7 +281,7 @@ public class RtfTextrun extends RtfConta
ListIterator lit = children.listIterator(children.size());
while (lit.hasPrevious()
&& (lit.previous() instanceof RtfCloseGroupMark)) {
- tmp.push(Integer.valueOf(((RtfCloseGroupMark)lit.next()).getBreakType()));
+ tmp.push(((RtfCloseGroupMark) lit.next()).getBreakType());
lit.remove();
deletedCloseGroupCount++;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java Thu Sep 1 13:02:29 2016
@@ -114,7 +114,7 @@ public class PercentContext implements P
baseWidthSet = true;
}
// width in mpt
- lengthMap.put(fobj, new Integer(width));
+ lengthMap.put(fobj, width);
}
/**
@@ -123,7 +123,7 @@ public class PercentContext implements P
* @param tableUnit the table unit value (in millipoints)
*/
public void setTableUnit(Table table, int tableUnit) {
- tableUnitMap.put(table, new Integer(tableUnit));
+ tableUnitMap.put(table, tableUnit);
}
/**
@@ -132,13 +132,13 @@ public class PercentContext implements P
private Integer findParent(FONode fobj) {
if (fobj.getRoot() != fobj) {
if (lengthMap.containsKey(fobj)) {
- return new Integer(lengthMap.get(fobj).toString());
+ return Integer.valueOf(lengthMap.get(fobj).toString());
} else {
return findParent(fobj.getParent());
}
} else {
log.error("Base Value for element " + fobj.getName() + " not found");
- return new Integer(-1);
+ return -1;
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java Thu Sep 1 13:02:29 2016
@@ -168,9 +168,9 @@ public class TableContext implements ITa
while (colIndex >= colFirstSpanningCol.size()) {
setNextFirstSpanningCol(false);
}
- colFirstSpanningCol.set(colIndex, Boolean.valueOf(bFirstSpanningCol));
+ colFirstSpanningCol.set(colIndex, bFirstSpanningCol);
} else {
- colFirstSpanningCol.add(Boolean.valueOf(bFirstSpanningCol));
+ colFirstSpanningCol.add(bFirstSpanningCol);
}
}
@@ -181,7 +181,7 @@ public class TableContext implements ITa
*/
public void setNextFirstSpanningCol(
boolean bFirstSpanningCol) {
- colFirstSpanningCol.add(Boolean.valueOf(bFirstSpanningCol));
+ colFirstSpanningCol.add(bFirstSpanningCol);
}
/**
@@ -195,14 +195,14 @@ public class TableContext implements ITa
Integer i = (Integer)colRowSpanningNumber.get(z);
if (i.intValue() > 0) {
- i = new Integer(i.intValue() - 1);
+ i = i.intValue() - 1;
}
colRowSpanningNumber.set(z, i);
if (i.intValue() == 0) {
colRowSpanningAttrs.set(z, null);
- colFirstSpanningCol.set(z, Boolean.valueOf(false));
+ colFirstSpanningCol.set(z, false);
}
}
}
@@ -238,7 +238,7 @@ public class TableContext implements ITa
log.warn("Column width for column " + (colIndex + 1) + " is not defined, using "
+ INVALID_COLUMN_WIDTH);
while (colIndex >= getNumberOfColumns()) {
- setNextColumnWidth(new Float(INVALID_COLUMN_WIDTH));
+ setNextColumnWidth(INVALID_COLUMN_WIDTH);
}
}
return ((Float)colWidths.get(colIndex)).floatValue();
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/border/BorderManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/border/BorderManager.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/border/BorderManager.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/border/BorderManager.java Thu Sep 1 13:02:29 2016
@@ -98,7 +98,7 @@ public class BorderManager {
public Character getCharacter(int x, int y) {
Character c = null;
if (borderInfo[y][x] != null) {
- c = new Character(borderInfo[y][x].convert2Char());
+ c = borderInfo[y][x].convert2Char();
}
return c;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java Thu Sep 1 13:02:29 2016
@@ -934,10 +934,10 @@ public class PDFGraphics2D extends Abstr
// }
List<Double> bbox = new java.util.ArrayList<Double>();
- bbox.add(new Double(rect.getX()));
- bbox.add(new Double(rect.getHeight() + rect.getY()));
- bbox.add(new Double(rect.getWidth() + rect.getX()));
- bbox.add(new Double(rect.getY()));
+ bbox.add(rect.getX());
+ bbox.add(rect.getHeight() + rect.getY());
+ bbox.add(rect.getWidth() + rect.getX());
+ bbox.add(rect.getY());
AffineTransform transform;
transform = new AffineTransform(getBaseTransform());
@@ -948,7 +948,7 @@ public class PDFGraphics2D extends Abstr
double [] mat = new double[6];
transform.getMatrix(mat);
for (int idx = 0; idx < mat.length; idx++) {
- theMatrix.add(new Double(mat[idx]));
+ theMatrix.add(mat[idx]);
}
/** @todo see if pdfDoc and res can be linked here,
@@ -1324,8 +1324,8 @@ public class PDFGraphics2D extends Abstr
}
if (kerningAvailable && (i + 1) < l) {
- addKerning(currentStream, (Integer.valueOf(ch)),
- (Integer.valueOf(fontState.mapChar(s.charAt(i + 1)))),
+ addKerning(currentStream, ((int) ch),
+ ((int) fontState.mapChar(s.charAt(i + 1))),
kerning, startText, endText);
}
@@ -1348,10 +1348,10 @@ public class PDFGraphics2D extends Abstr
if (profile == null) {
Map<String, Float> vals = new java.util.HashMap<String, Float>();
if (fillAlpha != OPAQUE) {
- vals.put(PDFGState.GSTATE_ALPHA_NONSTROKE, new Float(fillAlpha / 255f));
+ vals.put(PDFGState.GSTATE_ALPHA_NONSTROKE, fillAlpha / 255f);
}
if (strokeAlpha != OPAQUE) {
- vals.put(PDFGState.GSTATE_ALPHA_STROKE, new Float(strokeAlpha / 255f));
+ vals.put(PDFGState.GSTATE_ALPHA_STROKE, strokeAlpha / 255f);
}
PDFGState gstate = pdfDoc.getFactory().makeGState(vals, paintingState.getGState());
resourceContext.addGState(gstate);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/text/BidiAttributedCharacterIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/text/BidiAttributedCharacterIterator.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/text/BidiAttributedCharacterIterator.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/text/BidiAttributedCharacterIterator.java Thu Sep 1 13:02:29 2016
@@ -67,7 +67,7 @@ public class BidiAttributedCharacterIter
currRunLevel = nextRunLevel;
} else if (nextRunLevel != currRunLevel) {
as.addAttribute(GVTAttributedCharacterIterator.TextAttribute.BIDI_LEVEL,
- new Integer(currRunLevel), runStart, i);
+ currRunLevel, runStart, i);
runStart = i;
runEnd = runStart;
currRunLevel = nextRunLevel;
@@ -75,7 +75,7 @@ public class BidiAttributedCharacterIter
}
if ((currRunLevel >= 0) && (end > runStart)) {
as.addAttribute(GVTAttributedCharacterIterator.TextAttribute.BIDI_LEVEL,
- new Integer(currRunLevel), runStart, end);
+ currRunLevel, runStart, end);
}
return as.getIterator();
} else {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/TestConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/TestConverter.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/TestConverter.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/TestConverter.java Thu Sep 1 13:02:29 2016
@@ -285,8 +285,8 @@ public class TestConverter {
FopFactory fopFactory = FopFactory.newInstance(baseUri);
FOUserAgent userAgent = fopFactory.newFOUserAgent();
- userAgent.getRendererOptions().put("fineDetail", Boolean.valueOf(false));
- userAgent.getRendererOptions().put("consistentOutput", Boolean.valueOf(true));
+ userAgent.getRendererOptions().put("fineDetail", false);
+ userAgent.getRendererOptions().put("consistentOutput", true);
userAgent.setProducer("Testsuite Converter");
String outname = res;
@@ -312,7 +312,7 @@ public class TestConverter {
File f1 = new File(destdir, outname + ".at.xml");
File f2 = new File(compare, outname + ".at.xml");
if (!compareFiles(f1, f2)) {
- differ.put(outname + ".at.xml", Boolean.valueOf(pass));
+ differ.put(outname + ".at.xml", pass);
}
}
} catch (Exception e) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/XMLUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/XMLUtil.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/XMLUtil.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/XMLUtil.java Thu Sep 1 13:02:29 2016
@@ -95,7 +95,7 @@ public final class XMLUtil implements XM
if (s == null) {
return null;
} else {
- return new Integer(s);
+ return Integer.valueOf(s);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java Thu Sep 1 13:02:29 2016
@@ -260,7 +260,7 @@ public class TTXFile {
}
public int mapCharToGlyph(int c) {
if (cmap != null) {
- Integer g = cmap.get(Integer.valueOf(c));
+ Integer g = cmap.get(c);
if (g != null) {
return (int) g;
} else {
@@ -389,7 +389,7 @@ public class TTXFile {
missingRequiredAttribute(en, "glyph");
}
int gid = mapGlyphId(glyph, en);
- alternates.add(Integer.valueOf(gid));
+ alternates.add(gid);
} else {
notPermittedInElementContext(en, getParent(), pn);
}
@@ -401,7 +401,7 @@ public class TTXFile {
missingRequiredAttribute(en, "glyph");
}
int gid = mapGlyphId(glyph, en);
- coverageEntries.add(Integer.valueOf(gid));
+ coverageEntries.add(gid);
} else {
notPermittedInElementContext(en, getParent(), pn);
}
@@ -817,7 +817,7 @@ public class TTXFile {
missingRequiredAttribute(en, "value");
} else {
int gid = mapGlyphId(value, en);
- coverageEntries.add(Integer.valueOf(gid));
+ coverageEntries.add(gid);
}
} else {
notPermittedInElementContext(en, getParent(), pnx);
@@ -1030,7 +1030,7 @@ public class TTXFile {
missingRequiredAttribute(en, "glyph");
}
int gid = mapGlyphId(glyph, en);
- coverageEntries.add(Integer.valueOf(gid));
+ coverageEntries.add(gid);
} else {
notPermittedInElementContext(en, getParent(), pn);
}
@@ -1708,7 +1708,7 @@ public class TTXFile {
missingRequiredAttribute(en, "value");
} else {
int gid = mapGlyphId(value, en);
- substitutes.add(Integer.valueOf(gid));
+ substitutes.add(gid);
}
} else {
notPermittedInElementContext(en, getParent(), pn);
@@ -1730,8 +1730,8 @@ public class TTXFile {
} else {
ogid = mapGlyphId(out, en);
}
- coverageEntries.add(Integer.valueOf(igid));
- subtableEntries.add(Integer.valueOf(ogid));
+ coverageEntries.add(igid);
+ subtableEntries.add(ogid);
} else {
notPermittedInElementContext(en, getParent(), pn);
}
@@ -2594,8 +2594,8 @@ public class TTXFile {
private Map<Integer, Integer> getCMAP() {
Map<Integer, Integer> cmap = new TreeMap();
for (int[] cme : cmapEntries) {
- Integer c = Integer.valueOf(cme[0]);
- Integer g = Integer.valueOf(cme[1]);
+ Integer c = cme[0];
+ Integer g = cme[1];
cmap.put(c, g);
}
return cmap;
@@ -2603,8 +2603,8 @@ public class TTXFile {
private Map<Integer, Integer> getGMAP() {
Map<Integer, Integer> gmap = new TreeMap();
for (int[] cme : cmapEntries) {
- Integer c = Integer.valueOf(cme[0]);
- Integer g = Integer.valueOf(cme[1]);
+ Integer c = cme[0];
+ Integer g = cme[1];
gmap.put(g, c);
}
return gmap;
@@ -2636,21 +2636,21 @@ public class TTXFile {
List entries = new ArrayList<Integer>();
int s = -1;
int l = -1;
- Integer zero = Integer.valueOf(0);
+ Integer zero = 0;
for (int[] m : cma) {
int g = m[0];
int c = m[1];
if (s < 0) {
s = g;
l = g - 1;
- entries.add(Integer.valueOf(s));
+ entries.add(s);
}
while (g > (l + 1)) {
entries.add(zero);
l++;
}
assert l == (g - 1);
- entries.add(Integer.valueOf(c));
+ entries.add(c);
l = g;
}
return GlyphClassTable.createClassTable(entries);
@@ -3140,7 +3140,7 @@ public class TTXFile {
}
}
}
- return Integer.valueOf(ncMax);
+ return ncMax;
}
private Anchor[][] extractComponents() {
Anchor[][] cam = new Anchor [ components.size() ][];
@@ -3206,7 +3206,7 @@ public class TTXFile {
}
}
}
- return Integer.valueOf(ncMax);
+ return ncMax;
}
private Integer computeLigaturesComponentCount(Anchor[][][] lam) {
int nxMax = 0;
@@ -3220,7 +3220,7 @@ public class TTXFile {
}
}
}
- return Integer.valueOf(nxMax);
+ return nxMax;
}
private Anchor[] extractAttachmentAnchors() {
int na = attachmentAnchors.size();
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java Thu Sep 1 13:02:29 2016
@@ -40,13 +40,13 @@ import org.apache.fop.fo.properties.Comm
*/
public class CollapsedConditionalBorderTestCase extends AbstractTableTest {
- private final Integer border0pt = new Integer(0);
+ private final Integer border0pt = 0;
- private final Integer border4pt = new Integer(4000);
+ private final Integer border4pt = 4000;
- private final Integer border6pt = new Integer(6000);
+ private final Integer border6pt = 6000;
- private final Integer border8pt = new Integer(8000);
+ private final Integer border8pt = 8000;
/**
* Resolved borders for tables without headers and footers, generated from the Python
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java Thu Sep 1 13:02:29 2016
@@ -55,7 +55,7 @@ public class CIDFullTestCase {
continue;
}
bs.set(j);
- glyphs.put(Integer.valueOf(j), Integer.valueOf(j));
+ glyphs.put(j, j);
chars[i] = (char) j;
widths[i] = 100;
i++;
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java Thu Sep 1 13:02:29 2016
@@ -245,21 +245,21 @@ public class OTFSubSetFileTestCase exten
if (b0 == 28) {
int b1 = input[curPos + 1] & 0xff;
int b2 = input[curPos + 2] & 0xff;
- return new BytesNumber(Integer.valueOf((short) (b1 << 8 | b2)), 3);
+ return new BytesNumber((int) (short) (b1 << 8 | b2), 3);
} else if (b0 >= 32 && b0 <= 246) {
- return new BytesNumber(Integer.valueOf(b0 - 139), 1);
+ return new BytesNumber(b0 - 139, 1);
} else if (b0 >= 247 && b0 <= 250) {
int b1 = input[curPos + 1] & 0xff;
- return new BytesNumber(Integer.valueOf((b0 - 247) * 256 + b1 + 108), 2);
+ return new BytesNumber((b0 - 247) * 256 + b1 + 108, 2);
} else if (b0 >= 251 && b0 <= 254) {
int b1 = input[curPos + 1] & 0xff;
- return new BytesNumber(Integer.valueOf(-(b0 - 251) * 256 - b1 - 108), 2);
+ return new BytesNumber(-(b0 - 251) * 256 - b1 - 108, 2);
} else if (b0 == 255) {
int b1 = input[curPos + 1] & 0xff;
int b2 = input[curPos + 2] & 0xff;
int b3 = input[curPos + 3] & 0xff;
int b4 = input[curPos + 4] & 0xff;
- return new BytesNumber(Integer.valueOf((b1 << 24 | b2 << 16 | b3 << 8 | b4)), 5);
+ return new BytesNumber((b1 << 24 | b2 << 16 | b3 << 8 | b4), 5);
} else {
throw new IllegalArgumentException();
}
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java Thu Sep 1 13:02:29 2016
@@ -114,10 +114,10 @@ public class TTFFileTestCase {
if (ansiKerning.isEmpty()) {
fail();
}
- Integer k1 = ansiKerning.get(Integer.valueOf('A')).get(
- Integer.valueOf('T'));
+ Integer k1 = ansiKerning.get((int) 'A').get(
+ (int) 'T');
assertEquals(dejavuTTFFile.convertTTFUnit2PDFUnit(-112), k1.intValue());
- Integer k2 = ansiKerning.get(Integer.valueOf('Y')).get(Integer.valueOf('u'));
+ Integer k2 = ansiKerning.get((int) 'Y').get((int) 'u');
assertEquals(dejavuTTFFile.convertTTFUnit2PDFUnit(-178), k2.intValue());
// DroidSansMono doens't have kerning (it's mono-spaced)
@@ -297,9 +297,9 @@ public class TTFFileTestCase {
if (kerning.isEmpty()) {
fail();
}
- Integer k1 = kerning.get(Integer.valueOf('A')).get(Integer.valueOf('T'));
+ Integer k1 = kerning.get((int) 'A').get((int) 'T');
assertEquals(dejavuTTFFile.convertTTFUnit2PDFUnit(-112), k1.intValue());
- Integer k2 = kerning.get(Integer.valueOf('K')).get(Integer.valueOf('u'));
+ Integer k2 = kerning.get((int) 'K').get((int) 'u');
assertEquals(dejavuTTFFile.convertTTFUnit2PDFUnit(-45), k2.intValue());
// DroidSansMono has no kerning data (mono-spaced)
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/memory/MemoryEater.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/memory/MemoryEater.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/memory/MemoryEater.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/memory/MemoryEater.java Thu Sep 1 13:02:29 2016
@@ -75,7 +75,7 @@ public final class MemoryEater {
Source src = new StreamSource(foFile);
Transformer transformer = replicatorTemplates.newTransformer();
- transformer.setParameter("repeats", new Integer(replicatorRepeats));
+ transformer.setParameter("repeats", replicatorRepeats);
OutputStream out = new NullOutputStream(); //write to /dev/nul
try {
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java Thu Sep 1 13:02:29 2016
@@ -196,7 +196,7 @@ public class PDFArrayTestCase extends PD
*/
@Test
public void testAdd() {
- intArray.add(new Integer(6));
+ intArray.add(Integer.valueOf(6));
doubleArray.add(6.6);
// Test some arbitrary values
for (int i = 1; i <= 6; i++) {
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java Thu Sep 1 13:02:29 2016
@@ -65,7 +65,7 @@ public class PDFDictionaryTestCase exten
pdfDictUnderTest.setDocument(doc);
pdfDictUnderTest.put("String", "TestValue");
pdfDictUnderTest.put("int", 10);
- pdfDictUnderTest.put("double", Double.valueOf(3.1));
+ pdfDictUnderTest.put("double", 3.1);
pdfDictUnderTest.put("array", testArray);
pdfDictUnderTest.put("number", testNumber);
// null is a valid PDF object
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java Thu Sep 1 13:02:29 2016
@@ -212,7 +212,7 @@ public class MinOptMaxTestCase {
assertFalse(number.equals(MinOptMax.getInstance(1, 4, 5)));
assertFalse(number.equals(MinOptMax.getInstance(1, 3, 4)));
assertFalse(number.equals(null));
- assertFalse(number.equals(new Integer(1)));
+ assertFalse(number.equals(1));
}
@Test
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java Thu Sep 1 13:02:29 2016
@@ -172,15 +172,15 @@ public class AdvancedMessageFormatTestCa
Map params = new java.util.HashMap();
- params.put("amount", new Integer(0));
+ params.put("amount", 0);
msg = format.format(params);
assertEquals("You have nothing.", msg);
- params.put("amount", new Integer(7));
+ params.put("amount", 7);
msg = format.format(params);
assertEquals("You have 7 bucks.", msg);
- params.put("amount", new Integer(140));
+ params.put("amount", 140);
msg = format.format(params);
assertEquals("You have more than enough.", msg);
Modified: xmlgraphics/fop/trunk/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java Thu Sep 1 13:02:29 2016
@@ -43,7 +43,7 @@ public class BasicEventTestCase {
Event ev = new Event(this, "123", EventSeverity.INFO,
Event.paramsBuilder()
.param("reason", "I'm tired")
- .param("blah", new Integer(23))
+ .param("blah", Integer.valueOf(23))
.build());
broadcaster.broadcastEvent(ev);
@@ -52,7 +52,7 @@ public class BasicEventTestCase {
assertEquals("123", listener.event.getEventID());
assertEquals(EventSeverity.INFO, listener.event.getSeverity());
assertEquals("I'm tired", ev.getParam("reason"));
- assertEquals(new Integer(23), ev.getParam("blah"));
+ assertEquals(Integer.valueOf(23), ev.getParam("blah"));
broadcaster.removeEventListener(listener);
assertFalse(broadcaster.hasEventListeners());
@@ -79,7 +79,7 @@ public class BasicEventTestCase {
listener.event.getEventID());
assertEquals(EventSeverity.WARN, listener.event.getSeverity());
assertEquals("I'm tired", ev.getParam("reason"));
- assertEquals(new Integer(23), ev.getParam("blah"));
+ assertEquals(Integer.valueOf(23), ev.getParam("blah"));
broadcaster.removeEventListener(listener);
assertFalse(broadcaster.hasEventListeners());
Modified: xmlgraphics/fop/trunk/fop/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java?rev=1758773&r1=1758772&r2=1758773&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java (original)
+++ xmlgraphics/fop/trunk/fop/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java Thu Sep 1 13:02:29 2016
@@ -138,17 +138,17 @@ public class HyphenationTreeAnalysis ext
Node n = new Node(nodeIndex);
ns.string.append(n.toNodeString());
if (n.high != 0) {
- ns.high.add(new Integer(pos));
+ ns.high.add(Integer.valueOf(pos));
NodeString highNs = new NodeString(pos);
- highNs.low.add(new Integer(pos));
+ highNs.low.add(Integer.valueOf(pos));
int index = strings.indexOf(ns);
strings.add(index, highNs);
addNode(n.high, strings, highNs);
}
if (n.low != 0) {
- ns.low.add(new Integer(pos));
+ ns.low.add(Integer.valueOf(pos));
NodeString lowNs = new NodeString(pos);
- lowNs.high.add(new Integer(pos));
+ lowNs.high.add(Integer.valueOf(pos));
int index = strings.indexOf(ns);
strings.add(index + 1, lowNs);
addNode(n.low, strings, lowNs);
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.