Author: zothar
Date: 2006-11-20 04:39:50 +0000 (Mon, 20 Nov 2006)
New Revision: 11019
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/fcp/AddPeer.java
trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
Remove second argument, multiLevel, of SimpleFieldSet(String, boolean), which
became unused as of r9869.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-11-20 04:27:02 UTC (rev 11018)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-11-20 04:39:50 UTC (rev 11019)
@@ -635,7 +635,7 @@
SimpleFieldSet fs;
try {
- fs = new SimpleFieldSet(ref.toString(), true);
+ fs = new SimpleFieldSet(ref.toString());
fs.setEndMarker("End"); // It's always End ;
the regex above doesn't always grok this
} catch (IOException e) {
this.sendErrorPage(ctx, 200, "Failed To Add
Node", "Unable to parse the given text as a node reference ("+e+"). Please try
again.");
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-11-20 04:27:02 UTC (rev
11018)
+++ trunk/freenet/src/freenet/node/Node.java 2006-11-20 04:39:50 UTC (rev
11019)
@@ -2815,7 +2815,7 @@
Logger.normal(this, "Received N2NM from '"+source.getPeer());
SimpleFieldSet fs = null;
try {
- fs = new SimpleFieldSet(messageData, true);
+ fs = new SimpleFieldSet(messageData);
} catch (IOException e) {
Logger.error(this, "IOException while parsing node to
node message data", e);
return;
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-11-20 04:27:02 UTC
(rev 11018)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-11-20 04:39:50 UTC
(rev 11019)
@@ -2947,7 +2947,7 @@
SimpleFieldSet fs;
try {
- fs = new SimpleFieldSet(ref, true);
+ fs = new SimpleFieldSet(ref);
if(logMINOR) Logger.minor(this, "Got ARK for "+this);
gotARK(fs, edition);
} catch (IOException e) {
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-11-20
04:27:02 UTC (rev 11018)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-11-20
04:39:50 UTC (rev 11019)
@@ -952,7 +952,7 @@
SimpleFieldSet fs;
System.out.println("Connecting to:\r\n"+content);
try {
- fs = new SimpleFieldSet(content, true);
+ fs = new SimpleFieldSet(content);
} catch (IOException e) {
System.err.println("Did not parse: "+e);
e.printStackTrace();
Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java 2006-11-20 04:27:02 UTC
(rev 11018)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java 2006-11-20 04:39:50 UTC
(rev 11019)
@@ -68,7 +68,7 @@
throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from URL <"+urlString+ '>', null);
}
try {
- fs = new SimpleFieldSet(ref.toString(), true);
+ fs = new SimpleFieldSet(ref.toString());
} catch (IOException e) {
throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from URL <"+urlString+">: "+e.getMessage(), null);
}
@@ -99,7 +99,7 @@
throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from file <"+fileString+ '>', null);
}
try {
- fs = new SimpleFieldSet(ref.toString(), true);
+ fs = new SimpleFieldSet(ref.toString());
} catch (IOException e) {
throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from file <"+fileString+">: "+e.getMessage(), null);
}
Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java 2006-11-20
04:27:02 UTC (rev 11018)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java 2006-11-20
04:39:50 UTC (rev 11019)
@@ -62,7 +62,7 @@
* Construct from a string.
* @throws IOException if the string is too short or invalid.
*/
- public SimpleFieldSet(String content, boolean multiLevel) throws
IOException {
+ public SimpleFieldSet(String content) throws IOException {
values = new HashMap();
subsets = null;
StringReader sr = new StringReader(content);
