Merge branch 'editor-refactor-fixup'

Author: cmaglie

app/src/processing/app/Base.java

@@ -1254,6 +1254,7 @@ public void rebuildExamplesMenu(JMenu menu) {
   }
 
   private static String priorPlatformFolder;
+  private static boolean newLibraryImported;
 
   public void onBoardOrPortChange() {
     BaseNoGui.onBoardOrPortChange();
@@ -1262,10 +1263,11 @@ public void onBoardOrPortChange() {
     TargetPlatform tp = BaseNoGui.getTargetPlatform();
     if (tp != null) {
       String platformFolder = tp.getFolder().getAbsolutePath();
-      if (priorPlatformFolder == null || !priorPlatformFolder.equals(platformFolder)) {
+      if (priorPlatformFolder == null || !priorPlatformFolder.equals(platformFolder) || newLibraryImported) {
         pdeKeywords = new PdeKeywords();
         pdeKeywords.reload();
         priorPlatformFolder = platformFolder;
+        newLibraryImported = false;
         for (Editor editor : editors) {
           editor.updateKeywords(pdeKeywords);
         }
@@ -1305,6 +1307,7 @@ protected void onIndexesUpdated() throws Exception {
     // Manager dialog is modal, waits here until closed
 
     //handleAddLibrary();
+    newLibraryImported = true;
     onBoardOrPortChange();
     rebuildImportMenu(Editor.importMenu);
     rebuildExamplesMenu(Editor.examplesMenu);
@@ -2262,6 +2265,7 @@ public void handleAddLibrary() {
       // FIXME error when importing. ignoring :(
     } finally {
       // delete zip created temp folder, if exists
+      newLibraryImported = true;
       FileUtils.recursiveDelete(tmpFolder);
     }
   }

app/src/processing/app/Editor.java

@@ -1691,6 +1691,13 @@ public void createTabs() {
     selectTab(0);
   }
 
+  /**
+   * Reorders tabs as per current sketch's files order
+   */
+  public void reorderTabs() {
+    Collections.sort(tabs, (x, y) -> Sketch.CODE_DOCS_COMPARATOR.compare(x.getSketchFile(), y.getSketchFile()));
+  }
+
   /**
    * Add a new tab.
    *
@@ -1704,6 +1711,12 @@ public void createTabs() {
   protected void addTab(SketchFile file, String contents) throws IOException {
     EditorTab tab = new EditorTab(this, file, contents);
     tabs.add(tab);
+    reorderTabs();
+  }
+
+  protected void removeTab(SketchFile file) throws IOException {
+    int index = findTabIndex(file);
+    tabs.remove(index);
   }
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

app/src/processing/app/SketchController.java

@@ -260,6 +260,8 @@ public void handleDeleteCode() throws IOException {
           return;
         }
 
+        editor.removeTab(current);
+
         // just set current tab to the main tab
         editor.selectTab(0);
 

arduino-core/src/processing/app/BaseNoGui.java

@@ -166,12 +166,17 @@ static public PreferencesMap getBoardPreferences() {
 
     // Add all tools dependencies from the (possibily) referenced core
     String core = prefs.get("build.core");
-    if (core.contains(":")) {
+    if (core != null && core.contains(":")) {
       String split[] = core.split(":");
       TargetPlatform referenced = BaseNoGui.getCurrentTargetPlatformFromPackage(split[0]);
-      ContributedPlatform referencedPlatform = indexer.getContributedPlaform(referenced);
-      if (referencedPlatform != null)
-        requiredTools.addAll(referencedPlatform.getResolvedTools());
+      if (referenced != null) {
+        ContributedPlatform referencedPlatform = indexer.getContributedPlaform(referenced);
+        if (referencedPlatform != null)
+          requiredTools.addAll(referencedPlatform.getResolvedTools());
+      } else {
+        String msg = tr("The current selected board needs the core '{0}' that is not installed.");
+        System.out.println(I18n.format(msg, core));
+      }
     }
 
     String prefix = "runtime.tools.";

arduino-core/src/processing/app/Sketch.java

@@ -31,7 +31,7 @@ public class Sketch {
 
   private File buildPath;
 
-  private static final Comparator<SketchFile> CODE_DOCS_COMPARATOR = new Comparator<SketchFile>() {
+  public static final Comparator<SketchFile> CODE_DOCS_COMPARATOR = new Comparator<SketchFile>() {
     @Override
     public int compare(SketchFile x, SketchFile y) {
       if (x.isPrimary() && !y.isPrimary())

arduino-core/src/processing/app/i18n/Resources_ach.po

@@ -2006,6 +2006,10 @@ msgstr ""
 msgid "The Udp class has been renamed EthernetUdp."
 msgstr ""
 
+#: ../../../../../arduino-core/src/processing/app/BaseNoGui.java:173
+msgid "The current selected board needs the core '{0}' that is not installed."
+msgstr ""
+
 #: Editor.java:2147
 #, java-format
 msgid ""

arduino-core/src/processing/app/i18n/Resources_ach.properties

@@ -1463,6 +1463,9 @@
 #: debug/Compiler.java:432
 !The\ Udp\ class\ has\ been\ renamed\ EthernetUdp.=
 
+#: ../../../../../arduino-core/src/processing/app/BaseNoGui.java:173
+!The\ current\ selected\ board\ needs\ the\ core\ '{0}'\ that\ is\ not\ installed.=
+
 #: Editor.java:2147
 #, java-format
 !The\ file\ "{0}"\ needs\ to\ be\ inside\na\ sketch\ folder\ named\ "{1}".\nCreate\ this\ folder,\ move\ the\ file,\ and\ continue?=

arduino-core/src/processing/app/i18n/Resources_af.po

@@ -2007,6 +2007,10 @@ msgstr ""
 msgid "The Udp class has been renamed EthernetUdp."
 msgstr ""
 
+#: ../../../../../arduino-core/src/processing/app/BaseNoGui.java:173
+msgid "The current selected board needs the core '{0}' that is not installed."
+msgstr ""
+
 #: Editor.java:2147
 #, java-format
 msgid ""

arduino-core/src/processing/app/i18n/Resources_af.properties

@@ -1464,6 +1464,9 @@ System\ Default=Stelsel Verstek
 #: debug/Compiler.java:432
 !The\ Udp\ class\ has\ been\ renamed\ EthernetUdp.=
 
+#: ../../../../../arduino-core/src/processing/app/BaseNoGui.java:173
+!The\ current\ selected\ board\ needs\ the\ core\ '{0}'\ that\ is\ not\ installed.=
+
 #: Editor.java:2147
 #, java-format
 !The\ file\ "{0}"\ needs\ to\ be\ inside\na\ sketch\ folder\ named\ "{1}".\nCreate\ this\ folder,\ move\ the\ file,\ and\ continue?=

arduino-core/src/processing/app/i18n/Resources_an.po

@@ -2007,6 +2007,10 @@ msgstr "A clase Servidor ha estau renombrada a EthernetServer"
 msgid "The Udp class has been renamed EthernetUdp."
 msgstr "A clase Udp ha estau renombrada a EthernetUdp"
 
+#: ../../../../../arduino-core/src/processing/app/BaseNoGui.java:173
+msgid "The current selected board needs the core '{0}' that is not installed."
+msgstr ""
+
 #: Editor.java:2147
 #, java-format
 msgid ""