diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2008-09-28 16:11:46 +0000 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2008-09-28 16:11:46 +0000 |
commit | eefbd2e03bed592549bc6a61b16e076ccccd819f (patch) | |
tree | bc8c5007611ce642de8fd30c4e413c2276a1cd75 | |
parent | 6388bc8c2306bb70b2e211beb7f7f9ce1a2496d6 (diff) | |
download | instadisc-eefbd2e03bed592549bc6a61b16e076ccccd819f.tar.gz instadisc-eefbd2e03bed592549bc6a61b16e076ccccd819f.tar.bz2 instadisc-eefbd2e03bed592549bc6a61b16e076ccccd819f.zip |
Client: Worked more on step 2
Refs #69
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 | |||
6 | public void modeDeinitalize(); | 6 | public void modeDeinitalize(); |
7 | 7 | ||
8 | public void requestRetained(); | 8 | public void requestRetained(); |
9 | public void sendItem(int id); | 9 | public void resendItem(int id); |
10 | 10 | ||
11 | public int setTimer(); | 11 | public int setTimer(); |
12 | public void timerTick(); | 12 | 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 | |||
35 | dim.requestRetained(); | 35 | dim.requestRetained(); |
36 | } | 36 | } |
37 | 37 | ||
38 | public void sendItem(int id) { | 38 | public void resendItem(int id) { |
39 | dim.sendItem(id); | 39 | dim.resendItem(id); |
40 | } | 40 | } |
41 | 41 | ||
42 | public int setTimer() { | 42 | 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 | |||
14 | throw new UnsupportedOperationException("Not supported yet."); | 14 | throw new UnsupportedOperationException("Not supported yet."); |
15 | } | 15 | } |
16 | 16 | ||
17 | public void sendItem(int id) { | 17 | public void resendItem(int id) { |
18 | throw new UnsupportedOperationException("Not supported yet."); | 18 | throw new UnsupportedOperationException("Not supported yet."); |
19 | } | 19 | } |
20 | 20 | ||
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 | |||
38 | xmlrpc.execute(); | 38 | xmlrpc.execute(); |
39 | } | 39 | } |
40 | 40 | ||
41 | public void sendItem(int id) { | 41 | public void resendItem(int id) { |
42 | XmlRpc xmlrpc = new XmlRpc("sendItem"); | 42 | XmlRpc xmlrpc = new XmlRpc("resendItem"); |
43 | xmlrpc.addParam(id); | 43 | xmlrpc.addParam(id); |
44 | xmlrpc.execute(); | 44 | xmlrpc.execute(); |
45 | } | 45 | } |
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 { | |||
183 | Verification ver = new Verification(ivid); | 183 | Verification ver = new Verification(ivid); |
184 | good = aThis.headerMap.get("Verification").equals(ver.getHash()); | 184 | good = aThis.headerMap.get("Verification").equals(ver.getHash()); |
185 | } catch (VerificationIDReusedException ex) { | 185 | } catch (VerificationIDReusedException ex) { |
186 | ModeControl.INSTANCE.sendItem(Integer.decode(aThis.headerMap.get("ID"))); | 186 | ModeControl.INSTANCE.resendItem(Integer.decode(aThis.headerMap.get("ID"))); |
187 | } catch (Exception ex) { | 187 | } catch (Exception ex) { |
188 | Logger.getLogger(WellFormedItem.class.getName()).log(Level.SEVERE, null, ex); | 188 | Logger.getLogger(WellFormedItem.class.getName()).log(Level.SEVERE, null, ex); |
189 | } | 189 | } |