You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ss...@apache.org on 2017/07/18 13:58:13 UTC
svn commit: r1802297 [3/3] - in /xmlgraphics/batik/trunk:
batik-anim/src/main/java/org/apache/batik/anim/dom/
batik-anim/src/main/java/org/apache/batik/anim/timing/
batik-awt-util/src/main/java/org/apache/batik/ext/awt/geom/
batik-awt-util/src/main/jav...
Modified: xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java (original)
+++ xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java Tue Jul 18 13:58:12 2017
@@ -189,7 +189,7 @@ public abstract class AbstractSVGList {
if (index < 0 || itemList == null || index >= itemList.size()) {
throw createDOMException
(DOMException.INDEX_SIZE_ERR, "index.out.of.bounds",
- new Object[] { new Integer(index) } );
+ new Object[] {index} );
}
return (SVGItem)itemList.get(index);
@@ -228,7 +228,7 @@ public abstract class AbstractSVGList {
if (index < 0) {
throw createDOMException
(DOMException.INDEX_SIZE_ERR, "index.out.of.bounds",
- new Object[] { new Integer(index) } );
+ new Object[] {index} );
}
if (index > itemList.size()) {
@@ -279,7 +279,7 @@ public abstract class AbstractSVGList {
if (index < 0 || index >= itemList.size()) {
throw createDOMException
(DOMException.INDEX_SIZE_ERR, "index.out.of.bounds",
- new Object[] { new Integer(index) } );
+ new Object[] {index} );
}
SVGItem item = removeIfNeeded(newItem);
@@ -314,7 +314,7 @@ public abstract class AbstractSVGList {
if (index < 0 || index >= itemList.size()) {
throw createDOMException
(DOMException.INDEX_SIZE_ERR, "index.out.of.bounds",
- new Object[] { new Integer(index) } );
+ new Object[] {index} );
}
SVGItem item = (SVGItem)itemList.remove(index);
Modified: xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java (original)
+++ xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java Tue Jul 18 13:58:12 2017
@@ -157,7 +157,7 @@ public abstract class AbstractSVGPreserv
throw createDOMException
(DOMException.INVALID_MODIFICATION_ERR,
"preserve.aspect.ratio.align",
- new Object[] { new Integer(align) });
+ new Object[] {(int) align});
}
String value = ALIGN_VALUES[align];
if (align == SVG_PRESERVEASPECTRATIO_NONE) {
@@ -168,7 +168,7 @@ public abstract class AbstractSVGPreserv
throw createDOMException
(DOMException.INVALID_MODIFICATION_ERR,
"preserve.aspect.ratio.meet.or.slice",
- new Object[] { new Integer(meetOrSlice) });
+ new Object[] {(int) meetOrSlice});
}
return value + ' ' + MEET_OR_SLICE_VALUES[meetOrSlice];
}
Modified: xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java (original)
+++ xmlgraphics/batik/trunk/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java Tue Jul 18 13:58:12 2017
@@ -56,7 +56,7 @@ public class SVGZoomAndPanSupport implem
throw ((AbstractNode)elt).createDOMException
(DOMException.INVALID_MODIFICATION_ERR,
"zoom.and.pan",
- new Object[] { new Integer(val) });
+ new Object[] {(int) val});
}
}
Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AboutDialog.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AboutDialog.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AboutDialog.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AboutDialog.java Tue Jul 18 13:58:12 2017
@@ -125,7 +125,7 @@ public class AboutDialog extends JWindow
JLabel l = new JLabel(icon);
l.setBounds(0, 0, w, h);
- p.add(l, new Integer(0));
+ p.add(l, Integer.valueOf(0));
JLabel l2 = new JLabel("Batik " + Version.getVersion());
l2.setForeground(new Color(232, 232, 232, 255));
@@ -134,7 +134,7 @@ public class AboutDialog extends JWindow
l2.setHorizontalAlignment(JLabel.RIGHT);
l2.setVerticalAlignment(JLabel.BOTTOM);
l2.setBounds(w - 320, h - 117, 300, 100);
- p.add(l2, new Integer(2));
+ p.add(l2, Integer.valueOf(2));
((JComponent)getContentPane()).setBorder
(BorderFactory.createCompoundBorder
Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JPEGOptionPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JPEGOptionPanel.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JPEGOptionPanel.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JPEGOptionPanel.java Tue Jul 18 13:58:12 2017
@@ -72,9 +72,9 @@ public class JPEGOptionPanel extends Opt
quality.setBorder(BorderFactory.createEmptyBorder(0,0,10,0));
Hashtable labels = new Hashtable();
for (int i=0; i < 100; i+=10) {
- labels.put(new Integer(i), new JLabel("0."+i/10));
+ labels.put(i, new JLabel("0."+i/10));
}
- labels.put(new Integer(100), new JLabel("1"));
+ labels.put(100, new JLabel("1"));
quality.setLabelTable(labels);
Dimension dim = quality.getPreferredSize();
Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java Tue Jul 18 13:58:12 2017
@@ -1721,7 +1721,7 @@ public class JSVGViewerFrame
application.getXMLParserClassName());
}
trans.addTranscodingHint
- (JPEGTranscoder.KEY_QUALITY, new Float(quality));
+ (JPEGTranscoder.KEY_QUALITY, quality);
final BufferedImage img = trans.createImage(w, h);
@@ -1785,7 +1785,7 @@ public class JSVGViewerFrame
Boolean.TRUE );
if(isIndexed){
- trans.addTranscodingHint(PNGTranscoder.KEY_INDEXED, new Integer(8));
+ trans.addTranscodingHint(PNGTranscoder.KEY_INDEXED, 8);
}
final BufferedImage img = trans.createImage(w, h);
Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java Tue Jul 18 13:58:12 2017
@@ -377,19 +377,19 @@ public class Main implements Application
defaults.put(PreferenceDialog.PREFERENCE_KEY_LOAD_ECMASCRIPT,
Boolean.TRUE);
defaults.put(PreferenceDialog.PREFERENCE_KEY_ALLOWED_SCRIPT_ORIGIN,
- new Integer(ResourceOrigin.DOCUMENT));
+ ResourceOrigin.DOCUMENT);
defaults.put(PreferenceDialog.PREFERENCE_KEY_ALLOWED_EXTERNAL_RESOURCE_ORIGIN,
- new Integer(ResourceOrigin.ANY));
+ ResourceOrigin.ANY);
defaults.put(PREFERENCE_KEY_VISITED_URI_LIST,
"");
defaults.put(PREFERENCE_KEY_VISITED_URI_LIST_LENGTH,
- new Integer(MAX_VISITED_URIS));
+ MAX_VISITED_URIS);
defaults.put(PreferenceDialog.PREFERENCE_KEY_ANIMATION_RATE_LIMITING_MODE,
- new Integer(1));
+ 1);
defaults.put(PreferenceDialog.PREFERENCE_KEY_ANIMATION_RATE_LIMITING_CPU,
- new Float(0.75f));
+ 0.75f);
defaults.put(PreferenceDialog.PREFERENCE_KEY_ANIMATION_RATE_LIMITING_FPS,
- new Float(10));
+ (float) 10);
defaults.put(PreferenceDialog.PREFERENCE_KEY_USER_STYLESHEET_ENABLED,
Boolean.TRUE);
Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java Tue Jul 18 13:58:12 2017
@@ -1241,8 +1241,8 @@ public class NodeTemplates {
baseFieldName + VALUE).get(this).toString();
String nodeName = getClass().getField(baseFieldName + NAME)
.get(this).toString();
- short nodeType = ((Short) getClass().getField(
- baseFieldName + TYPE).get(this)).shortValue();
+ short nodeType = (Short) getClass().getField(
+ baseFieldName + TYPE).get(this);
String nodeDescription = getClass().getField(
baseFieldName + DESCRIPTION).get(this).toString();
String nodeCategory = getClass().getField(
Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/PreferenceDialog.java Tue Jul 18 13:58:12 2017
@@ -1196,7 +1196,7 @@ public class PreferenceDialog extends JD
// button.setIconTextGap(0);
AbstractButton.class.getMethod
("setIconTextGap", new Class[] { Integer.TYPE })
- .invoke(button, new Object[] { new Integer(0) });
+ .invoke(button, new Object[] {0});
} catch (Exception ex) {
}
button.setPressedIcon(icon2);
Modified: xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/ImageCacher.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/ImageCacher.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/ImageCacher.java (original)
+++ xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/ImageCacher.java Tue Jul 18 13:58:12 2017
@@ -103,7 +103,7 @@ public abstract class ImageCacher implem
// need to check on actual byte-for-byte equality as well.
// The checksum will be sufficient in most cases.
int checksum = getChecksum(os.toByteArray());
- Integer key = new Integer(checksum);
+ Integer key = checksum;
String href = null;
Object data = getCacheableData(os);
Modified: xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGFont.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGFont.java (original)
+++ xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGFont.java Tue Jul 18 13:58:12 2017
@@ -44,32 +44,32 @@ import org.w3c.dom.NodeList;
*/
public class SVGFont extends AbstractSVGConverter {
public static final float EXTRA_LIGHT =
- TextAttribute.WEIGHT_EXTRA_LIGHT.floatValue();
+ TextAttribute.WEIGHT_EXTRA_LIGHT;
public static final float LIGHT =
- TextAttribute.WEIGHT_LIGHT.floatValue();
+ TextAttribute.WEIGHT_LIGHT;
public static final float DEMILIGHT =
- TextAttribute.WEIGHT_DEMILIGHT.floatValue();
+ TextAttribute.WEIGHT_DEMILIGHT;
public static final float REGULAR =
- TextAttribute.WEIGHT_REGULAR.floatValue();
+ TextAttribute.WEIGHT_REGULAR;
public static final float SEMIBOLD =
- TextAttribute.WEIGHT_SEMIBOLD.floatValue();
+ TextAttribute.WEIGHT_SEMIBOLD;
public static final float MEDIUM =
- TextAttribute.WEIGHT_MEDIUM.floatValue();
+ TextAttribute.WEIGHT_MEDIUM;
public static final float DEMIBOLD =
- TextAttribute.WEIGHT_DEMIBOLD.floatValue();
+ TextAttribute.WEIGHT_DEMIBOLD;
public static final float BOLD =
- TextAttribute.WEIGHT_BOLD.floatValue();
+ TextAttribute.WEIGHT_BOLD;
public static final float HEAVY =
- TextAttribute.WEIGHT_HEAVY.floatValue();
+ TextAttribute.WEIGHT_HEAVY;
public static final float EXTRABOLD =
- TextAttribute.WEIGHT_EXTRABOLD.floatValue();
+ TextAttribute.WEIGHT_EXTRABOLD;
public static final float ULTRABOLD =
- TextAttribute.WEIGHT_ULTRABOLD.floatValue();
+ TextAttribute.WEIGHT_ULTRABOLD;
public static final float POSTURE_REGULAR =
- TextAttribute.POSTURE_REGULAR.floatValue();
+ TextAttribute.POSTURE_REGULAR;
public static final float POSTURE_OBLIQUE =
- TextAttribute.POSTURE_OBLIQUE.floatValue();
+ TextAttribute.POSTURE_OBLIQUE;
/**
* Contains threshold value for the various Font styles. If a given
@@ -201,7 +201,7 @@ public class SVGFont extends AbstractSVG
*/
private static Font createCommonSizeFont(Font font) {
Map attributes = new HashMap();
- attributes.put(TextAttribute.SIZE, new Float(COMMON_FONT_SIZE));
+ attributes.put(TextAttribute.SIZE, (float) COMMON_FONT_SIZE);
// Remove Transform from font otherwise it will be applied twice.
attributes.put(TextAttribute.TRANSFORM, null);
return font.deriveFont(attributes);
@@ -436,7 +436,7 @@ public class SVGFont extends AbstractSVG
styleValue = TextAttribute.POSTURE_REGULAR;
}
- float style = styleValue.floatValue();
+ float style = styleValue;
int i = 0;
for (i=0; i< fontStyles.length; i++) {
@@ -462,7 +462,7 @@ public class SVGFont extends AbstractSVG
weightValue = TextAttribute.WEIGHT_REGULAR;
}
- float weight = weightValue.floatValue();
+ float weight = weightValue;
int i = 0;
for (i=0; i<fontWeights.length; i++) {
Modified: xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGIDGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGIDGenerator.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGIDGenerator.java (original)
+++ xmlgraphics/batik/trunk/batik-svggen/src/main/java/org/apache/batik/svggen/SVGIDGenerator.java Tue Jul 18 13:58:12 2017
@@ -45,11 +45,11 @@ public class SVGIDGenerator {
public String generateID(String prefix) {
Integer maxId = (Integer)prefixMap.get(prefix);
if (maxId == null) {
- maxId = new Integer(0);
+ maxId = 0;
prefixMap.put(prefix, maxId);
}
- maxId = new Integer(maxId.intValue()+1);
+ maxId = maxId + 1;
prefixMap.put(prefix, maxId);
return prefix + maxId;
}
Modified: xmlgraphics/batik/trunk/batik-svgpp/src/main/java/org/apache/batik/apps/svgpp/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgpp/src/main/java/org/apache/batik/apps/svgpp/Main.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgpp/src/main/java/org/apache/batik/apps/svgpp/Main.java (original)
+++ xmlgraphics/batik/trunk/batik-svgpp/src/main/java/org/apache/batik/apps/svgpp/Main.java Tue Jul 18 13:58:12 2017
@@ -296,7 +296,7 @@ public class Main {
throw new IllegalArgumentException();
}
transcoder.addTranscodingHint(SVGTranscoder.KEY_TABULATION_WIDTH,
- new Integer(arguments[index++]));
+ Integer.valueOf(arguments[index++]));
}
public String getDescription() {
@@ -314,7 +314,7 @@ public class Main {
throw new IllegalArgumentException();
}
transcoder.addTranscodingHint(SVGTranscoder.KEY_DOCUMENT_WIDTH,
- new Integer(arguments[index++]));
+ Integer.valueOf(arguments[index++]));
}
public String getDescription() {
Modified: xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java (original)
+++ xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java Tue Jul 18 13:58:12 2017
@@ -833,12 +833,12 @@ public class SVGConverter {
// Set image quality. ------------------------------------------------
if (quality > 0) {
- map.put(JPEGTranscoder.KEY_QUALITY, new Float(this.quality));
+ map.put(JPEGTranscoder.KEY_QUALITY, this.quality);
}
// Set image indexed. ------------------------------------------------
if (indexed != -1) {
- map.put(PNGTranscoder.KEY_INDEXED, new Integer(indexed));
+ map.put(PNGTranscoder.KEY_INDEXED, indexed);
}
// Set image background color -----------------------------------------
@@ -848,18 +848,18 @@ public class SVGConverter {
// Set image height and width. ----------------------------------------
if (height > 0) {
- map.put(ImageTranscoder.KEY_HEIGHT, new Float(this.height));
+ map.put(ImageTranscoder.KEY_HEIGHT, this.height);
}
if (width > 0){
- map.put(ImageTranscoder.KEY_WIDTH, new Float(this.width));
+ map.put(ImageTranscoder.KEY_WIDTH, this.width);
}
// Set maximum height and width ---------------------------------------
if (maxHeight > 0) {
- map.put(ImageTranscoder.KEY_MAX_HEIGHT, new Float(this.maxHeight));
+ map.put(ImageTranscoder.KEY_MAX_HEIGHT, this.maxHeight);
}
if (maxWidth > 0){
- map.put(ImageTranscoder.KEY_MAX_WIDTH, new Float(this.maxWidth));
+ map.put(ImageTranscoder.KEY_MAX_WIDTH, this.maxWidth);
}
// Set CSS Media
@@ -897,7 +897,7 @@ public class SVGConverter {
// Sets the millimeters per pixel
if (pixelUnitToMillimeter > 0){
map.put(ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER,
- new Float(pixelUnitToMillimeter));
+ pixelUnitToMillimeter);
}
// Set validation
@@ -912,7 +912,7 @@ public class SVGConverter {
// Set snapshot time
if (!Float.isNaN(snapshotTime)) {
- map.put(ImageTranscoder.KEY_SNAPSHOT_TIME, new Float(snapshotTime));
+ map.put(ImageTranscoder.KEY_SNAPSHOT_TIME, snapshotTime);
}
// Set allowed scripts
Modified: xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/AbstractTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/AbstractTest.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/AbstractTest.java (original)
+++ xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/AbstractTest.java Tue Jul 18 13:58:12 2017
@@ -308,7 +308,7 @@ public abstract class AbstractTest imple
}
public void assertEquals(int ref, int cmp) throws AssertEqualsException {
- assertEquals(new Integer(ref), new Integer(cmp));
+ assertEquals(Integer.valueOf(ref), Integer.valueOf(cmp));
}
/**
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/SVGAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/SVGAbstractTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/SVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/SVGAbstractTranscoder.java Tue Jul 18 13:58:12 2017
@@ -184,9 +184,9 @@ public abstract class SVGAbstractTransco
}
if (hints.containsKey(KEY_WIDTH))
- width = ((Float)hints.get(KEY_WIDTH)).floatValue();
+ width = (Float) hints.get(KEY_WIDTH);
if (hints.containsKey(KEY_HEIGHT))
- height = ((Float)hints.get(KEY_HEIGHT)).floatValue();
+ height = (Float) hints.get(KEY_HEIGHT);
SVGOMDocument svgDoc = (SVGOMDocument)document;
@@ -198,7 +198,7 @@ public abstract class SVGAbstractTransco
// flag that indicates if the document is dynamic
boolean isDynamic =
hints.containsKey(KEY_EXECUTE_ONLOAD) &&
- ((Boolean)hints.get(KEY_EXECUTE_ONLOAD)).booleanValue();
+ (Boolean) hints.get(KEY_EXECUTE_ONLOAD);
GraphicsNode gvtRoot;
try {
@@ -215,7 +215,7 @@ public abstract class SVGAbstractTransco
se.dispatchSVGLoadEvent();
if (hints.containsKey(KEY_SNAPSHOT_TIME)) {
float t =
- ((Float) hints.get(KEY_SNAPSHOT_TIME)).floatValue();
+ (Float) hints.get(KEY_SNAPSHOT_TIME);
ctx.getAnimationEngine().setCurrentTime(t);
} else if (ctx.isSVG12()) {
float t = SVGUtilities.convertSnapshotTime(root, null);
@@ -350,11 +350,11 @@ public abstract class SVGAbstractTransco
// Compute the image's width and height according the hints
float imgWidth = -1;
if (hints.containsKey(KEY_WIDTH)) {
- imgWidth = ((Float)hints.get(KEY_WIDTH)).floatValue();
+ imgWidth = (Float) hints.get(KEY_WIDTH);
}
float imgHeight = -1;
if (hints.containsKey(KEY_HEIGHT)) {
- imgHeight = ((Float)hints.get(KEY_HEIGHT)).floatValue();
+ imgHeight = (Float) hints.get(KEY_HEIGHT);
}
if (imgWidth > 0 && imgHeight > 0) {
@@ -374,11 +374,11 @@ public abstract class SVGAbstractTransco
// Limit image size according to the maximuxm size hints.
float imgMaxWidth = -1;
if (hints.containsKey(KEY_MAX_WIDTH)) {
- imgMaxWidth = ((Float)hints.get(KEY_MAX_WIDTH)).floatValue();
+ imgMaxWidth = (Float) hints.get(KEY_MAX_WIDTH);
}
float imgMaxHeight = -1;
if (hints.containsKey(KEY_MAX_HEIGHT)) {
- imgMaxHeight = ((Float)hints.get(KEY_MAX_HEIGHT)).floatValue();
+ imgMaxHeight = (Float) hints.get(KEY_MAX_HEIGHT);
}
if ((imgMaxHeight > 0) && (height > imgMaxHeight)) {
@@ -958,7 +958,7 @@ public abstract class SVGAbstractTransco
Object obj = SVGAbstractTranscoder.this.hints.get
(KEY_PIXEL_UNIT_TO_MILLIMETER);
if (obj != null) {
- return ((Float)obj).floatValue();
+ return (Float) obj;
}
return super.getPixelUnitToMillimeter();
@@ -1041,7 +1041,7 @@ public abstract class SVGAbstractTransco
Boolean b = (Boolean)SVGAbstractTranscoder.this.hints.get
(KEY_XML_PARSER_VALIDATING);
if (b != null)
- return b.booleanValue();
+ return b;
return super.isXMLParserValidating();
}
@@ -1076,8 +1076,8 @@ public abstract class SVGAbstractTransco
if (SVGAbstractTranscoder.this.hints.containsKey
(KEY_CONSTRAIN_SCRIPT_ORIGIN)) {
constrainOrigin =
- ((Boolean)SVGAbstractTranscoder.this.hints.get
- (KEY_CONSTRAIN_SCRIPT_ORIGIN)).booleanValue();
+ (Boolean) SVGAbstractTranscoder.this.hints.get
+ (KEY_CONSTRAIN_SCRIPT_ORIGIN);
}
if (constrainOrigin) {
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java Tue Jul 18 13:58:12 2017
@@ -73,13 +73,13 @@ import org.w3c.dom.Element;
* <li>KEY_ESCAPED : this Boolean ley allow to escape XML characters in the output</li>
* </ul>
* <pre>
- * transcoder.addTranscodingHint(ToSVGAbstractTranscoder.KEY_INPUT_WIDTH, new Integer(input_width));
+ * transcoder.addTranscodingHint(ToSVGAbstractTranscoder.KEY_INPUT_WIDTH, Integer.valueOf(input_width));
* </pre>
* </li>
* <li>KEY_WIDTH, KEY_HEIGHT : this Float values allows to force the width and height of the output:
* </ul>
* <pre>
- * transcoder.addTranscodingHint(ToSVGAbstractTranscoder.KEY_WIDTH, new Float(width));
+ * transcoder.addTranscodingHint(ToSVGAbstractTranscoder.KEY_WIDTH, Float.valueOf(width));
* </pre>
* </li>
* </li>
@@ -187,7 +187,7 @@ public abstract class ToSVGAbstractTrans
try {
boolean escaped = false;
if (hints.containsKey(KEY_ESCAPED)) {
- escaped = ((Boolean)hints.get(KEY_ESCAPED)).booleanValue();
+ escaped = (Boolean) hints.get(KEY_ESCAPED);
}
// Output stream
OutputStream os = output.getOutputStream();
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/XMLAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/XMLAbstractTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/XMLAbstractTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/XMLAbstractTranscoder.java Tue Jul 18 13:58:12 2017
@@ -107,7 +107,7 @@ public abstract class XMLAbstractTransco
// parse the XML document
DocumentFactory f = createDocumentFactory(domImpl, parserClassname);
Object xmlParserValidating = hints.get(KEY_XML_PARSER_VALIDATING);
- boolean validating = xmlParserValidating != null && ((Boolean) xmlParserValidating).booleanValue();
+ boolean validating = xmlParserValidating != null && (Boolean) xmlParserValidating;
f.setValidating(validating);
try {
if (input.getInputStream() != null) {
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/JPEGTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/JPEGTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/JPEGTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/JPEGTranscoder.java Tue Jul 18 13:58:12 2017
@@ -72,7 +72,7 @@ public class JPEGTranscoder extends Imag
try {
float quality;
if (hints.containsKey(KEY_QUALITY)) {
- quality = ((Float)hints.get(KEY_QUALITY)).floatValue();
+ quality = (Float) hints.get(KEY_QUALITY);
} else {
TranscoderException te;
te = new TranscoderException
@@ -133,7 +133,7 @@ public class JPEGTranscoder extends Imag
private static class QualityKey extends TranscodingHints.Key {
public boolean isCompatibleValue(Object v) {
if (v instanceof Float) {
- float q = ((Float)v).floatValue();
+ float q = (Float) v;
return (q > 0 && q <= 1.0f);
} else {
return false;
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java Tue Jul 18 13:58:12 2017
@@ -97,8 +97,8 @@ public class PNGTranscoder extends Image
if (hints.containsKey(PNGTranscoder.KEY_FORCE_TRANSPARENT_WHITE)) {
forceTransparentWhite =
- ((Boolean)hints.get
- (PNGTranscoder.KEY_FORCE_TRANSPARENT_WHITE)).booleanValue();
+ (Boolean) hints.get
+ (PNGTranscoder.KEY_FORCE_TRANSPARENT_WHITE);
}
if (forceTransparentWhite) {
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java Tue Jul 18 13:58:12 2017
@@ -90,8 +90,8 @@ public class TIFFTranscoder extends Imag
if (hints.containsKey(PNGTranscoder.KEY_FORCE_TRANSPARENT_WHITE)) {
forceTransparentWhite =
- ((Boolean)hints.get
- (PNGTranscoder.KEY_FORCE_TRANSPARENT_WHITE)).booleanValue();
+ (Boolean) hints.get
+ (PNGTranscoder.KEY_FORCE_TRANSPARENT_WHITE);
}
if (forceTransparentWhite) {
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/keys/LengthKey.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/keys/LengthKey.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/keys/LengthKey.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/keys/LengthKey.java Tue Jul 18 13:58:12 2017
@@ -30,6 +30,6 @@ import org.apache.batik.transcoder.Trans
public class LengthKey extends TranscodingHints.Key {
public boolean isCompatibleValue(Object v) {
- return (v instanceof Float && ((Float)v).floatValue() > 0);
+ return (v instanceof Float && (Float) v > 0);
}
}
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java Tue Jul 18 13:58:12 2017
@@ -183,12 +183,12 @@ public class PrintTranscoder extends SVG
Float pageWidth = (Float)hints.get(KEY_PAGE_WIDTH);
Float pageHeight = (Float)hints.get(KEY_PAGE_HEIGHT);
if(pageWidth != null){
- paper.setSize(pageWidth.floatValue(),
+ paper.setSize(pageWidth,
paper.getHeight());
}
if(pageHeight != null){
paper.setSize(paper.getWidth(),
- pageHeight.floatValue());
+ pageHeight);
}
float x=0, y=0;
@@ -201,18 +201,18 @@ public class PrintTranscoder extends SVG
Float bottomMargin = (Float)hints.get(KEY_MARGIN_BOTTOM);
if(leftMargin != null){
- x = leftMargin.floatValue();
- width -= leftMargin.floatValue();
+ x = leftMargin;
+ width -= leftMargin;
}
if(topMargin != null){
- y = topMargin.floatValue();
- height -= topMargin.floatValue();
+ y = topMargin;
+ height -= topMargin;
}
if(rightMargin != null){
- width -= rightMargin.floatValue();
+ width -= rightMargin;
}
if(bottomMargin != null){
- height -= bottomMargin.floatValue();
+ height -= bottomMargin;
}
paper.setImageableArea(x, y, width, height);
@@ -235,7 +235,7 @@ public class PrintTranscoder extends SVG
// If required, pop up a dialog to adjust the page format
//
Boolean showPageFormat = (Boolean)hints.get(KEY_SHOW_PAGE_DIALOG);
- if ((showPageFormat != null) && (showPageFormat.booleanValue())) {
+ if ((showPageFormat != null) && (showPageFormat)) {
PageFormat tmpPageFormat = printerJob.pageDialog(pageFormat);
if(tmpPageFormat == pageFormat){
// Dialog was cancelled, meaning that the print process should
@@ -255,7 +255,7 @@ public class PrintTranscoder extends SVG
//
Boolean showPrinterDialog;
showPrinterDialog = (Boolean)hints.get(KEY_SHOW_PRINTER_DIALOG);
- if(showPrinterDialog != null && showPrinterDialog.booleanValue()){
+ if(showPrinterDialog != null && showPrinterDialog){
if(!printerJob.printDialog()){
// Dialog was cancelled, meaning that the print process
// should be stopped.
@@ -378,7 +378,7 @@ public class PrintTranscoder extends SVG
protected void setImageSize(float docWidth, float docHeight) {
// Check hint to know if scaling is really needed
Boolean scaleToPage = (Boolean)hints.get(KEY_SCALE_TO_PAGE);
- if(scaleToPage != null && !scaleToPage.booleanValue()) {
+ if(scaleToPage != null && !scaleToPage) {
float w = docWidth;
float h = docHeight;
if (hints.containsKey(KEY_AOI)) {
@@ -800,7 +800,7 @@ public class PrintTranscoder extends SVG
String str = System.getProperty(property);
if(str != null){
try{
- Float value = new Float(Float.parseFloat(str));
+ Float value = Float.parseFloat(str);
transcoder.addTranscodingHint(key, value);
}catch(NumberFormatException e){
handleValueError(property, str);
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java Tue Jul 18 13:58:12 2017
@@ -451,7 +451,7 @@ public class OutputManager {
throws IOException {
xmlSpace.add(0, xmlSpace.get(0));
- startingLines.add(0, new Integer(line));
+ startingLines.add(0, line);
if (prettyPrinter.getFormat()) {
if (canIndent) {
@@ -555,7 +555,7 @@ public class OutputManager {
if (name != null) {
if (prettyPrinter.getFormat()) {
if (xmlSpace.get(0) != Boolean.TRUE &&
- (line != ((Integer)startingLines.get(0)).intValue() ||
+ (line != (Integer) startingLines.get(0) ||
column + name.length + 3 >= prettyPrinter.getDocumentWidth())) {
printNewline();
printString(margin.toString());
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/SVGTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/SVGTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/SVGTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/SVGTranscoder.java Tue Jul 18 13:58:12 2017
@@ -199,15 +199,15 @@ public class SVGTranscoder extends Abstr
}
Boolean b = (Boolean)hints.get(KEY_FORMAT);
if (b != null) {
- pp.setFormat(b.booleanValue());
+ pp.setFormat(b);
}
Integer i = (Integer)hints.get(KEY_TABULATION_WIDTH);
if (i != null) {
- pp.setTabulationWidth(i.intValue());
+ pp.setTabulationWidth(i);
}
i = (Integer)hints.get(KEY_DOCUMENT_WIDTH);
if (i != null) {
- pp.setDocumentWidth(i.intValue());
+ pp.setDocumentWidth(i);
}
DoctypeValue dtv = (DoctypeValue)hints.get(KEY_DOCTYPE);
if (dtv != null) {
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java Tue Jul 18 13:58:12 2017
@@ -224,7 +224,7 @@ public class AbstractWMFPainter {
protected AttributedString getAttributedString(Graphics2D g2d, String sr, WMFFont wmffont) {
AttributedString ats = new AttributedString(sr);
Font font = g2d.getFont();
- ats.addAttribute(TextAttribute.SIZE, new Float(font.getSize2D()));
+ ats.addAttribute(TextAttribute.SIZE, font.getSize2D());
ats.addAttribute(TextAttribute.FONT, font);
if (wmfFont.underline != 0)
ats.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/MetaRecord.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/MetaRecord.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/MetaRecord.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/MetaRecord.java Tue Jul 18 13:58:12 2017
@@ -52,13 +52,13 @@ public class MetaRecord /*implements Ser
}
/**
- * helper method to add int-values. This way we keep the call to new Integer()
+ * helper method to add int-values. This way we keep the call to Integer.valueOf()
* in one place, here.
*
* @param iValue the value to add to ptVector, wrapped in an Integer
*/
public final void addElement( int iValue ){
- ptVector.add( new Integer( iValue ) );
+ ptVector.add(iValue);
}
/**
@@ -77,7 +77,7 @@ public class MetaRecord /*implements Ser
* @return the intValue of the element at offset
*/
public final int elementAt( int offset ){
- return ((Integer)ptVector.get( offset )).intValue();
+ return (Integer) ptVector.get(offset);
}
/** A record that contain byte arrays elements.
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/RecordStore.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/RecordStore.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/RecordStore.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/RecordStore.java Tue Jul 18 13:58:12 2017
@@ -116,7 +116,7 @@ public class RecordStore {
mr.functionId = functionId;
for ( int j = 0; j < numPts; j++ ){
- mr.AddElement( new Integer( is.readShort()));
+ mr.AddElement((int) is.readShort());
}
records.add( mr );
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/TextureFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/TextureFactory.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/TextureFactory.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/TextureFactory.java Tue Jul 18 13:58:12 2017
@@ -71,7 +71,7 @@ public class TextureFactory {
* texture will be cached, so the Paint will only be created once.
*/
public Paint getTexture(int textureId) {
- Integer _itexture = new Integer(textureId);
+ Integer _itexture = textureId;
if (textures.containsKey( _itexture)) {
Paint paint = (Paint)(textures.get(_itexture));
return paint;
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java Tue Jul 18 13:58:12 2017
@@ -45,7 +45,7 @@ import org.apache.batik.transcoder.wmf.W
*/
public class WMFHeaderProperties extends AbstractWMFReader {
- private static final Integer INTEGER_0 = new Integer( 0 );
+ private static final Integer INTEGER_0 = 0;
protected DataInputStream stream;
private int _bleft, _bright, _btop, _bbottom, _bwidth, _bheight;
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java Tue Jul 18 13:58:12 2017
@@ -66,7 +66,7 @@ public class WMFPainter extends Abstract
*/
private static final int INPUT_BUFFER_SIZE = 30720;
- private static final Integer INTEGER_0 = new Integer( 0 );
+ private static final Integer INTEGER_0 = 0;
private float scale, scaleX, scaleY, conv;
private float xOffset, yOffset;
@@ -695,12 +695,12 @@ public class WMFPainter extends Abstract
break;
case WMFConstants.META_SAVEDC:
- dcStack.push( new Float( penWidth ));
- dcStack.push( new Float( startX ));
- dcStack.push( new Float( startY ));
- dcStack.push( new Integer( brushObject ));
- dcStack.push( new Integer( penObject ));
- dcStack.push( new Integer( fontObject ));
+ dcStack.push(penWidth);
+ dcStack.push(startX);
+ dcStack.push(startY);
+ dcStack.push(brushObject);
+ dcStack.push(penObject);
+ dcStack.push(fontObject);
dcStack.push( frgdColor );
dcStack.push( bkgdColor );
break;
@@ -708,12 +708,12 @@ public class WMFPainter extends Abstract
case WMFConstants.META_RESTOREDC:
bkgdColor = (Color)dcStack.pop();
frgdColor = (Color)dcStack.pop();
- fontObject = ((Integer)(dcStack.pop())).intValue();
- penObject = ((Integer)(dcStack.pop())).intValue();
- brushObject = ((Integer)(dcStack.pop())).intValue();
- startY = ((Float)(dcStack.pop())).floatValue();
- startX = ((Float)(dcStack.pop())).floatValue();
- penWidth = ((Float)(dcStack.pop())).floatValue();
+ fontObject = (Integer) (dcStack.pop());
+ penObject = (Integer) (dcStack.pop());
+ brushObject = (Integer) (dcStack.pop());
+ startY = (Float) (dcStack.pop());
+ startX = (Float) (dcStack.pop());
+ penWidth = (Float) (dcStack.pop());
break;
case WMFConstants.META_POLYBEZIER16:
@@ -777,7 +777,7 @@ public class WMFPainter extends Abstract
//UPDATED : added SETROP2
case WMFConstants.META_SETROP2:
{
- float rop = (float)(mr.ElementAt( 0 ).intValue());
+ float rop = (float)(mr.ElementAt(0));
Paint paint = null;
boolean ok = false;
if (rop == WMFConstants.META_BLACKNESS) {
@@ -896,19 +896,19 @@ public class WMFPainter extends Abstract
break;
case WMFConstants.META_DIBBITBLT:
{
- int rop = mr.ElementAt( 0 ).intValue();
- float height = (mr.ElementAt( 1 ).intValue() *
+ int rop = mr.ElementAt(0);
+ float height = (mr.ElementAt(1) *
conv * currentStore.getVpWFactor());
- float width = (mr.ElementAt( 2 ).intValue() *
+ float width = (mr.ElementAt(2) *
conv * currentStore.getVpHFactor());
- int sy = mr.ElementAt( 3 ).intValue();
- int sx = mr.ElementAt( 4 ).intValue();
+ int sy = mr.ElementAt(3);
+ int sx = mr.ElementAt(4);
float dy = (conv * currentStore.getVpWFactor() *
(vpY + yOffset +
- (float)mr.ElementAt( 5 ).intValue()));
+ (float) mr.ElementAt(5)));
float dx = (conv * currentStore.getVpHFactor() *
(vpX + xOffset +
- (float)mr.ElementAt( 6 ).intValue()));
+ (float) mr.ElementAt(6)));
if (mr instanceof MetaRecord.ByteRecord) {
byte[] bitmap = ((MetaRecord.ByteRecord)mr).bstr;
Modified: xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java (original)
+++ xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java Tue Jul 18 13:58:12 2017
@@ -76,13 +76,13 @@ import org.w3c.dom.Element;
* of this portion in Metafile units.
* </ul>
* <pre>
- * transcoder.addTranscodingHint(FromWMFTranscoder.KEY_INPUT_WIDTH, new Integer(input_width));
+ * transcoder.addTranscodingHint(FromWMFTranscoder.KEY_INPUT_WIDTH, Integer.valueOf(input_width));
* </pre>
* </li>
* <li>KEY_WIDTH, KEY_HEIGHT : this Float values allows to force the width and height of the output:
* </ul>
* <pre>
- * transcoder.addTranscodingHint(FromWMFTranscoder.KEY_WIDTH, new Float(width));
+ * transcoder.addTranscodingHint(FromWMFTranscoder.KEY_WIDTH, Float.valueOf(width));
* </pre>
* </li>
* </ul>
@@ -127,8 +127,8 @@ public class WMFTranscoder extends ToSVG
float conv = 1.0f; // conversion factor
if (hints.containsKey(KEY_INPUT_WIDTH)) {
- wmfwidth = ((Integer)hints.get(KEY_INPUT_WIDTH)).intValue();
- wmfheight = ((Integer)hints.get(KEY_INPUT_HEIGHT)).intValue();
+ wmfwidth = (Integer) hints.get(KEY_INPUT_WIDTH);
+ wmfheight = (Integer) hints.get(KEY_INPUT_HEIGHT);
} else {
wmfwidth = currentStore.getWidthPixels();
wmfheight = currentStore.getHeightPixels();
@@ -138,7 +138,7 @@ public class WMFTranscoder extends ToSVG
// change the output width and height if required
if (hints.containsKey(KEY_WIDTH)) {
- width = ((Float)hints.get(KEY_WIDTH)).floatValue();
+ width = (Float) hints.get(KEY_WIDTH);
conv = width / wmfwidth;
height = height * width / wmfwidth;
}
@@ -147,10 +147,10 @@ public class WMFTranscoder extends ToSVG
int xOffset = 0;
int yOffset = 0;
if (hints.containsKey(KEY_XOFFSET)) {
- xOffset = ((Integer)hints.get(KEY_XOFFSET)).intValue();
+ xOffset = (Integer) hints.get(KEY_XOFFSET);
}
if (hints.containsKey(KEY_YOFFSET)) {
- yOffset = ((Integer)hints.get(KEY_YOFFSET)).intValue();
+ yOffset = (Integer) hints.get(KEY_YOFFSET);
}
// Set the size and viewBox on the output document
@@ -163,8 +163,8 @@ public class WMFTranscoder extends ToSVG
int vpH;
// if we took only a part of the image, we use its dimension for computing
if (hints.containsKey(KEY_INPUT_WIDTH)) {
- vpW = (int)(((Integer)hints.get(KEY_INPUT_WIDTH)).intValue() * conv);
- vpH = (int)(((Integer)hints.get(KEY_INPUT_HEIGHT)).intValue() * conv);
+ vpW = (int)((Integer) hints.get(KEY_INPUT_WIDTH) * conv);
+ vpH = (int)((Integer) hints.get(KEY_INPUT_HEIGHT) * conv);
// else we took the whole image dimension
} else {
vpW = (int)(currentStore.getWidthUnits() * sizeFactor);
Modified: xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java (original)
+++ xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java Tue Jul 18 13:58:12 2017
@@ -146,9 +146,9 @@ public class ClassFileUtilities {
}
Integer n = (Integer) fromJar.deps.get(toJar);
if (n == null) {
- fromJar.deps.put(toJar, new Integer(1));
+ fromJar.deps.put(toJar, 1);
} else {
- fromJar.deps.put(toJar, new Integer(n.intValue() + 1));
+ fromJar.deps.put(toJar, n + 1);
}
}
}
@@ -163,7 +163,7 @@ public class ClassFileUtilities {
Triple t = new Triple();
t.from = fromJar;
t.to = toJar;
- t.count = ((Integer) fromJar.deps.get(toJar)).intValue();
+ t.count = (Integer) fromJar.deps.get(toJar);
triples.add(t);
}
}
@@ -362,7 +362,7 @@ public class ClassFileUtilities {
break;
case CONSTANT_CLASS_INFO:
- classes.add(new Integer(dis.readShort() & 0xffff));
+ classes.add(dis.readShort() & 0xffff);
break;
case CONSTANT_STRING_INFO:
@@ -371,7 +371,7 @@ public class ClassFileUtilities {
case CONSTANT_NAMEANDTYPE_INFO:
dis.readShort();
- desc.add(new Integer(dis.readShort() & 0xffff));
+ desc.add(dis.readShort() & 0xffff);
break;
case CONSTANT_UTF8_INFO:
@@ -387,12 +387,12 @@ public class ClassFileUtilities {
Iterator it = classes.iterator();
while (it.hasNext()) {
- result.add(strs[((Integer)it.next()).intValue()]);
+ result.add(strs[((Integer) it.next())]);
}
it = desc.iterator();
while (it.hasNext()) {
- result.addAll(getDescriptorClasses(strs[((Integer)it.next()).intValue()]));
+ result.addAll(getDescriptorClasses(strs[((Integer) it.next())]));
}
return result;
Modified: xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java (original)
+++ xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java Tue Jul 18 13:58:12 2017
@@ -591,7 +591,7 @@ public class PreferenceManager
{
int defaultValue = 0;
if (getDefault(key) != null)
- defaultValue = ((Integer)getDefault(key)).intValue();
+ defaultValue = (Integer) getDefault(key);
String sp = internal.getProperty(key);
if (sp == null) {
return defaultValue;
@@ -613,7 +613,7 @@ public class PreferenceManager
{
float defaultValue = 0;
if (getDefault(key) != null)
- defaultValue = ((Float)getDefault(key)).floatValue();
+ defaultValue = (Float) getDefault(key);
String sp = internal.getProperty(key);
if (sp == null) {
return defaultValue;
@@ -637,7 +637,7 @@ public class PreferenceManager
return internal.getProperty(key).equals("true");
else
if (getDefault(key) != null)
- return ((Boolean)getDefault(key)).booleanValue();
+ return (Boolean) getDefault(key);
else
return false;
}
@@ -815,7 +815,7 @@ public class PreferenceManager
public void setInteger(String key, int value)
{
if (getDefault(key) != null &&
- ((Integer)getDefault(key)).intValue() != value)
+ (Integer) getDefault(key) != value)
internal.setProperty(key, Integer.toString(value));
else
internal.remove(key);
@@ -827,7 +827,7 @@ public class PreferenceManager
public void setFloat(String key, float value)
{
if (getDefault(key) != null &&
- ((Float)getDefault(key)).floatValue() != value)
+ (Float) getDefault(key) != value)
internal.setProperty(key, Float.toString(value));
else
internal.remove(key);
@@ -839,7 +839,7 @@ public class PreferenceManager
public void setBoolean(String key, boolean value)
{
if (getDefault(key) != null &&
- ((Boolean)getDefault(key)).booleanValue() != value) {
+ (Boolean) getDefault(key) != value) {
internal.setProperty(key, value?"true":"false");
} else {
internal.remove(key);
Modified: xmlgraphics/batik/trunk/batik-util/src/test/java/org/apache/batik/util/RunnableQueueTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-util/src/test/java/org/apache/batik/util/RunnableQueueTest.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-util/src/test/java/org/apache/batik/util/RunnableQueueTest.java (original)
+++ xmlgraphics/batik/trunk/batik-util/src/test/java/org/apache/batik/util/RunnableQueueTest.java Tue Jul 18 13:58:12 2017
@@ -40,7 +40,7 @@ public class RunnableQueueTest extends A
this.nThreads = nThreads;
}
public RunnableQueueTest(Integer nThreads) {
- this((nThreads==null)?10:nThreads.intValue());
+ this((nThreads==null)?10: nThreads);
}
/**
Modified: xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLScanner.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLScanner.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLScanner.java (original)
+++ xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLScanner.java Tue Jul 18 13:58:12 2017
@@ -2073,8 +2073,8 @@ public class XMLScanner implements Local
try {
m = formatMessage(message,
new Object[] {
- new Integer(reader.getLine()),
- new Integer(reader.getColumn())
+ reader.getLine(),
+ reader.getColumn()
});
} catch (MissingResourceException e) {
m = message;
Modified: xmlgraphics/batik/trunk/contrib/tiledTranscoder/TiledImageTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/contrib/tiledTranscoder/TiledImageTranscoder.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/contrib/tiledTranscoder/TiledImageTranscoder.java (original)
+++ xmlgraphics/batik/trunk/contrib/tiledTranscoder/TiledImageTranscoder.java Tue Jul 18 13:58:12 2017
@@ -92,7 +92,7 @@ public class TiledImageTranscoder extend
try {
FileOutputStream fos = new FileOutputStream(args[1]);
TiledImageTranscoder tit = new TiledImageTranscoder();
- tit.addTranscodingHint(KEY_WIDTH, new Float(10240));
+ tit.addTranscodingHint(KEY_WIDTH, Float.valueOf(10240));
tit.transcode(new TranscoderInput("file:" + args[0]),
new TranscoderOutput(fos));
} catch (IOException ioe) {
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java Tue Jul 18 13:58:12 2017
@@ -84,7 +84,7 @@ public class SVGConverterTest extends De
t.setId("HintsConfigTest.KEY_AOI");
t = new HintsConfigTest(new Object[][]{
- {JPEGTranscoder.KEY_QUALITY, new Float(.5)}}){
+ {JPEGTranscoder.KEY_QUALITY, Float.valueOf(.5)}}){
protected void deltaConfigure(SVGConverter c){
c.setQuality(.5f);
}
@@ -94,7 +94,7 @@ public class SVGConverterTest extends De
t.setId("HintsConfigTest.KEY_QUALITY");
t = new HintsConfigTest(new Object[][]{
- {PNGTranscoder.KEY_INDEXED, new Integer(8)}}){
+ {PNGTranscoder.KEY_INDEXED, Integer.valueOf(8)}}){
protected void deltaConfigure(SVGConverter c){
c.setIndexed(8);
}
@@ -113,7 +113,7 @@ public class SVGConverterTest extends De
t.setId("HintsConfigTest.KEY_BACKGROUND_COLOR");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_HEIGHT, new Float(50)}}){
+ {ImageTranscoder.KEY_HEIGHT, Float.valueOf(50)}}){
protected void deltaConfigure(SVGConverter c){
c.setHeight(50);
}
@@ -123,7 +123,7 @@ public class SVGConverterTest extends De
t.setId("HintsConfigTest.KEY_HEIGHT");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_WIDTH, new Float(50)}}){
+ {ImageTranscoder.KEY_WIDTH, Float.valueOf(50)}}){
protected void deltaConfigure(SVGConverter c){
c.setWidth(50);
}
@@ -133,7 +133,7 @@ public class SVGConverterTest extends De
t.setId("HintsConfigTest.KEY_WIDTH");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_MAX_HEIGHT, new Float(50)}}){
+ {ImageTranscoder.KEY_MAX_HEIGHT, Float.valueOf(50)}}){
protected void deltaConfigure(SVGConverter c){
c.setMaxHeight(50);
}
@@ -142,7 +142,7 @@ public class SVGConverterTest extends De
t.setId("HintsConfigTest.KEY_MAX_HEIGHT");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_MAX_WIDTH, new Float(50)}}){
+ {ImageTranscoder.KEY_MAX_WIDTH, Float.valueOf(50)}}){
protected void deltaConfigure(SVGConverter c){
c.setMaxWidth(50);
}
@@ -199,7 +199,7 @@ public class SVGConverterTest extends De
t.setId("HintsConfigTest.KEY_LANGUAGE");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER, new Float(.5f)}}){
+ {ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER, Float.valueOf(.5f)}}){
protected void deltaConfigure(SVGConverter c){
c.setPixelUnitToMillimeter(.5f);
}
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java Tue Jul 18 13:58:12 2017
@@ -46,7 +46,7 @@ public class AttributedCharacterIterator
//
Font font = new Font(fontName, Font.PLAIN, fontSize);
styledText.addAttribute(TextAttribute.FAMILY, font.getFamily());
- styledText.addAttribute(TextAttribute.SIZE, new Float(font.getSize()));
+ styledText.addAttribute(TextAttribute.SIZE, Float.valueOf(font.getSize()));
styledText.addAttribute(TextAttribute.FOREGROUND, Color.black);
//
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java Tue Jul 18 13:58:12 2017
@@ -274,8 +274,8 @@ public class SVGAccuracyTest extends Abs
}
report.setErrorCode(ERROR_GENERATED_SVG_INACCURATE);
- report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_LINE_NUMBER,null), new Integer(ln));
- report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_NUMBER,null), new Integer(cn));
+ report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_LINE_NUMBER,null), Integer.valueOf(ln));
+ report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_NUMBER,null), Integer.valueOf(cn));
report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_EXPECTED_VALUE,null), expectedChar);
report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_FOUND_VALUE,null), foundChar);
report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_REFERENCE_LINE,null), refLine);
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java Tue Jul 18 13:58:12 2017
@@ -70,8 +70,8 @@ public class AOITest extends AbstractIma
y,
width,
height,
- new Float(-1),
- new Float(-1));
+ Float.valueOf(-1),
+ Float.valueOf(-1));
}
/**
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java Tue Jul 18 13:58:12 2017
@@ -38,13 +38,13 @@ public class MaxDimensionTest extends Ab
/** The URI of the reference image. */
protected String refImageURI;
/** The maximum width of the image. */
- protected Float maxWidth = new Float(Float.NaN);
+ protected Float maxWidth = Float.valueOf(Float.NaN);
/** The maximum height of the image. */
- protected Float maxHeight = new Float(Float.NaN);
+ protected Float maxHeight = Float.valueOf(Float.NaN);
/** The width of the image. */
- protected Float width = new Float(Float.NaN);
+ protected Float width = Float.valueOf(Float.NaN);
/** The height of the image. */
- protected Float height = new Float(Float.NaN);
+ protected Float height = Float.valueOf(Float.NaN);
//-- Constructors --------------------------------------------------------
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java?rev=1802297&r1=1802296&r2=1802297&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java Tue Jul 18 13:58:12 2017
@@ -316,9 +316,9 @@ public class WMFAccuracyTest extends Abs
report.setErrorCode(ERROR_GENERATED_SVG_INACCURATE);
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_LINE_NUMBER),
- new Integer(line));
+ Integer.valueOf(line));
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_COLUMN_NUMBER),
- new Integer(cn));
+ Integer.valueOf(cn));
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_COLUMN_EXPECTED_VALUE),
expectedChar);
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_COLUMN_FOUND_VALUE),