cvs commit: xml-fop/src/java/org/apache/fop/apps FOPException.java

2004-01-24 Thread pbwest 
pbwest  2004/01/24 18:17:22

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPException.java
  Log:
  Clean up disabled methods
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.6   +0 -104xml-fop/src/java/org/apache/fop/apps/FOPException.java
  
  Index: FOPException.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOPException.java,v
  retrieving revision 1.2.2.5
  retrieving revision 1.2.2.6
  diff -u -r1.2.2.5 -r1.2.2.6
  --- FOPException.java 14 Jan 2004 14:17:19 -  1.2.2.5
  +++ FOPException.java 25 Jan 2004 02:17:22 -  1.2.2.6
  @@ -60,10 +60,6 @@
   private static final String TAG = "$Name$";
   private static final String REVISION = "$Revision$";
   
  -//private static final String EXCEPTION_SEPARATOR = "\n-\n";
  -
  -//private Throwable exception;
  -
   /**
* create a new FOP Exception
* @param message description
  @@ -87,105 +83,5 @@
   public FOPException(String message, Throwable e) {
   super(message, e);
   }
  -
  -/**
  - * Sets this exception to the Throwable parameter
  - * @param t the exception
  - */
  -/*
  -protected void setException(Throwable t) {
  -exception = t;
  -}
  -*/
  -
  -/**
  - * Gets this exception.
  - * @return a Throwable
  - */
  -/*
  -public Throwable getException() {
  -return exception;
  -}
  -*/
  -
  -/**
  - * Gets the root exception of this exception.
  - * @return the Throwable root exception
  - */
  -/*
  -protected Throwable getRootException() {
  -Throwable result = exception;
  -
  -if (result instanceof SAXException) {
  -result = ((SAXException)result).getException();
  -}
  -if (result instanceof java.lang.reflect.InvocationTargetException) {
  -result = ((java.lang.reflect.InvocationTargetException)result)
  -.getTargetException();
  -}
  -if (result != exception) {
  -return result;
  -}
  -return null;
  -}
  -*/
  -
  -
  -/**
  - * @see java.lang.Throwable#printStackTrace()
  - */
  -/*
  -public void printStackTrace() {
  -synchronized (System.err) {
  -super.printStackTrace();
  -if (exception != null) {
  -System.err.println(EXCEPTION_SEPARATOR);
  -exception.printStackTrace();
  -}
  -if (getRootException() != null) {
  -System.err.println(EXCEPTION_SEPARATOR);
  -getRootException().printStackTrace();
  -}
  -}
  -}
  -*/
  -
  -/**
  - * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
  - */
  -/*
  -public void printStackTrace(java.io.PrintStream stream) {
  -synchronized (stream) {
  -super.printStackTrace(stream);
  -if (exception != null) {
  -stream.println(EXCEPTION_SEPARATOR);
  -exception.printStackTrace(stream);
  -}
  -if (getRootException() != null) {
  -System.err.println(EXCEPTION_SEPARATOR);
  -getRootException().printStackTrace(stream);
  -}
  -}
  -}
  -*/
  -
  -/**
  - * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
  - */
  -/*
  -public void printStackTrace(java.io.PrintWriter writer) {
  -synchronized (writer) {
  -super.printStackTrace(writer);
  -if (exception != null) {
  -writer.println(EXCEPTION_SEPARATOR);
  -exception.printStackTrace(writer);
  -}
  -if (getRootException() != null) {
  -System.err.println(EXCEPTION_SEPARATOR);
  -getRootException().printStackTrace(writer);
  -}
  -}
  -}
  -*/
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/apps FOPException.java

