diff --git a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java
index 63de0366d..f2f601259 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java
@@ -353,7 +353,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
String sentence = selected.getSentence();
String paragraph = selected.getParagraph();
// String availableVer = selectedLib.getVersion();
- String url = selected.getUrl();
+ // String url = selected.getUrl();
String midcolor = isSelected ? "#000000" : "#888888";
@@ -379,8 +379,6 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
} else {
desc += " " + format(_("Version {0}"), installedVer);
}
- } else {
- // not installed...
}
desc += "";
diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
index da32275f6..f9d9f69e3 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
@@ -44,9 +44,9 @@ public class LibrariesIndexTableModel extends FilteredAbstractTableModel {
- public String name;
- public List releases = new ArrayList();
- public List versions = new ArrayList();
+ public final String name;
+ public final List releases = new ArrayList();
+ public final List versions = new ArrayList();
public ContributedLibrary selected = null;
public ContributedLibraryReleases(ContributedLibrary library) {
@@ -122,11 +122,11 @@ public class LibrariesIndexTableModel extends FilteredAbstractTableModel contributions = new ArrayList();
+ private final List contributions = new ArrayList();
- private String[] columnNames = {"Description"};
+ private final String[] columnNames = {"Description"};
- private Class>[] columnTypes = {ContributedPlatform.class};
+ private final Class>[] columnTypes = {ContributedPlatform.class};
private LibrariesIndexer indexer;
diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java b/app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java
index ede80d64f..d00677039 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java
@@ -55,18 +55,17 @@ public class LibraryInstaller {
}
}
- private LibrariesIndexer indexer;
- private File stagingFolder;
- private DownloadableContributionsDownloader downloader;
+ private final LibrariesIndexer indexer;
+ private final DownloadableContributionsDownloader downloader;
public LibraryInstaller(LibrariesIndexer _indexer) {
indexer = _indexer;
- stagingFolder = _indexer.getStagingFolder();
+ File stagingFolder = _indexer.getStagingFolder();
downloader = new DownloadableContributionsDownloader(stagingFolder) {
@Override
protected void onProgress(Progress progress) {
LibraryInstaller.this.onProgress(progress);
- };
+ }
};
}
@@ -160,8 +159,7 @@ public class LibraryInstaller {
rescanLibraryIndex(progress);
}
- private void rescanLibraryIndex(MultiStepProgress progress)
- throws IOException {
+ private void rescanLibraryIndex(MultiStepProgress progress) {
progress.setStatus(_("Updating list of installed libraries"));
onProgress(progress);
indexer.rescanLibraries();
diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
index 017943a49..c0fc5da08 100644
--- a/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
+++ b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
@@ -61,9 +61,7 @@ public class ContributionIndexTableModel extends FilteredAbstractTableModel extends JDialog {
// Toolbar on top of the window:
// - Categories drop-down menu
- protected JLabel categoryLabel;
- protected JComboBox categoryChooser;
- protected Component categoryStrut1;
- protected Component categoryStrut2;
- protected Component categoryStrut3;
+ protected final JLabel categoryLabel;
+ protected final JComboBox categoryChooser;
+ protected final Component categoryStrut1;
+ protected final Component categoryStrut2;
+ protected final Component categoryStrut3;
// - Search text-field
- protected FilterJTextField filterField;
+ protected final FilterJTextField filterField;
// Currently selected category and filters
protected Predicate categoryFilter;
protected String[] filters;
@@ -75,9 +75,9 @@ public abstract class InstallerJDialog extends JDialog {
// Bottom:
// - Progress bar
- protected ProgressJProgressBar progressBar;
- protected Box progressBox;
- protected Box errorMessageBox;
+ protected final ProgressJProgressBar progressBar;
+ protected final Box progressBox;
+ protected final Box errorMessageBox;
private final JLabel errorMessage;
public InstallerJDialog(Frame parent, String title, ModalityType applicationModal, String noConnectionErrorMessage) {
@@ -136,7 +136,7 @@ public abstract class InstallerJDialog extends JDialog {
@Override
public void keyReleased(KeyEvent keyEvent) {
- if (keyEvent.getKeyCode() != keyEvent.VK_DOWN && keyEvent.getKeyCode() != KeyEvent.VK_UP) {
+ if (keyEvent.getKeyCode() != KeyEvent.VK_DOWN && keyEvent.getKeyCode() != KeyEvent.VK_UP) {
return;
}
@@ -263,7 +263,7 @@ public abstract class InstallerJDialog extends JDialog {
}
}
- protected ActionListener categoryChooserActionListener = new ActionListener() {
+ protected final ActionListener categoryChooserActionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent event) {
diff --git a/app/src/cc/arduino/packages/formatter/AStyle.java b/app/src/cc/arduino/packages/formatter/AStyle.java
index 5252bb802..1747c622f 100644
--- a/app/src/cc/arduino/packages/formatter/AStyle.java
+++ b/app/src/cc/arduino/packages/formatter/AStyle.java
@@ -42,7 +42,7 @@ import static processing.app.I18n._;
public class AStyle implements Tool {
- private static String FORMATTER_CONF = "formatter.conf";
+ private static final String FORMATTER_CONF = "formatter.conf";
private final AStyleInterface aStyleInterface;
private final String formatterConfiguration;
diff --git a/app/src/cc/arduino/view/Event.java b/app/src/cc/arduino/view/Event.java
index 4cc2cd278..5a050dfb3 100644
--- a/app/src/cc/arduino/view/Event.java
+++ b/app/src/cc/arduino/view/Event.java
@@ -48,10 +48,7 @@ public class Event extends ActionEvent {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(super.toString());
- sb.append("\n").append(payload.toString());
- return sb.toString();
+ return super.toString() + "\n" + payload.toString();
}
}
diff --git a/app/src/cc/arduino/view/SplashScreenHelper.java b/app/src/cc/arduino/view/SplashScreenHelper.java
index 8b450515f..d9f5fedb6 100644
--- a/app/src/cc/arduino/view/SplashScreenHelper.java
+++ b/app/src/cc/arduino/view/SplashScreenHelper.java
@@ -38,7 +38,7 @@ import java.util.Map;
public class SplashScreenHelper {
private final Map desktopHints;
- private SplashScreen splash;
+ private final SplashScreen splash;
private Rectangle2D.Double splashTextArea;
private Graphics2D splashGraphics;
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
index f894cb5c1..76e030a90 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
@@ -154,12 +154,12 @@ public abstract class ContributedLibrary extends DownloadableContribution {
String thisVersion = getVersion();
String otherVersion = ((ContributedLibrary) obj).getVersion();
- boolean versionEquals = thisVersion == null || otherVersion == null || thisVersion == otherVersion || thisVersion.equals(otherVersion);
+ boolean versionEquals = thisVersion == null || otherVersion == null || thisVersion.equals(otherVersion);
String thisName = getName();
String otherName = ((ContributedLibrary) obj).getName();
- boolean nameEquals = thisName == null || otherName == null || thisName == otherName || thisName.equals(otherName);
+ boolean nameEquals = thisName == null || otherName == null || thisName.equals(otherName);
return versionEquals && nameEquals;
}
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
index 4b19779af..deaaeec90 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
@@ -51,10 +51,10 @@ import com.fasterxml.jackson.module.mrbean.MrBeanModule;
public class LibrariesIndexer {
private LibrariesIndex index;
- private LibraryList installedLibraries = new LibraryList();
+ private final LibraryList installedLibraries = new LibraryList();
private List librariesFolders;
- private File indexFile;
- private File stagingFolder;
+ private final File indexFile;
+ private final File stagingFolder;
private File sketchbookLibrariesFolder;
public LibrariesIndexer(File preferencesFolder) {
@@ -84,13 +84,12 @@ public class LibrariesIndexer {
}
}
- public void setLibrariesFolders(List _librariesFolders)
- throws IOException {
+ public void setLibrariesFolders(List _librariesFolders) {
librariesFolders = _librariesFolders;
rescanLibraries();
}
- public void rescanLibraries() throws IOException {
+ public void rescanLibraries() {
// Clear all installed flags
installedLibraries.clear();
for (ContributedLibrary lib : index.getLibraries())
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java
index 724d15664..0a7bbdd46 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java
@@ -94,7 +94,7 @@ public abstract class ContributedPackage {
for (ContributedPlatform plat : getPlatforms()) {
res += "\n Plaform : name : " + plat.getName();
if (plat.isInstalled()) {
- res += "\n " + ((DownloadableContribution) plat);
+ res += "\n " + plat;
}
res += "\n category : " + plat.getCategory();
res += "\n architecture : " +
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
index ca91e652b..f790bb064 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
@@ -60,12 +60,13 @@ public abstract class ContributedPlatform extends DownloadableContribution {
return new LinkedList(resolvedTools);
}
- public List resolveToolsDependencies(Collection packages) {
+ public void resolveToolsDependencies(Collection packages) {
resolvedTools = new ArrayList();
// If there are no dependencies return empty list
- if (getToolsDependencies() == null)
- return resolvedTools;
+ if (getToolsDependencies() == null) {
+ return;
+ }
// For each tool dependency
for (ContributedToolReference dep : getToolsDependencies()) {
@@ -76,7 +77,6 @@ public abstract class ContributedPlatform extends DownloadableContribution {
}
resolvedTools.add(tool);
}
- return resolvedTools;
}
public ContributedPackage getParentPackage() {
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java
index d0fc05aa6..a04c5d79f 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java
@@ -37,8 +37,8 @@ import processing.app.debug.TargetPlatform;
public class ContributedTargetPackage implements TargetPackage {
- private String id;
- private Map platforms;
+ private final String id;
+ private final Map platforms;
public ContributedTargetPackage(String _id) {
id = _id;
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java
index ab4b4421f..312595c0b 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java
@@ -65,12 +65,11 @@ public class ContributionInstaller {
}
}
- private File stagingFolder;
- private ContributionsIndexer indexer;
- private DownloadableContributionsDownloader downloader;
+ private final ContributionsIndexer indexer;
+ private final DownloadableContributionsDownloader downloader;
public ContributionInstaller(ContributionsIndexer contributionsIndexer) {
- stagingFolder = contributionsIndexer.getStagingFolder();
+ File stagingFolder = contributionsIndexer.getStagingFolder();
indexer = contributionsIndexer;
downloader = new DownloadableContributionsDownloader(stagingFolder) {
@Override
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java
index a7a8fce2f..2c262f216 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java
@@ -51,7 +51,7 @@ public abstract class ContributionsIndex {
return pack.findTool(name, version);
}
- private List categories = new ArrayList();
+ private final List categories = new ArrayList();
public List getCategories() {
return categories;
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
index f0ece392a..ce96187a6 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
@@ -150,7 +150,6 @@ public class ContributionsIndexer {
}
contrib.setInstalled(true);
contrib.setInstalledFolder(versionFolder);
- return;
}
private void syncHardwareWithFilesystem(ContributedPackage pack,
diff --git a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java
index 80173a9f2..dc10306ef 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java
@@ -80,14 +80,9 @@ public abstract class DownloadableContribution {
@Override
public String toString() {
- String chk = getChecksum();
- if (chk.length() > 14)
- chk = getChecksum().substring(0, 14);
String res = "";
- // res += getUrl() + " (" + chk + ") ";
if (installed) {
- res += "installed on " + installedFolder.getAbsolutePath() + " (" +
- getSize() + " bytes)";
+ res += "installed on " + installedFolder.getAbsolutePath() + " (" + getSize() + " bytes)";
}
return res;
}
diff --git a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java
index 908df52a2..1a963254b 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java
@@ -42,7 +42,7 @@ import static processing.app.I18n.format;
public class DownloadableContributionsDownloader {
- private File stagingFolder;
+ private final File stagingFolder;
public DownloadableContributionsDownloader(File _stagingFolder) {
stagingFolder = _stagingFolder;
diff --git a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
index b7a7927c8..1c99e1500 100644
--- a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
+++ b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
@@ -28,7 +28,6 @@
*/
package cc.arduino.contributions.packages;
-import processing.app.BaseNoGui;
import processing.app.Platform;
public abstract class HostDependentDownloadableContribution extends DownloadableContribution {
diff --git a/arduino-core/src/cc/arduino/os/linux/LinuxFileNativeUtils.java b/arduino-core/src/cc/arduino/os/linux/LinuxFileNativeUtils.java
index c519ce88f..d9f6ad2f0 100644
--- a/arduino-core/src/cc/arduino/os/linux/LinuxFileNativeUtils.java
+++ b/arduino-core/src/cc/arduino/os/linux/LinuxFileNativeUtils.java
@@ -33,7 +33,7 @@ import java.io.IOException;
public class LinuxFileNativeUtils {
- public static LibCNative libc = LibCNative.libc;
+ public static final LibCNative libc = LibCNative.libc;
public static void chmod(File file, int mode) throws IOException {
int res = libc.chmod(file.getAbsolutePath(), mode);
diff --git a/arduino-core/src/cc/arduino/os/windows/WindowsFileNativeUtils.java b/arduino-core/src/cc/arduino/os/windows/WindowsFileNativeUtils.java
index 5073e7920..26b477dd7 100644
--- a/arduino-core/src/cc/arduino/os/windows/WindowsFileNativeUtils.java
+++ b/arduino-core/src/cc/arduino/os/windows/WindowsFileNativeUtils.java
@@ -29,11 +29,10 @@
package cc.arduino.os.windows;
import java.io.File;
-import java.io.IOException;
public class WindowsFileNativeUtils {
- public static void chmod(File file, int mode) throws IOException {
+ public static void chmod(File file, int mode) {
// Empty
}
diff --git a/arduino-core/src/cc/arduino/packages/UploaderFactory.java b/arduino-core/src/cc/arduino/packages/UploaderFactory.java
index 8cfe44d9e..56828a753 100644
--- a/arduino-core/src/cc/arduino/packages/UploaderFactory.java
+++ b/arduino-core/src/cc/arduino/packages/UploaderFactory.java
@@ -36,8 +36,9 @@ import processing.app.debug.TargetBoard;
public class UploaderFactory {
public Uploader newUploader(TargetBoard board, BoardPort port, boolean noUploadPort) {
- if (noUploadPort)
- return new SerialUploader(noUploadPort);
+ if (noUploadPort) {
+ return new SerialUploader(true);
+ }
if ("true".equals(board.getPreferences().get("upload.via_ssh")) && port != null && "network".equals(port.getProtocol())) {
return new SSHUploader(port);
diff --git a/arduino-core/src/cc/arduino/packages/security/ClearSignedVerifier.java b/arduino-core/src/cc/arduino/packages/security/ClearSignedVerifier.java
index 97554e878..0c53126a9 100644
--- a/arduino-core/src/cc/arduino/packages/security/ClearSignedVerifier.java
+++ b/arduino-core/src/cc/arduino/packages/security/ClearSignedVerifier.java
@@ -58,8 +58,7 @@ public class ClearSignedVerifier {
* @throws FileNotFoundException
*/
public static VerifyResult verify(File signedTextFile,
- PGPPublicKeyRingCollection pubKeyRing)
- throws FileNotFoundException {
+ PGPPublicKeyRingCollection pubKeyRing) {
// Create the result object
VerifyResult result = new VerifyResult();
result.clearText = null;
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
index b99c00a5c..cadb05736 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
@@ -119,7 +119,10 @@ public class SSHUploader extends Uploader {
private boolean runAVRDude(SSH ssh) throws IOException, JSchException {
TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
PreferencesMap prefs = PreferencesData.getMap();
- prefs.putAll(BaseNoGui.getBoardPreferences());
+ PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();
+ if (boardPreferences != null) {
+ prefs.putAll(boardPreferences);
+ }
prefs.putAll(targetPlatform.getTool(prefs.get("upload.tool")));
String additionalParams = verbose ? prefs.get("upload.params.verbose") : prefs.get("upload.params.quiet");
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
index 86524f773..220ee1cee 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -60,7 +60,10 @@ public class SerialUploader extends Uploader {
// FIXME: Preferences should be reorganized
TargetPlatform targetPlatform = BaseNoGui.getTargetPlatform();
PreferencesMap prefs = PreferencesData.getMap();
- prefs.putAll(BaseNoGui.getBoardPreferences());
+ PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();
+ if (boardPreferences != null) {
+ prefs.putAll(boardPreferences);
+ }
String tool = prefs.getOrExcept("upload.tool");
if (tool.contains(":")) {
String[] split = tool.split(":", 2);
@@ -242,7 +245,10 @@ public class SerialUploader extends Uploader {
}
PreferencesMap prefs = PreferencesData.getMap();
- prefs.putAll(BaseNoGui.getBoardPreferences());
+ PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();
+ if (boardPreferences != null) {
+ prefs.putAll(boardPreferences);
+ }
PreferencesMap programmerPrefs = targetPlatform.getProgrammer(programmer);
if (programmerPrefs == null)
throw new RunnerException(
@@ -295,7 +301,10 @@ public class SerialUploader extends Uploader {
// Build configuration for the current programmer
PreferencesMap prefs = PreferencesData.getMap();
- prefs.putAll(BaseNoGui.getBoardPreferences());
+ PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();
+ if (boardPreferences != null) {
+ prefs.putAll(boardPreferences);
+ }
prefs.putAll(programmerPrefs);
// Create configuration for bootloader tool
diff --git a/arduino-core/src/cc/arduino/utils/MultiStepProgress.java b/arduino-core/src/cc/arduino/utils/MultiStepProgress.java
index 9c14cf818..6846ab79a 100644
--- a/arduino-core/src/cc/arduino/utils/MultiStepProgress.java
+++ b/arduino-core/src/cc/arduino/utils/MultiStepProgress.java
@@ -30,10 +30,10 @@ package cc.arduino.utils;
public class MultiStepProgress implements Progress {
- double steps;
+ private final double steps;
- double step;
- double stepProgress;
+ private double step;
+ private double stepProgress;
String status;
diff --git a/arduino-core/src/cc/arduino/utils/Progress.java b/arduino-core/src/cc/arduino/utils/Progress.java
index 4eafcee3a..cc63ff3a8 100644
--- a/arduino-core/src/cc/arduino/utils/Progress.java
+++ b/arduino-core/src/cc/arduino/utils/Progress.java
@@ -30,11 +30,11 @@ package cc.arduino.utils;
public interface Progress {
- public void setProgress(double progress);
+ void setProgress(double progress);
double getProgress();
- public void setStatus(String _status);
+ void setStatus(String _status);
String getStatus();
diff --git a/arduino-core/src/cc/arduino/utils/network/FileDownloader.java b/arduino-core/src/cc/arduino/utils/network/FileDownloader.java
index f686ab2e7..358de9759 100644
--- a/arduino-core/src/cc/arduino/utils/network/FileDownloader.java
+++ b/arduino-core/src/cc/arduino/utils/network/FileDownloader.java
@@ -55,9 +55,9 @@ public class FileDownloader extends Observable {
private long initialSize;
private Long downloadSize = null;
private long downloaded;
- private URL downloadUrl;
+ private final URL downloadUrl;
- private File outputFile;
+ private final File outputFile;
private InputStream stream = null;
private Exception error;
@@ -225,6 +225,7 @@ public class FileDownloader extends Observable {
try {
file.close();
} catch (Exception e) {
+ //ignore
}
}
@@ -233,6 +234,7 @@ public class FileDownloader extends Observable {
try {
stream.close();
} catch (Exception e) {
+ //ignore
}
}
}
diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
index 1056da0b1..b35098e4d 100644
--- a/arduino-core/src/processing/app/BaseNoGui.java
+++ b/arduino-core/src/processing/app/BaseNoGui.java
@@ -757,13 +757,9 @@ public class BaseNoGui {
// Scan for libraries in each library folder.
// Libraries located in the latest folders on the list can override
// other libraries with the same name.
- try {
- BaseNoGui.librariesIndexer.setSketchbookLibrariesFolder(getSketchbookLibrariesFolder());
- BaseNoGui.librariesIndexer.setLibrariesFolders(librariesFolders);
- BaseNoGui.librariesIndexer.rescanLibraries();
- } catch (IOException e) {
- showWarning(_("Error"), _("Error loading libraries"), e);
- }
+ BaseNoGui.librariesIndexer.setSketchbookLibrariesFolder(getSketchbookLibrariesFolder());
+ BaseNoGui.librariesIndexer.setLibrariesFolders(librariesFolders);
+ BaseNoGui.librariesIndexer.rescanLibraries();
populateImportToLibraryTable();
}