about summary refs log tree commit diff stats
path: root/client/trunk/src
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2008-09-28 22:44:27 +0000
committerKelly Rauchenberger <fefferburbia@gmail.com>2008-09-28 22:44:27 +0000
commit9c696344683332400000e40c2c54dc98e98d947b (patch)
treea59e871c0e67decd6401a8284d2611de239e48c4 /client/trunk/src
parent433efccd36add54061868af33d1ebf1d61dae554 (diff)
downloadinstadisc-9c696344683332400000e40c2c54dc98e98d947b.tar.gz
instadisc-9c696344683332400000e40c2c54dc98e98d947b.tar.bz2
instadisc-9c696344683332400000e40c2c54dc98e98d947b.zip
Client: Completed steps 3, 4 and 5
Refs #63
Diffstat (limited to 'client/trunk/src')
-rw-r--r--client/trunk/src/com/fourisland/instadisc/ChangePasswordForm.java2
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/FirstRunWizard.java13
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form28
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java31
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form53
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java60
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.form139
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.java191
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/StepEndResults.java1
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties5
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties5
-rw-r--r--client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2_1.properties11
-rw-r--r--client/trunk/src/com/fourisland/instadisc/Item/SubscriptionFile.java1
-rw-r--r--client/trunk/src/com/fourisland/instadisc/Item/Verification.java1
-rw-r--r--client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java1
-rw-r--r--client/trunk/src/com/fourisland/instadisc/MD5.java (renamed from client/trunk/src/com/fourisland/instadisc/Item/MD5.java)3
16 files changed, 474 insertions, 71 deletions
diff --git a/client/trunk/src/com/fourisland/instadisc/ChangePasswordForm.java b/client/trunk/src/com/fourisland/instadisc/ChangePasswordForm.java index 8af46ff..2a071fb 100644 --- a/client/trunk/src/com/fourisland/instadisc/ChangePasswordForm.java +++ b/client/trunk/src/com/fourisland/instadisc/ChangePasswordForm.java
@@ -7,7 +7,7 @@
7package com.fourisland.instadisc; 7package com.fourisland.instadisc;
8 8
9import com.fourisland.instadisc.Database.Wrapper; 9import com.fourisland.instadisc.Database.Wrapper;
10import com.fourisland.instadisc.Item.MD5; 10import com.fourisland.instadisc.MD5;
11 11
12/** 12/**
13 * 13 *
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/FirstRunWizard.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/FirstRunWizard.java index 713cc83..1a9c6ec 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/FirstRunWizard.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/FirstRunWizard.java
@@ -7,6 +7,7 @@ package com.fourisland.instadisc.FirstRun;
7 7
8import com.fourisland.instadisc.Database.Wrapper; 8import com.fourisland.instadisc.Database.Wrapper;
9import com.fourisland.instadisc.DownloadItem.DownloadItemModeTest; 9import com.fourisland.instadisc.DownloadItem.DownloadItemModeTest;
10import javax.swing.JDialog;
10import javax.swing.JFrame; 11import javax.swing.JFrame;
11 12
12/** 13/**
@@ -22,7 +23,15 @@ public class FirstRunWizard implements Runnable {
22 if (StepEndResults.ok) 23 if (StepEndResults.ok)
23 { 24 {
24 StepEndResults.ok = false; 25 StepEndResults.ok = false;
25 Step2 s2 = new Step2(new JFrame(), true); 26 JDialog s2;
27
28 if (StepEndResults.hasAccount)
29 {
30 s2 = new Step2(new JFrame(), true);
31 } else {
32 s2 = new Step2A(new JFrame(), true);
33 }
34
26 s2.setVisible(true); 35 s2.setVisible(true);
27 if (StepEndResults.ok) 36 if (StepEndResults.ok)
28 { 37 {
@@ -43,6 +52,8 @@ public class FirstRunWizard implements Runnable {
43 Wrapper.setConfig("ipCheckUnit", "day"); 52 Wrapper.setConfig("ipCheckUnit", "day");
44 Wrapper.setConfig("useUnreadFlag", "true"); 53 Wrapper.setConfig("useUnreadFlag", "true");
45 } 54 }
55 } else {
56 run();
46 } 57 }
47 } 58 }
48 System.exit(0); 59 System.exit(0);
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form index b33a49c..d515313 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.form
@@ -22,11 +22,6 @@
22 <Layout> 22 <Layout>
23 <DimensionLayout dim="0"> 23 <DimensionLayout dim="0">
24 <Group type="103" groupAlignment="0" attributes="0"> 24 <Group type="103" groupAlignment="0" attributes="0">
25 <Group type="102" alignment="1" attributes="0">
26 <EmptySpace pref="448" max="32767" attributes="0"/>
27 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
28 <EmptySpace max="-2" attributes="0"/>
29 </Group>
30 <Group type="102" alignment="0" attributes="0"> 25 <Group type="102" alignment="0" attributes="0">
31 <EmptySpace min="-2" max="-2" attributes="0"/> 26 <EmptySpace min="-2" max="-2" attributes="0"/>
32 <Group type="103" groupAlignment="0" attributes="0"> 27 <Group type="103" groupAlignment="0" attributes="0">
@@ -38,6 +33,13 @@
38 </Group> 33 </Group>
39 <EmptySpace max="32767" attributes="0"/> 34 <EmptySpace max="32767" attributes="0"/>
40 </Group> 35 </Group>
36 <Group type="102" alignment="1" attributes="0">
37 <EmptySpace pref="198" max="32767" attributes="0"/>
38 <Component id="jButton2" min="-2" max="-2" attributes="0"/>
39 <EmptySpace max="-2" attributes="0"/>
40 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
41 <EmptySpace max="-2" attributes="0"/>
42 </Group>
41 </Group> 43 </Group>
42 </DimensionLayout> 44 </DimensionLayout>
43 <DimensionLayout dim="1"> 45 <DimensionLayout dim="1">
@@ -48,8 +50,11 @@
48 <EmptySpace max="-2" attributes="0"/> 50 <EmptySpace max="-2" attributes="0"/>
49 <Component id="jLabel3" pref="119" max="32767" attributes="0"/> 51 <Component id="jLabel3" pref="119" max="32767" attributes="0"/>
50 <EmptySpace max="-2" attributes="0"/> 52 <EmptySpace max="-2" attributes="0"/>
51 <Component id="jButton1" min="-2" max="-2" attributes="0"/> 53 <Group type="103" groupAlignment="3" attributes="0">
52 <EmptySpace min="-2" max="-2" attributes="0"/> 54 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
55 <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/>
56 </Group>
57 <EmptySpace max="-2" attributes="0"/>
53 </Group> 58 </Group>
54 </Group> 59 </Group>
55 </DimensionLayout> 60 </DimensionLayout>
@@ -77,5 +82,14 @@
77 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/> 82 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
78 </Properties> 83 </Properties>
79 </Component> 84 </Component>
85 <Component class="javax.swing.JButton" name="jButton2">
86 <Properties>
87 <Property name="text" type="java.lang.String" resourceKey="jButton2.text"/>
88 <Property name="name" type="java.lang.String" value="jButton2" noResource="true"/>
89 </Properties>
90 <Events>
91 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
92 </Events>
93 </Component>
80 </SubComponents> 94 </SubComponents>
81</Form> 95</Form>
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java index e96b275..ed664c0 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step1.java
@@ -29,6 +29,7 @@ public class Step1 extends javax.swing.JDialog {
29 jLabel1 = new javax.swing.JLabel(); 29 jLabel1 = new javax.swing.JLabel();
30 jButton1 = new javax.swing.JButton(); 30 jButton1 = new javax.swing.JButton();
31 jLabel3 = new javax.swing.JLabel(); 31 jLabel3 = new javax.swing.JLabel();
32 jButton2 = new javax.swing.JButton();
32 33
33 setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); 34 setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
34 setName("Form"); // NOI18N 35 setName("Form"); // NOI18N
@@ -49,14 +50,18 @@ public class Step1 extends javax.swing.JDialog {
49 jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N 50 jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N
50 jLabel3.setName("jLabel3"); // NOI18N 51 jLabel3.setName("jLabel3"); // NOI18N
51 52
53 jButton2.setText(resourceMap.getString("jButton2.text")); // NOI18N
54 jButton2.setName("jButton2"); // NOI18N
55 jButton2.addActionListener(new java.awt.event.ActionListener() {
56 public void actionPerformed(java.awt.event.ActionEvent evt) {
57 jButton2ActionPerformed(evt);
58 }
59 });
60
52 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); 61 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
53 getContentPane().setLayout(layout); 62 getContentPane().setLayout(layout);
54 layout.setHorizontalGroup( 63 layout.setHorizontalGroup(
55 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 64 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
56 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
57 .addContainerGap(448, Short.MAX_VALUE)
58 .addComponent(jButton1)
59 .addContainerGap())
60 .addGroup(layout.createSequentialGroup() 65 .addGroup(layout.createSequentialGroup()
61 .addContainerGap() 66 .addContainerGap()
62 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 67 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -65,6 +70,12 @@ public class Step1 extends javax.swing.JDialog {
65 .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 466, javax.swing.GroupLayout.PREFERRED_SIZE)) 70 .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 466, javax.swing.GroupLayout.PREFERRED_SIZE))
66 .addComponent(jLabel1)) 71 .addComponent(jLabel1))
67 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 72 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
73 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
74 .addContainerGap(198, Short.MAX_VALUE)
75 .addComponent(jButton2)
76 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
77 .addComponent(jButton1)
78 .addContainerGap())
68 ); 79 );
69 layout.setVerticalGroup( 80 layout.setVerticalGroup(
70 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 81 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -74,7 +85,9 @@ public class Step1 extends javax.swing.JDialog {
74 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 85 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
75 .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE) 86 .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
76 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 87 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
77 .addComponent(jButton1) 88 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
89 .addComponent(jButton1)
90 .addComponent(jButton2))
78 .addContainerGap()) 91 .addContainerGap())
79 ); 92 );
80 93
@@ -83,8 +96,15 @@ public class Step1 extends javax.swing.JDialog {
83 96
84 private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed 97 private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
85 StepEndResults.ok = true; 98 StepEndResults.ok = true;
99 StepEndResults.hasAccount = false;
86 this.setVisible(false); 100 this.setVisible(false);
87 }//GEN-LAST:event_jButton1ActionPerformed 101 }//GEN-LAST:event_jButton1ActionPerformed
102
103 private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
104 StepEndResults.ok = true;
105 StepEndResults.hasAccount = true;
106 this.setVisible(false);
107 }//GEN-LAST:event_jButton2ActionPerformed
88 108
89 /** 109 /**
90 * @param args the command line arguments 110 * @param args the command line arguments
@@ -105,6 +125,7 @@ public class Step1 extends javax.swing.JDialog {
105 125
106 // Variables declaration - do not modify//GEN-BEGIN:variables 126 // Variables declaration - do not modify//GEN-BEGIN:variables
107 private javax.swing.JButton jButton1; 127 private javax.swing.JButton jButton1;
128 private javax.swing.JButton jButton2;
108 private javax.swing.JLabel jLabel1; 129 private javax.swing.JLabel jLabel1;
109 private javax.swing.JLabel jLabel3; 130 private javax.swing.JLabel jLabel3;
110 // End of variables declaration//GEN-END:variables 131 // End of variables declaration//GEN-END:variables
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form index ce8ae5c..6f928c4 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.form
@@ -26,32 +26,30 @@
26 <Group type="103" groupAlignment="0" attributes="0"> 26 <Group type="103" groupAlignment="0" attributes="0">
27 <Group type="102" attributes="0"> 27 <Group type="102" attributes="0">
28 <EmptySpace max="-2" attributes="0"/> 28 <EmptySpace max="-2" attributes="0"/>
29 <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
30 </Group>
31 <Group type="102" alignment="0" attributes="0">
32 <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
29 <Group type="103" groupAlignment="0" attributes="0"> 33 <Group type="103" groupAlignment="0" attributes="0">
30 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/> 34 <Component id="jLabel6" alignment="0" min="-2" pref="359" max="-2" attributes="0"/>
31 <Group type="102" alignment="0" attributes="0"> 35 <Group type="102" alignment="0" attributes="0">
32 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
33 <Group type="103" groupAlignment="0" attributes="0"> 36 <Group type="103" groupAlignment="0" attributes="0">
34 <Component id="jLabel2" min="-2" max="-2" attributes="0"/> 37 <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
35 <Component id="jLabel3" min="-2" max="-2" attributes="0"/> 38 <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
36 </Group> 39 </Group>
37 <EmptySpace min="-2" pref="66" max="-2" attributes="0"/> 40 <EmptySpace max="-2" attributes="0"/>
38 <Group type="103" groupAlignment="0" attributes="0"> 41 <Group type="103" groupAlignment="0" attributes="0">
39 <Component id="jTextField1" alignment="0" pref="222" max="32767" attributes="0"/> 42 <Group type="102" alignment="1" attributes="0">
40 <Component id="jPasswordField1" alignment="0" pref="222" max="32767" attributes="0"/> 43 <Component id="jButton2" min="-2" max="-2" attributes="0"/>
44 <EmptySpace max="-2" attributes="0"/>
45 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
46 </Group>
47 <Component id="jTextField1" alignment="1" pref="277" max="32767" attributes="0"/>
48 <Component id="jPasswordField1" alignment="1" pref="277" max="32767" attributes="0"/>
41 </Group> 49 </Group>
42 </Group> 50 </Group>
43 </Group> 51 </Group>
44 </Group> 52 </Group>
45 <Group type="102" alignment="0" attributes="0">
46 <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
47 <Component id="jLabel6" min="-2" pref="359" max="-2" attributes="0"/>
48 </Group>
49 <Group type="102" alignment="1" attributes="0">
50 <EmptySpace max="-2" attributes="0"/>
51 <Component id="jLabel5" pref="317" max="32767" attributes="0"/>
52 <EmptySpace max="-2" attributes="0"/>
53 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
54 </Group>
55 </Group> 53 </Group>
56 <EmptySpace max="-2" attributes="0"/> 54 <EmptySpace max="-2" attributes="0"/>
57 </Group> 55 </Group>
@@ -64,7 +62,7 @@
64 <Component id="jLabel1" min="-2" max="-2" attributes="0"/> 62 <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
65 <EmptySpace max="-2" attributes="0"/> 63 <EmptySpace max="-2" attributes="0"/>
66 <Component id="jLabel6" pref="51" max="32767" attributes="0"/> 64 <Component id="jLabel6" pref="51" max="32767" attributes="0"/>
67 <EmptySpace type="unrelated" max="-2" attributes="0"/> 65 <EmptySpace max="-2" attributes="0"/>
68 <Group type="103" groupAlignment="3" attributes="0"> 66 <Group type="103" groupAlignment="3" attributes="0">
69 <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/> 67 <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
70 <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/> 68 <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -74,10 +72,10 @@
74 <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/> 72 <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
75 <Component id="jPasswordField1" alignment="3" min="-2" max="-2" attributes="0"/> 73 <Component id="jPasswordField1" alignment="3" min="-2" max="-2" attributes="0"/>
76 </Group> 74 </Group>
77 <EmptySpace max="-2" attributes="0"/> 75 <EmptySpace min="-2" pref="17" max="-2" attributes="0"/>
78 <Group type="103" groupAlignment="0" attributes="0"> 76 <Group type="103" groupAlignment="3" attributes="0">
79 <Component id="jButton1" min="-2" max="-2" attributes="0"/> 77 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
80 <Component id="jLabel5" min="-2" pref="40" max="-2" attributes="0"/> 78 <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/>
81 </Group> 79 </Group>
82 <EmptySpace min="-2" max="-2" attributes="0"/> 80 <EmptySpace min="-2" max="-2" attributes="0"/>
83 </Group> 81 </Group>
@@ -110,12 +108,6 @@
110 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/> 108 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
111 </Properties> 109 </Properties>
112 </Component> 110 </Component>
113 <Component class="javax.swing.JLabel" name="jLabel5">
114 <Properties>
115 <Property name="text" type="java.lang.String" resourceKey="jLabel5.text"/>
116 <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
117 </Properties>
118 </Component>
119 <Component class="javax.swing.JButton" name="jButton1"> 111 <Component class="javax.swing.JButton" name="jButton1">
120 <Properties> 112 <Properties>
121 <Property name="text" type="java.lang.String" resourceKey="jButton1.text"/> 113 <Property name="text" type="java.lang.String" resourceKey="jButton1.text"/>
@@ -137,5 +129,14 @@
137 <Property name="name" type="java.lang.String" value="jPasswordField1" noResource="true"/> 129 <Property name="name" type="java.lang.String" value="jPasswordField1" noResource="true"/>
138 </Properties> 130 </Properties>
139 </Component> 131 </Component>
132 <Component class="javax.swing.JButton" name="jButton2">
133 <Properties>
134 <Property name="text" type="java.lang.String" resourceKey="jButton2.text"/>
135 <Property name="name" type="java.lang.String" value="jButton2" noResource="true"/>
136 </Properties>
137 <Events>
138 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
139 </Events>
140 </Component>
140 </SubComponents> 141 </SubComponents>
141</Form> 142</Form>
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java index 85180ee..59f82c0 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2.java
@@ -6,7 +6,7 @@
6package com.fourisland.instadisc.FirstRun; 6package com.fourisland.instadisc.FirstRun;
7 7
8import com.fourisland.instadisc.Database.Wrapper; 8import com.fourisland.instadisc.Database.Wrapper;
9import com.fourisland.instadisc.Item.MD5; 9import com.fourisland.instadisc.MD5;
10import com.fourisland.instadisc.XmlRpc; 10import com.fourisland.instadisc.XmlRpc;
11 11
12/** 12/**
@@ -33,10 +33,10 @@ public class Step2 extends javax.swing.JDialog {
33 jLabel2 = new javax.swing.JLabel(); 33 jLabel2 = new javax.swing.JLabel();
34 jTextField1 = new javax.swing.JTextField(); 34 jTextField1 = new javax.swing.JTextField();
35 jLabel3 = new javax.swing.JLabel(); 35 jLabel3 = new javax.swing.JLabel();
36 jLabel5 = new javax.swing.JLabel();
37 jButton1 = new javax.swing.JButton(); 36 jButton1 = new javax.swing.JButton();
38 jLabel6 = new javax.swing.JLabel(); 37 jLabel6 = new javax.swing.JLabel();
39 jPasswordField1 = new javax.swing.JPasswordField(); 38 jPasswordField1 = new javax.swing.JPasswordField();
39 jButton2 = new javax.swing.JButton();
40 40
41 setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); 41 setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
42 setName("Form"); // NOI18N 42 setName("Form"); // NOI18N
@@ -55,9 +55,6 @@ public class Step2 extends javax.swing.JDialog {
55 jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N 55 jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N
56 jLabel3.setName("jLabel3"); // NOI18N 56 jLabel3.setName("jLabel3"); // NOI18N
57 57
58 jLabel5.setText(resourceMap.getString("jLabel5.text")); // NOI18N
59 jLabel5.setName("jLabel5"); // NOI18N
60
61 jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N 58 jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N
62 jButton1.setName("jButton1"); // NOI18N 59 jButton1.setName("jButton1"); // NOI18N
63 jButton1.addActionListener(new java.awt.event.ActionListener() { 60 jButton1.addActionListener(new java.awt.event.ActionListener() {
@@ -72,6 +69,14 @@ public class Step2 extends javax.swing.JDialog {
72 jPasswordField1.setText(resourceMap.getString("jPasswordField1.text")); // NOI18N 69 jPasswordField1.setText(resourceMap.getString("jPasswordField1.text")); // NOI18N
73 jPasswordField1.setName("jPasswordField1"); // NOI18N 70 jPasswordField1.setName("jPasswordField1"); // NOI18N
74 71
72 jButton2.setText(resourceMap.getString("jButton2.text")); // NOI18N
73 jButton2.setName("jButton2"); // NOI18N
74 jButton2.addActionListener(new java.awt.event.ActionListener() {
75 public void actionPerformed(java.awt.event.ActionEvent evt) {
76 jButton2ActionPerformed(evt);
77 }
78 });
79
75 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); 80 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
76 getContentPane().setLayout(layout); 81 getContentPane().setLayout(layout);
77 layout.setHorizontalGroup( 82 layout.setHorizontalGroup(
@@ -80,25 +85,23 @@ public class Step2 extends javax.swing.JDialog {
80 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 85 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
81 .addGroup(layout.createSequentialGroup() 86 .addGroup(layout.createSequentialGroup()
82 .addContainerGap() 87 .addContainerGap()
88 .addComponent(jLabel1))
89 .addGroup(layout.createSequentialGroup()
90 .addGap(24, 24, 24)
83 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 91 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
84 .addComponent(jLabel1) 92 .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 359, javax.swing.GroupLayout.PREFERRED_SIZE)
85 .addGroup(layout.createSequentialGroup() 93 .addGroup(layout.createSequentialGroup()
86 .addGap(12, 12, 12)
87 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 94 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
88 .addComponent(jLabel2) 95 .addComponent(jLabel2)
89 .addComponent(jLabel3)) 96 .addComponent(jLabel3))
90 .addGap(66, 66, 66) 97 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
91 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 98 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
92 .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE) 99 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
93 .addComponent(jPasswordField1, javax.swing.GroupLayout.DEFAULT_SIZE, 222, Short.MAX_VALUE))))) 100 .addComponent(jButton2)
94 .addGroup(layout.createSequentialGroup() 101 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
95 .addGap(24, 24, 24) 102 .addComponent(jButton1))
96 .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 359, javax.swing.GroupLayout.PREFERRED_SIZE)) 103 .addComponent(jTextField1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 277, Short.MAX_VALUE)
97 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() 104 .addComponent(jPasswordField1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 277, Short.MAX_VALUE))))))
98 .addContainerGap()
99 .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
100 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
101 .addComponent(jButton1)))
102 .addContainerGap()) 105 .addContainerGap())
103 ); 106 );
104 layout.setVerticalGroup( 107 layout.setVerticalGroup(
@@ -108,7 +111,7 @@ public class Step2 extends javax.swing.JDialog {
108 .addComponent(jLabel1) 111 .addComponent(jLabel1)
109 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 112 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
110 .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 51, Short.MAX_VALUE) 113 .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 51, Short.MAX_VALUE)
111 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) 114 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
112 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) 115 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
113 .addComponent(jLabel2) 116 .addComponent(jLabel2)
114 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) 117 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -116,10 +119,10 @@ public class Step2 extends javax.swing.JDialog {
116 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) 119 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
117 .addComponent(jLabel3) 120 .addComponent(jLabel3)
118 .addComponent(jPasswordField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) 121 .addComponent(jPasswordField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
119 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 122 .addGap(17, 17, 17)
120 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 123 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
121 .addComponent(jButton1) 124 .addComponent(jButton1)
122 .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) 125 .addComponent(jButton2))
123 .addContainerGap()) 126 .addContainerGap())
124 ); 127 );
125 128
@@ -127,10 +130,10 @@ public class Step2 extends javax.swing.JDialog {
127 }// </editor-fold>//GEN-END:initComponents 130 }// </editor-fold>//GEN-END:initComponents
128 private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed 131 private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
129 if (jTextField1.getText().equals("")) { 132 if (jTextField1.getText().equals("")) {
130 jLabel5.setText("Error: You forgot to enter a username"); 133 jLabel2.setText("Error: You forgot to enter a username");
131 } else { 134 } else {
132 if (jPasswordField1.getPassword().length == 0) { 135 if (jPasswordField1.getPassword().length == 0) {
133 jLabel5.setText("Error: You forgot to enter a password"); 136 jLabel2.setText("Error: You forgot to enter a password");
134 } else { 137 } else {
135 MD5 md5 = new MD5(jPasswordField1.getPassword()); 138 MD5 md5 = new MD5(jPasswordField1.getPassword());
136 String password = md5.hash(); 139 String password = md5.hash();
@@ -140,7 +143,7 @@ public class Step2 extends javax.swing.JDialog {
140 143
141 if (r == 1) 144 if (r == 1)
142 { 145 {
143 jLabel5.setText("Error: Couldn't find the specified user."); 146 jLabel2.setText("Error: Couldn't find the specified user.");
144 } else { 147 } else {
145 Wrapper.setConfig("username", jTextField1.getText()); 148 Wrapper.setConfig("username", jTextField1.getText());
146 Wrapper.setConfig("password", password); 149 Wrapper.setConfig("password", password);
@@ -152,6 +155,11 @@ public class Step2 extends javax.swing.JDialog {
152 } 155 }
153 }//GEN-LAST:event_jButton1ActionPerformed 156 }//GEN-LAST:event_jButton1ActionPerformed
154 157
158 private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
159 StepEndResults.ok = false;
160 setVisible(false);
161 }//GEN-LAST:event_jButton2ActionPerformed
162
155 /** 163 /**
156 * @param args the command line arguments 164 * @param args the command line arguments
157 */ 165 */
@@ -172,10 +180,10 @@ public class Step2 extends javax.swing.JDialog {
172 } 180 }
173 // Variables declaration - do not modify//GEN-BEGIN:variables 181 // Variables declaration - do not modify//GEN-BEGIN:variables
174 private javax.swing.JButton jButton1; 182 private javax.swing.JButton jButton1;
183 private javax.swing.JButton jButton2;
175 private javax.swing.JLabel jLabel1; 184 private javax.swing.JLabel jLabel1;
176 private javax.swing.JLabel jLabel2; 185 private javax.swing.JLabel jLabel2;
177 private javax.swing.JLabel jLabel3; 186 private javax.swing.JLabel jLabel3;
178 private javax.swing.JLabel jLabel5;
179 private javax.swing.JLabel jLabel6; 187 private javax.swing.JLabel jLabel6;
180 private javax.swing.JPasswordField jPasswordField1; 188 private javax.swing.JPasswordField jPasswordField1;
181 private javax.swing.JTextField jTextField1; 189 private javax.swing.JTextField jTextField1;
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.form b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.form new file mode 100644 index 0000000..ff8fd3e --- /dev/null +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.form
@@ -0,0 +1,139 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2
3<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
4 <Properties>
5 <Property name="defaultCloseOperation" type="int" value="2"/>
6 <Property name="name" type="java.lang.String" value="Form" noResource="true"/>
7 </Properties>
8 <SyntheticProperties>
9 <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
10 </SyntheticProperties>
11 <AuxValues>
12 <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
13 <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
14 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
15 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
16 <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
17 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
18 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
19 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
20 </AuxValues>
21
22 <Layout>
23 <DimensionLayout dim="0">
24 <Group type="103" groupAlignment="0" attributes="0">
25 <Group type="102" attributes="0">
26 <EmptySpace max="-2" attributes="0"/>
27 <Group type="103" groupAlignment="0" attributes="0">
28 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
29 <Group type="102" alignment="0" attributes="0">
30 <EmptySpace min="12" pref="12" max="12" attributes="0"/>
31 <Group type="103" groupAlignment="0" attributes="0">
32 <Group type="102" alignment="0" attributes="0">
33 <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
34 <EmptySpace max="-2" attributes="0"/>
35 <Component id="jTextField1" pref="276" max="32767" attributes="0"/>
36 </Group>
37 <Group type="102" alignment="0" attributes="0">
38 <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
39 <EmptySpace max="-2" attributes="0"/>
40 <Component id="jPasswordField1" pref="283" max="32767" attributes="0"/>
41 </Group>
42 <Component id="jLabel2" alignment="0" pref="359" max="32767" attributes="0"/>
43 </Group>
44 </Group>
45 <Group type="102" alignment="1" attributes="0">
46 <Component id="jButton2" min="-2" max="-2" attributes="0"/>
47 <EmptySpace max="-2" attributes="0"/>
48 <Component id="jButton1" min="-2" max="-2" attributes="0"/>
49 </Group>
50 </Group>
51 <EmptySpace max="-2" attributes="0"/>
52 </Group>
53 </Group>
54 </DimensionLayout>
55 <DimensionLayout dim="1">
56 <Group type="103" groupAlignment="0" attributes="0">
57 <Group type="102" alignment="0" attributes="0">
58 <EmptySpace min="-2" max="-2" attributes="0"/>
59 <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
60 <EmptySpace max="-2" attributes="0"/>
61 <Component id="jLabel2" pref="51" max="32767" attributes="0"/>
62 <EmptySpace max="-2" attributes="0"/>
63 <Group type="103" groupAlignment="3" attributes="0">
64 <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
65 <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
66 </Group>
67 <EmptySpace min="-2" max="-2" attributes="0"/>
68 <Group type="103" groupAlignment="3" attributes="0">
69 <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
70 <Component id="jPasswordField1" alignment="3" min="-2" max="-2" attributes="0"/>
71 </Group>
72 <EmptySpace min="-2" max="-2" attributes="0"/>
73 <Group type="103" groupAlignment="3" attributes="0">
74 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
75 <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/>
76 </Group>
77 <EmptySpace min="-2" max="-2" attributes="0"/>
78 </Group>
79 </Group>
80 </DimensionLayout>
81 </Layout>
82 <SubComponents>
83 <Component class="javax.swing.JLabel" name="jLabel1">
84 <Properties>
85 <Property name="font" type="java.awt.Font" resourceKey="jLabel1.font"/>
86 <Property name="text" type="java.lang.String" resourceKey="jLabel1.text"/>
87 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
88 </Properties>
89 </Component>
90 <Component class="javax.swing.JLabel" name="jLabel2">
91 <Properties>
92 <Property name="text" type="java.lang.String" resourceKey="jLabel2.text"/>
93 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
94 </Properties>
95 </Component>
96 <Component class="javax.swing.JLabel" name="jLabel3">
97 <Properties>
98 <Property name="text" type="java.lang.String" resourceKey="jLabel3.text"/>
99 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
100 </Properties>
101 </Component>
102 <Component class="javax.swing.JLabel" name="jLabel4">
103 <Properties>
104 <Property name="text" type="java.lang.String" resourceKey="jLabel4.text"/>
105 <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
106 </Properties>
107 </Component>
108 <Component class="javax.swing.JTextField" name="jTextField1">
109 <Properties>
110 <Property name="text" type="java.lang.String" resourceKey="jTextField1.text"/>
111 <Property name="name" type="java.lang.String" value="jTextField1" noResource="true"/>
112 </Properties>
113 </Component>
114 <Component class="javax.swing.JPasswordField" name="jPasswordField1">
115 <Properties>
116 <Property name="text" type="java.lang.String" resourceKey="jPasswordField1.text"/>
117 <Property name="name" type="java.lang.String" value="jPasswordField1" noResource="true"/>
118 </Properties>
119 </Component>
120 <Component class="javax.swing.JButton" name="jButton1">
121 <Properties>
122 <Property name="text" type="java.lang.String" resourceKey="jButton1.text"/>
123 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
124 </Properties>
125 <Events>
126 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
127 </Events>
128 </Component>
129 <Component class="javax.swing.JButton" name="jButton2">
130 <Properties>
131 <Property name="text" type="java.lang.String" resourceKey="jButton2.text"/>
132 <Property name="name" type="java.lang.String" value="jButton2" noResource="true"/>
133 </Properties>
134 <Events>
135 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
136 </Events>
137 </Component>
138 </SubComponents>
139</Form>
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.java new file mode 100644 index 0000000..c027ef6 --- /dev/null +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/Step2A.java
@@ -0,0 +1,191 @@
1/*
2 * Step2.java
3 *
4 * Created on July 28, 2008, 4:18 PM
5 */
6package com.fourisland.instadisc.FirstRun;
7
8import com.fourisland.instadisc.Database.Wrapper;
9import com.fourisland.instadisc.MD5;
10import com.fourisland.instadisc.XmlRpc;
11
12/**
13 *
14 * @author hatkirby
15 */
16public class Step2A extends javax.swing.JDialog {
17
18 /** Creates new form Step2 */
19 public Step2A(java.awt.Frame parent, boolean modal) {
20 super(parent, modal);
21 initComponents();
22 }
23
24 /** This method is called from within the constructor to
25 * initialize the form.
26 * WARNING: Do NOT modify this code. The content of this method is
27 * always regenerated by the Form Editor.
28 */
29 // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
30 private void initComponents() {
31
32 jLabel1 = new javax.swing.JLabel();
33 jLabel2 = new javax.swing.JLabel();
34 jLabel3 = new javax.swing.JLabel();
35 jLabel4 = new javax.swing.JLabel();
36 jTextField1 = new javax.swing.JTextField();
37 jPasswordField1 = new javax.swing.JPasswordField();
38 jButton1 = new javax.swing.JButton();
39 jButton2 = new javax.swing.JButton();
40
41 setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
42 setName("Form"); // NOI18N
43
44 org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(com.fourisland.instadisc.InstaDiscApp.class).getContext().getResourceMap(Step2A.class);
45 jLabel1.setFont(resourceMap.getFont("jLabel1.font")); // NOI18N
46 jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
47 jLabel1.setName("jLabel1"); // NOI18N
48
49 jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N
50 jLabel2.setName("jLabel2"); // NOI18N
51
52 jLabel3.setText(resourceMap.getString("jLabel3.text")); // NOI18N
53 jLabel3.setName("jLabel3"); // NOI18N
54
55 jLabel4.setText(resourceMap.getString("jLabel4.text")); // NOI18N
56 jLabel4.setName("jLabel4"); // NOI18N
57
58 jTextField1.setText(resourceMap.getString("jTextField1.text")); // NOI18N
59 jTextField1.setName("jTextField1"); // NOI18N
60
61 jPasswordField1.setText(resourceMap.getString("jPasswordField1.text")); // NOI18N
62 jPasswordField1.setName("jPasswordField1"); // NOI18N
63
64 jButton1.setText(resourceMap.getString("jButton1.text")); // NOI18N
65 jButton1.setName("jButton1"); // NOI18N
66 jButton1.addActionListener(new java.awt.event.ActionListener() {
67 public void actionPerformed(java.awt.event.ActionEvent evt) {
68 jButton1ActionPerformed(evt);
69 }
70 });
71
72 jButton2.setText(resourceMap.getString("jButton2.text")); // NOI18N
73 jButton2.setName("jButton2"); // NOI18N
74 jButton2.addActionListener(new java.awt.event.ActionListener() {
75 public void actionPerformed(java.awt.event.ActionEvent evt) {
76 jButton2ActionPerformed(evt);
77 }
78 });
79
80 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
81 getContentPane().setLayout(layout);
82 layout.setHorizontalGroup(
83 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
84 .addGroup(layout.createSequentialGroup()
85 .addContainerGap()
86 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
87 .addComponent(jLabel1)
88 .addGroup(layout.createSequentialGroup()
89 .addGap(12, 12, 12)
90 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
91 .addGroup(layout.createSequentialGroup()
92 .addComponent(jLabel3)
93 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
94 .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE))
95 .addGroup(layout.createSequentialGroup()
96 .addComponent(jLabel4)
97 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
98 .addComponent(jPasswordField1, javax.swing.GroupLayout.DEFAULT_SIZE, 283, Short.MAX_VALUE))
99 .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE)))
100 .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
101 .addComponent(jButton2)
102 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
103 .addComponent(jButton1)))
104 .addContainerGap())
105 );
106 layout.setVerticalGroup(
107 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
108 .addGroup(layout.createSequentialGroup()
109 .addContainerGap()
110 .addComponent(jLabel1)
111 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
112 .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 51, Short.MAX_VALUE)
113 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
114 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
115 .addComponent(jLabel3)
116 .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
117 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
118 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
119 .addComponent(jLabel4)
120 .addComponent(jPasswordField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
121 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
122 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
123 .addComponent(jButton1)
124 .addComponent(jButton2))
125 .addContainerGap())
126 );
127
128 pack();
129 }// </editor-fold>//GEN-END:initComponents
130
131 private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
132 if (jTextField1.getText().equals("")) {
133 jLabel2.setText("Error: You forgot to enter a username");
134 } else {
135 if (jPasswordField1.getPassword().length == 0) {
136 jLabel2.setText("Error: You forgot to enter a password");
137 } else {
138 MD5 md5 = new MD5(jPasswordField1.getPassword());
139 String password = md5.hash();
140
141 XmlRpc xmlrpc = new XmlRpc("createUser", jTextField1.getText(), password);
142 String usr = (String) xmlrpc.execute();
143
144 if (!usr.equals(jTextField1.getText()))
145 {
146 jLabel2.setText("Error: The specified username is already taken. Why don't you try: " + usr);
147 } else {
148 Wrapper.setConfig("username", jTextField1.getText());
149 Wrapper.setConfig("password", password);
150
151 StepEndResults.ok = true;
152 this.setVisible(false);
153 }
154 }
155 }
156 }//GEN-LAST:event_jButton1ActionPerformed
157
158 private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
159 StepEndResults.ok = false;
160 setVisible(false);
161 }//GEN-LAST:event_jButton2ActionPerformed
162
163 /**
164 * @param args the command line arguments
165 */
166 public static void main(String args[]) {
167 java.awt.EventQueue.invokeLater(new Runnable() {
168
169 public void run() {
170 Step2 dialog = new Step2(new javax.swing.JFrame(), true);
171 dialog.addWindowListener(new java.awt.event.WindowAdapter() {
172
173 public void windowClosing(java.awt.event.WindowEvent e) {
174 System.exit(0);
175 }
176 });
177 dialog.setVisible(true);
178 }
179 });
180 }
181 // Variables declaration - do not modify//GEN-BEGIN:variables
182 private javax.swing.JButton jButton1;
183 private javax.swing.JButton jButton2;
184 private javax.swing.JLabel jLabel1;
185 private javax.swing.JLabel jLabel2;
186 private javax.swing.JLabel jLabel3;
187 private javax.swing.JLabel jLabel4;
188 private javax.swing.JPasswordField jPasswordField1;
189 private javax.swing.JTextField jTextField1;
190 // End of variables declaration//GEN-END:variables
191}
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/StepEndResults.java b/client/trunk/src/com/fourisland/instadisc/FirstRun/StepEndResults.java index ccdd4b9..b4b4d7a 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/StepEndResults.java +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/StepEndResults.java
@@ -12,5 +12,6 @@ package com.fourisland.instadisc.FirstRun;
12public class StepEndResults { 12public class StepEndResults {
13 13
14 public static boolean ok = false; 14 public static boolean ok = false;
15 public static boolean hasAccount = false;
15 16
16} 17}
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties index fb9ecf0..bfc7213 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step1.properties
@@ -1,5 +1,6 @@
1jLabel1.text=Welcome to the InstaDisc FirstRun Wizard! 1jLabel1.text=Welcome to the InstaDisc FirstRun Wizard!
2#NOI18N 2#NOI18N
3jLabel1.font=DejaVu Sans-Plain-18 3jLabel1.font=DejaVu Sans-Plain-18
4jButton1.text=Next 4jButton1.text=I don't have an account
5jLabel3.text=<html>This is, apparently, the first time you've run InstaDisc, so you need to step through me before being able to use InstaDisc.<BR><BR>First, ensure that you've chosen and signed up for a Central Server. If you haven't, or don't even know what that means, please read <A HREF="http://fourisland.com/projects/instadisc/wiki/ChoosingACentralServer">Choosing a Central Server</A> before continuing. If you do know what you're doing, feel free to click on the NEXT button and get on with InstaDisc. 5jLabel3.text=<html>This is, apparently, the first time you've run InstaDisc, so you need to step through me before being able to use InstaDisc.<BR><BR>To use InstaDisc, you need an account. Have you ever used InstaDisc before, perhaps on a different computer? If so, then you already have an account, otherwise, we need to make one now. Choose the button that suits you:
6jButton2.text=I have an account
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties index 9adb0b8..aa0d075 100644 --- a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2.properties
@@ -4,7 +4,8 @@ jLabel1.font=DejaVu Sans-Plain-18
4jLabel2.text=Username: 4jLabel2.text=Username:
5jTextField1.text= 5jTextField1.text=
6jLabel3.text=Password: 6jLabel3.text=Password:
7jLabel5.text=
8jButton1.text=Next 7jButton1.text=Next
9jLabel6.text=<HTML>To use InstaDisc, you must have signed up for the Four Island InstaDisc Central Server. Please input your member details here. 8jLabel6.text=<HTML>If you already have an InstaDisc account, you can enter your details here. Otherwise, go back and click "I don't have an account"
10jPasswordField1.text= 9jPasswordField1.text=
10jButton2.text=Back
11jLabel4.text=jLabel4
diff --git a/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2_1.properties b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2_1.properties new file mode 100644 index 0000000..65a8a60 --- /dev/null +++ b/client/trunk/src/com/fourisland/instadisc/FirstRun/resources/Step2_1.properties
@@ -0,0 +1,11 @@
1
2jLabel1.text=Central Server Details
3#NOI18N
4jLabel1.font=DejaVu Sans-Plain-18
5jLabel2.text=<HTML>If you don't have an InstaDisc account yet, you can make one here. If you do, though, go back and click "I have an account"
6jLabel3.text=Username:
7jLabel4.text=Password:
8jTextField1.text=
9jPasswordField1.text=
10jButton1.text=Next
11jButton2.text=Back
diff --git a/client/trunk/src/com/fourisland/instadisc/Item/SubscriptionFile.java b/client/trunk/src/com/fourisland/instadisc/Item/SubscriptionFile.java index 95f7ae6..6361329 100644 --- a/client/trunk/src/com/fourisland/instadisc/Item/SubscriptionFile.java +++ b/client/trunk/src/com/fourisland/instadisc/Item/SubscriptionFile.java
@@ -4,6 +4,7 @@
4 */ 4 */
5package com.fourisland.instadisc.Item; 5package com.fourisland.instadisc.Item;
6 6
7import com.fourisland.instadisc.MD5;
7import com.fourisland.instadisc.AskForPasswordForm; 8import com.fourisland.instadisc.AskForPasswordForm;
8import com.fourisland.instadisc.Database.Filter; 9import com.fourisland.instadisc.Database.Filter;
9import com.fourisland.instadisc.Database.Subscription; 10import com.fourisland.instadisc.Database.Subscription;
diff --git a/client/trunk/src/com/fourisland/instadisc/Item/Verification.java b/client/trunk/src/com/fourisland/instadisc/Item/Verification.java index 3b99c4b..2bb6894 100644 --- a/client/trunk/src/com/fourisland/instadisc/Item/Verification.java +++ b/client/trunk/src/com/fourisland/instadisc/Item/Verification.java
@@ -4,6 +4,7 @@
4 */ 4 */
5package com.fourisland.instadisc.Item; 5package com.fourisland.instadisc.Item;
6 6
7import com.fourisland.instadisc.MD5;
7import com.fourisland.instadisc.Database.Wrapper; 8import com.fourisland.instadisc.Database.Wrapper;
8import java.util.Random; 9import java.util.Random;
9 10
diff --git a/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java b/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java index 23305d2..ecb131d 100644 --- a/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java +++ b/client/trunk/src/com/fourisland/instadisc/Item/WellFormedItem.java
@@ -4,6 +4,7 @@
4 */ 4 */
5package com.fourisland.instadisc.Item; 5package com.fourisland.instadisc.Item;
6 6
7import com.fourisland.instadisc.MD5;
7import com.fourisland.instadisc.Database.Filter; 8import com.fourisland.instadisc.Database.Filter;
8import com.fourisland.instadisc.Database.Subscription; 9import com.fourisland.instadisc.Database.Subscription;
9import com.fourisland.instadisc.Database.Wrapper; 10import com.fourisland.instadisc.Database.Wrapper;
diff --git a/client/trunk/src/com/fourisland/instadisc/Item/MD5.java b/client/trunk/src/com/fourisland/instadisc/MD5.java index 31a7a5c..762d427 100644 --- a/client/trunk/src/com/fourisland/instadisc/Item/MD5.java +++ b/client/trunk/src/com/fourisland/instadisc/MD5.java
@@ -2,8 +2,9 @@
2 * To change this template, choose Tools | Templates 2 * To change this template, choose Tools | Templates
3 * and open the template in the editor. 3 * and open the template in the editor.
4 */ 4 */
5package com.fourisland.instadisc.Item; 5package com.fourisland.instadisc;
6 6
7import com.fourisland.instadisc.Item.*;
7import com.fourisland.instadisc.Functions; 8import com.fourisland.instadisc.Functions;
8import java.security.MessageDigest; 9import java.security.MessageDigest;
9import java.util.logging.Level; 10import java.util.logging.Level;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-11-19 09:13:37 +0000