rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Merge branch 'java-warnings' of https://github.com/matthijskooijman/Arduino

Browse Source
This commit is contained in:
Cristian Maglie 2016-01-25 11:06:47 +01:00
commit 6b4c018740
8 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/processing/app/Sketch.java
View File

@ -27,7 +27,6 @@ import cc.arduino.Compiler;
import cc.arduino.CompilerProgressListener;
import cc.arduino.UploaderUtils;
import cc.arduino.packages.Uploader;
import org.apache.commons.codec.digest.DigestUtils;
import processing.app.debug.RunnerException;
import processing.app.forms.PasswordAuthorizationDialog;
import processing.app.helpers.FileUtils;

2
arduino-core/src/cc/arduino/packages/uploaders/GenericNetworkUploader.java
View File

@ -38,8 +38,6 @@ import processing.app.helpers.StringReplacer;
import java.io.File;
import java.util.List;
import static processing.app.I18n.tr;
public class GenericNetworkUploader extends Uploader {
private final BoardPort port;

4
arduino-core/src/cc/arduino/utils/network/FileDownloader.java
View File

@ -207,8 +207,10 @@ public class FileDownloader extends Observable {
file.write(buffer, 0, read);
setDownloaded(getDownloaded() + read);
if (Thread.interrupted())
if (Thread.interrupted()) {
file.close();
throw new InterruptedException();
}
}
if (getDownloadSize() != null) {

5
arduino-core/src/processing/app/I18n.java
View File

@ -70,11 +70,6 @@ public class I18n {
PROMPT_BROWSE = tr("Browse");
}
@Deprecated
public static String _(String s) {
return tr(s);
}
public static String tr(String s) {
String res;
try {

1
arduino-core/src/processing/app/SketchCode.java
View File

@ -28,7 +28,6 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

8
arduino-core/src/processing/app/linux/Platform.java
View File

@ -22,18 +22,10 @@
package processing.app.linux;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.Executor;
import org.apache.commons.exec.PumpStreamHandler;
import processing.app.PreferencesData;
import processing.app.debug.TargetPackage;
import processing.app.legacy.PConstants;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.Map;
/**

2
arduino-core/src/processing/app/macosx/Platform.java
View File

@ -29,7 +29,6 @@ import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.Executor;
import org.apache.commons.exec.PumpStreamHandler;
import org.apache.commons.lang3.StringUtils;
import processing.app.debug.TargetPackage;
import processing.app.legacy.PApplet;
import processing.app.legacy.PConstants;
@ -41,7 +40,6 @@ import java.io.IOException;
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/**

8
arduino-core/src/processing/app/windows/Platform.java
View File

@ -24,16 +24,9 @@ package processing.app.windows;
import cc.arduino.os.windows.FolderFinderInWindowsEnvVar;
import cc.arduino.os.windows.FolderFinderInWindowsRegistry;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.Executor;
import org.apache.commons.exec.PumpStreamHandler;
import processing.app.BaseNoGui;
import processing.app.debug.TargetPackage;
import processing.app.legacy.PApplet;
import processing.app.legacy.PConstants;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@ -41,7 +34,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
public class Platform extends processing.app.Platform {