Skip to content

Commit c1a6a56

Browse files
authored
Merge branch 'main' into all-contributors/add-DinoWw
2 parents 6f1e97b + a05d254 commit c1a6a56

File tree

5 files changed

+19
-3
lines changed

5 files changed

+19
-3
lines changed

.all-contributorsrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,6 +1687,14 @@
16871687
"contributions": [
16881688
"doc"
16891689
]
1690+
},
1691+
"login": "avinxshKD",
1692+
"name": "Avinash Kumar Deepak",
1693+
"avatar_url": "https://avatars.githubusercontent.com/u/152387616?v=4",
1694+
"profile": "https://github.com/avinxshKD",
1695+
"contributions": [
1696+
"code"
1697+
]
16901698
}
16911699
],
16921700
"repoType": "github",

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ _Note: due to GitHub's limitations, this repository's [Contributors](https://git
250250
<td align="center" valign="top" width="16.66%"><a href="https://github.com/SuganthiThomas"><img src="https://avatars.githubusercontent.com/u/150956406?v=4?s=120" width="120px;" alt="SuganthiThomas"/><br /><sub><b>SuganthiThomas</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=SuganthiThomas" title="Code">💻</a></td>
251251
<td align="center" valign="top" width="16.66%"><a href="https://github.com/madhav2348"><img src="https://avatars.githubusercontent.com/u/161720210?v=4?s=120" width="120px;" alt="Madhav Majumdar"/><br /><sub><b>Madhav Majumdar</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=madhav2348" title="Code">💻</a></td>
252252
<td align="center" valign="top" width="16.66%"><a href="https://github.com/DinoWw"><img src="https://avatars.githubusercontent.com/u/19573337?v=4?s=120" width="120px;" alt="Dino_Ww"/><br /><sub><b>Dino_Ww</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=DinoWw" title="Documentation">📖</a></td>
253+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/avinxshKD"><img src="https://avatars.githubusercontent.com/u/152387616?v=4?s=120" width="120px;" alt="Avinash Kumar Deepak"/><br /><sub><b>Avinash Kumar Deepak</b></sub></a><br /><a href="https://github.com/processing/processing4/commits?author=avinxshKD" title="Code">💻</a></td>
253254
</tr>
254255
</tbody>
255256
</table>

app/src/processing/app/Preferences.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,15 @@ static public void setBoolean(String attribute, boolean value) {
336336

337337

338338
static public int getInteger(String attribute /*, int defaultValue*/) {
339-
return Integer.parseInt(get(attribute));
339+
try {
340+
return Integer.parseInt(get(attribute));
341+
} catch (NumberFormatException err) {
342+
try {
343+
return Integer.parseInt(getDefault(attribute));
344+
} catch (NumberFormatException err2) {
345+
throw new IllegalArgumentException("Cannot parse: " + attribute);
346+
}
347+
}
340348
}
341349

342350

core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ plugins {
88

99
repositories {
1010
mavenCentral()
11-
maven { url = uri("https://jogamp.org/deployment/maven") }
1211
}
1312

1413
sourceSets{

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin = "2.2.20"
33
compose-plugin = "1.9.1"
4-
jogl = "2.5.0"
4+
jogl = "2.6.0"
55
antlr = "4.13.2"
66
jupiter = "5.12.0"
77
markdown = "0.37.0"

0 commit comments

Comments
 (0)