From eefbd2e03bed592549bc6a61b16e076ccccd819f Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 28 Sep 2008 16:11:46 +0000 Subject: Client: Worked more on step 2 Refs #69 --- .../src/com/fourisland/instadisc/DownloadItem/DownloadItemMode.java | 2 +- .../trunk/src/com/fourisland/instadisc/DownloadItem/ModeControl.java | 4 ++-- client/trunk/src/com/fourisland/instadisc/DownloadItem/PullMode.java | 2 +- client/trunk/src/com/fourisland/instadisc/DownloadItem/PushMode.java | 4 ++-- client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/trunk/src/com/fourisland/instadisc/DownloadItem/DownloadItemMode.java b/client/trunk/src/com/fourisland/instadisc/DownloadItem/DownloadItemMode.java index 9d7efc0..bf63971 100644 --- a/client/trunk/src/com/fourisland/instadisc/DownloadItem/DownloadItemMode.java +++ b/client/trunk/src/com/fourisland/instadisc/DownloadItem/DownloadItemMode.java @@ -6,7 +6,7 @@ public interface DownloadItemMode public void modeDeinitalize(); public void requestRetained(); - public void sendItem(int id); + public void resendItem(int id); public int setTimer(); public void timerTick(); diff --git a/client/trunk/src/com/fourisland/instadisc/DownloadItem/ModeControl.java b/client/trunk/src/com/fourisland/instadisc/DownloadItem/ModeControl.java index 9801b74..f38457c 100644 --- a/client/trunk/src/com/fourisland/instadisc/DownloadItem/ModeControl.java +++ b/client/trunk/src/com/fourisland/instadisc/DownloadItem/ModeControl.java @@ -35,8 +35,8 @@ public class ModeControl implements DownloadItemMode dim.requestRetained(); } - public void sendItem(int id) { - dim.sendItem(id); + public void resendItem(int id) { + dim.resendItem(id); } public int setTimer() { diff --git a/client/trunk/src/com/fourisland/instadisc/DownloadItem/PullMode.java b/client/trunk/src/com/fourisland/instadisc/DownloadItem/PullMode.java index 46f71a5..a14ef1c 100644 --- a/client/trunk/src/com/fourisland/instadisc/DownloadItem/PullMode.java +++ b/client/trunk/src/com/fourisland/instadisc/DownloadItem/PullMode.java @@ -14,7 +14,7 @@ public class PullMode implements DownloadItemMode throw new UnsupportedOperationException("Not supported yet."); } - public void sendItem(int id) { + public void resendItem(int id) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/client/trunk/src/com/fourisland/instadisc/DownloadItem/PushMode.java b/client/trunk/src/com/fourisland/instadisc/DownloadItem/PushMode.java index 7fb7a4b..3d8671b 100644 --- a/client/trunk/src/com/fourisland/instadisc/DownloadItem/PushMode.java +++ b/client/trunk/src/com/fourisland/instadisc/DownloadItem/PushMode.java @@ -38,8 +38,8 @@ public class PushMode implements DownloadItemMode xmlrpc.execute(); } - public void sendItem(int id) { - XmlRpc xmlrpc = new XmlRpc("sendItem"); + public void resendItem(int id) { + XmlRpc xmlrpc = new XmlRpc("resendItem"); xmlrpc.addParam(id); xmlrpc.execute(); } diff --git a/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java b/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java index 9cc644d..23305d2 100644 --- a/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java +++ b/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java @@ -183,7 +183,7 @@ public class WellFormedItem { Verification ver = new Verification(ivid); good = aThis.headerMap.get("Verification").equals(ver.getHash()); } catch (VerificationIDReusedException ex) { - ModeControl.INSTANCE.sendItem(Integer.decode(aThis.headerMap.get("ID"))); + ModeControl.INSTANCE.resendItem(Integer.decode(aThis.headerMap.get("ID"))); } catch (Exception ex) { Logger.getLogger(WellFormedItem.class.getName()).log(Level.SEVERE, null, ex); } -- cgit 1.4.1