Author: nextgens
Date: 2006-05-20 19:06:28 +0000 (Sat, 20 May 2006)
New Revision: 8802
Modified:
trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeStarter.java
Log:
18:41 <@toad_> nextgens: please revert your change to demand email addresses
18:41 <@toad_> nextgens: it's not necessary, since we will have internal
messaging anyway
:/
Modified: trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
2006-05-20 16:21:38 UTC (rev 8801)
+++ trunk/freenet/src/freenet/node/MeaningfulNodeNameUserAlert.java
2006-05-20 19:06:28 UTC (rev 8802)
@@ -16,8 +16,7 @@
"up a node name doesn't affect your anonymity in any way but "+
"is useful for your peers to know who you are in case they have
"+
"to reach you. You can change the node's name at the
Configuration page. "+
- "Putting your e-mail address there is generally speaking a good
idea."+
- "<br> Example : John Doe (bigbrother at nsa.gov) ";
+ "Putting your e-mail address there is generally speaking a good
idea.";
}
public short getPriorityClass() {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-20 16:21:38 UTC (rev
8801)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-20 19:06:28 UTC (rev
8802)
@@ -303,15 +303,8 @@
NodeNameCallback(Node n) {
node=n;
}
-
- public boolean check(String myName){
- return (myName.startsWith("Node created
around")||
-
myName.equals("MyFirstFreenetNode")||
- !myName.matches("^.* .*@.*$"));
- }
-
public String get() {
- if(check(myName)){
+ if(myName.startsWith("Node created around")||
myName.equals("MyFirstFreenetNode")){
node.alerts.register(nodeNameUserAlert);
}else{
node.alerts.unregister(nodeNameUserAlert);
@@ -321,7 +314,7 @@
public void set(String val) throws
InvalidConfigValueException {
myName = val;
- if(check(myName)){
+ if(myName.startsWith("Node created around")||
myName.equals("MyFirstFreenetNode")){
node.alerts.register(nodeNameUserAlert);
}else{
node.alerts.unregister(nodeNameUserAlert);
Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java 2006-05-20 16:21:38 UTC
(rev 8801)
+++ trunk/freenet/src/freenet/node/NodeStarter.java 2006-05-20 19:06:28 UTC
(rev 8802)
@@ -107,9 +107,6 @@
// t.setPriority(Thread.MAX_PRIORITY);
// t.start();
- // The node can take time to start up (DS checking)
- WrapperManager.signalStarting(120000);
-
try {
node = new Node(cfg, random, logConfigHandler,this);
node.start(false);
