Client: Completed step 5

Instead of forcing restart after running the DownloadItemMode, ModeControl is deinitalized before the test is run and reinitalized after the test is run so that the DownloadItemMode can change smoothly.

Refs #69

4 files changed, 64 insertions, 14 deletions

@@ -1,12 +1,15 @@
 package com.fourisland.instadisc.DownloadItem;
 
-import java.util.Timer;
-
 public class ModeControl implements DownloadItemMode
 {
     public static final ModeControl INSTANCE = new ModeControl();
     private DownloadItemMode dim;
     
+    public ModeControl()
+    {
+        Runtime.getRuntime().addShutdownHook(new Thread(new DeinitalizeModeThread()));
+    }
+    
     public void initalize(String dim) throws UnknownDownloadItemModeException
     {
         if (dim.equals("Push"))
@@ -18,8 +21,6 @@ public class ModeControl implements DownloadItemMode
         } else {
             throw new UnknownDownloadItemModeException();
         }
-        
-        Runtime.getRuntime().addShutdownHook(new Thread(new DeinitalizeModeThread()));
     }
 
     public void modeInitalize() {
@@ -123,6 +123,20 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem7ActionPerformed"/>
               </Events>
             </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem8">
+              <Properties>
+                <Property name="text" type="java.lang.String" resourceKey="jMenuItem8.text"/>
+                <Property name="name" type="java.lang.String" value="jMenuItem8" noResource="true"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem8ActionPerformed"/>
+              </Events>
+            </MenuItem>
+            <MenuItem class="javax.swing.JSeparator" name="jSeparator2">
+              <Properties>
+                <Property name="name" type="java.lang.String" value="jSeparator2" noResource="true"/>
+              </Properties>
+            </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem3">
               <Properties>
                 <Property name="text" type="java.lang.String" resourceKey="jMenuItem3.text"/>
@@ -141,13 +155,13 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem4ActionPerformed"/>
               </Events>
             </MenuItem>
-            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem8">
+            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem9">
               <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="jMenuItem8.text"/>
-                <Property name="name" type="java.lang.String" value="jMenuItem8" noResource="true"/>
+                <Property name="text" type="java.lang.String" resourceKey="jMenuItem9.text"/>
+                <Property name="name" type="java.lang.String" value="jMenuItem9" noResource="true"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem8ActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem9ActionPerformed"/>
               </Events>
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem5">
@@ -5,6 +5,7 @@ package com.fourisland.instadisc;
 
 import com.fourisland.instadisc.Database.Item;
 import com.fourisland.instadisc.Database.Wrapper;
+import com.fourisland.instadisc.DownloadItem.DownloadItemModeTest;
 import com.fourisland.instadisc.DownloadItem.ModeControl;
 import com.fourisland.instadisc.DownloadItem.UnknownDownloadItemModeException;
 import com.fourisland.instadisc.Item.Categories.InstaDiscIcon;
@@ -166,9 +167,11 @@ public class InstaDiscView extends FrameView {
         javax.swing.JMenuItem exitMenuItem = new javax.swing.JMenuItem();
         jMenu1 = new javax.swing.JMenu();
         jMenuItem7 = new javax.swing.JMenuItem();
+        jMenuItem8 = new javax.swing.JMenuItem();
+        jSeparator2 = new javax.swing.JSeparator();
         jMenuItem3 = new javax.swing.JMenuItem();
         jMenuItem4 = new javax.swing.JMenuItem();
-        jMenuItem8 = new javax.swing.JMenuItem();
+        jMenuItem9 = new javax.swing.JMenuItem();
         jMenuItem5 = new javax.swing.JMenuItem();
         javax.swing.JMenu helpMenu = new javax.swing.JMenu();
         jMenuItem6 = new javax.swing.JMenuItem();
@@ -269,6 +272,18 @@ public class InstaDiscView extends FrameView {
         });
         jMenu1.add(jMenuItem7);
 
+        jMenuItem8.setText(resourceMap.getString("jMenuItem8.text")); // NOI18N
+        jMenuItem8.setName("jMenuItem8"); // NOI18N
+        jMenuItem8.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jMenuItem8ActionPerformed(evt);
+            }
+        });
+        jMenu1.add(jMenuItem8);
+
+        jSeparator2.setName("jSeparator2"); // NOI18N
+        jMenu1.add(jSeparator2);
+
         jMenuItem3.setText(resourceMap.getString("jMenuItem3.text")); // NOI18N
         jMenuItem3.setName("jMenuItem3"); // NOI18N
         jMenuItem3.addActionListener(new java.awt.event.ActionListener() {
@@ -287,14 +302,14 @@ public class InstaDiscView extends FrameView {
         });
         jMenu1.add(jMenuItem4);
 
-        jMenuItem8.setText(resourceMap.getString("jMenuItem8.text")); // NOI18N
-        jMenuItem8.setName("jMenuItem8"); // NOI18N
-        jMenuItem8.addActionListener(new java.awt.event.ActionListener() {
+        jMenuItem9.setText(resourceMap.getString("jMenuItem9.text")); // NOI18N
+        jMenuItem9.setName("jMenuItem9"); // NOI18N
+        jMenuItem9.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jMenuItem8ActionPerformed(evt);
+                jMenuItem9ActionPerformed(evt);
             }
         });
-        jMenu1.add(jMenuItem8);
+        jMenu1.add(jMenuItem9);
 
         jMenuItem5.setText(resourceMap.getString("jMenuItem5.text")); // NOI18N
         jMenuItem5.setName("jMenuItem5"); // NOI18N
@@ -485,6 +500,23 @@ public class InstaDiscView extends FrameView {
         jMenuItem8.setEnabled(Wrapper.getConfig("useUnreadFlag").equals("true"));
     }//GEN-LAST:event_jMenu1MenuSelected
 
+    private void jMenuItem9ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem9ActionPerformed
+        try
+        {
+            ModeControl.INSTANCE.modeDeinitalize();
+
+            DownloadItemModeTest dIMT = new DownloadItemModeTest(new JFrame(), true);
+            dIMT.setVisible(true);
+
+            ModeControl.INSTANCE.initalize(Wrapper.getConfig("downloadItemMode"));
+            ModeControl.INSTANCE.modeInitalize();//GEN-LAST:event_jMenuItem9ActionPerformed
+            ModeControl.INSTANCE.requestRetained();
+        } catch (UnknownDownloadItemModeException ex)
+        {
+            Logger.getLogger(InstaDiscView.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JList jList1;
     private javax.swing.JMenu jMenu1;
@@ -496,8 +528,10 @@ public class InstaDiscView extends FrameView {
     private javax.swing.JMenuItem jMenuItem6;
     private javax.swing.JMenuItem jMenuItem7;
     private javax.swing.JMenuItem jMenuItem8;
+    private javax.swing.JMenuItem jMenuItem9;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JSeparator jSeparator1;
+    private javax.swing.JSeparator jSeparator2;
     private javax.swing.JPanel mainPanel;
     private javax.swing.JMenuBar menuBar;
     private javax.swing.JProgressBar progressBar;
@@ -39,3 +39,4 @@ jMenuItem5.text=Advanced Settings
 jMenuItem6.text=InstaDisc Website
 jMenuItem7.text=Change Password
 jMenuItem8.text=Mark all as Read
+jMenuItem9.text=Run Download Item Test