Show warning message if mode cannot be changed

tyfkda · tyfkda · commit 497a2c430734 · 2016-07-29T09:15:46.000+09:00
If selected mode cannot handle current source,
show warning dialog and reselect old (current) mode.
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -885,8 +885,9 @@ public Mode getNextMode() {
   /**
    * The call has already checked to make sure this sketch is not modified,
    * now change the mode.
+   * @return true if mode is changed.
    */
-  public void changeMode(Mode mode) {
+  public boolean changeMode(Mode mode) {
     Mode oldMode = activeEditor.getMode();
     if (oldMode != mode) {
       Sketch sketch = activeEditor.getSketch();
@@ -908,7 +909,9 @@ public void changeMode(Mode mode) {
             break;
           }
         }
-        if (newModeCanHandleCurrentSource) {
+        if (!newModeCanHandleCurrentSource) {
+          return false;
+        } else {
           final File props = new File(sketch.getCodeFolder(), "sketch.properties");
           saveModeSettings(props, nextMode);
           handleClose(activeEditor, true);
@@ -918,10 +921,12 @@ public void changeMode(Mode mode) {
             // re-open the sketch using the mode we were in before
             saveModeSettings(props, oldMode);
             handleOpen(sketch.getMainFilePath());
+            return false;
           }
         }
       }
     }
+    return true;
   }
 
 
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -505,22 +505,15 @@ public void rebuildModePopup() {
       item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           if (!sketch.isModified()) {
-            base.changeMode(m);
+            if (!base.changeMode(m)) {
+              reselectMode();
+              Messages.showWarning(Language.text("warn.cannot_change_mode.title"),
+                                   Language.interpolate("warn.cannot_change_mode.body", m));
+            }
           } else {
+            reselectMode();
             Messages.showWarning("Save",
                                  "Please save the sketch before changing the mode.");
-
-            // Re-select the old checkbox, because it was automatically
-            // updated by Java, even though the Mode could not be changed.
-            // https://github.com/processing/processing/issues/2615
-            for (Component c : getModePopup().getComponents()) {
-              if (c instanceof JRadioButtonMenuItem) {
-                if (((JRadioButtonMenuItem)c).getText() == mode.getTitle()) {
-                  ((JRadioButtonMenuItem)c).setSelected(true);
-                  break;
-                }
-              }
-            }
           }
         }
       });
@@ -543,6 +536,19 @@ public void actionPerformed(ActionEvent e) {
     Toolkit.setMenuMnemsInside(modePopup);
   }
 
+  // Re-select the old checkbox, because it was automatically
+  // updated by Java, even though the Mode could not be changed.
+  // https://github.com/processing/processing/issues/2615
+  private void reselectMode() {
+    for (Component c : getModePopup().getComponents()) {
+      if (c instanceof JRadioButtonMenuItem) {
+        if (((JRadioButtonMenuItem)c).getText() == mode.getTitle()) {
+          ((JRadioButtonMenuItem)c).setSelected(true);
+          break;
+        }
+      }
+    }
+  }
 
   public JPopupMenu getModePopup() {
     return modePopup.getPopupMenu();
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
@@ -529,6 +529,8 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
 warn.delete = Delete
 warn.delete.sketch = Are you sure you want to delete this sketch?
 warn.delete.file = Are you sure you want to delete "%s"?
+warn.cannot_change_mode.title = Cannot change mode
+warn.cannot_change_mode.body = Cannot change mode,\nbecause "%s" mode is not compatible with current mode.
 
 
 # ---------------------------------------
diff --git a/build/shared/lib/languages/PDE_ja.properties b/build/shared/lib/languages/PDE_ja.properties
@@ -528,6 +528,8 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
 warn.delete = Delete
 warn.delete.sketch = Are you sure you want to delete this sketch?
 warn.delete.file = Are you sure you want to delete "%s"?
+warn.cannot_change_mode.title = &#12514;&#12540;&#12489;&#22793;&#26356;&#22833;&#25943;
+warn.cannot_change_mode.body = &#20114;&#25563;&#24615;&#12364;&#12394;&#12356;&#12383;&#12417;&#12289;"%s"&#12514;&#12540;&#12489;&#12395;&#20999;&#12426;&#26367;&#12360;&#12425;&#12428;&#12414;&#12379;&#12435;&#12290;
 
 
 # ---------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -885,8 +885,9 @@ public Mode getNextMode() {`
`885`	`885`	`/**`
`886`	`886`	`* The call has already checked to make sure this sketch is not modified,`
`887`	`887`	`* now change the mode.`
	`888`	`+ * @return true if mode is changed.`
`888`	`889`	`*/`
`889`		`- public void changeMode(Mode mode) {`
	`890`	`+ public boolean changeMode(Mode mode) {`
`890`	`891`	`Mode oldMode = activeEditor.getMode();`
`891`	`892`	`if (oldMode != mode) {`
`892`	`893`	`Sketch sketch = activeEditor.getSketch();`
`@@ -908,7 +909,9 @@ public void changeMode(Mode mode) {`
`908`	`909`	`break;`
`909`	`910`	`}`
`910`	`911`	`}`
`911`		`- if (newModeCanHandleCurrentSource) {`
	`912`	`+ if (!newModeCanHandleCurrentSource) {`
	`913`	`+ return false;`
	`914`	`+ } else {`
`912`	`915`	`final File props = new File(sketch.getCodeFolder(), "sketch.properties");`
`913`	`916`	`saveModeSettings(props, nextMode);`
`914`	`917`	`handleClose(activeEditor, true);`
`@@ -918,10 +921,12 @@ public void changeMode(Mode mode) {`
`918`	`921`	`// re-open the sketch using the mode we were in before`
`919`	`922`	`saveModeSettings(props, oldMode);`
`920`	`923`	`handleOpen(sketch.getMainFilePath());`
	`924`	`+ return false;`
`921`	`925`	`}`
`922`	`926`	`}`
`923`	`927`	`}`
`924`	`928`	`}`
	`929`	`+ return true;`
`925`	`930`	`}`
`926`	`931`
`927`	`932`