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/09/29 10:39:46 UTC
svn commit: r1810083 - in /xmlgraphics/batik/trunk:
batik-bridge/src/main/java/org/apache/batik/bridge/
batik-dom/src/main/java/org/apache/batik/dom/
batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/
batik-test-old/src/test/java/org/a...
Author: ssteiner
Date: Fri Sep 29 10:39:45 2017
New Revision: 1810083
URL: http://svn.apache.org/viewvc?rev=1810083&view=rev
Log:
Fix java 9 warnings
Modified:
xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java
xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java
xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java
xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/DestinationType.java
xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/css/engine/value/PropertyManagerTest.java
xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/JPainterCompare.java
xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/SimpleTestRunner.java
xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java
xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
xmlgraphics/batik/trunk/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/Service.java
Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java Fri Sep 29 10:39:45 2017
@@ -418,7 +418,7 @@ public class BaseScriptingEnvironment {
if (sh != null) {
// Run the script handler.
ScriptHandler h;
- h = (ScriptHandler)cll.loadClass(sh).newInstance();
+ h = (ScriptHandler)cll.loadClass(sh).getDeclaredConstructor().newInstance();
h.run(document, getWindow());
}
@@ -428,7 +428,7 @@ public class BaseScriptingEnvironment {
// Run the initializer
EventListenerInitializer initializer;
initializer =
- (EventListenerInitializer)cll.loadClass(sh).newInstance();
+ (EventListenerInitializer)cll.loadClass(sh).getDeclaredConstructor().newInstance();
getWindow();
Modified: xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java (original)
+++ xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java Fri Sep 29 10:39:45 2017
@@ -2730,7 +2730,7 @@ public abstract class AbstractDocument
implementation = (DOMImplementation)m.invoke(null, (Object[])null);
} catch (Exception e) {
try {
- implementation = (DOMImplementation)c.newInstance();
+ implementation = (DOMImplementation)c.getDeclaredConstructor().newInstance();
} catch (Exception ex) {
}
}
Modified: xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java (original)
+++ xmlgraphics/batik/trunk/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java Fri Sep 29 10:39:45 2017
@@ -18,6 +18,7 @@
*/
package org.apache.batik.dom;
+import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -123,7 +124,7 @@ public abstract class ExtensibleDOMImple
String pn = XMLResourceDescriptor.getCSSParserClassName();
Parser p;
try {
- p = (Parser)Class.forName(pn).newInstance();
+ p = (Parser)Class.forName(pn).getDeclaredConstructor().newInstance();
} catch (ClassNotFoundException e) {
throw new DOMException(DOMException.INVALID_ACCESS_ERR,
formatMessage("css.parser.class",
@@ -136,6 +137,14 @@ public abstract class ExtensibleDOMImple
throw new DOMException(DOMException.INVALID_ACCESS_ERR,
formatMessage("css.parser.access",
new Object[] { pn }));
+ } catch (NoSuchMethodException e) {
+ throw new DOMException(DOMException.INVALID_ACCESS_ERR,
+ formatMessage("css.parser.access",
+ new Object[] { pn }));
+ } catch (InvocationTargetException e) {
+ throw new DOMException(DOMException.INVALID_ACCESS_ERR,
+ formatMessage("css.parser.access",
+ new Object[] { pn }));
}
ExtendedParser ep = ExtendedParserWrapper.wrap(p);
Modified: xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/DestinationType.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/DestinationType.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/DestinationType.java (original)
+++ xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/DestinationType.java Fri Sep 29 10:39:45 2017
@@ -94,7 +94,7 @@ public final class DestinationType {
case PDF_CODE:
try {
Class pdfClass = Class.forName("org.apache.fop.svg.PDFTranscoder");
- return (Transcoder)pdfClass.newInstance();
+ return (Transcoder)pdfClass.getDeclaredConstructor().newInstance();
} catch(Exception e) {
return null;
}
Modified: xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/css/engine/value/PropertyManagerTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/css/engine/value/PropertyManagerTest.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/css/engine/value/PropertyManagerTest.java (original)
+++ xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/css/engine/value/PropertyManagerTest.java Fri Sep 29 10:39:45 2017
@@ -121,7 +121,7 @@ public class PropertyManagerTest extends
* Creates the value manager.
*/
protected ValueManager createValueManager() throws Exception {
- return (ValueManager)Class.forName(managerClassName).newInstance();
+ return (ValueManager)Class.forName(managerClassName).getDeclaredConstructor().newInstance();
}
/**
Modified: xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/JPainterCompare.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/JPainterCompare.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/JPainterCompare.java (original)
+++ xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/JPainterCompare.java Fri Sep 29 10:39:45 2017
@@ -228,7 +228,7 @@ public class JPainterCompare extends JPa
Object o = null;
try{
- o = cl.newInstance();
+ o = cl.getDeclaredConstructor().newInstance();
System.out.println
(Messages.formatMessage(MESSAGES_INSTANCIATED_OBJECT,
null));
Modified: xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/SVGGeneratorTests.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/SVGGeneratorTests.java (original)
+++ xmlgraphics/batik/trunk/batik-test-old/src/test/java/org/apache/batik/svggen/SVGGeneratorTests.java Fri Sep 29 10:39:45 2017
@@ -95,7 +95,7 @@ public class SVGGeneratorTests extends D
Object o = null;
try {
- o = cl.newInstance();
+ o = cl.getDeclaredConstructor().newInstance();
}catch(Exception e){
throw new IllegalArgumentException(clName);
}
Modified: xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/SimpleTestRunner.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/SimpleTestRunner.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/SimpleTestRunner.java (original)
+++ xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/SimpleTestRunner.java Fri Sep 29 10:39:45 2017
@@ -73,7 +73,7 @@ public class SimpleTestRunner {
Test t = null;
try{
- t = (Test)cl.newInstance();
+ t = (Test)cl.getDeclaredConstructor().newInstance();
}catch(ClassCastException e){
System.err.println(Messages.formatMessage(ERROR_CLASS_CAST,
new Object[]{ className,
Modified: xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java (original)
+++ xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java Fri Sep 29 10:39:45 2017
@@ -253,7 +253,7 @@ public class XMLReflect implements XMLRe
}
else{
// Default constructor
- return cl.newInstance();
+ return cl.getDeclaredConstructor().newInstance();
}
}
else{
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=1810083&r1=1810082&r2=1810083&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 Fri Sep 29 10:39:45 2017
@@ -21,6 +21,7 @@ package org.apache.batik.transcoder.imag
import java.awt.image.BufferedImage;
import java.awt.image.SinglePixelPackedSampleModel;
import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.transcoder.TranscoderException;
@@ -63,7 +64,7 @@ public class PNGTranscoder extends Image
WriteAdapter adapter;
try {
Class clazz = Class.forName(className);
- adapter = (WriteAdapter)clazz.newInstance();
+ adapter = (WriteAdapter)clazz.getDeclaredConstructor().newInstance();
return adapter;
} catch (ClassNotFoundException e) {
return null;
@@ -71,6 +72,10 @@ public class PNGTranscoder extends Image
return null;
} catch (IllegalAccessException e) {
return null;
+ } catch (NoSuchMethodException e) {
+ return null;
+ } catch (InvocationTargetException e) {
+ return null;
}
}
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=1810083&r1=1810082&r2=1810083&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 Fri Sep 29 10:39:45 2017
@@ -21,6 +21,7 @@ package org.apache.batik.transcoder.imag
import java.awt.image.BufferedImage;
import java.awt.image.SinglePixelPackedSampleModel;
+import java.lang.reflect.InvocationTargetException;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.transcoder.TranscoderException;
@@ -62,7 +63,7 @@ public class TIFFTranscoder extends Imag
WriteAdapter adapter;
try {
Class clazz = Class.forName(className);
- adapter = (WriteAdapter)clazz.newInstance();
+ adapter = (WriteAdapter)clazz.getDeclaredConstructor().newInstance();
return adapter;
} catch (ClassNotFoundException e) {
return null;
@@ -70,6 +71,10 @@ public class TIFFTranscoder extends Imag
return null;
} catch (IllegalAccessException e) {
return null;
+ } catch (NoSuchMethodException e) {
+ return null;
+ } catch (InvocationTargetException e) {
+ return null;
}
}
Modified: xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/Service.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/Service.java?rev=1810083&r1=1810082&r2=1810083&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/Service.java (original)
+++ xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/Service.java Fri Sep 29 10:39:45 2017
@@ -120,7 +120,7 @@ public class Service {
// System.out.println("Line: " + line);
// Try and load the class
- Object obj = cl.loadClass(line).newInstance();
+ Object obj = cl.loadClass(line).getDeclaredConstructor().newInstance();
// stick it into our vector...
l.add(obj);
} catch (Exception ex) {