From ace03209ad88c30f8fde1e0ca3c293800cd34ceb Mon Sep 17 00:00:00 2001
From: John Patton <jpatton@usgs.gov>
Date: Fri, 1 Mar 2019 13:23:33 -0700
Subject: [PATCH] removed property files

---
 src/gov/usgs/traveltime/AuxTtRef.java         |  10 +-
 src/gov/usgs/traveltime/CWBProperties.java    | 200 ------------------
 src/gov/usgs/traveltime/TTSessionLocal.java   |   6 +-
 src/gov/usgs/traveltime/TauUtil.java          |  18 +-
 src/gov/usgs/traveltime/TtMain.java           |   4 +-
 .../usgs/traveltime/session/TTSession.java    |   4 +-
 .../usgs/traveltime/tables/EarthModel.java    |   5 -
 src/gov/usgs/traveltime/tables/ReModel.java   |   4 +-
 8 files changed, 21 insertions(+), 230 deletions(-)
 delete mode 100644 src/gov/usgs/traveltime/CWBProperties.java

diff --git a/src/gov/usgs/traveltime/AuxTtRef.java b/src/gov/usgs/traveltime/AuxTtRef.java
index f51ef81..ab79375 100644
--- a/src/gov/usgs/traveltime/AuxTtRef.java
+++ b/src/gov/usgs/traveltime/AuxTtRef.java
@@ -68,11 +68,13 @@ public class AuxTtRef {
 	 * @param readStats If true, read the phase statistics
 	 * @param readEllip If true, read the ellipticity corrections
 	 * @param readTopo If true, read the topography file
+	 * @param modelPath If not null, path to model files
 	 * @throws IOException If opens fail
 	 * @throws ClassNotFoundException Serialization input fails
 	 */
 	@SuppressWarnings("unchecked")
-	public AuxTtRef(boolean readStats, boolean readEllip, boolean readTopo) 
+	public AuxTtRef(boolean readStats, boolean readEllip, boolean readTopo, 
+			String modelPath) 
 			throws IOException, ClassNotFoundException {
 		String[] absNames;
 		BufferedInputStream inGroup, inStats, inEllip;
@@ -83,10 +85,10 @@ public AuxTtRef(boolean readStats, boolean readEllip, boolean readTopo)
 		FileLock lock;
 		EllipDeps eDepth;
 		
-		// Set up the properties.
-		if(TauUtil.modelPath == null) {
-			TauUtil.getProperties();
+		if (modelPath != null) {
+			TauUtil.modelPath = modelPath;
 		}
+
 		// Create absolute path names.
 		absNames = new String[fileNames.length];
 		for(int j=0; j<fileNames.length; j++) {
diff --git a/src/gov/usgs/traveltime/CWBProperties.java b/src/gov/usgs/traveltime/CWBProperties.java
deleted file mode 100644
index 8993cf6..0000000
--- a/src/gov/usgs/traveltime/CWBProperties.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- *  This software is in the public domain because it contains materials 
- *  that originally came from the United States Geological Survey, 
- *  an agency of the United States Department of Interior. For more 
- *  information, see the official USGS copyright policy at 
- *  http://www.usgs.gov/visual-id/credit_usgs.html#copyright
- */
-package gov.usgs.traveltime;
-
-
-import java.io.File;
-import java.util.Properties;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
-
-/** Static classes related to properties.
- *
- * @author U.S. Geological Survey  &lt;ketchum at usgs.gov&gt;
- */
-public class CWBProperties {
-/**
- * System dependent file path separator.
- */
-  public static final String ps = System.getProperty("path.separator");
-  /**
-   * System dependent file name separator.
-   */
-  public static final String fs = System.getProperty("file.separator");
-  /**
-   * Alternate variable for the system dependent file path separator.
-   */
-  public static final String PS = System.getProperty("path.separator");
-  /**
-   * Alternate variable for the system dependent file name separator.
-   */
-  public static final String FS = System.getProperty("file.separator");
-  /**
-   * The path portion of the users home directory.
-   */
-  public static final String homedir
-          = System.getProperty("user.home").substring(0, System.getProperty("user.home").
-                  lastIndexOf(System.getProperty("file.separator")) + 1);
-  /**
-   * Identifier for the current operating system.
-   */
-  public static final String OS = System.getProperty("os.name");
-  /**
-   * The user's current directory.
-   */
-  public static final String userdir = System.getProperty("user.dir");
-  /**
-   * The user's home directory.
-   */
-  public static final String userhome = System.getProperty("user.home");
-  /**
-   * The user's login name.
-   */
-  public static final String username = System.getProperty("user.name");
-/**
- * Property file last used by loadProperties with "user.home/" in front.
- */
-  public static String propfilename;
-  /**
-   * Default properties.
-   */
-  private static final Properties defprops = new Properties();
-  /**
-   * All properties.
-   */
-  private static final Properties prop = new Properties(defprops);
-
-  /**
-   * add a default property
-   *
-   * @param tag The key of the property
-   * @param value The value of the default property
-   */
-  public static void addDefaultProperty(String tag, String value) {
-    defprops.setProperty(tag, value);
-  }
-
-  /**
-   * Getter for the property file name.
-   * 
-   * @return Property file name.
-   */
-  public static String getPropertyFilename() {
-    return propfilename;
-  }
-
-  /**
-   * return the properties
-   *
-   * @return The Properties
-   */
-  public static Properties getProperties() {
-    return prop;
-  }
-
-  /**
-   * Set a property key value pair
-   *
-   * @param tag The key in the property
-   * @param val The value to set it to
-   */
-  public static void setProperty(String tag, String val) {
-
-    prop.setProperty(tag, val);
-  }
-
-  /**
-   * Because this is run before the Util.prt out variable is set, it cannot use prt(). Load the
-   * properties from a file. First the file is check to see if it exists in user.home and then in
-   * user.home/Properties.
-   *
-   * @param filename The file to load from
-   */
-  public static void loadProperties(String filename) {
-
-    if (filename.equals("")) {
-      return;
-    }
-    propfilename = userhome + FS + filename;
-    File f = new File(propfilename);
-    if (f.exists()) {
-      //loadProperties(propfilename);
-    } else {
-      propfilename = userhome + FS + "Properties" + FS + filename;
-      f = new File(propfilename);
-      if (f.exists()) {
-        //loadProperties(propfilename);
-      }
-    }
-
-    try {
-      try (FileInputStream i = new FileInputStream(propfilename)) {
-        prop.load(i);
-        //prtProperties();
-      }
-    } catch (FileNotFoundException e) {
-      System.out.println(" ** Properties file not found=" + propfilename + " userhome=" + userhome + " " + System.getProperty("user.home"));
-      saveProperties();
-    } catch (IOException e) {
-      System.out.println("IOException reading properties file=" + propfilename);
-      System.exit(1);
-    }
-  }
-
-  /**
-   * print out the current Property pairs
-   */
-  public static void prtProperties() {
-    prop.list(System.out);
-  }
-
-  /**
-   * print out the current Property pairs
-   *
-   * @param out2 A print stream to print it on
-   */
-  public static void prtProperties(PrintStream out2) {
-    prop.list(System.out);
-  }
-
-  /**
-   * return the value of a given property
-   *
-   * @param key The name/key of the property
-   * @return the value associated with the key
-   */
-  public static String getProperty(String key) {
-    if (prop == null) {
-      return null;
-    }
-    return prop.getProperty(key);
-  }
-
-  /**
-   * save the properties to a file
-   */
-  public static void saveProperties() {
-    //if(debug_flag) 
-    //System.out.println(Util.asctime() + " Saving properties to " + propfilename + " nkeys=" + prop.size());
-    try {
-      try (FileOutputStream o = new FileOutputStream(propfilename)) {
-        prop.store(o, propfilename + " via Util.saveProperties() cp="
-                + System.getProperties().getProperty("java.class.path"));
-      }
-    } catch (FileNotFoundException e) {
-      System.out.println("Could not write properties to " + propfilename);
-      System.exit(1);
-    } catch (IOException e) {
-      System.out.println("Write error on properties to " + propfilename);
-      System.exit(1);
-    }
-  }
-}
diff --git a/src/gov/usgs/traveltime/TTSessionLocal.java b/src/gov/usgs/traveltime/TTSessionLocal.java
index 4012733..3d50c69 100644
--- a/src/gov/usgs/traveltime/TTSessionLocal.java
+++ b/src/gov/usgs/traveltime/TTSessionLocal.java
@@ -30,13 +30,15 @@ public class TTSessionLocal{
 	 * @param readStats If true, read the phase statistics
 	 * @param readEllip If true, read the ellipticity corrections
 	 * @param readTopo If true, read the topography file
+	 * @param modelPath If not null, path to model files
 	 * @throws IOException If the auxiliary data reads fail
 	 */
-	public TTSessionLocal(boolean readStats, boolean readEllip, boolean readTopo) 
+	public TTSessionLocal(boolean readStats, boolean readEllip, boolean readTopo,
+			String modelPath) 
 			throws IOException {
 		// Read in data common to all models.
 		try {
-			auxTT = new AuxTtRef(readStats, readEllip, readTopo);
+			auxTT = new AuxTtRef(readStats, readEllip, readTopo, modelPath);
 		} catch (IOException | ClassNotFoundException e1) {
 			System.out.println("Unable to read auxiliary data.");
 			e1.printStackTrace();
diff --git a/src/gov/usgs/traveltime/TauUtil.java b/src/gov/usgs/traveltime/TauUtil.java
index b3e27bc..e8eb822 100644
--- a/src/gov/usgs/traveltime/TauUtil.java
+++ b/src/gov/usgs/traveltime/TauUtil.java
@@ -180,23 +180,9 @@ public class TauUtil {
 	private static TreeMap<String, Integer> unique;
 	
 	/**
-	 * Path of the travel time/locator properties file.
+	 * Paths for model files.
 	 */
-	private static String propFile = "Properties"+CWBProperties.FS+"traveltime.prop";
-	/**
-	 * Paths for model and event files set in getProperties.
-	 */
-	public static String modelPath;
-	
-	/**
-	 * Read the travel time properties file and set up paths to the model 
-	 * and event files.
-	 */
-	public static void getProperties() {		
-		CWBProperties.loadProperties(propFile);
-		modelPath = CWBProperties.getProperty("modelPath");
-//	CWBProperties.prtProperties();
-	}
+	public static String modelPath = "./models/";
 	
 	/**
 	 * Build a path to a model file.
diff --git a/src/gov/usgs/traveltime/TtMain.java b/src/gov/usgs/traveltime/TtMain.java
index d104d09..8522926 100644
--- a/src/gov/usgs/traveltime/TtMain.java
+++ b/src/gov/usgs/traveltime/TtMain.java
@@ -49,7 +49,9 @@ public static void main(String[] args) throws Exception {
 		
 		if(local) {
 			// Initialize the local travel-time manager.
-			ttLocal = new TTSessionLocal(true, true, true);
+			// NOTE assumes default model path for now, need to figure out
+        	// where to get this path. Cmd line arg?
+			ttLocal = new TTSessionLocal(true, true, true, null);
 			// Generate a list of available Earth models.
 			String[] models = TauUtil.availableModels();
 			if(models.length > 0) {
diff --git a/src/gov/usgs/traveltime/session/TTSession.java b/src/gov/usgs/traveltime/session/TTSession.java
index b06858b..6f4336d 100644
--- a/src/gov/usgs/traveltime/session/TTSession.java
+++ b/src/gov/usgs/traveltime/session/TTSession.java
@@ -182,7 +182,9 @@ private void makeTTSession(String earthModel, double sourceDepth, String[] phase
       // Read in data common to all models.
       if (auxtt == null) {
         prta(ttag+" create AuxTtRef ");
-        auxtt = new AuxTtRef(true, true, true);
+        // NOTE assumes default model path for now, need to figure out
+        // where to get this path. Cmd line arg?
+        auxtt = new AuxTtRef(true, true, true, null);
       }
 
       // See if we know this model.
diff --git a/src/gov/usgs/traveltime/tables/EarthModel.java b/src/gov/usgs/traveltime/tables/EarthModel.java
index 72f39df..7af5af9 100644
--- a/src/gov/usgs/traveltime/tables/EarthModel.java
+++ b/src/gov/usgs/traveltime/tables/EarthModel.java
@@ -49,11 +49,6 @@ public EarthModel(String earthModel, boolean isCubic) {
 		model = new ArrayList<ModelSample>();
 		shells = new ArrayList<ModelShell>();
 		interp = new ModelInterp(model, shells, isCubic);
-		// Set up the properties.
-		if(TauUtil.modelPath == null) {
-			TauUtil.getProperties();
-			
-		}
 	}
 
 	/**
diff --git a/src/gov/usgs/traveltime/tables/ReModel.java b/src/gov/usgs/traveltime/tables/ReModel.java
index 0e289f2..d81bda3 100644
--- a/src/gov/usgs/traveltime/tables/ReModel.java
+++ b/src/gov/usgs/traveltime/tables/ReModel.java
@@ -38,7 +38,9 @@ public static void main(String[] args) throws Exception {
 				TauUtil.model("phases.txt"));
 		if(status == TtStatus.SUCCESS) {
 			// Build the branch reference classes.
-			auxTT = new AuxTtRef(true, false, false);
+			// NOTE assumes default model path for now, need to figure out
+        	// where to get this path. Cmd line arg?
+			auxTT = new AuxTtRef(true, false, false, null);
 			allRef = make.fillAllBrnRef(null, auxTT);
 			System.out.format("\n***** Table generation time: %5.3f *****\n",
 					0.001*(System.currentTimeMillis()-sysTime));