Changeset 11049 for trunk/gli

Timestamp:

2006-01-17T11:03:16+13:00 (18 years ago)

Author:

mdewsnip

Message:

A few minor tidy-ups of dead code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• LocalLibraryServer.java (modified) (2 diffs)
• cdm/GeneralManager.java (modified) (1 diff)
• file/FileQueue.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/LocalLibraryServer.java

@@ -212 +212 @@
     }
 
-    //if(gsdlsite_cfg_file.getURL() != null) {
-    //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Server.QuitManual"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-    //}
-
     // Restore the gsdlsite_cfg.
     gsdlsite_cfg_file.restore();
@@ -221 +217 @@
     // If the local server is still running then our changed values will get overwritten.
     if (gsdlsite_cfg_file.getURL() != null) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Server.QuitFailed"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Server.QuitManual"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
     }
 

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -469 +469 @@
             // If the file isn't in the images folder, then ask the user if they want to copy it there
             File file = file_chooser.getSelectedFile();
-            if(!file.getParentFile().equals(images_folder)) {
-            if(true) { //JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("CDM.General.Copy_Image"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
-                // Copy the file
-                try {
-                File collection_image_file = new File(images_folder, file.getName());
-                Gatherer.f_man.getQueue().copyFile(file, collection_image_file, null);
-
-                // If we're using a remote Greenstone server, upload the image
-                if (Gatherer.isGsdlRemote) {
-                    RemoteGreenstoneServer.uploadCollectionFile(Gatherer.c_man.getCollection().getName(), collection_image_file);
-                }
-                }
-                catch(Exception exception) {
-                DebugStream.printStackTrace(exception);
-                // Show warning
-                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.General.Image_Copy_Failed"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-                // Nothing else we can do.
-                return;
+            if (!file.getParentFile().equals(images_folder)) {
+            // Copy the file
+            try {
+                File collection_image_file = new File(images_folder, file.getName());
+                Gatherer.f_man.getQueue().copyFile(file, collection_image_file, null);
+
+                // If we're using a remote Greenstone server, upload the image
+                if (Gatherer.isGsdlRemote) {
+                RemoteGreenstoneServer.uploadCollectionFile(Gatherer.c_man.getCollection().getName(), collection_image_file);
                 }
             }
-            else {
-                // Nothing we can safely do
+            catch(Exception exception) {
+                DebugStream.printStackTrace(exception);
+                // Show warning
+                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.General.Image_Copy_Failed"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                // Nothing else we can do.
                 return;
             }
             }
+
             // Create the path starting _httpcollection_/images/<filename>
             String path = prefix + file.getName();

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

@@ -409 +409 @@
                     new_node = directory_record;
                     }
-                    // Else inform the users that a directory already exists and files will be copied into it
-                    //else {
-                    //    JOptionPane.showMessageDialog(null, Dictionary.get("FileActions.Directory_Exists", target_file.toString()), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
-                    //}
+
                     // Queue non-filtered child files for copying. If this directory already existed, the child records will have to generate the undo jobs, as we don't want to entirely delete this directory if it already existed.
                     FileNode child_record = null;