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

[t...@freenetproject.org]

Author: toad
Date: 2006-03-30 14:22:20 +0000 (Thu, 30 Mar 2006)
New Revision: 8365

Added:
   trunk/freenet/src/freenet/node/UserAlert.java
   trunk/freenet/src/freenet/node/UserAlertManager.java
Modified:
   trunk/freenet/src/freenet/node/TestnetHandler.java
   trunk/freenet/src/freenet/node/Version.java
Log:
594: Testnet port = -1 means default (listenPort + 1000). Also add an interface 
for UserAlert's.

Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java  2006-03-30 12:13:40 UTC 
(rev 8364)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java  2006-03-30 14:22:20 UTC 
(rev 8365)
@@ -238,12 +238,14 @@

                int defaultPort = 1024 + (node.portNumber-1024+1000) % (65536 - 
1024);

-               testnetConfig.register("port", defaultPort, 2, true, "Testnet 
port", "Testnet port number",
+               testnetConfig.register("port", defaultPort, 2, true, "Testnet 
port", "Testnet port number (-1 = listenPort+1000)",
                                new TestnetPortNumberCallback(node));

                testnetConfig.finishedInitialization();

-               return new TestnetHandler(node, testnetConfig.getInt("port"));
+               int port = testnetConfig.getInt("port");
+               if(port == -1) port = defaultPort;
+               return new TestnetHandler(node, port);
         } else return null;
        }


Added: trunk/freenet/src/freenet/node/UserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/UserAlert.java       2006-03-30 12:13:40 UTC 
(rev 8364)
+++ trunk/freenet/src/freenet/node/UserAlert.java       2006-03-30 14:22:20 UTC 
(rev 8365)
@@ -0,0 +1,34 @@
+package freenet.node;
+
+public interface UserAlert {
+       
+       /**
+        * Can the user dismiss the alert?
+        * If not, it persists until it is unregistered.
+        */
+       public boolean userCanDismiss();
+       
+       /**
+        * Title of alert (must be short!).
+        */
+       public String getTitle();
+       
+       /**
+        * Content of alert (plain text).
+        */
+       public String getText();
+       
+       /**
+        * Priority class
+        */
+       public short getPriorityClass();
+       
+       /** An error which prevents normal operation */
+       public final static short CRITICAL_ERROR = 0;
+       /** A less serious error */
+       public final static short ERROR = 1;
+       /** A non-immediate problem */
+       public final static short NORMAL = 2;
+       /** Something minor */
+       public final static short MINOR = 3;
+}

Added: trunk/freenet/src/freenet/node/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/UserAlertManager.java        2006-03-30 
12:13:40 UTC (rev 8364)
+++ trunk/freenet/src/freenet/node/UserAlertManager.java        2006-03-30 
14:22:20 UTC (rev 8365)
@@ -0,0 +1,8 @@
+package freenet.node;
+
+/**
+ * Collection of UserAlert's.
+ */
+public class UserAlertManager {
+
+}

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-30 12:13:40 UTC (rev 
8364)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-30 14:22:20 UTC (rev 
8365)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 593;
+       private static final int buildNumber = 594;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;