[freenet-cvs] r19427 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-04-19 16:33:44 +0000 (Sat, 19 Apr 2008)
New Revision: 19427

Modified:
   trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
The connection status box on the connectivity page isn't hideable.

Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19 
16:32:47 UTC (rev 19426)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19 
16:33:44 UTC (rev 19427)
@@ -150,12 +150,10 @@

                final boolean suggestPortForward;
                private int[] portsNotForwarded;
-               boolean noDismiss;

-               public MyUserAlert(String title, String text, boolean 
suggestPortForward, short code, boolean noDismiss) {
+               public MyUserAlert(String title, String text, boolean 
suggestPortForward, short code) {
                        super(false, title, text, title, null, code, true, 
L10n.getString("UserAlert.hide"), false, null);
                        this.suggestPortForward = suggestPortForward;
-                       this.noDismiss = noDismiss;
                        portsNotForwarded = new int[] { };
                }

@@ -204,16 +202,7 @@
                }

                public boolean userCanDismiss() {
-                       if(noDismiss) return false;
-                       // If no ports need forwarding, make it dismissable 
immediately.
-                       if(!suggestPortForward) return true;
-                       // Prevent NPE.
-                       if(portsNotForwarded == null) return false;
-                       // If any port definitely does need forwarding, make it 
non-dismissable.
-                       for(int i=0;i<portsNotForwarded.length;i++)
-                               if(portsNotForwarded[i] < 0) return false; // 
Port definitely needs to be forwarded
-                       // Otherwise it is dismissable.
-                       return true;
+                       return false;
                }

        }
@@ -241,13 +230,13 @@
                this.node = node;
                this.detector = detector;
                noConnectionAlert = new MyUserAlert( 
l10n("noConnectivityTitle"), l10n("noConnectivity"), 
-                               true, UserAlert.ERROR, true);
+                               true, UserAlert.ERROR);
                symmetricAlert = new MyUserAlert(l10n("symmetricTitle"), 
l10n("symmetric"), 
-                               true, UserAlert.ERROR, false);
+                               true, UserAlert.ERROR);
                portRestrictedAlert = new 
MyUserAlert(l10n("portRestrictedTitle"), l10n("portRestricted"), 
-                               true, UserAlert.WARNING, false);
+                               true, UserAlert.WARNING);
                restrictedAlert = new MyUserAlert(l10n("restrictedTitle"), 
l10n("restricted"), 
-                               false, UserAlert.MINOR, false);
+                               false, UserAlert.MINOR);
                portForwardAlert = new PortForwardAlert();
        }