[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/gui Config.java,1.131,1.132

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/gmod/apollo/src/java/apollo/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv11441

Modified Files:
	Config.java 
Log Message:

First read default config files (in APOLLO_ROOT/conf), then read user's personal
ones (if any) and apply any changes to existing style.

Another (unrelated) change in this commit:  both EnsJ adapter and Synteny adapter
require JDK1.4.

Index: Config.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/gui/Config.java,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** Config.java	9 Sep 2003 22:42:42 -0000	1.131
--- Config.java	26 Sep 2003 21:23:06 -0000	1.132
***************
*** 670,691 ****

    /** Create a style from the stylefile for the driverName */
!   private static void createStyle(String styleFile, String driverName) {
      //      System.out.println("In create style for file "+styleFile+" "+driverName);
!     if (styleFile==null)
!       styleFile = "default.style";
!     styleFile = apollo.util.IOUtil.findFile(styleFile); // gets full path
! //    System.out.println("Full path for style file for " + driverName + " is " + styleFile);  // DEL
!     if (styleFile==null)
!       return; // findFile returns null if nonexistent
      Style newStyle;
!     if (filenameToStyle.containsKey(styleFile)) { // check if already created style
!       newStyle = (Style)filenameToStyle.get(styleFile);
      }
      else {
!       newStyle = new Style(styleFile);
!       filenameToStyle.put(styleFile,newStyle);
!       //      System.out.println("Read style file " + styleFile + " for " + driverName);
      }
!     adapterToStyle.put(driverName,newStyle);
    }

--- 670,704 ----

    /** Create a style from the stylefile for the driverName */
!   private static void createStyle(String styleFilename, String driverName) {
      //      System.out.println("In create style for file "+styleFile+" "+driverName);
!     if (styleFilename == null)
!       styleFilename = "default.style";
      Style newStyle;
!     if (filenameToStyle.containsKey(styleFilename)) { // check if already created style
!       newStyle = (Style)filenameToStyle.get(styleFilename);
      }
      else {
!       // First read the default style file for this style (should be in apollo/conf)
!       String styleFilePath = apollo.util.IOUtil.findFile("conf/" + styleFilename); // gets full path
!       //      System.out.println("Full path for style file for " + driverName + " is " + styleFilePath);  // DEL
!       if (styleFilePath==null)
!         return; // findFile returns null if nonexistent
! 
!       newStyle = new Style(styleFilePath);
!       if (newStyle == null) {
!         errorDialog("Couldn't read style file " + styleFilePath);
!         return;
!       }
!       filenameToStyle.put(styleFilename, newStyle);
!       // Now see if the user has a personalized style file in their .apollo directory,
!       // and if so, read it and modify the existing style
!       styleFilePath = apollo.util.IOUtil.findFile("~/.apollo/" + styleFilename); // gets full path
!       if (styleFilePath != null) {
!         File sf = new File(styleFilePath);
!         newStyle.readStyle(sf);
!         //        System.out.println("Read personal style file " + styleFilePath + " for " + driverName); // DEL
!       }
      }
!     adapterToStyle.put(driverName, newStyle);
    }

***************
*** 697,702 ****
          driverName = installString.substring(0,breakIndex);

!       // EnsJ adapter now requires JDK1.4 but other data adapters are ok with 1.3.
!       // If we're running <1.4, refuse to load EnsJ data adapter; that way we
        // can still run Apollo with other data adapters.
        if (canRunWithThisJVM(driverName)) {
--- 710,715 ----
          driverName = installString.substring(0,breakIndex);

!       // EnsJ adapter and Synteny adapter require JDK1.4 but other data adapters are ok with 1.3.
!       // If we're running <1.4, refuse to load EnsJ and Synteny data adapter; that way we
        // can still run Apollo with other data adapters.
        if (canRunWithThisJVM(driverName)) {
***************
*** 714,721 ****
    }

!   // EnsJ adapter now requires JDK1.4 but other data adapters are ok with 1.3.
    private static boolean canRunWithThisJVM(String driverName) {
!     if ((driverName.indexOf("EnsJ") > 0) &&
!         (jvm.indexOf("1.4") < 0))
        return false;
      else
--- 727,734 ----
    }

!   // EnsJ and Synteny adapters now requirs JDK1.4 but other data adapters are ok with 1.3.
    private static boolean canRunWithThisJVM(String driverName) {
!     if (((driverName.indexOf("EnsJ") > 0) || (driverName.indexOf("Synteny") > 0))
!          && (jvm.indexOf("1.4") < 0))
        return false;
      else
***************
*** 843,848 ****
        }

!       // Look for config file
!       String configFileName = apollo.util.IOUtil.findFile("apollo.cfg");
        // If we can't find the config file, we should give up now.
        if (configFileName == null) {
--- 856,866 ----
        }

!       // Look for config file (apollo.cfg)
!       // First read the apollo.cfg that's in apollo/conf.
!       // THEN read the user's personal apollo.cfg, which can include only
!       // lines that are a modification of the global apollo.cfg.
!       String configFileName = apollo.util.IOUtil.findFile("conf/apollo.cfg");
!       if (configFileName == null)  // Huh?  Couldn't find it in conf.  Try again.
!         configFileName = apollo.util.IOUtil.findFile("apollo.cfg");
        // If we can't find the config file, we should give up now.
        if (configFileName == null) {
***************
*** 851,858 ****
        }

        File configFile = new File(configFileName);
        try {
  	System.out.println("Reading config file " + configFileName);
!         readConfig(configFile);
        } catch (Exception e) {
          // If we can't find the config file, we should give up now.
--- 869,881 ----
        }

+       // Read the global config file
        File configFile = new File(configFileName);
        try {
  	System.out.println("Reading config file " + configFileName);
!         boolean success = readConfig(configFile);
!         if (!success) {
!           errorDialog("Failed to read config file " + configFileName);
!           System.exit(-1);
!         }
        } catch (Exception e) {
          // If we can't find the config file, we should give up now.
***************
*** 862,865 ****
--- 885,903 ----
        }

+       // Now read the user's personal config file (if any)
+       configFileName = apollo.util.IOUtil.findFile("~/.apollo/apollo.cfg");
+       if (configFileName != null) {
+         configFile = new File(configFileName);
+         try {
+           System.out.println("Reading personal config file " + configFileName);
+           boolean success = readConfig(configFile);
+           if (!success)
+             System.err.println("Warning: failed to read personal config file " + configFileName);
+         } catch (Exception e) {
+           System.out.println("Warning: couldn't open personal config file " + configFileName +
+                              ": " + e.getMessage());
+         }
+       }
+ 
        // If locations for history file and autosave file were not specified,
        // set them now.
***************
*** 1031,1035 ****
          return stamp;
        } catch (Exception ex) {
-         //	    System.out.println("getTimeStamp got exception: " + ex);  // DEL--just for debugging
          return null;
        }
--- 1069,1072 ----
***************
*** 1041,1044 ****
--- 1078,1082 ----
    private static void errorDialog(String msg) {
      JOptionPane.showMessageDialog(null,msg,"Warning",JOptionPane.WARNING_MESSAGE);
+     System.out.println("Warning: " + msg);
    }