Merge remote-tracking branch 'origin2/master'
This commit is contained in:
commit
0b7ebfeec0
|
@ -1,3 +1,3 @@
|
||||||
#maven.buildNumber.plugin properties file
|
#maven.buildNumber.plugin properties file
|
||||||
#Wed Feb 21 16:14:03 CST 2024
|
#Wed Feb 21 16:14:03 CST 2024
|
||||||
buildNumber=1
|
buildNumber=2
|
||||||
|
|
3
pom.xml
3
pom.xml
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<groupId>org.aohe</groupId>
|
<groupId>org.aohe</groupId>
|
||||||
<artifactId>twain-service</artifactId>
|
<artifactId>twain-service</artifactId>
|
||||||
<version>0.1.4</version>
|
<version>0.1.5</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>8</maven.compiler.source>
|
<maven.compiler.source>8</maven.compiler.source>
|
||||||
|
@ -52,7 +52,6 @@
|
||||||
<groupId>com.formdev</groupId>
|
<groupId>com.formdev</groupId>
|
||||||
<artifactId>flatlaf</artifactId>
|
<artifactId>flatlaf</artifactId>
|
||||||
<version>3.4.1</version>
|
<version>3.4.1</version>
|
||||||
<classifier>no-natives</classifier>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ch.qos.logback</groupId>
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
|
|
@ -22,7 +22,8 @@ public class Main {
|
||||||
|
|
||||||
public static void main(String[] args) throws Exception {
|
public static void main(String[] args) throws Exception {
|
||||||
AppLocker locker = AppLocker.create("aoheSaneServiceLock").setPath(Paths.get(JAVA_IO_TMPDIR)).build();
|
AppLocker locker = AppLocker.create("aoheSaneServiceLock").setPath(Paths.get(JAVA_IO_TMPDIR)).build();
|
||||||
UIManager.setLookAndFeel(new FlatDarculaLaf());
|
FlatDarculaLaf.setup();
|
||||||
|
//UIManager.setLookAndFeel(new FlatDarculaLaf());
|
||||||
try {
|
try {
|
||||||
locker.lock();
|
locker.lock();
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
|
|
Loading…
Reference in New Issue