Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3ba8583

Browse files
committed
Merge branch 'master' of github.com:arduino/Arduino
2 parents 7248aff + cf47df3 commit 3ba8583

File tree

10 files changed

+18
-17
lines changed

10 files changed

+18
-17
lines changed

‎app/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
4343
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
4444
<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino2.jar"/>
45-
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.1.jar"/>
45+
<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
4646
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
4747
<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
4848
<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>

‎app/lib/rsyntaxtextarea-BSD.txt‎ renamed to ‎app/lib/RSyntaxTextArea.License.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2121
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
2222
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2323
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎app/lib/rsyntaxtextarea-2.6.1.jar‎

-1.1 MB
Binary file not shown.
1.11 MB
Binary file not shown.

‎app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellEditor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,27 +98,27 @@ public Component getTableCellEditorComponent(JTable table, Object value,
9898
editorCell.downgradeChooser.addItem(tr("Select version"));
9999

100100
final List<ContributedLibrary> notInstalledPrevious = new LinkedList<>();
101-
final List<ContributedLibrary> notIInstalledNewer = new LinkedList<>();
101+
final List<ContributedLibrary> notInstalledNewer = new LinkedList<>();
102102

103103
notInstalled.stream().forEach(input -> {
104104
if (!mayInstalled.isPresent()
105105
|| VersionComparator.greaterThan(mayInstalled.get(), input)) {
106106
notInstalledPrevious.add(input);
107107
} else {
108-
notIInstalledNewer.add(input);
108+
notInstalledNewer.add(input);
109109
}
110110
});
111-
notIInstalledNewer.forEach(editorCell.downgradeChooser::addItem);
111+
notInstalledNewer.forEach(editorCell.downgradeChooser::addItem);
112112
notInstalledPrevious.forEach(editorCell.downgradeChooser::addItem);
113113

114114
editorCell.downgradeChooser
115115
.setVisible(mayInstalled.isPresent()
116116
&& (!notInstalledPrevious.isEmpty()
117-
|| notIInstalledNewer.size() > 1));
117+
|| notInstalledNewer.size() > 1));
118118
editorCell.downgradeButton
119119
.setVisible(mayInstalled.isPresent()
120120
&& (!notInstalledPrevious.isEmpty()
121-
|| notIInstalledNewer.size() > 1));
121+
|| notInstalledNewer.size() > 1));
122122

123123
editorCell.versionToInstallChooser.removeAllItems();
124124
notInstalled.forEach(editorCell.versionToInstallChooser::addItem);

‎arduino-core/src/cc/arduino/contributions/DownloadableContributionVersionComparator.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,9 @@
3333

3434
public class DownloadableContributionVersionComparator implements Comparator<DownloadableContribution> {
3535

36-
private final VersionComparator versionComparator;
37-
38-
public DownloadableContributionVersionComparator() {
39-
versionComparator = new VersionComparator();
40-
}
41-
4236
@Override
4337
public int compare(DownloadableContribution lib1, DownloadableContribution lib2) {
44-
return versionComparator.compare(lib1.getParsedVersion(), lib2.getParsedVersion());
38+
return VersionComparator.compareTo(lib1.getParsedVersion(), lib2.getParsedVersion());
4539
}
4640

4741

‎arduino-core/src/cc/arduino/contributions/VersionComparator.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public int compare(String a, String b) {
6161
public static boolean greaterThan(String a, String b) {
6262
return compareTo(a, b) > 0;
6363
}
64-
64+
6565
public static boolean greaterThanOrEqual(String a, String b) {
6666
return compareTo(a, b) >= 0;
6767
}
@@ -77,4 +77,8 @@ public static ContributedLibrary max(ContributedLibrary a, ContributedLibrary b)
7777
public static boolean greaterThan(ContributedLibrary a, ContributedLibrary b) {
7878
return greaterThan(a.getParsedVersion(), b.getParsedVersion());
7979
}
80+
81+
public static int compareTo(ContributedLibrary a, ContributedLibrary b) {
82+
return compareTo(a.getParsedVersion(), b.getParsedVersion());
83+
}
8084
}

‎arduino-core/src/processing/app/helpers/FileUtils.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,9 @@ public static List<File> listFiles(File folder, boolean recursive,
344344
public static List<File> listFiles(File folder, boolean recursive,
345345
List<String> extensions) {
346346
List<File> result = new ArrayList<>();
347+
if (!folder.exists()) {
348+
return result;
349+
}
347350

348351
for (File file : folder.listFiles()) {
349352
if (isSCCSOrHiddenFile(file))

‎build/windows/launcher/config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<cp>%EXEDIR%/lib/jsch-0.1.50.jar</cp>
5151
<cp>%EXEDIR%/lib/jssc-2.8.0-arduino2.jar</cp>
5252
<cp>%EXEDIR%/lib/pde.jar</cp>
53-
<cp>%EXEDIR%/lib/rsyntaxtextarea-2.6.1.jar</cp>
53+
<cp>%EXEDIR%/lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar</cp>
5454
<cp>%EXEDIR%/lib/xml-apis-1.3.04.jar</cp>
5555
<cp>%EXEDIR%/lib/xml-apis-ext-1.3.04.jar</cp>
5656
<cp>%EXEDIR%/lib/xmlgraphics-commons-2.0.jar</cp>

‎build/windows/launcher/config_debug.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<cp>%EXEDIR%/lib/jsch-0.1.50.jar</cp>
5151
<cp>%EXEDIR%/lib/jssc-2.8.0-arduino2.jar</cp>
5252
<cp>%EXEDIR%/lib/pde.jar</cp>
53-
<cp>%EXEDIR%/lib/rsyntaxtextarea-2.6.1.jar</cp>
53+
<cp>%EXEDIR%/lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar</cp>
5454
<cp>%EXEDIR%/lib/xml-apis-1.3.04.jar</cp>
5555
<cp>%EXEDIR%/lib/xml-apis-ext-1.3.04.jar</cp>
5656
<cp>%EXEDIR%/lib/xmlgraphics-commons-2.0.jar</cp>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /