You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ss...@apache.org on 2016/09/16 10:43:46 UTC
svn commit: r1761019 [2/2] - in /xmlgraphics/fop/trunk/fop-core/src:
main/java/org/apache/fop/afp/ main/java/org/apache/fop/afp/fonts/
main/java/org/apache/fop/apps/ main/java/org/apache/fop/complexscripts/fonts/
main/java/org/apache/fop/complexscripts...
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -120,11 +120,11 @@ public final class RtfStringConverter {
sb.append('\\');
sb.append(replacement);
sb.append(' ');
- } else if (c.charValue() > 127) {
+ } else if (c > 127) {
// write unicode representation - contributed by Michel Jacobson
// <ja...@idf.ext.jussieu.fr>
sb.append("\\u");
- sb.append(Integer.toString((int)c.charValue()));
+ sb.append(Integer.toString((int) c));
sb.append("\\\'3f");
} else {
// plain char that is understood by RTF natively
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -178,7 +178,7 @@ public final class RtfStyleSheetTable {
}
// Adds the attributes to default attributes, if not available in default attributes
- attr.set("cs", style.intValue());
+ attr.set("cs", style);
Object o = attrTable.get(name);
if (o != null) {
@@ -191,7 +191,7 @@ public final class RtfStyleSheetTable {
if (i == null) {
attr.set(attrName);
} else {
- attr.set(attrName, i.intValue());
+ attr.set(attrName, i);
}
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java Fri Sep 16 10:43:45 2016
@@ -201,7 +201,7 @@ public class RtfTable extends RtfContain
isNestedTable = Boolean.FALSE;
} else {
- return isNestedTable.booleanValue();
+ return isNestedTable;
}
return false;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java Fri Sep 16 10:43:45 2016
@@ -231,7 +231,7 @@ public class RtfTableCell
int iCurrentWidth = this.cellWidth;
if (attrib.getValue("number-columns-spanned") != null) {
// Get the number of columns spanned
- int nbMergedCells = ((Integer)attrib.getValue("number-columns-spanned")).intValue();
+ int nbMergedCells = (Integer) attrib.getValue("number-columns-spanned");
RtfTable tab = getRow().getTable();
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java Fri Sep 16 10:43:45 2016
@@ -193,7 +193,7 @@ public class RtfTableRow extends RtfCont
final Object leftIndent = attrib.getValue(ITableAttributes.ATTR_ROW_LEFT_INDENT);
if (leftIndent != null) {
- xPos = ((Integer)leftIndent).intValue();
+ xPos = (Integer) leftIndent;
}
RtfAttributes tableBorderAttributes = getTable().getBorderAttributes();
@@ -342,11 +342,11 @@ public class RtfTableRow extends RtfCont
// set (RTF 1.5) gaph to the average of the (RTF 1.6) left and right padding values
final Integer leftPadStr = (Integer)attrib.getValue(ATTR_ROW_PADDING_LEFT);
if (leftPadStr != null) {
- gaph = leftPadStr.intValue();
+ gaph = leftPadStr;
}
final Integer rightPadStr = (Integer)attrib.getValue(ATTR_ROW_PADDING_RIGHT);
if (rightPadStr != null) {
- gaph = (gaph + rightPadStr.intValue()) / 2;
+ gaph = (gaph + rightPadStr) / 2;
}
} catch (Exception e) {
final String msg = "RtfTableRow.writePaddingAttributes: " + e.toString();
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -291,7 +291,7 @@ public class RtfTextrun extends RtfConta
setChildren(children);
par = new RtfParagraphBreak(this, writer);
for (int i = 0; i < deletedCloseGroupCount; i++) {
- addCloseGroupMark(((Integer)tmp.pop()).intValue());
+ addCloseGroupMark((Integer) tmp.pop());
}
}
return par;
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -86,12 +86,12 @@ public class PercentContext implements P
case LengthBase.TABLE_UNITS:
Object unit = tableUnitMap.get(fobj);
if (unit != null) {
- return ((Integer)unit).intValue();
+ return (Integer) unit;
} else if (fobj.getParent() != null) {
// If the object itself has no width the parent width will be used
unit = tableUnitMap.get(fobj.getParent());
if (unit != null) {
- return ((Integer)unit).intValue();
+ return (Integer) unit;
}
}
return 0;
@@ -151,7 +151,7 @@ public class PercentContext implements P
public void setDimension(FObj fobj) {
if (baseWidthSet) {
Integer width = findParent(fobj.getParent());
- if (width.intValue() != -1) {
+ if (width != -1) {
lengthMap.put(fobj, width);
}
}
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -125,7 +125,7 @@ public class TableContext implements ITa
*/
public boolean getFirstSpanningCol() {
Boolean b = (Boolean) colFirstSpanningCol.get(colIndex);
- return b.booleanValue();
+ return b;
}
/**
@@ -194,13 +194,13 @@ public class TableContext implements ITa
for (int z = 0; z < colRowSpanningNumber.size(); ++z) {
Integer i = (Integer)colRowSpanningNumber.get(z);
- if (i.intValue() > 0) {
- i = i.intValue() - 1;
+ if (i > 0) {
+ i = i - 1;
}
colRowSpanningNumber.set(z, i);
- if (i.intValue() == 0) {
+ if (i == 0) {
colRowSpanningAttrs.set(z, null);
colFirstSpanningCol.set(z, false);
}
@@ -241,7 +241,7 @@ public class TableContext implements ITa
setNextColumnWidth(INVALID_COLUMN_WIDTH);
}
}
- return ((Float)colWidths.get(colIndex)).floatValue();
+ return (Float) colWidths.get(colIndex);
}
/**
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTRenderer.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTRenderer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTRenderer.java Fri Sep 16 10:43:45 2016
@@ -246,7 +246,7 @@ public class TXTRenderer extends Abstrac
for (int y = 0; y < pageHeight; y++) {
Character c = bm.getCharacter(x, y);
if (c != null) {
- putChar(x, y, c.charValue(), false);
+ putChar(x, y, c, false);
}
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java Fri Sep 16 10:43:45 2016
@@ -128,7 +128,7 @@ public class XMLRenderer extends Abstrac
userAgent.getXMLHandlerRegistry().addXMLHandler(xmlHandler);
Boolean b = (Boolean)userAgent.getRendererOptions().get("compact-format");
if (b != null) {
- setCompactFormat(b.booleanValue());
+ setCompactFormat(b);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/ACIUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/ACIUtils.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/ACIUtils.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/ACIUtils.java Fri Sep 16 10:43:45 2016
@@ -67,7 +67,7 @@ public final class ACIUtils {
GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
String style = toStyle((Float) aci.getAttribute(TextAttribute.POSTURE));
int weight = toCSSWeight((Float) aci.getAttribute(TextAttribute.WEIGHT));
- float fontSize = ((Float) aci.getAttribute(TextAttribute.SIZE)).floatValue();
+ float fontSize = (Float) aci.getAttribute(TextAttribute.SIZE);
String firstFontFamily = null;
//GVT_FONT can sometimes be different from the fonts in GVT_FONT_FAMILIES
@@ -119,23 +119,23 @@ public final class ACIUtils {
public static int toCSSWeight(Float weight) {
if (weight == null) {
return 400;
- } else if (weight <= TextAttribute.WEIGHT_EXTRA_LIGHT.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_EXTRA_LIGHT) {
return 100;
- } else if (weight <= TextAttribute.WEIGHT_LIGHT.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_LIGHT) {
return 200;
- } else if (weight <= TextAttribute.WEIGHT_DEMILIGHT.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_DEMILIGHT) {
return 300;
- } else if (weight <= TextAttribute.WEIGHT_REGULAR.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_REGULAR) {
return 400;
- } else if (weight <= TextAttribute.WEIGHT_SEMIBOLD.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_SEMIBOLD) {
return 500;
- } else if (weight < TextAttribute.WEIGHT_BOLD.floatValue()) {
+ } else if (weight < TextAttribute.WEIGHT_BOLD) {
return 600;
} else if (weight == TextAttribute.WEIGHT_BOLD.floatValue()) {
return 700;
- } else if (weight <= TextAttribute.WEIGHT_HEAVY.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_HEAVY) {
return 800;
- } else if (weight <= TextAttribute.WEIGHT_EXTRABOLD.floatValue()) {
+ } else if (weight <= TextAttribute.WEIGHT_EXTRABOLD) {
return 900;
} else {
return 900;
@@ -143,7 +143,7 @@ public final class ACIUtils {
}
public static String toStyle(Float posture) {
- return ((posture != null) && (posture.floatValue() > 0.0))
+ return ((posture != null) && (posture > 0.0))
? Font.STYLE_ITALIC
: Font.STYLE_NORMAL;
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java Fri Sep 16 10:43:45 2016
@@ -155,7 +155,7 @@ public abstract class AbstractFOPTransco
//By default, enable font auto-detection if no cfg is given
boolean autoFonts = getAutoFontsDefault();
if (hints.containsKey(KEY_AUTO_FONTS)) {
- autoFonts = ((Boolean)hints.get(KEY_AUTO_FONTS)).booleanValue();
+ autoFonts = (Boolean) hints.get(KEY_AUTO_FONTS);
}
if (autoFonts) {
DefaultConfiguration c = new DefaultConfiguration("cfg");
@@ -212,7 +212,7 @@ public abstract class AbstractFOPTransco
protected boolean isTextStroked() {
boolean stroke = false;
if (hints.containsKey(KEY_STROKE_TEXT)) {
- stroke = ((Boolean)hints.get(KEY_STROKE_TEXT)).booleanValue();
+ stroke = (Boolean) hints.get(KEY_STROKE_TEXT);
}
return stroke;
}
@@ -223,7 +223,7 @@ public abstract class AbstractFOPTransco
*/
protected float getDeviceResolution() {
if (hints.containsKey(KEY_DEVICE_RESOLUTION)) {
- return ((Float)hints.get(KEY_DEVICE_RESOLUTION)).floatValue();
+ return (Float) hints.get(KEY_DEVICE_RESOLUTION);
} else {
return GraphicsConstants.DEFAULT_DPI;
}
@@ -369,7 +369,7 @@ public abstract class AbstractFOPTransco
public float getPixelUnitToMillimeter() {
Object key = ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER;
if (getTranscodingHints().containsKey(key)) {
- return ((Float)getTranscodingHints().get(key)).floatValue();
+ return (Float) getTranscodingHints().get(key);
} else {
// return 0.3528f; // 72 dpi
return UnitConv.IN2MM / 96; //96dpi = 0.2645833333333333333f;
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -1411,7 +1411,7 @@ public class PDFGraphics2D extends Abstr
if (kernPair != null) {
Integer width = kernPair.get(ch2);
if (width != null) {
- currentStream.write(endText + (-width.intValue()) + " " + startText);
+ currentStream.write(endText + (-width) + " " + startText);
}
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/font/FOPGVTGlyphVector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/font/FOPGVTGlyphVector.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/font/FOPGVTGlyphVector.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/font/FOPGVTGlyphVector.java Fri Sep 16 10:43:45 2016
@@ -124,7 +124,7 @@ public class FOPGVTGlyphVector implement
this.language = (String) aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.LANGUAGE);
Integer level = (Integer) aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.BIDI_LEVEL);
if (level != null) {
- this.level = level.intValue();
+ this.level = level;
}
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/RunTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/RunTest.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/RunTest.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/RunTest.java Fri Sep 16 10:43:45 2016
@@ -111,7 +111,7 @@ public class RunTest extends Task {
Boolean pass = (Boolean)e.getValue();
System.out.println("file: " + fname
+ " - reference success: " + pass);
- if (pass.booleanValue()) {
+ if (pass) {
broke = true;
}
}
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -47,7 +47,7 @@ public final class XMLUtil implements XM
if (s == null) {
return defaultValue;
} else {
- return Boolean.valueOf(s).booleanValue();
+ return Boolean.valueOf(s);
}
}
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/text/IfFieldPart.java Fri Sep 16 10:43:45 2016
@@ -81,7 +81,7 @@ public class IfFieldPart implements Part
protected boolean isTrue(Map params) {
Object obj = params.get(fieldName);
if (obj instanceof Boolean) {
- return ((Boolean)obj).booleanValue();
+ return (Boolean) obj;
} else {
return (obj != null);
}
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -3291,7 +3291,7 @@ public class TTXFile {
if (gmap != null) {
Integer cid = gmap.get(gid);
if (cid != null) {
- return cid.intValue();
+ return cid;
}
}
}
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=1761019&r1=1761018&r2=1761019&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 Fri Sep 16 10:43:45 2016
@@ -128,7 +128,7 @@ public class CollapsedConditionalBorderT
private static void checkBorder(String errorMsge, BorderSpecification border,
Object[] resolvedBorder) {
checkBorder(errorMsge, border,
- ((Integer) resolvedBorder[0]).intValue(),
+ (Integer) resolvedBorder[0],
(Color) resolvedBorder[1]);
}
Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java?rev=1761019&r1=1761018&r2=1761019&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java Fri Sep 16 10:43:45 2016
@@ -165,7 +165,7 @@ public class FOTreeTestCase {
public void processingInstruction(String target, String data) throws SAXException {
if ("fop-useragent-break-indent-inheritance".equals(target)) {
fopConfig.setBreakIndentInheritanceOnReferenceAreaBoundary(
- Boolean.valueOf(data).booleanValue());
+ Boolean.valueOf(data));
} else if ("fop-source-resolution".equals(target)) {
fopConfig.setSourceResolution(Float.parseFloat(data));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org