Author: jflesch
Date: 2006-07-14 18:50:17 +0000 (Fri, 14 Jul 2006)
New Revision: 9605
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPGenerateSSK.java
trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
Log:
Fix again jdk 1.4 compatibility
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-14 18:39:42 UTC
(rev 9604)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-14 18:50:17 UTC
(rev 9605)
@@ -411,7 +411,7 @@
status = "Inserting";
publicKey = msg.getValue("URI");
- publicKey = publicKey.replace("freenet:", "");
+ publicKey = publicKey.replaceAll("freenet:",
"");
/*
if(keyType == 0)
@@ -433,7 +433,7 @@
running = false;
publicKey = msg.getValue("URI");
- publicKey = publicKey.replace("freenet:", "");
+ publicKey = publicKey.replaceAll("freenet:",
"");
if(keyType == 0)
publicKey = publicKey + name;
@@ -703,7 +703,7 @@
result.put("status", status);
- result.put("attempt", (new Integer(attempt)).intValue());
+ result.put("attempt", (new Integer(attempt)).toString());
result.put("identifier", identifier);
result.put("running", ((new Boolean(running)).toString()));
result.put("successful", ((new
Boolean(successful)).toString()));
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPGenerateSSK.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPGenerateSSK.java 2006-07-14 18:39:42 UTC
(rev 9604)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPGenerateSSK.java 2006-07-14 18:50:17 UTC
(rev 9605)
@@ -48,8 +48,8 @@
privateKey = msg.getValue("InsertURI");
publicKey = msg.getValue("RequestURI");
- privateKey = privateKey.replace("freenet:", "");
- publicKey = publicKey.replace("freenet:", "");
+ privateKey = privateKey.replaceFirst("freenet:", "");
+ publicKey = publicKey.replaceFirst("freenet:", "");
setChanged();
notifyObservers();
Modified: trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-07-14 18:39:42 UTC
(rev 9604)
+++ trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-07-14 18:50:17 UTC
(rev 9605)
@@ -52,7 +52,7 @@
for(int i = 0 ; i < keys.length ; i++) {
String[] subKey = keys[i].split("\\?"); /* Because of
VolodyA :p */
- String key =
subKey[0].replace("http://127.0.0.1:8888/";, "");
+ String key =
subKey[0].replaceFirst("http://127.0.0.1:8888/";, "");
core.getQueueManager().addQueryToThePendingQueue(new
FCPClientGet(key,
priority,
Modified: trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2006-07-14 18:39:42 UTC (rev 9604)
+++ trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2006-07-14 18:50:17 UTC (rev 9605)
@@ -266,8 +266,8 @@
if(privateKey != null
&& !privateKey.equals("")) {
- privateKey =
privateKey.replace("SSK@", "");
- privateKey =
privateKey.replace("USK@", "");
+ privateKey =
privateKey.replaceFirst("SSK@", "");
+ privateKey =
privateKey.replaceFirst("USK@", "");
String[] split =
privateKey.split("/");
privateKey = split[0];
} else {
@@ -390,8 +390,8 @@
if(clientPut.getPublicKey() != null) {
String publicKey =
clientPut.getPublicKey();
- publicKey = publicKey.replace("SSK@",
"");
- publicKey = publicKey.replace("USK@",
"");
+ publicKey =
publicKey.replaceFirst("SSK@", "");
+ publicKey =
publicKey.replaceFirst("USK@", "");
String[] split = publicKey.split("/");
publicKeyField.setText(split[0]);
} else {
@@ -400,8 +400,8 @@
if(clientPut.getPrivateKey() != null) {
String privateKey =
clientPut.getPrivateKey();
- privateKey = privateKey.replace("SSK@",
"");
- privateKey = privateKey.replace("USK@",
"");
+ privateKey =
privateKey.replaceFirst("SSK@", "");
+ privateKey =
privateKey.replaceFirst("USK@", "");
String[] split = privateKey.split("/");
privateKeyField.setText(split[0]);
