Changeset 23143 for main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

Timestamp:

2010-10-15T20:33:43+13:00 (14 years ago)

Author:

ak19

Message:

More changes to making collectdir movable: 1. When not working with a remote GS or server.exe: if the collecthome set in GLI is not the same as the one in gsdlsite.cfg used by the apache web server, then a dialog pops up on exiting GLI allowing the user to set the collecthome value for both GLI (in the user's GLI config.xml) and the server (in gsdlsite.cfg). 2. Collecthome line in gsdlsite.cfg is removed if it is the default GS collect folder. (Just as a recent commit stores an empty string for the open_collection element in the GLI config.xml file if no collection is left open on exiting GLI and the collect folder is the default GS collect directory.) 3. Some bug fixes.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -104 +104 @@
     private TabUpdater tab_updater = null;
 
-
-
-
-
   final static String newline = "\n";
     final static String space = "    ";
@@ -502 +498 @@
     public void exit(int exit_status)
     {
+    boolean collection_open = false;
     // If we have a collection open remember it for next time, then save it and close it
     if (Gatherer.c_man.ready()) {
@@ -515 +512 @@
         }
         saveThenCloseCurrentCollection();
+        collection_open = true;
     }
     else {
@@ -528 +526 @@
         }
     }
+    
+    
+    // Basically, if GLI coldir != gsdlsite_colhome, we ask them if they want to save GLI coldir as gsdlsite_colhome
+    // If gsdlsite_colhome = "" (meaning default GS coldir) and GLI is also set to defaultGScoldir, no saving necessary.
+    // We ONLY do this for the local included apache web server, since the issue revolves around gsdlsite.cfg containing
+    // the global collecthome when using the apache web server. This is not an issue for remote GS or server.exe (the latter
+    // has separate config files specifying collecthome for when GLI is running whereas when just the server.exe is running).
+    if(!Gatherer.isGsdlRemote && !Gatherer.isPersistentServer()) {      
+    
+        String defaultColDir = Gatherer.getDefaultGSCollectDirectoryPath(false); // no filesep at end
+        String gliColDir = Gatherer.getCollectDirectoryPath();
+        String serverColDir = Gatherer.gsdlsite_collecthome;
+        
+        boolean showSettingsDlg = true;
+        // if collectdir was changed during GLI session (to something different from what's in gsdlsite), need to ask what to store
+        if(gliColDir.equals(Gatherer.gsdlsite_collecthome+File.separator)) {    
+            showSettingsDlg = false;
+        } else if(Gatherer.gsdlsite_collecthome.equals("") // both set to default coldir
+                && gliColDir.equals(defaultColDir+File.separator)) {
+            showSettingsDlg = false;
+        } 
+        if(showSettingsDlg) {
+            
+            // else we will be showing the Collect Directory Settings Dialog
+            if(gliColDir.endsWith(File.separator)) {
+                gliColDir = gliColDir.substring(0, gliColDir.length()-1);
+            }
+            
+            if(serverColDir.equals("")) {
+                serverColDir = defaultColDir;
+            }   
+            collectDirSettingsDialog(defaultColDir, serverColDir, gliColDir, collection_open);
+        }
+    }
 
     // Store the current position and size of the GLI for next time
@@ -544 +576 @@
     }
 
