Stage 1 complete: at least update manager opens

joelmoniz · joelmoniz · commit e73316b74eed · 2014-06-24T23:59:38.000+05:30
diff --git a/app/src/processing/app/UpdateCheck.java b/app/src/processing/app/UpdateCheck.java
@@ -50,15 +50,15 @@ public class UpdateCheck {
   Base base;
   String downloadURL = "http://processing.org/download/latest.txt";
 
-  static final long ONE_DAY = 24 * 60 * 60 * 1000;
+  static final long ONE_DAY = 0;//24 * 60 * 60 * 1000;
 
 
   public UpdateCheck(Base base) {
     this.base = base;
     new Thread(new Runnable() {
       public void run() {
         try {
-          Thread.sleep(30 * 1000);  // give the PDE time to get rolling
+          Thread.sleep(10 * 1000);  // give the PDE time to get rolling
           updateCheck();
         } catch (Exception e) {
           // this can safely be ignored, too many instances where no net
@@ -122,13 +122,14 @@ public void updateCheck() throws Exception {
       if (offerToUpdateContributions) {
         // Wait for xml file to be downloaded and updates to come in.
         // (this should really be handled better).
+        base.rebuildContribModes();
         Thread.sleep(5 * 1000);
         if ((!base.libraryManagerFrame.hasAlreadyBeenOpened() &&
-             base.libraryManagerFrame.hasUpdates()) ||
+             base.libraryManagerFrame.hasUpdates(base)) ||
             (!base.toolManagerFrame.hasAlreadyBeenOpened() &&
-             base.toolManagerFrame.hasUpdates()) ||
+             base.toolManagerFrame.hasUpdates(base)) ||
             (!base.modeManagerFrame.hasAlreadyBeenOpened() &&
-             base.modeManagerFrame.hasUpdates())) {
+             base.modeManagerFrame.hasUpdates(base))) {
           promptToOpenContributionManager();
         }
       }
diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java
@@ -27,6 +27,8 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import processing.app.Base;
+import processing.app.Editor;
+import processing.app.Library;
 import processing.core.PApplet;
 
 
@@ -379,14 +381,41 @@ boolean hasUpdates() {
     }
     return false;
   }
+  
+  boolean hasUpdates(Base base) {
+    System.out.println("here321");
+    try {
+    System.out.println((base/*.getModeContribs()*/==null) ? "Null :(" : "what?!");
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+    System.out.println("Here too?!");
+    for (ModeContribution m : base.getModeContribs())
+      if (m.isInstalled()) {
+        System.out.println(m.getName());
+        Contribution advertised = getAvailableContribution(m);
+        if (advertised == null) {
+        }
+        else {
+        System.out.println("Here2");
+        if (advertised.getVersion() > m.getVersion())
+          return true;
+        }
+      }
+    return false;
+  }
 
 
   boolean hasUpdates(Contribution contribution) {
     if (contribution.isInstalled()) {
+      System.out.println("Here");
       Contribution advertised = getAvailableContribution(contribution);
       if (advertised == null) {
         return false;
       }
+      System.out.println("Here2");
       return advertised.getVersion() > contribution.getVersion();
     }
     return false;
diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java
@@ -74,6 +74,10 @@ public boolean hasUpdates() {
   }
 
 
+  public boolean hasUpdates(Base base) {
+    return contribListing.hasUpdates(base);
+  }
+  
   public void showFrame(Editor editor) {
     this.editor = editor;
 

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,10 @@ public boolean hasUpdates() {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`
	`77`	`+ public boolean hasUpdates(Base base) {`
	`78`	`+ return contribListing.hasUpdates(base);`
	`79`	`+ }`
	`80`	`+`
`77`	`81`	`public void showFrame(Editor editor) {`
`78`	`82`	`this.editor = editor;`
`79`	`83`