Skip to content

Commit 0496b0d

Browse files
committed
Merge branch 'hi-res-display'
2 parents 3f27ab4 + b02ce54 commit 0496b0d

File tree

98 files changed

+2505
-644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2505
-644
lines changed

Diff for: app/.classpath

+26-5
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,52 @@
33
<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
44
<classpathentry kind="src" path="test"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6+
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
7+
<classpathentry kind="output" path="bin"/>
68
<classpathentry kind="lib" path="lib/apple.jar"/>
9+
<classpathentry kind="lib" path="lib/batik-1.8.jar"/>
10+
<classpathentry kind="lib" path="lib/batik-anim-1.8.jar"/>
11+
<classpathentry kind="lib" path="lib/batik-awt-util-1.8.jar"/>
12+
<classpathentry kind="lib" path="lib/batik-bridge-1.8.jar"/>
13+
<classpathentry kind="lib" path="lib/batik-codec-1.8.jar"/>
14+
<classpathentry kind="lib" path="lib/batik-css-1.8.jar"/>
15+
<classpathentry kind="lib" path="lib/batik-dom-1.8.jar"/>
16+
<classpathentry kind="lib" path="lib/batik-ext-1.8.jar"/>
17+
<classpathentry kind="lib" path="lib/batik-gvt-1.8.jar"/>
18+
<classpathentry kind="lib" path="lib/batik-parser-1.8.jar"/>
19+
<classpathentry kind="lib" path="lib/batik-rasterizer-1.8.jar"/>
20+
<classpathentry kind="lib" path="lib/batik-script-1.8.jar"/>
21+
<classpathentry kind="lib" path="lib/batik-squiggle-1.8.jar"/>
22+
<classpathentry kind="lib" path="lib/batik-svg-dom-1.8.jar"/>
23+
<classpathentry kind="lib" path="lib/batik-svgpp-1.8.jar"/>
24+
<classpathentry kind="lib" path="lib/batik-transcoder-1.8.jar"/>
25+
<classpathentry kind="lib" path="lib/batik-util-1.8.jar"/>
26+
<classpathentry kind="lib" path="lib/batik-xml-1.8.jar"/>
727
<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>
828
<classpathentry kind="lib" path="lib/bcprov-jdk15on-152.jar"/>
929
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
1030
<classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
1131
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
1232
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
33+
<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
1334
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
1435
<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
1536
<classpathentry kind="lib" path="lib/jackson-annotations-2.6.3.jar"/>
1637
<classpathentry kind="lib" path="lib/jackson-core-2.6.3.jar"/>
1738
<classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
1839
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
40+
<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
1941
<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
2042
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
2143
<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
44+
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>
45+
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
46+
<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
47+
<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
2248
<classpathentry kind="lib" path="test-lib/junit-4.11.jar"/>
2349
<classpathentry kind="lib" path="test-lib/fest-assert-1.2.jar"/>
2450
<classpathentry kind="lib" path="test-lib/fest-reflect-1.2.jar"/>
2551
<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
2652
<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
27-
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
2853
<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
29-
<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
30-
<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
31-
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>
32-
<classpathentry kind="output" path="bin"/>
3354
</classpath>

Diff for: app/lib/README.xml-apis-1.3.04.txt

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
This distribution includes xml-apis.jar from the XML Commons External
2+
1.3.04 binary distribution, which can also be obtained from:
3+
4+
http://xml.apache.org/mirrors.cgi
5+
6+
Source code is available from the XML Commons web site:
7+
8+
http://xml.apache.org/commons/
9+
10+
xml-apis.jar contains:
11+
12+
- DOM Level 2 Events
13+
- DOM Level 2 HTML
14+
- DOM Level 2 Style
15+
- DOM Level 2 Traversal and Range
16+
- DOM Level 2 Views
17+
- DOM Level 3 Core
18+
- DOM Level 3 Load and Save
19+
- DOM Level 3 XPath
20+
- JAXP 1.3 (JSR 206)
21+
- SAX
22+
23+
All DOM code is licensed under the W3C Software License, and DOM documentation
24+
under the W3C Document License. See LICENSE.dom-software.txt and
25+
LICENSE.dom-documentation.txt.
26+
27+
The JAXP 1.3 code is licensed under the Apache Software License 2.0, which is
28+
in the LICENSE in the root directory of this distribution.
29+
30+
SAX is public domain. See LICENSE.sax.txt.

Diff for: app/lib/README.xml-apis-ext-1.3.04.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
This distribution includes xml-apis-ext.jar from the XML Commons External
2+
1.3.04 binary distribution, which can also be obtained from:
3+
4+
http://xml.apache.org/mirrors.cgi
5+
6+
Source code is available from the XML Commons web site:
7+
8+
http://xml.apache.org/commons/
9+
10+
xml-apis-ext.jar contains:
11+
12+
- SAC 1.3
13+
- SMIL Java bindings
14+
- SVG 1.1 Java bindings
15+
16+
SAC 1.3, the SMIL Java bindings and the SVG 1.1 Java bindings are licensed
17+
under the W3C Software License. Related documentation is licensed under the
18+
W3C Document License. See LICENSE.dom-software.txt and
19+
LICENSE.dom-documentation.txt.

