Inverted MVC logic on installer to get a cleaner code.

Part of the control logic was moved from listeners to GUI class methods.
This goes against a pure MVC but makes the code much more cleaner.

Author: cmaglie

app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java

@@ -64,15 +64,14 @@
 import javax.swing.table.TableColumnModel;
 
 import cc.arduino.packages.contributions.ContributedPlatform;
-import cc.arduino.packages.contributions.ContributionsIndex;
+import cc.arduino.packages.contributions.ContributionInstaller;
+import cc.arduino.packages.contributions.ContributionsIndexer;
 
 @SuppressWarnings("serial")
 public class ContributionManagerUI extends JDialog {
 
   private FilterJTextField filterField;
 
-  private ContributionManagerUIListener listener = null;
-
   private JLabel categoryLabel;
   private JComboBox categoryChooser;
   private Component categoryStrut1;
@@ -92,8 +91,9 @@ public class ContributionManagerUI extends JDialog {
   private String category;
   private String[] filters;
 
-  public ContributionManagerUI(Frame parent) {
+  public ContributionManagerUI(Frame parent, ContributionsIndexer indexer) {
     super(parent, "Boards Manager", Dialog.ModalityType.APPLICATION_MODAL);
+
     setResizable(true);
 
     Container pane = getContentPane();
@@ -144,40 +144,25 @@ protected void onFilter(String[] _filters) {
 
     contribTable = new JTable(contribModel);
     contribTable.setTableHeader(null);
-    // contribTable.getTableHeader().setEnabled(false);
-    // contribTable.setRowSelectionAllowed(false);
     contribTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     contribTable.setColumnSelectionAllowed(false);
     contribTable.setDragEnabled(false);
     contribTable.setIntercellSpacing(new Dimension(0, 1));
     contribTable.setShowVerticalLines(false);
-    // contribTable.addMouseListener(new MouseAdapter() {
-    // @Override
-    // public void mousePressed(MouseEvent e) {
-    // if (listener == null)
-    // return;
-    // Point point = e.getPoint();
-    // int row = contribTable.rowAtPoint(point);
-    // int col = contribTable.columnAtPoint(point);
-    // }
-    // });
+
     {
       TableColumnModel tcm = contribTable.getColumnModel();
       TableColumn col = tcm.getColumn(DESCRIPTION_COL);
       col.setCellRenderer(new ContributedPlatformTableCell());
       cellEditor = new ContributedPlatformTableCell() {
         @Override
         protected void onInstall(ContributedPlatform selectedPlatform) {
-          if (listener == null)
-            return;
-          listener.onInstall(selectedPlatform);
+          onInstallPressed(selectedPlatform);
         }
 
         @Override
         protected void onRemove(ContributedPlatform installedPlatform) {
-          if (listener == null)
-            return;
-          listener.onRemove(installedPlatform);
+          onRemovePressed(installedPlatform);
         }
       };
       col.setCellEditor(cellEditor);
@@ -205,17 +190,15 @@ protected void onRemove(ContributedPlatform installedPlatform) {
       cancelButton.addActionListener(new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent arg0) {
-          if (listener != null)
-            listener.onCancelPressed();
+          onCancelPressed();
         }
       });
 
       JButton updateButton = new JButton(_("Update list"));
       updateButton.addActionListener(new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent arg0) {
-          if (listener != null)
-            listener.onUpdatePressed();
+          onUpdatePressed();
         }
       });
 
@@ -255,10 +238,18 @@ public void run() {
         });
       }
     });
-  }
 
-  public void setListener(ContributionManagerUIListener listener) {
-    this.listener = listener;
+    contribModel.setIndex(indexer.getIndex());
+    setCategories(indexer.getIndex().getCategories());
+
+    // Create installer with his dialog
+    installer = new ContributionInstaller(indexer);
+    installer.setListener(new ContributionInstaller.Listener() {
+      @Override
+      public void onProgress(double progress, String message) {
+        setProgress((int) progress, message);
+      }
+    });
   }
 
   public void setCategories(Collection<String> categories) {
@@ -280,11 +271,6 @@ public void setCategories(Collection<String> categories) {
     categoryStrut3.setVisible(show);
   }
 
-  public void setContributions(ContributionsIndex index) {
-    contribModel.setIndex(index);
-    setCategories(index.getCategories());
-  }
-
   public void setProgressVisible(boolean visible) {
     progressBox.setVisible(visible);
 
@@ -318,4 +304,58 @@ public void setProgress(int progress, String text) {
     if (text != null)
       progressBar.setString(text);
   }
+
+  public void onUpdatePressed() {
+    // TODO Auto-generated method stub
+    System.out.println("Update pressed");
+  }
+
+  /*
+   * Installer methods follows
+   */
+
+  private ContributionInstaller installer;
+  private Thread installerThread = null;
+
+  public void onCancelPressed() {
+    if (installerThread != null)
+      installerThread.interrupt();
+  }
+
+  public void onInstallPressed(final ContributedPlatform platform) {
+    installerThread = new Thread(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          setProgressVisible(true);
+          installer.install(platform);
+        } catch (Exception e) {
+          // TODO Show ERROR
+          e.printStackTrace();
+        } finally {
+          setProgressVisible(false);
+        }
+      }
+    });
+    installerThread.start();
+  }
+
+  public void onRemovePressed(final ContributedPlatform platform) {
+    installerThread = new Thread(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          setProgressVisible(true);
+          installer.remove(platform);
+        } catch (Exception e) {
+          // TODO Show ERROR
+          e.printStackTrace();
+        } finally {
+          setProgressVisible(false);
+        }
+      }
+    });
+    installerThread.start();
+  }
+
 }

