Client: Worked more on step 2

Refs #69

5 files changed, 18 insertions, 9 deletions

@@ -1,13 +1,12 @@
 package com.fourisland.instadisc.DownloadItem;
 
-import java.util.Timer;
-
 public interface DownloadItemMode
 {
     public void modeInitalize();
     public void modeDeinitalize();
     
     public void requestRetained();
+    public void sendItem(int id);
     
     public int setTimer();
     public void timerTick();
@@ -31,10 +31,13 @@ public class ModeControl implements DownloadItemMode
         dim.modeDeinitalize();
     }
     
-    public void requestRetained()
-    {
+    public void requestRetained() {
         dim.requestRetained();
     }
+    
+    public void sendItem(int id) {
+        dim.sendItem(id);
+    }
 
     public int setTimer() {
         return dim.setTimer();
@@ -13,6 +13,10 @@ public class PullMode implements DownloadItemMode
     public void requestRetained() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
+    
+    public void sendItem(int id) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 
     public int setTimer() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -37,6 +37,12 @@ public class PushMode implements DownloadItemMode
         XmlRpc xmlrpc = new XmlRpc("requestRetained");
         xmlrpc.execute();
     }
+    
+    public void sendItem(int id) {
+        XmlRpc xmlrpc = new XmlRpc("sendItem");
+        xmlrpc.addParam(id);
+        xmlrpc.execute();
+    }
 
     public int setTimer() {
         int delay = (1000 * 60 * 60);
@@ -7,6 +7,7 @@ package com.fourisland.instadisc.Item;
 import com.fourisland.instadisc.Database.Filter;
 import com.fourisland.instadisc.Database.Subscription;
 import com.fourisland.instadisc.Database.Wrapper;
+import com.fourisland.instadisc.DownloadItem.ModeControl;
 import com.fourisland.instadisc.Functions;
 import com.fourisland.instadisc.Item.Categories.Category;
 import com.fourisland.instadisc.XmlRpc;
@@ -182,11 +183,7 @@ public class WellFormedItem {
             Verification ver = new Verification(ivid);
             good = aThis.headerMap.get("Verification").equals(ver.getHash());
         } catch (VerificationIDReusedException ex) {
-            XmlRpc xmlrpc = new XmlRpc("resendItem");
-            String id = aThis.headerMap.get("ID");
-            int iid = Integer.decode(id);
-            xmlrpc.addParam(iid);
-            xmlrpc.execute();
+            ModeControl.INSTANCE.sendItem(Integer.decode(aThis.headerMap.get("ID")));
         } catch (Exception ex) {
             Logger.getLogger(WellFormedItem.class.getName()).log(Level.SEVERE, null, ex);
         }