Changeset 11049 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

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

Author:

mdewsnip

Message:

A few minor tidy-ups of dead code.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java (modified) (1 diff)

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();