some comments about progress update

Author: codeanticode

src/processing/mode/android/SDKUpdater.java

@@ -121,6 +121,13 @@ public void propertyChange(PropertyChangeEvent evt) {
   }
 
   class QueryTask extends SwingWorker<Object, Object> {
+    ProgressIndicator progress;
+    
+    QueryTask() {
+      super();
+      progress = new ConsoleProgressIndicator();
+    }
+    
     @Override
     protected Object doInBackground() throws Exception {
       numUpdates = 0;
@@ -131,8 +138,6 @@ protected Object doInBackground() throws Exception {
        */
       AndroidSdkHandler mHandler = AndroidSdkHandler.getInstance(AndroidSDK.load().getSdkFolder());
 
-      ProgressIndicator progress = new ConsoleProgressIndicator();
-
       FileSystemFileOp fop = (FileSystemFileOp) FileOpUtils.create();
       RepoManager mRepoManager = mHandler.getSdkManager(progress);
       mRepoManager.loadSynchronously(0, progress, new LegacyDownloader(fop, new SettingsController() {
@@ -222,6 +227,20 @@ protected void done() {
   }
 
   class DownloadTask extends SwingWorker<Object, Object> {
+    ProgressIndicator progress;
+
+    DownloadTask() {
+      super();
+      // This code can help understanding more advanced users of the progress 
+      // indicator and the download functionality:
+      // https://github.com/JetBrains/android/blob/master/android/src/com/android/tools/idea/welcome/wizard/InstallComponentsPath.java
+      // From Android Plugin for IntelliJ IDEA:
+      // https://github.com/JetBrains/android
+      // My impression is that the current progress has to be set using progress.setFraction()
+      //and then can be retrieved with progress.getFraction();      
+      progress = new ConsoleProgressIndicator();
+    }
+    
     @Override
     protected Object doInBackground() throws Exception {
       downloadTaskRunning = true;
@@ -233,12 +252,11 @@ protected Object doInBackground() throws Exception {
 
       FileSystemFileOp fop = (FileSystemFileOp) FileOpUtils.create();
       CustomSettings settings = new CustomSettings();
-      LegacyDownloader downloader = new LegacyDownloader(fop, settings);
-      ProgressIndicator progress = new ConsoleProgressIndicator();
+      Downloader downloader = new LegacyDownloader(fop, settings);
 
       RepoManager mRepoManager = mHandler.getSdkManager(progress);
       mRepoManager.loadSynchronously(0, progress, downloader, settings);
-
+      
       List<RemotePackage> remotes = new ArrayList<>();
       for (String path : settings.getPaths(mRepoManager)) {
         RemotePackage p = mRepoManager.getPackages().getRemotePackages().get(path);
@@ -275,7 +293,6 @@ protected void done() {
         get();
         actionButton.setEnabled(false);
         status.setText("Refreshing packages...");
-
         queryTask = new QueryTask();
         queryTask.addPropertyChangeListener(SDKUpdater.this);
         queryTask.execute();
@@ -394,6 +411,21 @@ public void actionPerformed(ActionEvent e) {
           downloadTask = new DownloadTask();
           progressBar.setIndeterminate(true);
           downloadTask.execute();
+
+          // getFraction() always returns 0.0, needs to be set somewhere (??) 
+//          Thread update = new Thread() {
+//            @Override
+//            public void run() {
+//              while (downloadTaskRunning) {
+//                try {
+//                  Thread.sleep(100);
+//                } catch (InterruptedException e) { }              
+//                System.out.println("Updating: " + downloadTask.progress.getFraction());                  
+//              }
+//            }
+//          };
+//          update.start();    
+          
           status.setText("Downloading available updates...");
           actionButton.setText("Cancel");
         }