Diff for: app/lib/batik-1.8.jar

5.12 KB
Binary file not shown.

Diff for: app/lib/batik-anim-1.8.jar

368 KB
Binary file not shown.

Diff for: app/lib/batik-awt-util-1.8.jar

294 KB
Binary file not shown.

Diff for: app/lib/batik-bridge-1.8.jar

517 KB
Binary file not shown.

Diff for: app/lib/batik-codec-1.8.jar

106 KB
Binary file not shown.

Diff for: app/lib/batik-css-1.8.jar

251 KB
Binary file not shown.

Diff for: app/lib/batik-dom-1.8.jar

137 KB
Binary file not shown.

Diff for: app/lib/batik-ext-1.8.jar

10.1 KB
Binary file not shown.

Diff for: app/lib/batik-gvt-1.8.jar

141 KB
Binary file not shown.

Diff for: app/lib/batik-parser-1.8.jar

54 KB
Binary file not shown.

Diff for: app/lib/batik-rasterizer-1.8.jar

46.6 KB
Binary file not shown.

Diff for: app/lib/batik-script-1.8.jar

16.8 KB
Binary file not shown.

Diff for: app/lib/batik-squiggle-1.8.jar

491 KB
Binary file not shown.

Diff for: app/lib/batik-svg-dom-1.8.jar

212 KB
Binary file not shown.

Diff for: app/lib/batik-svgpp-1.8.jar

16.3 KB
Binary file not shown.

Diff for: app/lib/batik-transcoder-1.8.jar

90.3 KB
Binary file not shown.

Diff for: app/lib/batik-util-1.8.jar

105 KB
Binary file not shown.

Diff for: app/lib/batik-xml-1.8.jar

26.1 KB
Binary file not shown.

Diff for: app/lib/batik.LICENSE.ASL-2.0.txt

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

Diff for: app/lib/xml-apis-1.3.04.jar

190 KB
Binary file not shown.

Diff for: app/lib/xml-apis-ext-1.3.04.jar

83.7 KB
Binary file not shown.

Diff for: app/lib/xmlgraphics-commons-2.0.jar

618 KB
Binary file not shown.

Diff for: app/src/cc/arduino/contributions/ContributionsSelfCheck.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ public void run() {
8383

8484
String text;
8585
if (updatableLibraries > 0 && updatablePlatforms <= 0) {
86-
text = I18n.format(tr("<br/>Update available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager\">", "</a>");
86+
text = I18n.format(tr("Updates available for some of your {0}libraries{1}"), "<a href=\"http://librarymanager\">", "</a>");
8787
} else if (updatableLibraries <= 0 && updatablePlatforms > 0) {
88-
text = I18n.format(tr("<br/>Update available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager\">", "</a>");
88+
text = I18n.format(tr("Updates available for some of your {0}boards{1}"), "<a href=\"http://boardsmanager\">", "</a>");
8989
} else {
90-
text = I18n.format(tr("<br/>Update available for some of your {0}boards{1} and {2}libraries{3}"), "<a href=\"http://boardsmanager\">", "</a>", "<a href=\"http://librarymanager\">", "</a>");
90+
text = I18n.format(tr("Updates available for some of your {0}boards{1} and {2}libraries{3}"), "<a href=\"http://boardsmanager\">", "</a>", "<a href=\"http://librarymanager\">", "</a>");
9191
}
9292

9393
if (cancelled) {

Diff for: app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import cc.arduino.contributions.libraries.ContributedLibrary;
2727
import cc.arduino.contributions.ui.InstallerTableCell;
2828
import processing.app.Base;
29+
import processing.app.Theme;
2930

3031
public class ContributedLibraryTableCellJPanel extends JPanel {
3132

@@ -39,7 +40,7 @@ public class ContributedLibraryTableCellJPanel extends JPanel {
3940
final JLabel statusLabel;
4041

4142
public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
42-
boolean isSelected) {
43+
boolean isSelected) {
4344
super();
4445
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
4546

@@ -217,10 +218,10 @@ private JTextPane makeNewDescription() {
217218
Document doc = description.getDocument();
218219
if (doc instanceof HTMLDocument) {
219220
HTMLDocument html = (HTMLDocument) doc;
220-
StyleSheet stylesheet = html.getStyleSheet();
221-
stylesheet.addRule("body { margin: 0; padding: 0;"
222-
+ "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
223-
+ "font-size: 100%;" + "font-size: 0.95em; }");
221+
StyleSheet s = html.getStyleSheet();
222+
s.addRule("body { margin: 0; padding: 0;"
223+
+ "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
224+
+ "font-size: " + 10 * Theme.getScale() / 100 + "; }");
224225
}
225226
description.setOpaque(false);
226227
description.setBorder(new EmptyBorder(4, 7, 7, 7));

0 commit comments

Comments
 (0)