EXTENSIONS = Stream.concat(SKETCH_EXTENSIONS.stream(), OTHER_ALLOWED_EXTENSIONS.stream()).collect(Collectors.toList());
- /** main pde file for this sketch. */
+ /**
+ * main pde file for this sketch.
+ */
private File primaryFile;
- /** folder that contains this sketch */
+ /**
+ * folder that contains this sketch
+ */
private File folder;
- /** data folder location for this sketch (may not exist yet) */
+ /**
+ * data folder location for this sketch (may not exist yet)
+ */
private File dataFolder;
- /** code folder location for this sketch (may not exist yet) */
+ /**
+ * code folder location for this sketch (may not exist yet)
+ */
private File codeFolder;
/**
@@ -79,15 +87,15 @@ public class SketchData {
/**
* Build the list of files.
- *
+ *
* Generally this is only done once, rather than
* each time a change is made, because otherwise it gets to be
* a nightmare to keep track of what files went where, because
* not all the data will be saved to disk.
- *
+ *
* This also gets called when the main sketch file is renamed,
* because the sketch has to be reloaded from a different folder.
- *
+ *
* Another exception is when an external editor is in use,
* in which case the load happens each time "run" is hit.
*/
@@ -106,7 +114,7 @@ public class SketchData {
// codeDocs = new SketchCodeDoc[list.length];
clearCodeDocs();
// data.setCodeDocs(codeDocs);
-
+
for (String filename : list) {
// Ignoring the dot prefix files is especially important to avoid files
// with the ._ prefix on Mac OS X. (You'll see this with Mac files on
diff --git a/arduino-core/src/processing/app/windows/RegQueryParser.java b/arduino-core/src/processing/app/windows/RegQueryParser.java
index 4d75b747e..e20a27faf 100644
--- a/arduino-core/src/processing/app/windows/RegQueryParser.java
+++ b/arduino-core/src/processing/app/windows/RegQueryParser.java
@@ -1,8 +1,5 @@
package processing.app.windows;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
import java.util.Arrays;
import java.util.List;
@@ -17,12 +14,7 @@ public class RegQueryParser {
private void parse(String regQueryOutput) {
List rows = Arrays.asList(regQueryOutput.replace(" ", "\t").replace("\r", "\n").replace("\n\n", "\n").split("\n"));
- String row = Iterables.find(rows, new Predicate() {
- @Override
- public boolean apply(String input) {
- return input.startsWith("\t");
- }
- });
+ String row = rows.stream().filter(input -> input.startsWith("\t")).findFirst().get();
String[] cols = row.split("\t");
assert cols.length == 4;
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index 5f78c2c53..4c6ddaf7e 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -19,7 +19,6 @@
%EXEDIR%/lib/commons-lang3-3.3.2.jar
%EXEDIR%/lib/commons-logging-1.0.4.jar
%EXEDIR%/lib/ecj.jar
- %EXEDIR%/lib/guava-18.0.jar
%EXEDIR%/lib/jackson-annotations-2.2.3.jar
%EXEDIR%/lib/jackson-core-2.2.3.jar
%EXEDIR%/lib/jackson-databind-2.2.3.jar
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index 4bcd2b34e..bd465e24a 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -19,7 +19,6 @@
%EXEDIR%/lib/commons-lang3-3.3.2.jar
%EXEDIR%/lib/commons-logging-1.0.4.jar
%EXEDIR%/lib/ecj.jar
- %EXEDIR%/lib/guava-18.0.jar
%EXEDIR%/lib/jackson-annotations-2.2.3.jar
%EXEDIR%/lib/jackson-core-2.2.3.jar
%EXEDIR%/lib/jackson-databind-2.2.3.jar