2004-01-14 Thread pbwest 
pbwest  2004/01/14 06:05:15

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPException.java
  Log:
  Modified to use 1.4 exception chaining
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.4   +16 -8 xml-fop/src/java/org/apache/fop/apps/FOPException.java
  
  Index: FOPException.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOPException.java,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- FOPException.java 11 Jul 2003 04:03:47 -  1.2.2.3
  +++ FOPException.java 14 Jan 2004 14:05:15 -  1.2.2.4
  @@ -52,8 +52,6 @@
   
   package org.apache.fop.apps;
   
  -import org.xml.sax.SAXException;
  -
   
   /**
* Exception thrown when FOP has a problem
  @@ -62,9 +60,9 @@
   private static final String TAG = "$Name$";
   private static final String REVISION = "$Revision$";
   
  -private static final String EXCEPTION_SEPARATOR = "\n-\n";
  +//private static final String EXCEPTION_SEPARATOR = "\n-\n";
   
  -private Throwable exception;
  +//private Throwable exception;
   
   /**
* create a new FOP Exception
  @@ -79,8 +77,7 @@
* @param e incoming Throwable
*/
   public FOPException(Throwable e) {
  -super(e.getMessage());
  -setException(e);
  +super(e);
   }
   
   /**
  @@ -88,30 +85,34 @@
* @param e the exception
*/
   public FOPException(String message, Throwable e) {
  -super(message);
  -setException(e);
  +super(message, e);
   }
   
   /**
* Sets this exception to the Throwable parameter
* @param t the exception
*/
  +/*
   protected void setException(Throwable t) {
   exception = t;
   }
  +*/
   
   /**
* Gets this exception.
* @return a Throwable
*/
  +/*
   public Throwable getException() {
   return exception;
   }
  +*/
   
   /**
* Gets the root exception of this exception.
* @return the Throwable root exception
*/
  +/*
   protected Throwable getRootException() {
   Throwable result = exception;
   
  @@ -127,11 +128,13 @@
   }
   return null;
   }
  +*/
   
   
   /**
* @see java.lang.Throwable#printStackTrace()
*/
  +/*
   public void printStackTrace() {
   synchronized (System.err) {
   super.printStackTrace();
  @@ -145,10 +148,12 @@
   }
   }
   }
  +*/
   
   /**
* @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
*/
  +/*
   public void printStackTrace(java.io.PrintStream stream) {
   synchronized (stream) {
   super.printStackTrace(stream);
  @@ -162,10 +167,12 @@
   }
   }
   }
  +*/
   
   /**
* @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
*/
  +/*
   public void printStackTrace(java.io.PrintWriter writer) {
   synchronized (writer) {
   super.printStackTrace(writer);
  @@ -179,5 +186,6 @@
   }
   }
   }
  +*/
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/apps FOPException.java

