Skip to content

Commit aac1a64

Browse files
charphicharphi
committed
Merge branch 'develop'
2 parents 7568786 + 3256426 commit aac1a64

File tree

119 files changed

+1951
-1299
lines changed

Some content is hidden

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

119 files changed

+1951
-1299
lines changed

‎.github/workflows/java8-maven.yml

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
java: [ 8, 11 ]
10+
java: [ 8, 17 ]
1111
os: [ ubuntu-latest, macOS-latest, windows-latest ]
1212
experimental: [ false ]
1313
include:
14-
- java: '>11'
14+
- java: '-ea'
1515
os: ubuntu-latest
1616
experimental: true
1717

@@ -24,18 +24,14 @@ jobs:
2424
uses: actions/checkout@v2
2525
with:
2626
submodules: true
27+
fetch-depth: 0
2728

2829
- name: Setup Java
29-
uses: actions/setup-java@v1
30+
uses: actions/setup-java@v2
3031
with:
32+
distribution: 'temurin'
3133
java-version: ${{ matrix.java }}
32-
33-
- name: Setup Maven cache
34-
uses: actions/cache@v1
35-
with:
36-
path: ~/.m2
37-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
38-
restore-keys: ${{ runner.os }}-m2
34+
cache: 'maven'
3935

4036
- name: Build and (headless) test with Maven
4137
uses: GabrielBB/xvfb-action@v1
@@ -47,7 +43,7 @@ jobs:
4743
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/heads/develop')
4844
strategy:
4945
matrix:
50-
java: [ 11 ]
46+
java: [ 17 ]
5147
os: [ ubuntu-latest ]
5248

5349
name: Snapshot on develop
@@ -58,21 +54,17 @@ jobs:
5854
uses: actions/checkout@v2
5955
with:
6056
submodules: true
57+
fetch-depth: 0
6158

6259
- name: Setup Java
63-
uses: actions/setup-java@v1
60+
uses: actions/setup-java@v2
6461
with:
62+
distribution: 'temurin'
6563
java-version: ${{ matrix.java }}
66-
67-
- name: Setup Maven cache
68-
uses: actions/cache@v1
69-
with:
70-
path: ~/.m2
71-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
72-
restore-keys: ${{ runner.os }}-m2
64+
cache: 'maven'
7365

7466
- name: Deploy snapshot with Maven if settings defined
75-
run: test -f ci.settings.xml && mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
67+
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
7668
env:
7769
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
7870
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
@@ -84,7 +76,7 @@ jobs:
8476
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/tags/v')
8577
strategy:
8678
matrix:
87-
java: [ 11 ]
79+
java: [ 17 ]
8880
os: [ ubuntu-latest ]
8981

9082
name: Release on tag
@@ -95,26 +87,24 @@ jobs:
9587
uses: actions/checkout@v2
9688
with:
9789
submodules: true
90+
fetch-depth: 0
9891

9992
- name: Setup Java
100-
uses: actions/setup-java@v1
93+
uses: actions/setup-java@v2
10194
with:
95+
distribution: 'temurin'
10296
java-version: ${{ matrix.java }}
103-
104-
- name: Setup Maven cache
105-
uses: actions/cache@v1
106-
with:
107-
path: ~/.m2
108-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
109-
restore-keys: ${{ runner.os }}-m2
97+
cache: 'maven'
11098

11199
- name: Deploy with Maven if settings defined
112-
run: test -f ci.settings.xml && mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
100+
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
113101
env:
114102
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
115103
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
116104
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
117105
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
106+
# Fix https://issues.sonatype.org/browse/OSSRH-66257
107+
MAVEN_OPTS: "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
118108

119109
- name: Build assets with Maven
120110
run: mvn -B -ntp install -DskipTests=true -P base-deploy

