Version 15.2, November 2013

[GpsPrune.git] / tim / prune / GpsPrune.java

diff --git a/tim/prune/GpsPrune.java b/tim/prune/GpsPrune.java
index 41dac2b0d0300538ecb9813bd8f71462e5b8c828..5cc5c9043099ef3fe960ee425b5a5a7b281ba7f2 100644 (file)
--- a/tim/prune/GpsPrune.java
+++ b/tim/prune/GpsPrune.java
@@ -28,16 +28,16 @@ import tim.prune.gui.profile.ProfileChart;
 /**
  * GpsPrune is a tool to visualize, edit, convert and prune GPS data
  * Please see the included readme.txt or http://activityworkshop.net
- * This software is copyright activityworkshop.net 2006-2011 and made available through the Gnu GPL version 2.
+ * This software is copyright activityworkshop.net 2006-2013 and made available through the Gnu GPL version 2.
  * For license details please see the included license.txt.
  * GpsPrune is the main entry point to the application, including initialisation and launch
  */
 public class GpsPrune
 {
        /** Version number of application, used in about screen and for version check */
-       public static final String VERSION_NUMBER = "13";
+       public static final String VERSION_NUMBER = "15.2";
        /** Build number, just used for about screen */
-       public static final String BUILD_NUMBER = "240";
+       public static final String BUILD_NUMBER = "283b";
        /** Static reference to App object */
        private static App APP = null;
 
@@ -87,17 +87,20 @@ public class GpsPrune
                        {
                                // Check if a data file has been given
                                File f = new File(arg);
-                               if (f.exists() && f.canRead()) {
+                               if (f.exists() && f.isFile() && f.canRead()) {
                                        dataFiles.add(f);
                                }
-                               else {
-                                       System.out.println("Unknown parameter '" + arg + "'.");
+                               else
+                               {
+                                       // Make a useful String from the unknown parameter - could it be a mistyped filename?
+                                       System.out.println(makeUnknownParameterString(arg));
                                        showUsage = true;
                                }
                        }
                }
-               if (showUsage) {
-                       System.out.println("Possible parameters:"
+               if (showUsage)
+               {
+                       System.out.println("GpsPrune - a tool for editing GPS data.\nPossible parameters:"
                                + "\n   --configfile=<file> used to specify a configuration file"
                                + "\n   --lang=<code>       used to specify language code such as DE"
                                + "\n   --langfile=<file>   used to specify an alternative language file\n");
@@ -134,13 +137,15 @@ public class GpsPrune
                        // If langfilename is blank on command line parameters then don't use setting from config
                        langFilename = Config.getConfigString(Config.KEY_LANGUAGE_FILE);
                }
-               if (langFilename != null && !langFilename.equals("")) {
+               if (langFilename != null)
+               {
                        try {
                                I18nManager.addLanguageFile(langFilename);
                                Config.setConfigString(Config.KEY_LANGUAGE_FILE, langFilename);
                        }
                        catch (FileNotFoundException fnfe) {
                                System.err.println("Failed to load language file: " + langFilename);
+                               Config.setConfigString(Config.KEY_LANGUAGE_FILE, "");
                        }
                }
                // Set up the window and go
@@ -229,6 +234,9 @@ public class GpsPrune
                }
                catch (Exception e) {} // ignore
 
+               // Set up drag-and-drop handler to accept dropped files
+               frame.setTransferHandler(new FileDropHandler(APP));
+
                // finish off and display frame
                frame.pack();
                frame.setSize(650, 450);
@@ -245,4 +253,29 @@ public class GpsPrune
                // Finally, give the files to load to the App
                APP.loadDataFiles(inDataFiles);
        }
+
+       /**
+        * Try to guess whether it's a mistyped parameter or a mistyped filename
+        * @param inParam command line argument
+        * @return error message
+        */
+       private static String makeUnknownParameterString(String inParam)
+       {
+               File file = new File(inParam);
+               if (file.exists())
+               {
+                       if (file.isDirectory()) return "'" + inParam + "' is a directory";
+                       if (!file.canRead())    return "Cannot read file '" + inParam + "'";
+                       return "Something wrong with file '" + inParam + "'";
+               }
+               do
+               {
+                       String name = file.getName();
+                       file = file.getParentFile();
+                       if (file != null && file.exists() && file.canRead()) return "Tried to load file '" + inParam + "' but cannot find '" + name + "'";
+               }
+               while (file != null);
+
+               return "Unknown parameter '" + inParam + "'";
+       }
 }