Changeset 31860 for main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

Timestamp:

2017-08-09T16:48:21+12:00 (7 years ago)

Author:

ak19

Message:

The changes necessary for getting the new no_check_certificate checkbox to appear and work in GLI and get propagated to the perl code that launches wget. This checkbox controls whether wget is launched with the no-check-certificate flag to retrieve Https URLs despite lack of (valid) certificates.

File:

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

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

@@ -71 +71 @@
     private JButton ok_button;
     private JCheckBox show_file_size_checkbox;
+    private JCheckBox no_check_certificate_checkbox; // Set no_check_certificate when retrieving Https URLs that have no (valid) certificate
     private JCheckBox use_proxy_checkbox;
     private JCheckBox view_extracted_metadata_checkbox;
@@ -318 +319 @@
         chdir_button.setEnabled(false);
     }
+
+    boolean no_check_cert_enabled = Configuration.get("general.no_check_certificate", true); // pass true to look in general rather than collection specific config file
     
     boolean currently_enabled = Configuration.get("general.use_proxy", true);
@@ -323 +326 @@
     JPanel connection_pane = new JPanel();
         connection_pane.setComponentOrientation(Dictionary.getOrientation());
+    no_check_certificate_checkbox = new JCheckBox(Dictionary.get("Preferences.Connection.No_Check_Certificate"));
+    no_check_certificate_checkbox.setToolTipText(Dictionary.get("Preferences.Connection.No_Check_Certificate_Tooltip"));
+    no_check_certificate_checkbox.setSelected(no_check_cert_enabled);
+    no_check_certificate_checkbox.setComponentOrientation(Dictionary.getOrientation());        
+    no_check_certificate_checkbox.setPreferredSize(ROW_SIZE);
+    
     use_proxy_checkbox = new JCheckBox(Dictionary.get("Preferences.Connection.Use_Proxy"));
     use_proxy_checkbox.setSelected(currently_enabled);
@@ -360 +369 @@
     
     // Connection
+    no_check_certificate_checkbox.addActionListener(new NoCheckCertificateListener());
     use_proxy_checkbox.addActionListener(new UseProxyListener());
     if (Gatherer.GS3) {
@@ -404 +414 @@
 
     connection_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    connection_pane.setLayout(new GridLayout(8,1,0,2));
+    connection_pane.setLayout(new GridLayout(9,1,0,2));
     connection_pane.add(program_pane);
     connection_pane.add(library_path_pane);
@@ -416 +426 @@
     connection_pane.add(collect_dir_pane);
 
+    connection_pane.add(no_check_certificate_checkbox);
     connection_pane.add(use_proxy_checkbox);
     connection_pane.add(proxy_host_pane);
@@ -1119 +1130 @@
     }
 
+    private class NoCheckCertificateListener implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        boolean isEnabled = no_check_certificate_checkbox.isSelected();
+        Configuration.set("general.no_check_certificate", true, isEnabled);
+        boolean no_check_cert_enabled = Configuration.get("general.no_check_certificate", true);
+    }
+    }
+    
     private class UseProxyListener
     implements ActionListener {