+    public void collectDirSettingsDialog(final String defaultColDir,
+        final String from, final String to, final boolean collection_open) 
+    {   
+        final JDialog colHomeDialog 
+            = new JDialog(this, Dictionary.get("GUI.CollectHome.title"), true); // this = Gatherer.g_man
+        colHomeDialog.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        
+        
+        JRadioButton gliYes = new JRadioButton(Dictionary.get("General.Yes"), true);
+                        // the default selection for GLI, collecthome=to
+        JRadioButton serverYes = new JRadioButton(Dictionary.get("General.Yes")); // not selected for the server        
+        JRadioButton gliNo = null;
+        JRadioButton gliThirdOption = null;
+        JRadioButton serverNo = null;
+        JRadioButton serverThirdOption = null;
+        
+        if(from.equals(defaultColDir)) { 
+            gliNo = new JRadioButton(Dictionary.get("GUI.CollectHome.resetToDefault"));
+            serverNo = new JRadioButton(Dictionary.get("GUI.CollectHome.leaveAtDefault"), true);
+                        // default selection for server, collecthome=from
+        } else {
+            gliNo = new JRadioButton(Dictionary.get("General.No"));
+            serverNo = new JRadioButton(Dictionary.get("General.No"), true); // default selection for server 
+            if(!to.equals(defaultColDir)) { // neither from nor to is the default GS collect dir, so give them that as the third option
+                gliThirdOption = new JRadioButton(Dictionary.get("GUI.CollectHome.reset"));
+                serverThirdOption = new JRadioButton(Dictionary.get("GUI.CollectHome.reset"));      
+            }
+        }
+        
+        JPanel gliPanel = new JPanel(); // flowlayout by default
+        ButtonGroup gliGroup = new ButtonGroup();
+        JPanel serverPanel = new JPanel(); // flowlayout by default
+        ButtonGroup serverGroup = new ButtonGroup();
+        
+        gliGroup.add(gliYes);
+        gliPanel.add(gliYes);
+        serverGroup.add(serverYes);
+        serverPanel.add(serverYes);     
+        
+        gliGroup.add(gliNo);
+        gliPanel.add(gliNo);
+        serverGroup.add(serverNo);
+        serverPanel.add(serverNo);
+            
+        if(gliThirdOption != null) {
+            gliThirdOption = new JRadioButton("Reset to default");
+            serverThirdOption = new JRadioButton("Reset to default");
+            
+            gliGroup.add(gliThirdOption);
+            gliPanel.add(gliThirdOption);
+            serverGroup.add(serverThirdOption);
+            serverPanel.add(serverThirdOption);
+        }
+        
+        // vars need to be final to use them in the actionlistener below
+        final JRadioButton gli_yes = gliYes;
+        final JRadioButton gli_no = gliNo;
+        final JRadioButton gli_optional = gliThirdOption;
+        final JRadioButton server_yes = serverYes;
+        final JRadioButton server_no = serverNo;
+        final JRadioButton server_optional = serverThirdOption;
+        
+        JButton okButton = new JButton(Dictionary.get("General.OK"));
+        okButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                // store the option chosen for GLI
+                String gliColDir = to;  
+                if(gli_optional != null && gli_optional.isSelected()) {
+                    // defaultColDir
+                    gliColDir = "";
+                } else if(gli_yes.isSelected()) {
+                    gliColDir = to;
+                } else if (gli_no.isSelected()) {
+                    gliColDir = from;
+                }
+                if(defaultColDir.equals(gliColDir)) {
+                    gliColDir = "";
+                }
+                if(!(collection_open && gli_yes.isSelected())) { // don't overwrite open collections
+                    Configuration.setString(
+                        "general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                        true, gliColDir);
+                }
+                
+                // store the option chosen for the server's settings
+                String serverColDir = from;
+                if(server_optional != null && server_optional.isSelected()) {
+                    // defaultColDir
+                    serverColDir = null;
+                } else if(server_yes.isSelected()) {
+                    serverColDir = to;
+                } else if (server_no.isSelected()) {
+                    serverColDir = from;
+                }
+                if(serverColDir != null && defaultColDir.equals(serverColDir)) {                    
+                    serverColDir = null;
+                }
+                                
+                Gatherer.gsdlsite_collecthome = Utility.updatePropertyConfigFile(
+                    Gatherer.getGsdlSiteConfigFile(), "collecthome", serverColDir); 
+                
+                colHomeDialog.dispose();
+            }
+        });
+        
+        //String[] dirs = {from, to};       
+        //JLabel message = new JLabel(Dictionary.get("GUI.CollectHome.message", dirs));
+        JLabel message = new JLabel(Dictionary.get("GUI.CollectHome.message"));
+        JLabel fromDirLine = new JLabel(Dictionary.get("GUI.CollectHome.dir", from));
+        fromDirLine.setBorder(BorderFactory.createEmptyBorder(0,25,0,0)); // padding
+        JLabel toLine = new JLabel(Dictionary.get("GUI.CollectHome.to"));
+        JLabel toDirLine = new JLabel(Dictionary.get("GUI.CollectHome.dir", to));
+        toDirLine.setBorder(BorderFactory.createEmptyBorder(0,25,0,0)); // padding
+        JLabel gliOption = new JLabel(Dictionary.get("GUI.CollectHome.gli"));
+        JLabel serverOption = new JLabel(Dictionary.get("GUI.CollectHome.server"));     
+        
+        JPanel mainPanel = new JPanel();
+        mainPanel.setLayout(new GridLayout(9, 1));
+        mainPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); // padding
+        mainPanel.add(message);
+        mainPanel.add(fromDirLine);     
+        mainPanel.add(toLine);
+        mainPanel.add(toDirLine);
+        mainPanel.add(gliOption);
+        mainPanel.add(gliPanel);
+        mainPanel.add(serverOption);
+        mainPanel.add(serverPanel);
+        mainPanel.add(okButton);        
+        Container c = colHomeDialog.getContentPane();
+        c.setLayout(new BorderLayout());
+        c.add(mainPanel, BorderLayout.CENTER);
+        colHomeDialog.getRootPane().setDefaultButton(okButton);
+        
+        colHomeDialog.pack();
+        colHomeDialog.setVisible(true);
+    }
+    
 
     /** This method is called when the collection is being built, and is used to disable all controls in all pane which could change the state of the collection.