Merge branch 'master' into serialPlotterLimitGrapfCount

Author: Wilhelm Wiens

.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="app/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="app/lib/apple.jar"/>
-	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
@@ -19,14 +18,16 @@
 	<classpathentry kind="lib" path="app/lib/jmdns-3.5.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/slf4j-api-1.7.22.jar"/>
 	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
-	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
 	<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-152.jar"/>
 	<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-152.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-core-2.6.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-databind-2.6.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.6.3.jar"/>
-	<classpathentry kind="lib" path="app/lib/jackson-annotations-2.6.3.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-core-2.9.5.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-databind-2.9.5.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.9.5.jar"/>
+	<classpathentry kind="lib" path="app/lib/jackson-annotations-2.9.5.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
+	<classpathentry kind="lib" path="app/lib/jssc-2.8.0-arduino1.jar"/>
+	<classpathentry kind="lib" path="app/lib/java-semver-0.8.0.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/app"/>
 	<classpathentry kind="output" path="app/bin"/>
 </classpath>

app/.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
-	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="lib/batik-1.8.jar"/>
 	<classpathentry kind="lib" path="lib/batik-anim-1.8.jar"/>
@@ -33,16 +32,16 @@
 	<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-annotations-2.6.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-core-2.6.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
-	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-core-2.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.9.5.jar"/>
 	<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/jmdns-3.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/jmdns-3.5.3.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
-	<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino1.jar"/>
+	<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino2.jar"/>
 	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
@@ -53,4 +52,6 @@
 	<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
 	<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
 	<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/autocomplete-2.6.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

app/build.xml

@@ -130,6 +130,8 @@
   </target>
 
   <target name="build" depends="compile" description="Build PDE">
-    <jar basedir="bin" destfile="pde.jar" />
+    <jar basedir="bin" destfile="pde.jar" >
+      <fileset dir="src" includes="**/icons/**" />
+    </jar>
   </target>
 </project>

app/lib/autocomplete-2.6.1.jar

@@ -52,7 +52,7 @@
  */
 public class ConsoleOutputStream extends ByteArrayOutputStream {
 
-  private final SimpleAttributeSet attributes;
+  private SimpleAttributeSet attributes;
   private final PrintStream printStream;
   private final Timer timer;
 
@@ -73,6 +73,10 @@ public ConsoleOutputStream(SimpleAttributeSet attributes, PrintStream printStrea
     timer.setRepeats(false);
   }
 
+  public void setAttibutes(SimpleAttributeSet attributes) {
+    this.attributes = attributes;
+  }
+
   public void setCurrentEditorConsole(EditorConsole console) {
     this.editorConsole = console;
   }

app/lib/jackson-annotations-2.6.3.jar

@@ -34,6 +34,10 @@
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import java.net.URL;
+import java.net.URI;
+import java.awt.Desktop;
+import java.io.IOException;
+import java.net.URISyntaxException;
 
 public class UpdatableBoardsLibsFakeURLsHandler implements HyperlinkListener {
 
@@ -71,6 +75,18 @@ public void openBoardLibManager(URL url) {
       return;
     }
 
+    if(Desktop.isDesktopSupported())
+    {
+      try {
+        Desktop.getDesktop().browse(url.toURI());
+        return;
+      } catch (IOException e) {
+        throw new IllegalArgumentException(url.getHost() + " is invalid");
+      } catch (URISyntaxException e) {
+        throw new IllegalArgumentException(url.getHost() + " is invalid");
+      }
+    }
+
     throw new IllegalArgumentException(url.getHost() + " is invalid");
 
   }

app/lib/jackson-annotations-2.9.5.jar

@@ -0,0 +1,134 @@
+/*
+ * This file is part of Arduino.
+ *
+ * Copyright 2017 Arduino LLC (http://www.arduino.cc/)
+ *
+ * Arduino is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ */
+
+package cc.arduino.autocomplete;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArduinoCompletionsList extends ArrayList<ArduinoCompletion> {
+}
+
+class ArduinoCompletion {
+  ArduinoCompletionDetail completion;
+  String type;
+  String location;
+  List<ArduinoParameter> parameters;
+
+  public ArduinoCompletionDetail getCompletion() {
+    return completion;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public List<ArduinoParameter> getParameters() {
+    return parameters;
+  }
+}
+
+class ArduinoParameter {
+  String name;
+  String type;
+
+  public String getName() {
+    return name;
+  }
+
+  public String getType() {
+    return type;
+  }
+}
+
+class ArduinoCompletionDetail {
+  List<CompletionChunk> chunks;
+  String brief;
+
+  public List<CompletionChunk> getChunks() {
+    return chunks;
+  }
+
+  public String getBrief() {
+    return brief;
+  }
+
+  public String getResultType() {
+    for (CompletionChunk c : chunks) {
+      if (c.res != null)
+        return c.res;
+    }
+    return null;
+  }
+
+  public String getTypedText() {
+    for (CompletionChunk c : chunks) {
+      if (c.typedtext != null)
+        return c.typedtext;
+    }
+    return null;
+  }
+}
+
+class CompletionChunk {
+  String typedtext;
+  String t;
+  String placeholder;
+  String res;
+  String info;
+  ArduinoCompletionDetail optional;
+
+  public String getTypedtext() {
+    return typedtext;
+  }
+
+  public String getT() {
+    return t;
+  }
+
+  public String getPlaceholder() {
+    return placeholder;
+  }
+
+  public String getRes() {
+    return res;
+  }
+
+  public ArduinoCompletionDetail getOptional() {
+    return optional;
+  }
+
+  public String getInfo() {
+    return info;
+  }
+}

app/lib/jackson-core-2.6.3.jar

@@ -1,7 +1,8 @@
 /*
  * This file is part of Arduino.
  *
- * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
+ * Copyright 2017 Arduino LLC (http://www.arduino.cc/)
+ *                Ricardo JL Rufino (ricardo@criativasoft.com.br)
  *
  * Arduino is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,21 +28,15 @@
  * the GNU General Public License.
  */
 
-package cc.arduino.contributions.filters;
+package cc.arduino.autocomplete;
 
-import cc.arduino.contributions.DownloadableContribution;
-
-import java.util.function.Predicate;
-
-public class BuiltInPredicate implements Predicate<DownloadableContribution> {
+import org.fife.ui.autocomplete.DefaultCompletionProvider;
 
+public class BaseCCompletionProvider extends DefaultCompletionProvider {
+ 
   @Override
-  public boolean test(DownloadableContribution input) {
-    return input.isReadOnly();
+  protected boolean isValidChar(char ch) {
+    return super.isValidChar(ch) || '.' == ch || '>' == ch  || '-' == ch  || '<' == ch || '#' == ch || ':' == ch /**|| getParameterListStart() == ch */;
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof BuiltInPredicate;
-  }
 }