move the step/continue highlighting around

benfry · benfry · commit 00a3ad643360 · 2015-05-18T14:23:43.000-04:00
diff --git a/app/src/processing/app/contrib/ContributionManager.java b/app/src/processing/app/contrib/ContributionManager.java
@@ -306,7 +306,7 @@ public boolean accept(File dir, String file) {
    *          The list of AvailableContributions to be downloaded and installed.
    */
   public static void downloadAndInstallOnImport(final Base base,
-                                                final ArrayList<AvailableContribution> aList) {
+                                                final List<AvailableContribution> aList) {
 
     // To avoid the user from modifying stuff, since this function is only called
     // during pre-processing
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
@@ -21,6 +21,8 @@
 
 import org.eclipse.jdt.core.compiler.IProblem;
 
+import processing.core.PApplet;
+
 import processing.app.*;
 import processing.app.Toolkit;
 import processing.app.contrib.AvailableContribution;
@@ -30,7 +32,6 @@
 import processing.app.contrib.ToolContribution;
 import processing.app.syntax.JEditTextArea;
 import processing.app.syntax.PdeTextAreaDefaults;
-import processing.core.PApplet;
 import processing.mode.java.debug.LineBreakpoint;
 import processing.mode.java.debug.LineHighlight;
 import processing.mode.java.debug.LineID;
@@ -1914,7 +1915,7 @@ protected void downloadImports() {
           for (String[] importStatement : pieces) {
             importHeaders.add(importStatement[2]);
           }
-          ArrayList<AvailableContribution> installLibsHeaders = getNotInstalledAvailableLibs(importHeaders);
+          List<AvailableContribution> installLibsHeaders = getNotInstalledAvailableLibs(importHeaders);
           if (!installLibsHeaders.isEmpty()) {
             StringBuilder libList = new StringBuilder("Would you like to install them now?");
             for (AvailableContribution ac : installLibsHeaders) {
@@ -1942,7 +1943,7 @@ protected void downloadImports() {
    *
    * @param importHeaders
    */
-  private ArrayList<AvailableContribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
+  private List<AvailableContribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
     Map<String, Contribution> importMap = ContributionListing.getInstance().librariesByImportHeader;
     ArrayList<AvailableContribution> libList = new ArrayList<AvailableContribution>();
     for (String importHeaders : importHeadersList) {
@@ -2117,22 +2118,22 @@ protected void deactivateDebug() {
 
 
   protected void activateContinue() {
-    inspector.activateContinue();
+    ((JavaToolbar) toolbar).activateContinue();
   }
 
 
   protected void deactivateContinue() {
-    inspector.deactivateContinue();
+    ((JavaToolbar) toolbar).deactivateContinue();
   }
 
 
   protected void activateStep() {
-    inspector.activateStep();
+    ((JavaToolbar) toolbar).activateStep();
   }
 
 
   protected void deactivateStep() {
-    inspector.deactivateStep();
+    ((JavaToolbar) toolbar).deactivateStep();
   }
 
 
diff --git a/java/src/processing/mode/java/JavaToolbar.java b/java/src/processing/mode/java/JavaToolbar.java
@@ -137,6 +137,30 @@ public void handleRun(int modifiers) {
   public void handleStop() {
     jeditor.handleStop();
   }
+
+
+  public void activateContinue() {
+    continueButton.setSelected(true);
+    repaint();
+  }
+
+
+  protected void deactivateContinue() {
+    continueButton.setSelected(false);
+    repaint();
+  }
+
+
+  protected void activateStep() {
+    stepButton.setSelected(true);
+    repaint();
+  }
+
+
+  protected void deactivateStep() {
+    stepButton.setSelected(false);
+    repaint();
+  }
 }
 
 
diff --git a/java/src/processing/mode/java/VariableInspector.java b/java/src/processing/mode/java/VariableInspector.java
@@ -255,6 +255,7 @@ Container createScrollPane() {
   }
 
 
+  /*
   protected void activateContinue() {
   }
 
@@ -269,6 +270,7 @@ protected void activateStep() {
 
   protected void deactivateStep() {
   }
+  */
 
 
   /*

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ Container createScrollPane() {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`
	`258`	`+ /*`
`258`	`259`	`protected void activateContinue() {`
`259`	`260`	`}`
`260`	`261`
`@@ -269,6 +270,7 @@ protected void activateStep() {`
`269`	`270`
`270`	`271`	`protected void deactivateStep() {`
`271`	`272`	`}`
	`273`	`+ */`
`272`	`274`
`273`	`275`
`274`	`276`	`/*`