[Thaw-dev] r13226 - in trunk/apps/Thaw/src/thaw/plugins: . index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-05-13 13:11:16 +0000 (Sun, 13 May 2007)
New Revision: 13226

Modified:
   trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
Log:
Fix bug #1365 : Display only once the warning popup about the comments

Modified: trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java  2007-05-13 11:08:35 UTC 
(rev 13225)
+++ trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java  2007-05-13 13:11:16 UTC 
(rev 13226)
@@ -98,7 +98,7 @@

                tab = new JPanel(new BorderLayout(5, 5));

-               JLabel topLabel = new 
JLabel(I18n.getMessage("thaw.plugin.transferLogs.transferLogs") + " :");
+               JLabel topLabel = new 
JLabel(I18n.getMessage("thaw.plugin.transferLogs.transferLogs"));
                topLabel.setIcon(IconBox.file);

                model = new EventListModel();

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java        
2007-05-13 11:08:35 UTC (rev 13225)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java        
2007-05-13 13:11:16 UTC (rev 13226)
@@ -73,7 +73,6 @@
                fetchNegative = new 
JCheckBox(I18n.getMessage("thaw.plugin.index.fetchNegative"));
                fetchComments = new 
JCheckBox(I18n.getMessage("thaw.plugin.index.fetchComments"));

-
                panel.add(autorefreshActivated);
                panel.add(refreshIntervalLabel);
                panel.add(refreshInterval);
@@ -91,6 +90,9 @@
                resetValues();

                updateTextFieldState();
+
+               fetchNegative.addActionListener(this);
+               fetchComments.addActionListener(this);
        }


@@ -173,31 +175,39 @@
                                Boolean.toString(fetchNegative.isSelected()));
                config.setValue("indexFetchComments",
                                Boolean.toString(fetchComments.isSelected()));
-
-               if (!fetchNegative.isSelected()
-                   && fetchComments.isSelected()) {
-                       new WarningWindow(configWindow.getFrame(),
-                                         
I18n.getMessage("thaw.plugin.index.warningNonNegative"));
-               }
        }

        public void actionPerformed(ActionEvent e) {
                if (e.getSource() == autorefreshActivated) {
                        updateTextFieldState();
+                       return;
                }

                if (e.getSource() == configWindow.getOkButton()) {
                        saveValues();
+                       return;
                }

                if (e.getSource() == configWindow.getCancelButton()) {
                        resetValues();
+                       return;
                }

                if (e.getSource() == editBlackList) {
                        indexBrowser.getBlackList().displayPanel();
                        configWindow.close();
+                       return;
                }
+
+               if (e.getSource() == fetchComments
+                   || e.getSource() == fetchNegative) {
+                       if (!fetchNegative.isSelected()
+                           && fetchComments.isSelected()) {
+                               new WarningWindow(configWindow.getFrame(),
+                                                 
I18n.getMessage("thaw.plugin.index.warningNonNegative"));
+                       }
+                       return;
+               }
        }

 }