Made Driver.initialize() private, more in line with 0.20.5, which doesn't

have such a method.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197773 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/examples/embedding/java/embedding/ExampleDOM2PDF.java b/examples/embedding/java/embedding/ExampleDOM2PDF.java
index 674a11191f10bd91841cd9345cb8bb97034754ee..17f2dfa3717b9f9344643aa275a3f33ca79c0dd9 100644 (file)
--- a/examples/embedding/java/embedding/ExampleDOM2PDF.java
+++ b/examples/embedding/java/embedding/ExampleDOM2PDF.java
@@ -64,9 +64,6 @@ public class ExampleDOM2PDF {
             // Construct driver
             Driver driver = new Driver();
             
-            // Setup driver
-            driver.initialize();
-            
             // Setup Renderer (output format)        
             driver.setRenderer(Driver.RENDER_PDF);
             

diff --git a/examples/embedding/java/embedding/ExampleFO2PDF.java b/examples/embedding/java/embedding/ExampleFO2PDF.java
index 6d7a7c564315364b9c0be18678e01f1608a8122a..9238c36ae0a49ae6a3e9bc0cbae0c2ed37722a26 100644 (file)
--- a/examples/embedding/java/embedding/ExampleFO2PDF.java
+++ b/examples/embedding/java/embedding/ExampleFO2PDF.java
@@ -48,9 +48,6 @@ public class ExampleFO2PDF {
         // Construct driver
         Driver driver = new Driver();
         
-        // Setup driver
-        driver.initialize();
-
         // Setup Renderer (output format)        
         driver.setRenderer(Driver.RENDER_PDF);
         

diff --git a/examples/embedding/java/embedding/ExampleObj2PDF.java b/examples/embedding/java/embedding/ExampleObj2PDF.java
index ff2419ff39048175e0999f1c2332b33cd629877a..b59a1a9f5f994a175b0af9d3d9efea598dae92ff 100644 (file)
--- a/examples/embedding/java/embedding/ExampleObj2PDF.java
+++ b/examples/embedding/java/embedding/ExampleObj2PDF.java
@@ -58,9 +58,6 @@ public class ExampleObj2PDF {
         // Construct driver
         Driver driver = new Driver();
         
-        // Setup driver
-        driver.initialize();
-
         // Setup Renderer (output format)        
         driver.setRenderer(Driver.RENDER_PDF);
 

diff --git a/examples/embedding/java/embedding/ExampleXML2PDF.java b/examples/embedding/java/embedding/ExampleXML2PDF.java
index ec2e065f4c5f8892ea8d34beb3bc3917d62b7dbf..18747e3e4b390569cda48e6c814c8e022912b815 100644 (file)
--- a/examples/embedding/java/embedding/ExampleXML2PDF.java
+++ b/examples/embedding/java/embedding/ExampleXML2PDF.java
@@ -69,9 +69,6 @@ public class ExampleXML2PDF {
             // Construct driver
             Driver driver = new Driver();
             
-            // Setup logger
-            driver.initialize();
-    
             // Setup Renderer (output format)        
             driver.setRenderer(Driver.RENDER_PDF);
             

diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java
index 28ffdff8adb0c175300de22b31950880b596acc9..2cfd3447caf0a87a2f5056d839e43393ae463012 100644 (file)
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -158,7 +158,7 @@ public class Driver implements Constants {
     /**
      * Initializes the Driver object.
      */
-    public void initialize() {
+    private void initialize() {
         if (isInitialized()) {
             throw new IllegalStateException("Driver already initialized");
         }

diff --git a/src/java/org/apache/fop/servlet/FopServlet.java b/src/java/org/apache/fop/servlet/FopServlet.java
index 566b17f4cd8e88366d9fffd527f277f73984d7a4..1d4223282184f5f6e40b846e48c5631fd03b2d2c 100644 (file)
--- a/src/java/org/apache/fop/servlet/FopServlet.java
+++ b/src/java/org/apache/fop/servlet/FopServlet.java
@@ -203,7 +203,6 @@ public class FopServlet extends HttpServlet {
         //Setup FOP
         Driver driver = new Driver();
         driver.setRenderer(Driver.RENDER_PDF);
-        driver.initialize();
 
         //Setup output
         ByteArrayOutputStream out = new ByteArrayOutputStream();