app/src/cc/arduino/packages/contributions/ui/ContributionManagerUIListener.java

@@ -23,11 +23,7 @@
 package processing.app;
 
 import cc.arduino.packages.DiscoveryManager;
-import cc.arduino.packages.contributions.ContributedPlatform;
-import cc.arduino.packages.contributions.ContributionInstaller;
-import cc.arduino.packages.contributions.ContributionInstaller.Listener;
 import cc.arduino.packages.contributions.ui.ContributionManagerUI;
-import cc.arduino.packages.contributions.ui.ContributionManagerUIListener;
 import cc.arduino.view.SplashScreenHelper;
 import processing.app.debug.TargetBoard;
 import processing.app.debug.TargetPackage;
@@ -1114,73 +1110,7 @@ public void onBoardOrPortChange() {
 
   private void openInstallBoardDialog() {
     // Create dialog for contribution manager
-    final ContributionManagerUI managerUI = new ContributionManagerUI(activeEditor);
-    final Listener installerListener = new ContributionInstaller.Listener() {
-      @Override
-      public void onProgress(double progress, String message) {
-        managerUI.setProgress((int) progress, message);
-      }
-    };
-    managerUI.setListener(new ContributionManagerUIListener() {
-
-      @Override
-      public void onUpdatePressed() {
-        // TODO Auto-generated method stub
-        System.out.println("Update pressed");
-      }
-
-      Thread task = null;
-      
-      @Override
-      public void onCancelPressed() {
-        if (task != null)
-          task.interrupt();
-      }
-      
-      @Override
-      public void onInstall(final ContributedPlatform platform) {
-        final ContributionInstaller installer = new ContributionInstaller(BaseNoGui.indexer);
-        installer.setListener(installerListener);
-        task = new Thread(new Runnable() {
-          @Override
-          public void run() {
-            try {
-              managerUI.setProgressVisible(true);
-              installer.install(platform);
-            } catch (Exception e) {
-              // TODO Show ERROR
-              e.printStackTrace();
-            } finally {
-              managerUI.setProgressVisible(false);
-            }
-          }
-        });
-        task.start();
-      }
-      
-      @Override
-      public void onRemove(final ContributedPlatform platform) {
-        // Create installer with his dialog
-        final ContributionInstaller installer = new ContributionInstaller(BaseNoGui.indexer);
-        installer.setListener(installerListener);
-        task = new Thread(new Runnable() {
-          @Override
-          public void run() {
-            try {
-              managerUI.setProgressVisible(true);
-              installer.remove(platform);
-            } catch (Exception e) {
-              // TODO Show ERROR
-              e.printStackTrace();
-            } finally {
-              managerUI.setProgressVisible(false);
-            }
-          }
-        });
-        task.start();
-      }
-    });
-    managerUI.setContributions(BaseNoGui.indexer.getIndex());
+    ContributionManagerUI managerUI = new ContributionManagerUI(activeEditor, BaseNoGui.indexer);
     managerUI.setVisible(true);
   }
 

app/src/processing/app/Base.java

@@ -48,15 +48,16 @@
 
 public class ContributionsIndexer {
 
-  private File preferencesFolder;
   private File packagesFolder;
   private File stagingFolder;
+  private File indexFile;
   private ContributionsIndex index;
 
-  public ContributionsIndexer(File _preferencesFolder) {
-    preferencesFolder = _preferencesFolder;
+  public ContributionsIndexer(File preferencesFolder) {
     packagesFolder = new File(preferencesFolder, "packages");
-    stagingFolder = new File(preferencesFolder, "staging");
+    stagingFolder = new File(preferencesFolder, "staging" + File.separator +
+        "packages");
+    indexFile = new File(preferencesFolder, "package_index.json");
   }
 
   // public static void main(String args[]) throws Exception {
@@ -75,7 +76,7 @@ public ContributionsIndexer(File _preferencesFolder) {
 
   public void parseIndex() throws JsonParseException, IOException {
     // Parse index file
-    parseIndex(new File(preferencesFolder, "package_index.json"));
+    parseIndex(indexFile);
 
     List<ContributedPackage> packages = index.getPackages();
     for (ContributedPackage pack : packages) {
@@ -224,10 +225,6 @@ public ContributionsIndex getIndex() {
     return index;
   }
 
-  public File getPreferencesFolder() {
-    return preferencesFolder;
-  }
-
   public File getPackagesFolder() {
     return packagesFolder;
   }
@@ -236,4 +233,8 @@ public File getStagingFolder() {
     return stagingFolder;
   }
 
+  public File getIndexFile() {
+    return indexFile;
+  }
+
 }

arduino-core/src/cc/arduino/packages/contributions/ContributionsIndexer.java

@@ -586,6 +586,9 @@ static public void initLogger() {
 
   static public void initPackages() throws Exception {
     indexer = new ContributionsIndexer(BaseNoGui.getSettingsFolder());
+    if (!indexer.getIndexFile().isFile())
+      // TODO: run first setup
+      ;
     indexer.parseIndex();
     indexer.syncWithFilesystem();
     System.out.println(indexer);