Changeset 6088

Timestamp:

2003-12-02T17:19:20+13:00 (20 years ago)

Author:

jmt12

Message:

Fixed slight problem with the home page icon in that it doesn't know what _httpcollection_ is

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java (modified) (4 diffs)

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

@@ -245 +245 @@
         // Connection
         beta_checkbox.addActionListener(CollectionDesignManager.change_listener);
-        ActionListener browse_listener = new BrowseListener();
-        browse_about_icon_button.addActionListener(browse_listener);
-        browse_home_icon_button.addActionListener(browse_listener);
-        browse_listener = null;
+        browse_about_icon_button.addActionListener(new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_COLLECTION_PREFIX));
+        browse_home_icon_button.addActionListener(new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_GSDL_PREFIX));
         public_checkbox.addActionListener(CollectionDesignManager.change_listener);
         creator_emailfield.getDocument().addDocumentListener(CollectionDesignManager.change_listener);
@@ -362 +360 @@
         implements ActionListener {
 
+        private String prefix;
+
+        public BrowseListener(String prefix) {
+        this.prefix = prefix;
+        }
+
         public void actionPerformed(ActionEvent event) {
         // Open an almost standard file browser to the images folder of the current collection
@@ -381 +385 @@
             File file = file_chooser.getSelectedFile();
             if(!file.getParentFile().equals(images_folder)) {
-            if(JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("CDM.General.Copy_Image"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+            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 {
@@ -400 +404 @@
             }
             // Create the path starting _httpcollection_/images/<filename>
-            String path = StaticStrings.IMAGES_PATH_PREFIX + file.getName();
+            String path = prefix + file.getName();
             if(event.getSource() == browse_about_icon_button) {
             icon_textfield.setText(path);