vhardy 01/10/26 04:36:16
Modified: sources/org/apache/batik/apps/rasterizer
DefaultSVGConverterController.java
SVGConverter.java SVGConverterFileSource.java
SVGConverterSource.java SVGConverterURLSource.java
Log:
Added a getURI method on SVGConverterSource
Revision Changes Path
1.2 +2 -1
xml-batik/sources/org/apache/batik/apps/rasterizer/DefaultSVGConverterController.java
Index: DefaultSVGConverterController.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/rasterizer/DefaultSVGConverterController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultSVGConverterController.java 2001/10/25 13:34:24 1.1
+++ DefaultSVGConverterController.java 2001/10/26 11:36:16 1.2
@@ -20,7 +20,7 @@
* <tt>SVGConverter</tt> operation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: DefaultSVGConverterController.java,v 1.1 2001/10/25 13:34:24
vhardy Exp $
+ * @version $Id: DefaultSVGConverterController.java,v 1.2 2001/10/26 11:36:16
vhardy Exp $
*/
public class DefaultSVGConverterController implements SVGConverterController {
/**
@@ -49,6 +49,7 @@
*/
public boolean proceedWithSourceTranscoding(SVGConverterSource source,
File dest) {
+ System.out.println("About to transcoder source of type: " +
source.getClass().getName());
return true;
}
1.2 +27 -4
xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverter.java
Index: SVGConverter.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGConverter.java 2001/10/25 13:34:24 1.1
+++ SVGConverter.java 2001/10/26 11:36:16 1.2
@@ -82,7 +82,7 @@
* <li>alternate: controls the alternate CSS stylesheet to activate, if any.</li>
* </ul>
*
- * @version $Id: SVGConverter.java,v 1.1 2001/10/25 13:34:24 vhardy Exp $
+ * @version $Id: SVGConverter.java,v 1.2 2001/10/26 11:36:16 vhardy Exp $
* @author Henri Ruini
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
*/
@@ -529,7 +529,13 @@
if (file.exists()) {
sources.addElement(new SVGConverterFileSource(file));
} else {
- sources.addElement(new SVGConverterURLSource(sourceString));
+ String[] fileNRef = getFileNRef(sourceString);
+ file = new File(fileNRef[0]);
+ if (file.exists()){
+ sources.addElement(new SVGConverterFileSource(file,
fileNRef[1]));
+ } else{
+ sources.addElement(new SVGConverterURLSource(sourceString));
+ }
}
}
}
@@ -550,6 +556,18 @@
return sources;
}
+ public String[] getFileNRef(String fileName){
+ int n = fileName.lastIndexOf("#");
+ String[] result = {fileName, ""};
+ if (n > -1){
+ result[0] = fileName.substring(0, n);
+ if (n+1 < fileName.length()){
+ result[1] = fileName.substring(n+1);
+ }
+ }
+
+ return result;
+ }
// -----------------------------------------------------------------------
// Internal methods
@@ -636,14 +654,18 @@
throw new SVGConverterException(ERROR_CANNOT_READ_SOURCE,
new Object[]{inputFile.getName()});
}
+
try {
- input = new TranscoderInput(inputFile.openStream());
+ InputStream in = inputFile.openStream();
+ in.close();
} catch(IOException ioe) {
throw new SVGConverterException(ERROR_CANNOT_OPEN_SOURCE,
new Object[] {inputFile.getName(),
ioe.toString()});
- }
+ }
+ input = new TranscoderInput(inputFile.getURI());
+
// Compute transcoder output.
if (!isWriteable(outputFile)) {
throw new SVGConverterException(ERROR_OUTPUT_NOT_WRITEABLE,
@@ -670,6 +692,7 @@
// Transcode now
boolean success = false;
try {
+ System.out.println("About to transcoder : " + input.getURI());
transcoder.transcode(input, output);
success = true;
} catch(TranscoderException te) {
1.2 +27 -3
xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java
Index: SVGConverterFileSource.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGConverterFileSource.java 2001/10/25 13:34:24 1.1
+++ SVGConverterFileSource.java 2001/10/26 11:36:16 1.2
@@ -13,21 +13,33 @@
import java.io.FileInputStream;
import java.io.InputStream;
+import java.net.MalformedURLException;
+
/**
* Describes a file source for the <tt>SVGConverter</tt>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGConverterFileSource.java,v 1.1 2001/10/25 13:34:24 vhardy Exp $
+ * @version $Id: SVGConverterFileSource.java,v 1.2 2001/10/26 11:36:16 vhardy Exp $
*/
public class SVGConverterFileSource implements SVGConverterSource {
File file;
+ String ref;
public SVGConverterFileSource(File file){
this.file = file;
}
+ public SVGConverterFileSource(File file, String ref){
+ this.file = file;
+ this.ref = ref;
+ }
+
public String getName(){
- return file.getName();
+ String name = file.getName();
+ if (ref != null && !"".equals(ref)){
+ name += "#" + ref;
+ }
+ return name;
}
public File getFile(){
@@ -35,7 +47,19 @@
}
public String toString(){
- return file.toString();
+ return getName();
+ }
+
+ public String getURI(){
+ try{
+ String uri = file.toURL().toString();
+ if (ref != null && !"".equals(ref)){
+ uri += "#" + ref;
+ }
+ return uri;
+ } catch(MalformedURLException e){
+ throw new Error();
+ }
}
public boolean equals(Object o){
1.2 +6 -1
xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverterSource.java
Index: SVGConverterSource.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverterSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGConverterSource.java 2001/10/25 13:34:24 1.1
+++ SVGConverterSource.java 2001/10/26 11:36:16 1.2
@@ -16,7 +16,7 @@
* <tt>SVGConverter</tt>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGConverterSource.java,v 1.1 2001/10/25 13:34:24 vhardy Exp $
+ * @version $Id: SVGConverterSource.java,v 1.2 2001/10/26 11:36:16 vhardy Exp $
*/
public interface SVGConverterSource {
/**
@@ -39,5 +39,10 @@
* Checks if source can be read
*/
public boolean isReadable();
+
+ /**
+ * Returns a URI string corresponding to this source
+ */
+ public String getURI();
}
1.2 +5 -1
xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverterURLSource.java
Index: SVGConverterURLSource.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverterURLSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGConverterURLSource.java 2001/10/25 13:34:24 1.1
+++ SVGConverterURLSource.java 2001/10/26 11:36:16 1.2
@@ -16,7 +16,7 @@
/*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGConverterURLSource.java,v 1.1 2001/10/25 13:34:24 vhardy Exp $
+ * @version $Id: SVGConverterURLSource.java,v 1.2 2001/10/26 11:36:16 vhardy Exp $
*/
public class SVGConverterURLSource implements SVGConverterSource {
/**
@@ -73,6 +73,10 @@
public String toString(){
return url.toString();
+ }
+
+ public String getURI(){
+ return toString();
}
public boolean equals(Object o){
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
