Changeset 7112 for trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2004-03-23T21:28:43+12:00 (20 years ago)

Author:

mdewsnip

Message:

Prevented a user home mapping being created on Windows 95/98/ME (these aren't multiuser and thus have a very poor concept of user.home).

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileSystem.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileSystem.java

@@ -4 +4 @@
 import javax.swing.filechooser.FileSystemView;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.ArrayTools;
@@ -47 +48 @@
     static public FileNode getUserHomeMapping()
     {
-    // Generate a special mapping to the user home folder
+    // Get the name of the OS we're running on
+    String os_name = System.getProperty("os.name");
+    if (os_name == null) {
+        return null;
+    }
+
+    // Make sure we're running on a multiuser OS where the idea of a "user home" is valid
+    Gatherer.println("Property os.name: " + os_name);
+    String os_name_lc = os_name.toLowerCase();
+    if (os_name_lc.equals("windows 95") || os_name_lc.equals("windows 98") || os_name_lc.equals("windows me")) {
+        return null;
+    }
+
+    // Get the user's home folder
     String home_folder_str = System.getProperty("user.home");
     if (home_folder_str == null || home_folder_str.length() == 0) {
@@ -53 +67 @@
     }
 
+    // Generate a special mapping to the user home folder
     File home_folder = new File(home_folder_str);
     String[] args = new String[1];