6 files changed, 341 insertions, 12 deletions

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="name" type="java.lang.String" value="Form" noResource="true"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+  </SyntheticProperties>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="12" pref="12" max="12" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jLabel3" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel2" alignment="0" pref="364" max="32767" attributes="0"/>
+                      </Group>
+                  </Group>
+                  <Component id="jButton1" alignment="1" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <Component id="jLabel2" pref="85" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="font" type="java.awt.Font" resourceKey="jLabel1.font"/>
+        <Property name="text" type="java.lang.String" resourceKey="jLabel1.text"/>
+        <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel2">
+      <Properties>
+        <Property name="text" type="java.lang.String" resourceKey="jLabel2.text"/>
+        <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel3">
+      <Properties>
+        <Property name="text" type="java.lang.String" resourceKey="jLabel3.text"/>
+        <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JButton" name="jButton1">
+      <Properties>
+        <Property name="text" type="java.lang.String" resourceKey="jButton1.text"/>
+        <Property name="enabled" type="boolean" value="false"/>
+        <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+      </Events>
+    </Component>
+  </SubComponents>
+</Form>
@@ -0,0 +1,221 @@
+/*
+ * DownloadItemModeTest.java
+ *
+ * Created on September 27, 2008, 10:20 AM
+ */
+
+package com.fourisland.instadisc.DownloadItem;
+
+import com.fourisland.instadisc.Database.Wrapper;
+import com.fourisland.instadisc.FirstRun.StepEndResults;
+import com.fourisland.instadisc.XmlRpc;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author  hatkirby
+ */
+public class DownloadItemModeTest extends javax.swing.JDialog {
+    
+    /** Creates new form DownloadItemModeTest */
+    public DownloadItemModeTest(java.awt.Frame parent, boolean modal) {
+        super(parent, modal);
+
+        initComponents();
+            
+        new Thread(new Runnable() {
+            public void run() {
+                runDownloadItemModeTest();
+            }
+        }).start();
+    }
+    
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        jLabel1 = new javax.swing.JLabel();
+        jLabel2 = new javax.swing.JLabel();
+        jLabel3 = new javax.swing.JLabel();
+        jButton1 = new javax.swing.JButton();
+
+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        setName("Form"); // NOI18N
+
+        org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(com.fourisland.instadisc.InstaDiscApp.class).getContext().getResourceMap(DownloadItemModeTest.class);
+        jLabel1.setFont(resourceMap.getFont("jLabel1.font")); // NOI18N
+        jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
+        jLabel1.setName("jLabel1"); // NOI18N
+
+        jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N
+        jLabel2.setName("jLabel2"); // NOI18N
+
+        jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N
+        jLabel3.setName("jLabel3"); // NOI18N
+
+        jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N
+        jButton1.setEnabled(false);
+        jButton1.setName("jButton1"); // NOI18N
+        jButton1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton1ActionPerformed(evt);
+            }
+        });
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+        getContentPane().setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel1)
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(12, 12, 12)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jLabel3)
+                            .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 364, Short.MAX_VALUE)))
+                    .addComponent(jButton1, javax.swing.GroupLayout.Alignment.TRAILING))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(jLabel1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 85, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel3)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jButton1)
+                .addContainerGap())
+        );
+
+        pack();
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+        StepEndResults.ok = true;
+        this.setVisible(false);
+    }//GEN-LAST:event_jButton1ActionPerformed
+    
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String args[]) {
+        java.awt.EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                DownloadItemModeTest dialog = new DownloadItemModeTest(new javax.swing.JFrame(), true);
+                dialog.addWindowListener(new java.awt.event.WindowAdapter() {
+                    public void windowClosing(java.awt.event.WindowEvent e) {
+                        System.exit(0);
+                    }
+                });
+                dialog.setVisible(true);
+            }
+        });
+    }
+    
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton jButton1;
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel2;
+    private javax.swing.JLabel jLabel3;
+    // End of variables declaration//GEN-END:variables
+    
+    public void runDownloadItemModeTest() {
+        try
+        {
+            ServerSocket svr = new ServerSocket();
+            java.net.InetSocketAddress addr = new java.net.InetSocketAddress(61200);
+            svr.bind(addr);
+
+            new Thread(new DownloadItemModeTestThread(svr)).start();
+
+            XmlRpc xmlrpc = new XmlRpc("downloadItemModeTest");
+            xmlrpc.resetParams();
+            if (((Integer) xmlrpc.execute()) == 1)
+            {
+                Wrapper.setConfig("downloadItemMode", "Pull");
+            }
+        } catch (IOException ex)
+        {
+            Logger.getLogger(DownloadItemModeTest.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        
+        jLabel3.setText("<HTML>You're download item mode has been set to <B>" + Wrapper.getConfig("downloadItemMode") + "</B>");
+        jButton1.setEnabled(true);
+    }
+}
+
+class DownloadItemModeTestThread implements Runnable
+{
+    ServerSocket svr;
+    
+    public DownloadItemModeTestThread(ServerSocket svr)
+    {
+        this.svr = svr;
+    }
+    
+    public void run() {
+        try
+        {
+            Socket s = svr.accept();
+            
+            InputStream is = s.getInputStream();
+            int buffer[] = new int[1000];
+            int rs = 0;
+            int i = 0;
+
+            while (rs != -1)
+            {
+                try
+                {
+                    rs = is.read();
+
+                    if (rs != -1)
+                    {
+                        buffer[i] = rs;
+                    }
+                    
+                    i++;
+                } catch (SocketException ex)
+                {
+                    return;
+                } catch (IOException ex)
+                {
+                    Logger.getLogger(DownloadItemModeTest.class.getName()).log(Level.SEVERE, null, ex);
+                }
+            }
+
+            StringBuilder result = new StringBuilder();
+            int j = 0;
+            for (j = 0; j < i; j++)
+            {
+                result.append(Character.toString((char) buffer[j]));
+            }
+            
+            if (result.toString().trim().equals("InstaDisc Download Item Mode Test"))
+            {
+                Wrapper.setConfig("downloadItemMode", "Push");
+            }
+            
+            s.close();
+            svr.close();
+        } catch (IOException ex)
+        {
+            Logger.getLogger(DownloadItemModeTestThread.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+}
\ No newline at end of file
@@ -0,0 +1,7 @@
+
+jLabel1.text=Download Item Mode Test
+#NOI18N
+jLabel1.font=DejaVu Sans-Plain-18
+jLabel2.text=<HTML>InstaDisc can recieve items for you in two ways, Push or Pull. Push is faster, but may not work for some people. Pull isn't as efficent, but should work for anyone. InstaDisc is now running a test to see which method is best for you.
+jLabel3.text=The test is running....
+jButton1.text=Next
@@ -5,6 +5,8 @@
 
 package com.fourisland.instadisc.FirstRun;
 
+import com.fourisland.instadisc.Database.Wrapper;
+import com.fourisland.instadisc.DownloadItem.DownloadItemModeTest;
 import javax.swing.JFrame;
 
 /**
@@ -25,8 +27,22 @@ public class FirstRunWizard implements Runnable {
             if (StepEndResults.ok)
             {
                 StepEndResults.ok = false;
-                Step3 s3 = new Step3(new JFrame(), true);
-                s3.setVisible(true);
+                DownloadItemModeTest dIMT = new DownloadItemModeTest(new JFrame(), true);
+                dIMT.setVisible(true);
+                if (StepEndResults.ok)
+                {
+                    StepEndResults.ok = false;
+                    Step3 s3 = new Step3(new JFrame(), true);
+                    s3.setVisible(true);
+                    
+                    Wrapper.setConfig("initCheck", "done");
+                    Wrapper.setConfig("itemBufferSize", "10");
+                    Wrapper.setConfig("verIDBufferSize", "10000");
+                    Wrapper.setConfig("nextFilterID", "0");
+                    Wrapper.setConfig("ipCheckValue", "1");
+                    Wrapper.setConfig("ipCheckUnit", "day");
+                    Wrapper.setConfig("useUnreadFlag", "true");
+                }
             }
         }
         System.exit(0);
@@ -8,8 +8,6 @@ package com.fourisland.instadisc.FirstRun;
 import com.fourisland.instadisc.Database.Wrapper;
 import com.fourisland.instadisc.Item.MD5;
 import com.fourisland.instadisc.XmlRpc;
-import java.net.MalformedURLException;
-import java.net.URL;
 
 /**
  *
@@ -142,17 +140,10 @@ public class Step2 extends javax.swing.JDialog {
 
                 if (r == 1)
                 {
-                    jLabel5.setText("Error: No registration exists on the specified Central Server with the specified UN/PW combination");
+                    jLabel5.setText("Error: Couldn't find the specified user.");
                 } else {                            
                     Wrapper.setConfig("username", jTextField1.getText());
                     Wrapper.setConfig("password", password);
-                    Wrapper.setConfig("itemBufferSize", "10");
-                    Wrapper.setConfig("verIDBufferSize", "10000");
-                    Wrapper.setConfig("nextFilterID", "0");
-                    Wrapper.setConfig("ipCheckValue", "1");
-                    Wrapper.setConfig("ipCheckUnit", "day");
-                    Wrapper.setConfig("useUnreadFlag", "true");
-                    Wrapper.setConfig("initCheck", "done");
 
                     StepEndResults.ok = true;
                     this.setVisible(false);
@@ -88,4 +88,9 @@ public class XmlRpc {
         }
         return result;
     }
+    
+    public void resetParams()
+    {
+        params = new Object[] {};
+    }
 }