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 ga...@apache.org on 2014/11/03 05:35:18 UTC
svn commit: r1636249 - in /xmlgraphics/batik/trunk: ./
sources/org/apache/batik/apps/rasterizer/
sources/org/apache/batik/apps/slideshow/
sources/org/apache/batik/apps/svgbrowser/ sources/org/apache/batik/svggen/
sources/org/apache/batik/transcoder/pri...
Author: gadams
Date: Mon Nov 3 04:35:18 2014
New Revision: 1636249
URL: http://svn.apache.org/r1636249
Log:
Fix build and deprecation warnings for JDK1.6 builds.
Modified:
xmlgraphics/batik/trunk/build.xml
xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java
xmlgraphics/batik/trunk/sources/org/apache/batik/apps/slideshow/Main.java
xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/Main.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/print/PrintTranscoder.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
Modified: xmlgraphics/batik/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Mon Nov 3 04:35:18 2014
@@ -1002,7 +1002,8 @@ JAVA=/usr/bin/java
<target name="compile" depends="init, compile-prepare" unless="compile.done">
<javac destdir="${dest}" deprecation="${deprecation}"
- debug="${debug}" optimize="${optimize}" encoding="UTF-8">
+ debug="${debug}" optimize="${optimize}" encoding="UTF-8"
+ includeAntRuntime="true">
<src path="${src}"/>
<classpath refid="libs-classpath"/>
<exclude name="**/*.html"/>
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverter.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverter.java Mon Nov 3 04:35:18 2014
@@ -881,7 +881,7 @@ public class SVGConverter {
if (userStylesheet != null) {
String userStylesheetURL;
try {
- URL userDir = new File(System.getProperty("user.dir")).toURL();
+ URL userDir = new File(System.getProperty("user.dir")).toURI().toURL();
userStylesheetURL = new ParsedURL(userDir, userStylesheet).toString();
} catch (Exception e) {
userStylesheetURL = userStylesheet;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java Mon Nov 3 04:35:18 2014
@@ -61,7 +61,7 @@ public class SVGConverterFileSource impl
public String getURI(){
try{
- String uri = file.toURL().toString();
+ String uri = file.toURI().toURL().toString();
if (ref != null && !"".equals(ref)){
uri += '#' + ref;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/slideshow/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/slideshow/Main.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/slideshow/Main.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/slideshow/Main.java Mon Nov 3 04:35:18 2014
@@ -129,7 +129,7 @@ public class Main extends JComponent {
GVTBuilder builder = new GVTBuilder();
try {
- String fileName = files[ i ].toURL().toString();
+ String fileName = files[ i ].toURI().toURL().toString();
System.out.println("Reading: " + fileName );
Document svgDoc = loader.loadDocument( fileName );
System.out.println("Building: " + fileName );
@@ -307,7 +307,7 @@ public class Main extends JComponent {
return;
}
try {
- URL flURL = new File(file).toURL();
+ URL flURL = new File(file).toURI().toURL();
String line;
while ((line = br.readLine()) != null) {
String str = line;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java Mon Nov 3 04:35:18 2014
@@ -1255,7 +1255,7 @@ public class JSVGViewerFrame
if (f != null) {
try {
- String furl = f.toURL().toString();
+ String furl = f.toURI().toURL().toString();
showSVGDocument(furl);
} catch (MalformedURLException ex) {
if (userAgent != null) {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/Main.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/Main.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/apps/svgbrowser/Main.java Mon Nov 3 04:35:18 2014
@@ -28,10 +28,12 @@ import java.io.FileWriter;
import java.io.InputStreamReader;
import java.io.IOException;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.Authenticator;
import java.net.URLDecoder;
import java.net.URLEncoder;
+import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -515,7 +517,7 @@ public class Main implements Application
overrideSecurityPolicy = true;
System.setProperty(PROPERTY_JAVA_SECURITY_POLICY,
- policyFile.toURL().toString());
+ policyFile.toURI().toURL().toString());
}
}
@@ -547,7 +549,7 @@ public class Main implements Application
try{
if (file.canRead()) {
- uri = file.toURL().toString();
+ uri = file.toURI().toURL().toString();
}
}catch(SecurityException se){
// Cannot access files.
@@ -846,7 +848,7 @@ public class Main implements Application
try {
File f = new File(ssPath);
if (f.exists()) {
- return f.toURL().toString();
+ return f.toURI().toURL().toString();
}
} catch (IOException ioe) {
// Nothing...
@@ -959,8 +961,13 @@ public class Main implements Application
StringBuffer lastVisitedBuffer = new StringBuffer( lastVisited.size() * 8 );
for (int i=0; i<lastVisited.size(); i++) {
- lastVisitedBuffer.append
- (URLEncoder.encode(lastVisited.get(i).toString()));
+ try {
+ lastVisitedBuffer.append
+ (URLEncoder.encode(lastVisited.get(i).toString(),
+ Charset.defaultCharset().name()));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
lastVisitedBuffer.append(URI_SEPARATOR);
}
@@ -1013,7 +1020,12 @@ public class Main implements Application
}
for (int i=0; i<n; i++) {
- lastVisited.addElement(URLDecoder.decode(st.nextToken()));
+ try {
+ lastVisited.addElement(URLDecoder.decode(st.nextToken(),
+ Charset.defaultCharset().name()));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
}
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java Mon Nov 3 04:35:18 2014
@@ -119,7 +119,7 @@ public abstract class AbstractImageHandl
this.urlRoot = urlRoot;
else {
try{
- this.urlRoot = imageDirFile.toURL().toString();
+ this.urlRoot = imageDirFile.toURI().toURL().toString();
} catch (MalformedURLException e) {
throw new SVGGraphics2DIOException(ERR_CANNOT_USE_IMAGE_DIR+
e.getMessage(),
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/print/PrintTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/print/PrintTranscoder.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/print/PrintTranscoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/print/PrintTranscoder.java Mon Nov 3 04:35:18 2014
@@ -782,7 +782,7 @@ public class PrintTranscoder extends SVG
// each of the input files
//
for(int i=0; i<args.length; i++){
- transcoder.transcode(new TranscoderInput(new File(args[i]).toURL().toString()),
+ transcoder.transcode(new TranscoderInput(new File(args[i]).toURI().toURL().toString()),
null);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java?rev=1636249&r1=1636248&r2=1636249&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java Mon Nov 3 04:35:18 2014
@@ -259,7 +259,7 @@ public class WMFTranscoder extends ToSVG
File inputFile = new File(fileName);
File outputFile = new File(outputFileName);
try {
- TranscoderInput input = new TranscoderInput(inputFile.toURL().toString());
+ TranscoderInput input = new TranscoderInput(inputFile.toURI().toURL().toString());
TranscoderOutput output = new TranscoderOutput(new FileOutputStream(outputFile));
transcoder.transcode(input, output);
}catch(MalformedURLException e){