Author: jflesch
Date: 2006-07-21 01:00:02 +0000 (Fri, 21 Jul 2006)
New Revision: 9687
Modified:
trunk/apps/Thaw/src/thaw/core/Config.java
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/Main.java
trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Fix my conversions
Modified: trunk/apps/Thaw/src/thaw/core/Config.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Config.java 2006-07-20 23:07:59 UTC (rev
9686)
+++ trunk/apps/Thaw/src/thaw/core/Config.java 2006-07-21 01:00:02 UTC (rev
9687)
@@ -298,7 +298,7 @@
setValue("maxSimultaneousDownloads", "-1");
setValue("maxSimultaneousInsertions", "-1");
setValue("maxUploadSpeed", "-1");
- setValue("thawId", "thaw_"+(new Integer((new
Random()).nextInt(1000))).toString());
+ setValue("thawId", "thaw_"+Integer.toString((new
Random()).nextInt(1000)));
}
}
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2006-07-20 23:07:59 UTC (rev
9686)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2006-07-21 01:00:02 UTC (rev
9687)
@@ -141,8 +141,8 @@
}
connection = new
FCPConnection(config.getValue("nodeAddress"),
- (new
Integer(config.getValue("nodePort"))).intValue(),
- (new
Integer(config.getValue("maxUploadSpeed"))).intValue());
+
Integer.parseInt(config.getValue("nodePort")),
+
Integer.parseInt(config.getValue("maxUploadSpeed")));
if(!connection.connect()) {
new WarningWindow(this, "Unable to connect to
"+config.getValue("nodeAddress")+":"+
@@ -155,8 +155,8 @@
queryManager = new FCPQueryManager(connection);
queueManager = new FCPQueueManager(queryManager,
config.getValue("thawId"),
- (new
Integer(config.getValue("maxSimultaneousDownloads"))).intValue(),
- (new
Integer(config.getValue("maxSimultaneousInsertions"))).intValue());
+
Integer.parseInt(config.getValue("maxSimultaneousDownloads")),
+
Integer.parseInt(config.getValue("maxSimultaneousInsertions")));
if(connection.isConnected()) {
queryManager.startListening();
Modified: trunk/apps/Thaw/src/thaw/core/Main.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Main.java 2006-07-20 23:07:59 UTC (rev
9686)
+++ trunk/apps/Thaw/src/thaw/core/Main.java 2006-07-21 01:00:02 UTC (rev
9687)
@@ -13,7 +13,7 @@
*/
public class Main {
- public final static String VERSION="0.2 Beta r at custom@";
+ public final static String VERSION="0.3 WIP r at custom@";
/**
* Look & feel use by GUI front end
Modified: trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/QueueKeeper.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/core/QueueKeeper.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -159,7 +159,7 @@
Element queryEl = xmlDoc.createElement("query");
- queryEl.setAttribute("type", ((new
Integer(query.getQueryType())).toString()));
+ queryEl.setAttribute("type",
Integer.toString(query.getQueryType()));
for(Iterator keys = params.keySet().iterator();
keys.hasNext();) {
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -154,7 +154,7 @@
queryMessage.setValue("Identifier", identifier);
queryMessage.setValue("Verbosity", "1");
queryMessage.setValue("MaxRetries", "0");
- queryMessage.setValue("PriorityClass", (new
Integer(priority)).toString());
+ queryMessage.setValue("PriorityClass",
Integer.toString(priority));
if(destinationDir != null)
queryMessage.setValue("ClientToken", destinationDir);
@@ -286,7 +286,7 @@
//removeRequest();
- int code = ((new
Integer(message.getValue("Code"))).intValue());
+ int code = Integer.parseInt(message.getValue("Code"));
if(MAX_RETRIES == -1 || attempt >= MAX_RETRIES || code
== 25) {
status = "Failed
("+message.getValue("CodeDescription")+")";
@@ -732,19 +732,19 @@
result.put("URI", key);
result.put("Filename", filename);
- result.put("Priority", ((new Integer(priority)).toString()));
- result.put("Persistence", ((new
Integer(persistence)).toString()));
- result.put("Global", ((new Boolean(globalQueue)).toString()));
+ result.put("Priority", Integer.toString(priority));
+ result.put("Persistence", Integer.toString(persistence));
+ result.put("Global", Boolean.toString(globalQueue));
result.put("ClientToken", destinationDir);
- result.put("Attempt", ((new Integer(attempt)).toString()));
+ result.put("Attempt", Integer.toString(attempt));
result.put("status", status);
result.put("Identifier", identifier);
- result.put("Progress", ((new Integer(progress)).toString()));
- result.put("FileSize", ((new Long(fileSize)).toString()));
- result.put("Running", ((new Boolean(running)).toString()));
- result.put("Successful", ((new
Boolean(successful)).toString()));
+ result.put("Progress", Integer.toString(progress));
+ result.put("FileSize", Long.toString(fileSize));
+ result.put("Running", Boolean.toString(running));
+ result.put("Successful", Boolean.toString(successful));
return result;
}
@@ -756,20 +756,20 @@
Logger.debug(this, "Resuming key : "+key);
filename = (String)parameters.get("Filename");
- priority = ((new
Integer((String)parameters.get("Priority"))).intValue());
- persistence = ((new
Integer((String)parameters.get("Persistence"))).intValue());
- globalQueue = ((new
Boolean((String)parameters.get("Global"))).booleanValue());
+ priority =
Integer.parseInt((String)parameters.get("Priority"));
+ persistence =
Integer.parseInt((String)parameters.get("Persistence"));
+ globalQueue =
Boolean.parseBoolean((String)parameters.get("Global"));
destinationDir = (String)parameters.get("ClientToken");
- attempt = ((new
Integer((String)parameters.get("Attempt"))).intValue());
+ attempt =
Integer.parseInt((String)parameters.get("Attempt"));
status = (String)parameters.get("Status");
identifier = (String)parameters.get("Identifier");
Logger.info(this, "Resuming id : "+identifier);
- progress = ((new
Integer((String)parameters.get("Progress"))).intValue());
- fileSize = ((new
Long((String)parameters.get("FileSize"))).longValue());
- running = ((new
Boolean((String)parameters.get("Running"))).booleanValue());
- successful = ((new
Boolean((String)parameters.get("Successful"))).booleanValue());
+ progress =
Integer.parseInt((String)parameters.get("Progress"));
+ fileSize =
Long.parseLong((String)parameters.get("FileSize"));
+ running =
Boolean.parseBoolean((String)parameters.get("Running"));
+ successful =
Boolean.parseBoolean((String)parameters.get("Successful"));
if(persistence == 2 && !isFinished()) {
progress = 0;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -115,8 +115,8 @@
nodeFCPVersion = answer.getValue("FCPVersion");
nodeVersion = answer.getValue("Version");
nodeName = answer.getValue("Node");
- testnet = (new
Boolean(answer.getValue("Testnet"))).booleanValue();
- nmbCompressionCodecs = (new
Integer(answer.getValue("CompressionCodecs"))).intValue();
+ testnet =
Boolean.parseBoolean(answer.getValue("Testnet"));
+ nmbCompressionCodecs =
Integer.parseInt(answer.getValue("CompressionCodecs"));
queryManager.deleteObserver(this);
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -103,7 +103,10 @@
public FCPClientPut(String identifier, String publicKey,
int priority, int persistence, boolean global,
String srcFile, String status, int progress,
- FCPQueueManager queueManager) {
+ long fileSize, FCPQueueManager queueManager) {
+ if(fileSize > 0)
+ this.fileSize = fileSize;
+
toTheNodeProgress = 100;
this.queueManager = queueManager;
@@ -124,7 +127,14 @@
if(srcFile != null) {
String[] plop =
srcFile.split(File.separator.replaceAll("\\\\", "\\\\\\\\"));
this.name = plop[plop.length-1];
+
+ this.localFile = new File(srcFile);
+ if(this.localFile.length() > 0)
+ this.fileSize = this.localFile.length();
+
} else {
+
+
/* <Jflesch> Bill Gates: God kills a kitten each time
you use a '\' !! */
String[] plop =
publicKey.split(File.separator.replaceAll("\\\\", "\\\\\\\\"));
@@ -141,6 +151,28 @@
}
}
}
+
+
+ if(this.name.equals("null")) {
+ Logger.warning(this, "The node returns \"null\"
as filename. Using id !");
+ Logger.warning(this, "( URI="+publicKey +" )");
+
+ plop = this.identifier.split("\\-");
+
+ if(plop.length >= 2) {
+ this.name = "";
+ for(int i = 1 ; i < plop.length; i++) {
+ this.name = this.name + plop[i];
+ if(i < plop.length-2)
+ this.name = this.name
+"-";
+ }
+ }
+
+
+ }
+
+
+
}
this.publicKey = null;
@@ -161,7 +193,23 @@
public boolean start(FCPQueueManager queueManager) {
this.queueManager = queueManager;
-
+
+ if(localFile != null && localFile.length() <= 0) {
+ Logger.warning(this, "Empty or unreachable
file:"+localFile.getPath());
+
+ status = "EMPTY OR UNREACHABLE FILE";
+
+ successful = false;
+ finished = true;
+ running = false;
+
+ setChanged();
+ notifyObservers();
+
+ return false;
+ }
+
+
queueManager.getQueryManager().addObserver(this);
progress = 0;
@@ -270,7 +318,7 @@
msg.setValue("Identifier", identifier);
msg.setValue("Verbosity", "512");
msg.setValue("MaxRetries", "-1");
- msg.setValue("PriorityClass", (new
Integer(priority)).toString());
+ msg.setValue("PriorityClass", Integer.toString(priority));
msg.setValue("GetCHKOnly", "false");
if(global)
msg.setValue("Global", "true");
@@ -450,7 +498,7 @@
/*
if(keyType > 0)
- publicKey = publicKey + "/" + name +
"-" + (new Integer(rev)).toString();
+ publicKey = publicKey + "/" + name +
"-" + Integer.toString(rev);
*/
@@ -470,9 +518,9 @@
if(keyType == 0)
publicKey = publicKey + "/" + name;
if(keyType == 1)
- publicKey = "KSK@"+name+"-" + (new
Integer(rev)).toString();
+ publicKey = "KSK@"+name+"-" +
Integer.toString(rev);
if(keyType == 2)
- publicKey = publicKey + "/" + name +
"-" + (new Integer(rev)).toString();
+ publicKey = publicKey + "/" + name +
"-" + Integer.toString(rev);
status = "Finished";
@@ -557,7 +605,7 @@
int rate = (int)( ((new
Long(msg.getValue("OrigSize"))).longValue() * 100) / (new
Long(msg.getValue("CompressedSize"))).longValue() );
- Logger.info(this, "Compression: "+ (new
Integer(rate)).intValue());
+ Logger.info(this, "Compression: "+
Integer.toString(rate));
setChanged();
notifyObservers();
@@ -689,7 +737,7 @@
if(keyType == 0 && publicKey == null)
key = "CHK at coinCoin/"+name;
if(keyType == 1)
- key = "KSK@" + name + "-"+((new
Integer(rev)).intValue());
+ key = "KSK@" + name + "-"+ Integer.toString(rev);
if(keyType == 2)
key = privateKey + name+"-"+rev;
@@ -745,27 +793,27 @@
HashMap result = new HashMap();
result.put("localFile", localFile.getPath());
- result.put("keyType", ((new Integer(keyType)).toString()));
- result.put("Revision", ((new Integer(rev)).toString()));
+ result.put("keyType", Integer.toString(keyType));
+ result.put("Revision", Integer.toString(rev));
result.put("Name", name);
if(privateKey != null)
result.put("privateKey", privateKey);
if(publicKey != null)
result.put("publicKey", publicKey);
- result.put("priority", ((new Integer(priority)).toString()));
- result.put("global", ((new Boolean(global)).toString()));
- result.put("persistence", (new
Integer(persistence)).toString());
+ result.put("priority", Integer.toString(priority));
+ result.put("global", Boolean.toString(global));
+ result.put("persistence", Integer.toString(persistence));
- result.put("progress", (new Integer(progress)).toString());
+ result.put("progress", Integer.toString(progress));
result.put("status", status);
- result.put("attempt", (new Integer(attempt)).toString());
+ result.put("attempt", Integer.toString(attempt));
if(identifier != null)
result.put("identifier", identifier);
- result.put("running", ((new Boolean(running)).toString()));
- result.put("successful", ((new
Boolean(successful)).toString()));
- result.put("finished", ((new Boolean(finished)).toString()));
+ result.put("running", Boolean.toString(running));
+ result.put("successful", Boolean.toString(successful));
+ result.put("finished", Boolean.toString(finished));
return result;
}
@@ -774,10 +822,13 @@
* not tested ; TODO : to test it
*/
public boolean setParameters(HashMap parameters) {
-
+
localFile = new File((String)parameters.get("localFile"));
- keyType = (new
Integer((String)parameters.get("keyType"))).intValue();
- rev = (new
Integer((String)parameters.get("Revision"))).intValue();
+
+ fileSize = localFile.length();
+
+ keyType = Integer.parseInt((String)parameters.get("keyType"));
+ rev = Integer.parseInt((String)parameters.get("Revision"));
name = (String)parameters.get("name");
privateKey = (String)parameters.get("privateKey");
@@ -788,20 +839,20 @@
if(privateKey == null || publicKey.equals(""))
publicKey = null;
- priority = ((new
Integer((String)parameters.get("priority"))).intValue());
- global = ((new
Boolean((String)parameters.get("global"))).booleanValue());
- persistence = ((new
Integer((String)parameters.get("persistence"))).intValue());
- progress = ((new
Integer((String)parameters.get("progress"))).intValue());
+ priority = Integer.parseInt((String)parameters.get("priority"));
+ global = Boolean.parseBoolean((String)parameters.get("global"));
+ persistence =
Integer.parseInt((String)parameters.get("persistence"));
+ progress =
Integer.parseInt(((String)parameters.get("progress")));
status = (String)parameters.get("status");
- attempt = ((new
Integer((String)parameters.get("attempt"))).intValue());
+ attempt = Integer.parseInt((String)parameters.get("attempt"));
identifier = (String)parameters.get("identifier");
if(identifier == null || identifier.equals(""))
identifier = null;
- running = ((new
Boolean((String)parameters.get("running"))).booleanValue());
- successful = ((new
Boolean((String)parameters.get("successful"))).booleanValue());
- finished = ((new
Boolean((String)parameters.get("finished"))).booleanValue());
+ running =
Boolean.parseBoolean((String)parameters.get("running"));
+ successful =
Boolean.parseBoolean((String)parameters.get("successful"));
+ finished =
Boolean.parseBoolean((String)parameters.get("finished"));
if(persistence == 2 && !isFinished()) {
progress = 0;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -113,7 +113,7 @@
return false;
}
- Logger.info(this, "Connection to "+nodeAddress+":"+(new
Integer(port)).toString()+"...");
+ Logger.info(this, "Connection to "+nodeAddress+":"+
Integer.toString(port) +"...");
if(socket != null && !socket.isClosed())
disconnect();
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPMessage.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -104,7 +104,7 @@
/**
* Returns the amount of data waiting on socket (in octets).
- * @return if > 0 : Data are still waiting, if == 0 : No data waiting,
if < 0 : These data are now unavailable.
+ * @return if > 0 : Data are still waiting (except if the message name
is "PersistentPut" !), if == 0 : No data waiting, if < 0 : These data are now
unavailable.
*/
public long getAmountOfDataWaiting() {
return dataWaiting;
@@ -112,6 +112,10 @@
public void setAmountOfDataWaiting(long amount) {
+ if(amount == 0) {
+ Logger.warning(this, "Setting amount of data waiting to
0 ?! Abnormal !");
+ }
+
this.dataWaiting = amount;
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -66,7 +66,7 @@
if(msg.getValue("Identifier").startsWith(thawId))
destinationDir = msg.getValue("ClientToken");
- int priority = ((new
Integer(msg.getValue("PriorityClass"))).intValue());
+ int priority =
Integer.parseInt(msg.getValue("PriorityClass"));
FCPClientGet clientGet = new
FCPClientGet(msg.getValue("Identifier"),
@@ -105,13 +105,17 @@
if(msg.getValue("Identifier").startsWith(thawId))
srcFile = msg.getValue("ClientToken");
- int priority = ((new
Integer(msg.getValue("PriorityClass"))).intValue());
+ int priority =
Integer.parseInt(msg.getValue("PriorityClass"));
+ long fileSize = 0;
+ if(msg.getValue("DataLength") != null)
+ fileSize =
Long.getLong(msg.getValue("DataLength"));
+
FCPClientPut clientPut = new
FCPClientPut(msg.getValue("Identifier"),
msg.getValue("URI"), // key
priority,
persistence, global,
- srcFile,
"Inserting", 0,
+ srcFile,
"Inserting", 0, fileSize,
queueManager);
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2006-07-20 23:07:59 UTC
(rev 9686)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2006-07-21 01:00:02 UTC
(rev 9687)
@@ -138,7 +138,7 @@
try {
String[] subId =
query.getIdentifier().split("-");
subId = subId[0].split("_");
- int id = ((new
Integer(subId[subId.length-1])).intValue());
+ int id =
Integer.parseInt(subId[subId.length-1]);
if(id > lastId) {
lastId = id;
@@ -389,7 +389,7 @@
lastId = 0;
}
- return (thawId+"_"+(new Integer(lastId)).toString());
+ return (thawId+"_"+ Integer.toString(lastId));
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2006-07-20 23:07:59 UTC (rev 9686)
+++ trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
2006-07-21 01:00:02 UTC (rev 9687)
@@ -258,7 +258,7 @@
return;
}
- rev = ((new
Integer(revField.getText())).intValue());
+ rev = Integer.parseInt(revField.getText());
name = nameField.getText();
}
@@ -280,7 +280,7 @@
}
for(int i = 0 ; i <= MIN_PRIORITY ; i++) {
-
if(I18n.getMessage("thaw.plugin.priority.p"+(new
Integer(i)).toString()).equals((String)prioritySelecter.getSelectedItem())) {
+ if(I18n.getMessage("thaw.plugin.priority.p"+
Integer.toString(i)).equals((String)prioritySelecter.getSelectedItem())) {
priority = i;
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
2006-07-20 23:07:59 UTC (rev 9686)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
2006-07-21 01:00:02 UTC (rev 9687)
@@ -134,12 +134,12 @@
public void refresh() {
if(query != null) {
- withTheNodeProgress.setValue((new
Integer(query.getTransferWithTheNodeProgression())).intValue());
- withTheNodeProgress.setString((new
Integer(query.getTransferWithTheNodeProgression())).toString() + "%");
+
withTheNodeProgress.setValue(query.getTransferWithTheNodeProgression());
+
withTheNodeProgress.setString(Integer.toString(query.getTransferWithTheNodeProgression())
+ "%");
progress.setValue(query.getProgression());
if(!query.isFinished() || query.isSuccessful()) {
- String progression = (new
Integer(query.getProgression())).toString() + "%";
+ String progression =
Integer.toString(query.getProgression()) + "%";
if(!query.isProgressionReliable())
progression = progression + "
("+I18n.getMessage("thaw.common.estimation")+")";
@@ -163,10 +163,10 @@
identifier.setText(query.getIdentifier());
else
identifier.setText("N/A");
- attempt.setText((new
Integer(query.getAttempt())).toString());
+ attempt.setText(Integer.toString(query.getAttempt()));
if(query.getThawPriority() != -1)
- priority.setText((new
Integer(query.getThawPriority())).toString());
+
priority.setText(Integer.toString(query.getThawPriority()));
else
priority.setText(I18n.getMessage("thaw.common.unknown"));
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-07-20 23:07:59 UTC (rev 9686)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-07-21 01:00:02 UTC (rev 9687)
@@ -104,12 +104,12 @@
rightClickMenu.add(removeItem);
- if((new
Integer(core.getConfig().getValue("maxSimultaneousDownloads"))).intValue() >= 0
- || (new
Integer(core.getConfig().getValue("maxSimultaneousInsertions"))).intValue() >=
0)
+ if(
Integer.parseInt(core.getConfig().getValue("maxSimultaneousDownloads")) >= 0
+ ||
Integer.parseInt(core.getConfig().getValue("maxSimultaneousInsertions")) >= 0)
rightClickMenu.add(cancelItem);
- if((new
Integer(core.getConfig().getValue("maxSimultaneousDownloads"))).intValue() >= 0
- || (new
Integer(core.getConfig().getValue("maxSimultaneousInsertions"))).intValue() >=
0)
+ if(
Integer.parseInt(core.getConfig().getValue("maxSimultaneousDownloads")) >= 0
+ ||
Integer.parseInt(core.getConfig().getValue("maxSimultaneousInsertions")) >= 0)
rightClickMenu.add(delayItem);
if(!isForInsertionQueue)
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-07-20 23:07:59 UTC (rev 9686)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-07-21 01:00:02 UTC (rev 9687)
@@ -109,9 +109,9 @@
if( (isForInsertions && column == 3
|| (!isForInsertions && column == 4) ) ) {
if(!query.isFinished() || query.isSuccessful())
- return (new Integer(query.getProgression()));
+ return new Integer(query.getProgression());
else
- return (new Integer(-1));
+ return new Integer(-1);
}
