Changeset 15374 for gli/trunk

Timestamp:

2008-05-09T14:42:59+12:00 (16 years ago)

Author:

ak19

Message:

FedoraLogin allows for looping whenever connecting to a Fedora server fails

File:

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

gli/trunk/src/org/greenstone/gatherer/gui/FedoraLogin.java

@@ -70 +70 @@
 {
 
+    private JPanel m_infoPane;
     private JComboBox m_serverComboBox;
     private JComboBox m_protocolComboBox;
@@ -89 +90 @@
     {
     super(Gatherer.g_man, "Login", true);
+    this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
         
         m_servers=new HashMap();
@@ -136 +138 @@
                 new JComponent[] {m_serverComboBox, m_protocolComboBox, m_usernameComboBox, m_passwordField}, 
                 gridBag, inputPane);
+    
+    // handling Closing and cancelling events
+    this.addWindowListener(new WindowAdapter() {
+        public void windowClosing(WindowEvent e){
+            // this is important, if we want to stop looping on displaying the dialog:
+            login_requested = false; 
+            //dispose(); // defaultCloseOperation of this dialog already set to dispose it
+        }
+        });
 
         JButton cancelButton=new JButton(new AbstractAction() {
             private static final long serialVersionUID = 1L;
             public void actionPerformed(ActionEvent evt) {
+        // this is important, if we want to stop looping on displaying the dialog:
+        login_requested = false;
                 dispose();
             }
@@ -150 +163 @@
         buttonPane.add(cancelButton);
         Container contentPane=getContentPane();
+
         contentPane.setLayout(new BorderLayout());
+    m_infoPane = new JPanel();
+    contentPane.add(m_infoPane, BorderLayout.NORTH);
         contentPane.add(inputPane, BorderLayout.CENTER);
         contentPane.add(buttonPane, BorderLayout.SOUTH);
@@ -305 +321 @@
         }
 
+    }
+
+    public void setErrorMessage(String[] errorLines) {
+    m_infoPane.removeAll();
+    // n rows and 1 column
+    m_infoPane.setLayout(new java.awt.GridLayout(errorLines.length, 1));
+    for(int i = 0; i < errorLines.length; i++) {
+        JLabel line = new JLabel("  " + errorLines[i] + "  ");
+        m_infoPane.add(line);
+    }
+    
+    // Adjust and resize this dialog to take into account the 
+    // recently added components (labels)
+    m_infoPane.validate();  
+    this.pack();
     }
 
@@ -403 +434 @@
             login_requested = true;
 
-                    m_loginDialog.dispose();
+            // hiding it instead of disposing it on OK-press allows us to loop
+            // on displaying the dialog in case there's more checking to do
+            m_loginDialog.setVisible(false);
+
                 } catch (Exception e) {
                     //String msg = e.getMessage();
@@ -413 +447 @@
                 }
             }
-      }
-    
-
+      }    
       }