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

2004-02-29 Thread pbwest 
pbwest  2004/02/29 21:23:41

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Options.java
  Log:
  Removed references to deleted file.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.7   +1 -9  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.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- Options.java  19 Feb 2004 03:11:57 -  1.1.2.6
  +++ Options.java  1 Mar 2004 05:23:40 -   1.1.2.7
  @@ -654,14 +654,6 @@
   }
   }
   
  -public static CommandLineStarter getStarter() {
  -switch (outputmode) {
  -
  -default:
  -return new CommandLineStarter();
  -}
  -}
  -
   public static String getInputMode() {
   return Configuration.getStringValue(inputMode);
   }
  
  
  

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

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

2004-01-04 Thread pbwest 
pbwest  2004/01/04 18:26:54

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Options.java
  Log:
  Removed spurious exception in throws clause.
  Javadocs cleanup.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.4   +7 -10 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.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Options.java  31 Dec 2003 04:28:27 -  1.1.2.3
  +++ Options.java  5 Jan 2004 02:26:54 -   1.1.2.4
  @@ -272,7 +272,7 @@
*
* It remains for any related variables defined in this class to be set.
*
  - * @exception org.apache.fop.fo.FOPException
  + * @exception FOPException
*/
   static void initOptions() throws FOPException {
   Boolean bool = null;
  @@ -339,7 +339,7 @@
* Load the standard configuration file and the user-defined configuration
* file if one has been defined.  The definition can occur in either the
* standard file or as a command line argument.
  - * @exception org.apache.fop.fo.FOPException
  + * @exception FOPException
*/
   private static void loadConfigFiles() throws FOPException {
   String str = null;
  @@ -362,7 +362,7 @@
* Convenience class for common functionality required by the config
* files.
* @param fname the configuration file name.
  - * @param classobj the ttClass/tt object of requesting class.
  + * @param classob the requesting class
* @return an ttInputStream/tt generated through a call to
* ttgetResourceAsStream/tt on the context ttClassLoader/tt
* or the ttClassLoader/tt for the conf class provided as an argument.
  @@ -402,7 +402,7 @@
* class loader are asked in turn to codegetResourceAsStream/code
* on ifname/i from a directory called iconf/i.
* @param fname the name of the configuration file to load.
  - * @exception org.apache.fop.fo.FOPException if the configuration file
  + * @exception FOPException if the configuration file
* cannot be discovered.
*/
   public static void loadConfiguration(String fname)
  @@ -430,11 +430,8 @@
* source.  If this fails, an attempt is made to load the file using
* codeloadConfiguration/code.
* @param userConfigFileName the name of the user configuration file.
  - * @exception org.apache.fop.fo.FOPException thrown when the file cannot
  - * be located.
*/
  -public static void loadUserConfiguration(String userConfigFileName)
  -throws FOPException {
  +public static void loadUserConfiguration(String userConfigFileName) {
   // read user configuration file
   boolean readOk = true;
   userConfigFile = new File(userConfigFileName);
  @@ -687,7 +684,7 @@
   }
   }
   
  -public static CommandLineStarter getStarter() throws FOPException {
  +public static CommandLineStarter getStarter() {
   switch (outputmode) {
   
   default:
  
  
  

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

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

2003-12-30 Thread pbwest 
pbwest  2003/12/30 20:28:27

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Options.java
  Log:
  Make failure to find user config file non-fatal.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.3   +11 -3 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.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- Options.java  11 Jul 2003 04:03:47 -  1.1.2.2
  +++ Options.java  31 Dec 2003 04:28:27 -  1.1.2.3
  @@ -458,8 +458,16 @@
   readOk = false;
   }
   if (! readOk) {
  -// Try reading the file using loadConfig()
  -loadConfiguration(userConfigFileName);
  +try {
  +// Try reading the file using loadConfig()
  +loadConfiguration(userConfigFileName);
  +} catch (FOPException ex) {
  +MessageHandler.logln(Can't find user configuration file 
  ++ userConfigFile +  in system locations);
  +if (debug) {
  +reader.dumpError(ex);
  +}
  +}
   }
   }
   }
  
  
  

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