4 files changed, 15 insertions, 29 deletions

@@ -175,6 +175,7 @@ public class Step2 extends javax.swing.JDialog {
                             Wrapper.setConfig("password", md5.hash());
                             Wrapper.setConfig("centralServerURL", jTextField3.getText());
                             Wrapper.setConfig("itemsToHold", "10");
+                            Wrapper.setConfig("initCheck", "done");
                             
                             StepEndResults.ok = true;
                             this.setVisible(false);
@@ -19,13 +19,6 @@ import javax.swing.ListCellRenderer;
  * @author hatkirby
  */
 public class IDItemListCellRenderer extends JLabel implements ListCellRenderer {
-    
-    String base;
-    
-    public IDItemListCellRenderer(String base)
-    {
-        this.base = base;
-    }
 
     public Component getListCellRendererComponent(JList arg0, Object arg1, int arg2, boolean arg3, boolean arg4) {
         Item item = (Item) arg1;
@@ -13,8 +13,6 @@ import org.jdesktop.application.SingleFrameApplication;
  * The main class of the application.
  */
 public class InstaDiscApp extends SingleFrameApplication {
-    
-    public static String base;
 
     /**
      * At startup create and show the main frame of the application.
@@ -45,28 +43,22 @@ public class InstaDiscApp extends SingleFrameApplication {
      * Main method launching the application.
      */
     public static void main(String[] args) {
-        if (args.length > 0) {
-            base = args[0];
-            
-            File db = new File(args[0] + "db");
-            if (!db.exists()) {
-                db.mkdir();
-            }
-            
-            Wrapper.init(args[0]);
-            if (args.length > 1) {
-                if (args[1].equals("-r")) {
-                    XmlRpc xmlrpc = new XmlRpc("requestRetained");
-                    xmlrpc.execute();
-                } else if (args[1].equals("-n")) {
-                    Thread th = new Thread(new FirstRunWizard());
-                    th.start();
-                }
+        File db = new File(System.getProperty("user.home") + File.separator + ".instadisc");
+        if (!db.exists()) {
+            db.mkdir();
+        }
+
+        Wrapper.init(db.getAbsolutePath());
+        if (!Wrapper.getConfig("initCheck").equals("done")) {
+            Thread th = new Thread(new FirstRunWizard());
+            th.start();
+        } else {
+            if ((args.length > 0) && (args[0].equals("-r"))) {
+                XmlRpc xmlrpc = new XmlRpc("requestRetained");
+                xmlrpc.execute();
             } else {
                 launch(InstaDiscApp.class, args);
             }
-        } else {
-            System.out.println("Oops, you seem to be running this application incorrectly. Try running it using the startup script provided.");
         }
     }
 }
@@ -90,7 +90,7 @@ public class InstaDiscView extends FrameView {
             }
         });
 
-        jList1.setCellRenderer(new IDItemListCellRenderer(InstaDiscApp.base));
+        jList1.setCellRenderer(new IDItemListCellRenderer());
         jList1.setModel(lm);
         refreshItemPane();