Merge pull request #1 from arduino/master

Sync changes from arduino/Arduino:master

Author: cousteaulecommandant

.gitignore

@@ -18,7 +18,9 @@ build/*.tar.bz2
 build/windows/work/
 build/windows/*.zip
 build/windows/*.tgz
+build/windows/*.tar.bz2
 build/windows/libastylej*
+build/windows/liblistSerials*
 build/windows/arduino-*.zip
 build/windows/dist/*.tar.gz
 build/windows/dist/*.tar.bz2
@@ -49,6 +51,7 @@ build/linux/liblistSerials*
 build/shared/reference*.zip
 build/shared/Edison*.zip
 build/shared/Galileo*.zip
+build/shared/WiFi101-Updater-ArduinoIDE-Plugin*.zip
 test-bin
 *.iml
 .idea

README.md

@@ -1,16 +1,16 @@
 Arduino
 ========
 
-* Arduino is an open-source physical computing platform based on a simple i/o
+* Arduino is an open-source physical computing platform based on a simple I/O
 board and a development environment that implements the Processing/Wiring
 language. Arduino can be used to develop stand-alone interactive objects or
-can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
+can be connected to software on your computer (e.g. Flash, Processing and MaxMSP).
 The boards can be assembled by hand or purchased preassembled; the open-source
 IDE can be downloaded for free at http://www.arduino.cc/en/Main/Software
 
 * For more information, see the website at: http://www.arduino.cc/
 or the forums at: http://www.arduino.cc/forum/  
-You can also follow Arduino on twitter at: https://twitter.com/arduino or
+You can also follow Arduino on Twitter at: https://twitter.com/arduino or
 like Arduino on Facebook at: https://www.facebook.com/official.arduino
 
 * To report a *bug* in the software or to request *a simple enhancement* go to:

app/build.xml

@@ -112,6 +112,8 @@
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>
+        <pathelement location="${work.dir}/lib/jna-4.2.2.jar"/>
+        <pathelement location="${work.dir}/lib/jna-platform-4.2.2.jar"/>
         <path refid="class.path.test"/>
       </classpath>
 

app/lib/jna-4.1.0.jar

@@ -53,22 +53,26 @@ public void hyperlinkUpdate(HyperlinkEvent event) {
     }
 
     URL url = event.getURL();
+    openBoardLibManager(url);
+  }
 
+  public void openBoardLibManager(URL url) {
     if (BOARDSMANAGER.equals(url.getHost())) {
       try {
-        base.openBoardsManager("", "DropdownUpdatableCoresItem");
+        base.openBoardsManager(url.getRef() == null ? "": url.getRef() , url.getPath() == null ? "" : url.getPath().replace("/", ""));
       } catch (Exception e) {
         e.printStackTrace();
       }
       return;
     }
 
     if (LIBRARYMANAGER.equals(url.getHost())) {
-      base.openLibraryManager("DropdownUpdatableLibrariesItem");
+      base.openLibraryManager(url.getRef() == null ? "": url.getRef() , url.getPath() == null ? "" : url.getPath().replace("/", ""));
       return;
     }
 
     throw new IllegalArgumentException(url.getHost() + " is invalid");
+
   }
 
 }

app/lib/jna-platform-4.1.0.jar

@@ -36,10 +36,14 @@
 import cc.arduino.view.NotificationPopup;
 import processing.app.Base;
 import processing.app.BaseNoGui;
+import processing.app.Editor;
 import processing.app.I18n;
 
 import javax.swing.*;
 import javax.swing.event.HyperlinkListener;
+
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
 import java.util.TimerTask;
 
 import static processing.app.I18n.tr;
@@ -83,20 +87,42 @@ public void run() {
 
     String text;
     if (updatableLibraries > 0 && updatablePlatforms <= 0) {
-      text = I18n.format(tr("Updates available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager\">", "</a>");
+      text = I18n.format(tr("Updates available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager/DropdownUpdatableLibrariesItem\">", "</a>");
     } else if (updatableLibraries <= 0 && updatablePlatforms > 0) {
-      text = I18n.format(tr("Updates available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager\">", "</a>");
+      text = I18n.format(tr("Updates available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager/DropdownUpdatableCoresItem\">", "</a>");
     } else {
-      text = I18n.format(tr("Updates available for some of your {0}boards{1} and {2}libraries{3}"), "<a href=\"http://boardsmanager\">", "</a>", "<a href=\"http://librarymanager\">", "</a>");
+      text = I18n.format(tr("Updates available for some of your {0}boards{1} and {2}libraries{3}"), "<a href=\"http://boardsmanager/DropdownUpdatableCoresItem\">", "</a>", "<a href=\"http://librarymanager/DropdownUpdatableLibrariesItem\">", "</a>");
     }
 
     if (cancelled) {
       return;
     }
 
     SwingUtilities.invokeLater(() -> {
-      notificationPopup = new NotificationPopup(base.getActiveEditor(), hyperlinkListener, text);
-      notificationPopup.setVisible(true);
+      Editor ed = base.getActiveEditor();
+      notificationPopup = new NotificationPopup(ed, hyperlinkListener, text);
+      if (ed.isFocused()) {
+        notificationPopup.begin();
+        return;
+      }
+
+      // If the IDE is not focused wait until it is focused again to
+      // display the notification, this avoids the annoying side effect
+      // to "steal" the focus from another application.
+      WindowFocusListener wfl = new WindowFocusListener() {
+        @Override
+        public void windowLostFocus(WindowEvent evt) {
+        }
+
+        @Override
+        public void windowGainedFocus(WindowEvent evt) {
+          notificationPopup.begin();
+          for (Editor e : base.getEditors())
+            e.removeWindowFocusListener(this);
+        }
+      };
+      for (Editor e : base.getEditors())
+        e.addWindowFocusListener(wfl);
     });
   }
 

app/src/cc/arduino/UpdatableBoardsLibsFakeURLsHandler.java

@@ -221,6 +221,7 @@ private JTextPane makeNewDescription() {
       StyleSheet s = html.getStyleSheet();
       s.addRule("body { margin: 0; padding: 0;"
                 + "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
+                + "color: black;"
                 + "font-size: " + 10 * Theme.getScale() / 100 + "; }");
     }
     description.setOpaque(false);

app/src/cc/arduino/contributions/ContributionsSelfCheck.java

@@ -123,6 +123,10 @@ protected void onFilter(String[] _filters) {
             contribTable.getCellEditor().stopCellEditing();
           }
           updateIndexFilter(filters, categoryFilter);
+          if (contribModel.getRowCount() == 1) {
+            // TODO: understand why it doesn't work
+            //contribTable.addRowSelectionInterval(0, 0);
+          }
         }
       };
 

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java

@@ -38,6 +38,7 @@ public class Languages {
   static {
     languages = new Language[]{
       new Language(tr("System Default"), "", ""),
+      new Language(tr("Acoli"), "Lwo", "ach"),
       new Language(tr("Afrikaans"), "Afrikaans", "af"),
       new Language(tr("Albanian"), "shqip", "sq"),
       new Language(tr("Arabic"), "العربية", "ar"),
@@ -52,8 +53,8 @@ public class Languages {
       new Language(tr("Canadian French"), "Canadienne-français", "fr_CA"),
       new Language(tr("Catalan"), "Català", "ca"),
       new Language(tr("Chinese (China)"), "简体中文", "zh_CN"),
-      new Language(tr("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"),
-      new Language(tr("Chinese (Taiwan)"), "", "zh_TW"),
+      new Language(tr("Chinese (Taiwan) (Big5)"), "台語 (Big5)", "zh_TW.Big5"),
+      new Language(tr("Chinese (Taiwan)"), "台語", "zh_TW"),
       new Language(tr("Croatian"), "Hrvatski", "hr_HR"),
       new Language(tr("Czech (Czech Republic)"), "český (Czech Republic)", "cs_CZ"),
       new Language(tr("Danish (Denmark)"), "Dansk (Denmark)", "da_DK"),
@@ -77,6 +78,7 @@ public class Languages {
       new Language(tr("Indonesian"), "Bahasa Indonesia", "id"),
       new Language(tr("Italian"), "Italiano", "it_IT"),
       new Language(tr("Japanese"), "日本語", "ja_JP"),
+      new Language(tr("Kazakh"), "قازاق ٴتىلى", "kk"),
       new Language(tr("Korean"), "한국어", "ko_KR"),
       new Language(tr("Latvian"), "Latviešu", "lv_LV"),
       new Language(tr("Lithuaninan"), "Lietuvių Kalba", "lt_LT"),
@@ -97,6 +99,7 @@ public class Languages {
       new Language(tr("Swedish"), "Svenska", "sv"),
       new Language(tr("Talossan"), "Talossan", "tzl"),
       new Language(tr("Tamil"), "தமிழ்", "ta"),
+      new Language(tr("Telugu"), "తెలుగు", "te"),
       new Language(tr("Thai"), "ภาษาไทย", "th"),
       new Language(tr("Turkish"), "Türk", "tr"),
       new Language(tr("Ukrainian"), "Український", "uk"),

app/src/cc/arduino/contributions/ui/InstallerJDialog.java

@@ -33,10 +33,8 @@
 import processing.app.BaseNoGui;
 import processing.app.Editor;
 import processing.app.helpers.FileUtils;
-import processing.app.syntax.SketchTextArea;
 import processing.app.tools.Tool;
 
-import javax.swing.text.BadLocationException;
 import java.io.File;
 import java.io.IOException;
 
@@ -78,65 +76,20 @@ public void init(Editor editor) {
 
   @Override
   public void run() {
-    String originalText = editor.getText();
+    String originalText = editor.getCurrentTab().getText();
     String formattedText = aStyleInterface.AStyleMain(originalText, formatterConfiguration);
 
     if (formattedText.equals(originalText)) {
       editor.statusNotice(tr("No changes necessary for Auto Format."));
       return;
     }
 
-    SketchTextArea textArea = editor.getTextArea();
-
-    int line = getLineOfOffset(textArea);
-    int lineOffset = getLineOffset(textArea, line);
-
-    textArea.getUndoManager().beginInternalAtomicEdit();
-    editor.removeAllLineHighlights();
-    editor.setText(formattedText);
-    editor.getSketch().setModified(true);
-    textArea.getUndoManager().endInternalAtomicEdit();
-
-    if (line != -1 && lineOffset != -1) {
-      try {
-        setCaretPosition(textArea, line, lineOffset);
-      } catch (BadLocationException e) {
-        e.printStackTrace();
-      }
-    }
+    editor.getCurrentTab().setText(formattedText);
 
     // mark as finished
     editor.statusNotice(tr("Auto Format finished."));
   }
 
-  private void setCaretPosition(SketchTextArea textArea, int line, int lineOffset) throws BadLocationException {
-    int caretPosition;
-    if (line < textArea.getLineCount()) {
-      caretPosition = Math.min(textArea.getLineStartOffset(line) + lineOffset, textArea.getLineEndOffset(line) - 1);
-    } else {
-      caretPosition = textArea.getText().length() - 1;
-    }
-    textArea.setCaretPosition(caretPosition);
-  }
-
-  private int getLineOffset(SketchTextArea textArea, int line) {
-    try {
-      return textArea.getCaretPosition() - textArea.getLineStartOffset(line);
-    } catch (BadLocationException e) {
-      e.printStackTrace();
-    }
-    return -1;
-  }
-
-  private int getLineOfOffset(SketchTextArea textArea) {
-    try {
-      return textArea.getLineOfOffset(textArea.getCaretPosition());
-    } catch (BadLocationException e) {
-      e.printStackTrace();
-    }
-    return -1;
-  }
-
   @Override
   public String getMenuTitle() {
     return tr("Auto Format");

app/src/cc/arduino/i18n/Languages.java

@@ -39,7 +39,7 @@ public class Event extends ActionEvent {
 
   public Event(Object source, int id, String command) {
     super(source, id, command);
-    this.payload = new HashMap<String, Object>();
+    this.payload = new HashMap<>();
   }
 
   public Map<String, Object> getPayload() {

app/src/cc/arduino/packages/formatter/AStyle.java

@@ -127,7 +127,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
   private void okActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okActionPerformed
     try {
       int line = Integer.parseInt(lineNumber.getText());
-      editor.goToLine(line);
+      editor.getCurrentTab().goToLine(line);
       cancelActionPerformed(evt);
     } catch (Exception e) {
       // ignore

app/src/cc/arduino/view/Event.java

@@ -42,6 +42,8 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -52,16 +54,25 @@
 import javax.swing.border.LineBorder;
 import javax.swing.event.HyperlinkListener;
 
+import cc.arduino.Constants;
 import processing.app.Theme;
 
 public class NotificationPopup extends JDialog {
 
+  private Timer autoCloseTimer = new Timer(false);
+  private boolean autoClose = true;
+
   public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener,
                            String message) {
+    this(parent, hyperlinkListener, message, true);
+  }
+
+  public NotificationPopup(Frame parent, HyperlinkListener hyperlinkListener,
+                           String message, boolean _autoClose) {
     super(parent, false);
+    autoClose = _autoClose;
     setLayout(new FlowLayout());
     setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-    setAlwaysOnTop(true);
     setUndecorated(true);
     setResizable(false);
 
@@ -131,6 +142,21 @@ private void updateLocation(Frame parent) {
   }
 
   public void close() {
+    if (autoClose) {
+      autoCloseTimer.cancel();
+    }
     dispatchEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
   }
+
+  public void begin() {
+    if (autoClose) {
+      autoCloseTimer.schedule(new TimerTask() {
+        @Override
+        public void run() {
+          close();
+        }
+      }, Constants.NOTIFICATION_POPUP_AUTOCLOSE_DELAY);
+    }
+    setVisible(true);
+  }
 }

app/src/cc/arduino/view/GoToLineNumber.java

@@ -51,8 +51,12 @@ public class SplashScreenHelper {
 
   public SplashScreenHelper(SplashScreen splash) {
     this.splash = splash;
-    Toolkit tk = Toolkit.getDefaultToolkit();
-    desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
+    if (splash != null) {
+      Toolkit tk = Toolkit.getDefaultToolkit();
+      desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
+    } else {
+      desktopHints = null;
+    }
   }
 
   public void splashText(String text) {