‎CHANGELOG.md

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
## [Unreleased]
8+
9+
### Added
10+
11+
### Fixed
12+
13+
### Changed
14+
15+
## [2.2.6] - 2022-06-03
16+
17+
This is a bugfix release of **java-desktop-util**.
18+
java-desktop-util follows [semantic versioning](http://semver.org/).
19+
20+
### Fixed
21+
- Fix colors on look&feel update
22+
23+
## [2.2.5] - 2021-03-24
24+
25+
This is a bugfix release of **java-desktop-util**.
26+
java-desktop-util follows [semantic versioning](http://semver.org/).
27+
28+
### Changed
29+
- Migration to [Maven-Central](https://search.maven.org/search?q=g:com.github.nbbrd.java-desktop-util)
30+
- **Breaking change:** Maven groupId is now `com.github.nbbrd.java-desktop-util`
31+
32+
## [2.2.4] - 2020-05-25
33+
34+
This is a bugfix release of **java-desktop-util**.
35+
java-desktop-util follows [semantic versioning](http://semver.org/).
36+
37+
### Fixed
38+
- Add fallback WinRegistry when JNA is unavailable
39+
40+
## [2.2.3] - 2019-09-25
41+
42+
### Added
43+
- Add automatic colors in font icons
44+
- Add local data transfer tool
45+
- Add invert action in JListSelection
46+
- Add custom icons for toolbars in JLists
47+
- Add partial support of JPMS
48+
49+
### Changed
50+
- Split code into smaller modules
51+
- Improve icon spinning
52+
53+
### Fixed
54+
- Fix drag & drop on Java11
55+
- Fix rendering on high dpi
56+
- Fix Windows search scope
57+
58+
## [2.2.2] - 2018-11-27
59+
60+
### Added
61+
- Add simple utilities for JList and JTable
62+
63+
### Fixed
64+
- JDK11 cleanup
65+
66+
[Unreleased]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.6...HEAD
67+
[2.2.6]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.5...v2.2.6
68+
[2.2.5]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.4...v2.2.5
69+
[2.2.4]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.3...v2.2.4
70+
[2.2.3]: https://github.com/nbbrd/java-desktop-util/compare/v2.2.2...v2.2.3
71+
[2.2.2]: https://github.com/nbbrd/java-desktop-util/releases/tag/v2.2.2

‎java-desktop-util-chart/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.github.nbbrd.java-desktop-util</groupId>
77
<artifactId>java-desktop-util-parent</artifactId>
8-
<version>2.2.5</version>
8+
<version>2.2.6</version>
99
</parent>
1010

1111
<artifactId>java-desktop-util-chart</artifactId>
@@ -18,7 +18,7 @@
1818
<properties>
1919
<!-- dependencies -->
2020
<jfreechart.version>1.0.19</jfreechart.version>
21-
<jfreesvg.version>3.4</jfreesvg.version>
21+
<jfreesvg.version>3.4.2</jfreesvg.version>
2222
</properties>
2323

2424
<dependencyManagement>

‎java-desktop-util-chart/src/main/java/ec/util/chart/ColorScheme.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import nbbrd.service.Mutability;
2222
import nbbrd.service.Quantifier;
2323
import nbbrd.service.ServiceDefinition;
24-
import org.checkerframework.checker.nullness.qual.NonNull;
24+
import lombok.NonNull;
2525

2626
/**
2727
* Defines a color scheme for charts.
@@ -123,7 +123,7 @@ public interface ColorScheme {
123123
*
124124
* @author Demortier Jeremy
125125
*/
126-
public enum KnownColor {
126+
enum KnownColor {
127127

128128
YELLOW, GREEN, BLUE, BROWN, ORANGE, GRAY, RED
129129
}

‎java-desktop-util-chart/src/main/java/ec/util/chart/ColorSchemeSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.List;
2323
import java.util.Map;
2424
import java.util.stream.Collectors;
25-
import org.checkerframework.checker.nullness.qual.NonNull;
25+
import lombok.NonNull;
2626

2727
/**
2828
* An helper class that simplifies the use of a color scheme in a specific
@@ -213,7 +213,7 @@ private Colors<T> createColors(ColorScheme colorScheme) {
213213
T gridColor = toColor(colorScheme.getGridColor());
214214
T textColor = toColor(colorScheme.getTextColor());
215215
T axisColor = toColor(colorScheme.getAxisColor());
216-
return new Colors(colorScheme.getName(), areaColors, lineColors, areaKnownColors, lineKnownColors, backColor, plotColor, gridColor, textColor, axisColor);
216+
return new Colors<>(colorScheme.getName(), areaColors, lineColors, areaKnownColors, lineKnownColors, backColor, plotColor, gridColor, textColor, axisColor);
217217
}
218218

219219
private static final class Colors<T> {

‎java-desktop-util-chart/src/main/java/ec/util/chart/ObsFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package ec.util.chart;
1818

1919
import java.util.Objects;
20-
import org.checkerframework.checker.nullness.qual.NonNull;
20+
import lombok.NonNull;
2121
import org.checkerframework.checker.nullness.qual.Nullable;
2222

2323
/**

‎java-desktop-util-chart/src/main/java/ec/util/chart/ObsIndex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package ec.util.chart;
1818

1919
import nbbrd.design.Immutable;
20-
import org.checkerframework.checker.nullness.qual.NonNull;
20+
import lombok.NonNull;
2121

2222
import java.util.Objects;
2323

‎java-desktop-util-chart/src/main/java/ec/util/chart/ObsPredicate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package ec.util.chart;
1818

19-
import org.checkerframework.checker.nullness.qual.NonNull;
19+
import lombok.NonNull;
2020

2121

2222
/**

‎java-desktop-util-chart/src/main/java/ec/util/chart/SeriesFunction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.Arrays;
2020
import java.util.Objects;
21-
import org.checkerframework.checker.nullness.qual.NonNull;
21+
import lombok.NonNull;
2222
import org.checkerframework.checker.nullness.qual.Nullable;
2323

2424
/**
@@ -46,7 +46,7 @@ public static <X> SeriesFunction<X> always(@Nullable X value) {
4646

4747
@NonNull
4848
public static <X> SeriesFunction<X> array(@NonNull X... values) throws NullPointerException {
49-
return new FromArray(values);
49+
return new FromArray<>(values);
5050
}
5151

5252
/**

‎java-desktop-util-chart/src/main/java/ec/util/chart/SeriesPredicate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package ec.util.chart;
1818

19-
import org.checkerframework.checker.nullness.qual.NonNull;
19+
import lombok.NonNull;
2020

2121

2222
/**

‎java-desktop-util-chart/src/main/java/ec/util/chart/TimeSeriesChart.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.text.DateFormat;
2222
import java.text.NumberFormat;
2323
import java.util.EnumSet;
24-
import org.checkerframework.checker.nullness.qual.NonNull;
24+
import lombok.NonNull;
2525
import org.checkerframework.checker.nullness.qual.Nullable;
2626

2727
/**
@@ -173,7 +173,7 @@ enum RendererType {
173173

174174
enum CrosshairOrientation {
175175

176-
HORIZONTAL, VERTICAL, BOTH;
176+
HORIZONTAL, VERTICAL, BOTH
177177
}
178178

179179
enum DisplayTrigger {

0 commit comments

Comments
 (0)