2003-09-25 Thread vmote 
vmote   2003/09/25 11:42:21

  Modified:src/java/org/apache/fop/apps FOPException.java
  Log:
  port maintenance branch improvements in apps/FOPException to the trunk
  
  Revision  ChangesPath
  1.4   +20 -0 xml-fop/src/java/org/apache/fop/apps/FOPException.java
  
  Index: FOPException.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOPException.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FOPException.java 1 Sep 2003 13:31:24 -   1.3
  +++ FOPException.java 25 Sep 2003 18:42:20 -  1.4
  @@ -60,6 +60,9 @@
   private static final String EXCEPTION_SEPARATOR = "\n-\n";
   
   private Throwable exception;
  +private String systemId;
  +private int line;
  +private int column;
   
   /**
* create a new FOP Exception
  @@ -70,6 +73,13 @@
   super(message);
   }
   
  +public FOPException(String message, String systemId, int line, int column) {
  +super(message);
  +this.systemId = systemId;
  +this.line = line;
  +this.column = column;
  +}
  +
   /**
*
* @param e Throwable object
  @@ -103,6 +113,16 @@
*/
   public Throwable getException() {
   return exception;
  +}
  +
  +public void setLocation(String systemId, int line, int column) {
  +this.systemId = systemId;
  +this.line = line;
  +this.column = column;
  +}
  +
  +public boolean isLocationSet() {
  +return line>=0;
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/apps FOPException.java Options.java Driver.java

2003-07-10 Thread pbwest 
pbwest  2003/07/10 21:03:47

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPException.java Options.java Driver.java
  Log:
  Fix Javadocs generation warnings.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.2.2.3   +14 -11xml-fop/src/java/org/apache/fop/apps/FOPException.java
  
  Index: FOPException.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOPException.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- FOPException.java 10 Jul 2003 11:26:28 -  1.2.2.2
  +++ FOPException.java 11 Jul 2003 04:03:47 -  1.2.2.3
  @@ -57,7 +57,6 @@
   
   /**
* Exception thrown when FOP has a problem
  - * @author pbw
*/
   public class FOPException extends Exception {
   private static final String TAG = "$Name$";
  @@ -69,8 +68,7 @@
   
   /**
* create a new FOP Exception
  - *
  - * @param message descriptive message
  + * @param message description
*/
   public FOPException(String message) {
   super(message);
  @@ -78,7 +76,6 @@
   
   /**
* create a new FOP Exception
  - *
* @param e incoming Throwable
*/
   public FOPException(Throwable e) {
  @@ -87,8 +84,8 @@
   }
   
   /**
  - * @param message 
  - * @param e
  + * @param message the description
  + * @param e the exception
*/
   public FOPException(String message, Throwable e) {
   super(message);
  @@ -96,21 +93,24 @@
   }
   
   /**
  - * @param t
  + * Sets this exception to the Throwable parameter
  + * @param t the exception
*/
   protected void setException(Throwable t) {
   exception = t;
   }
   
   /**
  - * @return
  + * Gets this exception.
  + * @return a Throwable
*/
   public Throwable getException() {
   return exception;
   }
   
   /**
  - * @return
  + * Gets the root exception of this exception.
  + * @return the Throwable root exception
*/
   protected Throwable getRootException() {
   Throwable result = exception;
  @@ -129,7 +129,7 @@
   }
   
   
  -/* (non-Javadoc)
  +/**
* @see java.lang.Throwable#printStackTrace()
*/
   public void printStackTrace() {
  @@ -146,6 +146,9 @@
   }
   }
   
  +/**
  + * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
  + */
   public void printStackTrace(java.io.PrintStream stream) {
   synchronized (stream) {
   super.printStackTrace(stream);
  @@ -160,7 +163,7 @@
   }
   }
   
  -/* (non-Javadoc)
  +/**
* @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
*/
   public void printStackTrace(java.io.PrintWriter writer) {
  
  
  
  1.1.2.2   +3 -2  xml-fop/src/java/org/apache/fop/apps/Attic/Options.java
  
  Index: Options.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/Options.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Options.java  5 Jul 2003 19:04:50 -   1.1.2.1
  +++ Options.java  11 Jul 2003 04:03:47 -  1.1.2.2
  @@ -361,7 +361,8 @@
   /**
* Convenience class for common functionality required by the config
* files.
  - * @param Class object of requesting class.
  + * @param fname the configuration file name.
  + * @param classobj the Class object of requesting class.
* @return an InputStream generated through a call to
* getResourceAsStream on the context ClassLoader
* or the ClassLoader for the conf class provided as an argument.
  
  
  
  1.9.2.2   +56 -9 xml-fop/src/java/org/apache/fop/apps/Driver.java
  
  Index: Driver.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.2
  diff -u -r1.9.2.1 -r1.9.2.2
  --- Driver.java   5 Jul 2003 19:04:50 -   1.9.2.1
  +++ Driver.java   11 Jul 2003 04:03:47 -  1.9.2.2
  @@ -65,10 +65,15 @@
   import org.apache.fop.xml.FoXMLSerialHandler;
   import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
   
  +/**
  + * Sets up and runs serialized component threads.
  + * XMLEventSource <=> FOTree <=> AreaTree ...
  + * 
  + * @author pbw
  + */
  +
   public class Driver {
  -/**
  - * If true, full error stacks are reported
  - */
  +/** If true, full error stacks are reported */
   private static boolean _errorDump = false;
   
   private InputHandler inputHandler;
  @@ -