Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/processing/app/Sketch.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
import java.io.File;
import java.util.List;

import static processing.app.I18n.tr;

public class GenericNetworkUploader extends Uploader {

private final BoardPort port;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,10 @@ private void downloadFile() throws InterruptedException {
file.write(buffer, 0, read);
setDownloaded(getDownloaded() + read);

if (Thread.interrupted())
if (Thread.interrupted()) {
file.close();
throw new InterruptedException();
}
}

if (getDownloadSize() != null) {
Expand Down
5 changes: 0 additions & 5 deletions arduino-core/src/processing/app/I18n.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ static protected void init(String language) throws MissingResourceException {
PROMPT_BROWSE = tr("Browse");
}

@Deprecated
public static String _(String s) {
return tr(s);
}

public static String tr(String s) {
String res;
try {
Expand Down
1 change: 0 additions & 1 deletion arduino-core/src/processing/app/SketchCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
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;
Expand Down
8 changes: 0 additions & 8 deletions arduino-core/src/processing/app/linux/Platform.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
2 changes: 0 additions & 2 deletions arduino-core/src/processing/app/macosx/Platform.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
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;

Expand All @@ -41,7 +40,6 @@
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;


/**
Expand Down
8 changes: 0 additions & 8 deletions arduino-core/src/processing/app/windows/Platform.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,16 @@

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;
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 {
Expand Down