branch develop updated (116e58a -> 0f049bc)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 116e58a fixes #145: Add an option to show in system tray the name of the currently running task new 114fa16 fixes #148: An illegal reflective access operation on java 11 new 0f049bc fixes #149: Update libs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0f049bcd97e05d03cb53fe4e4089d6ce37091800 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Jul 10 16:42:06 2019 +0200 fixes #149: Update libs commit 114fa1689291d735e9e641ada6788c06b66a0eba Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Jul 10 16:31:38 2019 +0200 fixes #148: An illegal reflective access operation on java 11 Summary of changes: pom.xml | 16 +++++++-------- src/main/java/org/chorem/jtimer/JTimer.java | 7 ++----- .../java/org/chorem/jtimer/system/SystemInfo.java | 5 ----- .../jtimer/system/macos/ApplicationServices.java | 2 +- .../jtimer/system/macos/MacOSSystemInfo.java | 7 +------ .../chorem/jtimer/system/unix/UnixSystemInfo.java | 24 +--------------------- .../java/org/chorem/jtimer/system/unix/X11.java | 2 +- .../java/org/chorem/jtimer/system/unix/Xss.java | 2 +- .../org/chorem/jtimer/system/win32/Kernel32.java | 2 +- .../org/chorem/jtimer/system/win32/User32.java | 2 +- .../jtimer/system/win32/Win32SystemInfo.java | 7 +------ .../jtimer/ui/resources/HelpFrame.properties | 2 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 2 +- 13 files changed, 20 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 114fa1689291d735e9e641ada6788c06b66a0eba Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Jul 10 16:31:38 2019 +0200 fixes #148: An illegal reflective access operation on java 11 --- pom.xml | 4 ++-- src/main/java/org/chorem/jtimer/JTimer.java | 7 ++----- .../java/org/chorem/jtimer/system/SystemInfo.java | 5 ----- .../jtimer/system/macos/MacOSSystemInfo.java | 7 +------ .../chorem/jtimer/system/unix/UnixSystemInfo.java | 24 +--------------------- .../jtimer/system/win32/Win32SystemInfo.java | 7 +------ 6 files changed, 7 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 806e98c..47af84a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2018 CodeLutin + Copyright (C) 2007 - 2019 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.3-SNAPSHOT</version> <name>jTimer</name> <description> diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index b5fb76b..5385a44 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2018 CodeLutin + * Copyright (C) 2007 - 2019 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -185,10 +185,7 @@ public class JTimer extends SingleFrameApplication implements resourceMap = ctxt.getResourceMap(); // native init - Optional<SystemInfo> systemInfo = SystemInfoFactory.getSystemInfo(); - if (systemInfo.isPresent()) { - systemInfo.get().systemInit(); - } + SystemInfoFactory.getSystemInfo(); // fix start in iconified mode ctxt.getSessionStorage().putProperty(JFrame.class, new WindowProperty2()); diff --git a/src/main/java/org/chorem/jtimer/system/SystemInfo.java b/src/main/java/org/chorem/jtimer/system/SystemInfo.java index 2769efe..f02bc82 100644 --- a/src/main/java/org/chorem/jtimer/system/SystemInfo.java +++ b/src/main/java/org/chorem/jtimer/system/SystemInfo.java @@ -33,11 +33,6 @@ package org.chorem.jtimer.system; */ public interface SystemInfo { - /** - * Perform additional init related to system native call. - */ - void systemInit(); - /** * Get system idle time in milliseconds. * diff --git a/src/main/java/org/chorem/jtimer/system/macos/MacOSSystemInfo.java b/src/main/java/org/chorem/jtimer/system/macos/MacOSSystemInfo.java index 085f2df..6e7b4ec 100644 --- a/src/main/java/org/chorem/jtimer/system/macos/MacOSSystemInfo.java +++ b/src/main/java/org/chorem/jtimer/system/macos/MacOSSystemInfo.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2010 - 2016 CodeLutin + * Copyright (C) 2010 - 2019 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -38,11 +38,6 @@ import org.chorem.jtimer.system.SystemInfo; */ public class MacOSSystemInfo implements SystemInfo { - @Override - public void systemInit() { - - } - @Override public long getIdleTime() { double idleTimeSeconds = ApplicationServices.INSTANCE diff --git a/src/main/java/org/chorem/jtimer/system/unix/UnixSystemInfo.java b/src/main/java/org/chorem/jtimer/system/unix/UnixSystemInfo.java index 6ff5a51..3751c8c 100644 --- a/src/main/java/org/chorem/jtimer/system/unix/UnixSystemInfo.java +++ b/src/main/java/org/chorem/jtimer/system/unix/UnixSystemInfo.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2016 CodeLutin + * Copyright (C) 2007 - 2019 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -46,28 +46,6 @@ public class UnixSystemInfo implements SystemInfo { /** log. */ private static Log log = LogFactory.getLog(UnixSystemInfo.class); - @Override - public void systemInit() { - // fixme awt application name. Can be seen only with gnome-shell - // tray icon is displayed with name "org-chorem-jtimer-JTimer" instead of - // only "jTimer" with following fix : - try { - Toolkit xToolkit = Toolkit.getDefaultToolkit(); - java.lang.reflect.Field awtAppClassNameField = xToolkit.getClass().getDeclaredField("awtAppClassName"); - awtAppClassNameField.setAccessible(true); - awtAppClassNameField.set(xToolkit, "jTimer"); - } catch (NoSuchFieldException ex) { - // probably not running on linux - if (log.isTraceEnabled()) { - log.trace("Can't find any field named 'awtAppClassName'", ex); - } - } catch (Exception ex) { - if (log.isWarnEnabled()) { - log.warn("Can change awt application name", ex); - } - } - } - @Override public long getIdleTime() { diff --git a/src/main/java/org/chorem/jtimer/system/win32/Win32SystemInfo.java b/src/main/java/org/chorem/jtimer/system/win32/Win32SystemInfo.java index ea613c7..889b8c6 100644 --- a/src/main/java/org/chorem/jtimer/system/win32/Win32SystemInfo.java +++ b/src/main/java/org/chorem/jtimer/system/win32/Win32SystemInfo.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2016 CodeLutin + * Copyright (C) 2007 - 2019 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -60,11 +60,6 @@ public class Win32SystemInfo implements SystemInfo { return Kernel32.INSTANCE.GetTickCount() - lastInputInfo.dwTime; } - @Override - public void systemInit() { - - } - @Override public long getIdleTime() { long millisTime = getIdleTimeMillisWin32(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 0f049bcd97e05d03cb53fe4e4089d6ce37091800 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Jul 10 16:42:06 2019 +0200 fixes #149: Update libs --- pom.xml | 12 ++++++------ .../org/chorem/jtimer/system/macos/ApplicationServices.java | 2 +- src/main/java/org/chorem/jtimer/system/unix/X11.java | 2 +- src/main/java/org/chorem/jtimer/system/unix/Xss.java | 2 +- src/main/java/org/chorem/jtimer/system/win32/Kernel32.java | 2 +- src/main/java/org/chorem/jtimer/system/win32/User32.java | 2 +- .../org/chorem/jtimer/ui/resources/HelpFrame.properties | 2 +- .../org/chorem/jtimer/ui/resources/HelpFrame_fr.properties | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 47af84a..89c9af0 100644 --- a/pom.xml +++ b/pom.xml @@ -167,19 +167,19 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>4.5.1</version> + <version>5.3.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.11.0</version> + <version>2.12.0</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.11.0</version> + <version>2.12.0</version> <scope>runtime</scope> </dependency> <dependency> @@ -190,7 +190,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.21</version> + <version>1.24</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -200,7 +200,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.7</version> + <version>3.9</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -358,7 +358,7 @@ <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion> <txtProductVersion>${project.version}</txtProductVersion> <companyName>${project.organization.name}</companyName> - <copyright>${project.inceptionYear} - 2018 ${project.organization.name}</copyright> + <copyright>${project.inceptionYear} - 2019 ${project.organization.name}</copyright> <internalName>jtimer</internalName> <originalFilename>jtimer.exe</originalFilename> </versionInfo> diff --git a/src/main/java/org/chorem/jtimer/system/macos/ApplicationServices.java b/src/main/java/org/chorem/jtimer/system/macos/ApplicationServices.java index 7c4cb2a..8b8572c 100644 --- a/src/main/java/org/chorem/jtimer/system/macos/ApplicationServices.java +++ b/src/main/java/org/chorem/jtimer/system/macos/ApplicationServices.java @@ -37,7 +37,7 @@ import com.sun.jna.Native; */ public interface ApplicationServices extends Library { - ApplicationServices INSTANCE = (ApplicationServices) Native.loadLibrary("ApplicationServices", ApplicationServices.class); + ApplicationServices INSTANCE = Native.load("ApplicationServices", ApplicationServices.class); /** Constants that specify an input event. */ int kCGAnyInputEventType = -1; diff --git a/src/main/java/org/chorem/jtimer/system/unix/X11.java b/src/main/java/org/chorem/jtimer/system/unix/X11.java index fb66ded..fef9882 100644 --- a/src/main/java/org/chorem/jtimer/system/unix/X11.java +++ b/src/main/java/org/chorem/jtimer/system/unix/X11.java @@ -34,7 +34,7 @@ public interface X11 extends Library { class Display extends PointerType { } - X11 INSTANCE = (X11) Native.loadLibrary("X11", X11.class); + X11 INSTANCE = Native.load("X11", X11.class); Display XOpenDisplay(String name); diff --git a/src/main/java/org/chorem/jtimer/system/unix/Xss.java b/src/main/java/org/chorem/jtimer/system/unix/Xss.java index 167e9fe..9ac52f7 100644 --- a/src/main/java/org/chorem/jtimer/system/unix/Xss.java +++ b/src/main/java/org/chorem/jtimer/system/unix/Xss.java @@ -45,7 +45,7 @@ import java.util.List; public interface Xss extends Library { /** Xss Instance */ - Xss INSTANCE = (Xss) Native.loadLibrary("Xss", Xss.class); + Xss INSTANCE = Native.load("Xss", Xss.class); /** * XScreenSaverInfo struct diff --git a/src/main/java/org/chorem/jtimer/system/win32/Kernel32.java b/src/main/java/org/chorem/jtimer/system/win32/Kernel32.java index 1da8a65..6d27957 100644 --- a/src/main/java/org/chorem/jtimer/system/win32/Kernel32.java +++ b/src/main/java/org/chorem/jtimer/system/win32/Kernel32.java @@ -37,7 +37,7 @@ import com.sun.jna.win32.W32APIOptions; public interface Kernel32 extends StdCallLibrary { /** The instance. */ - Kernel32 INSTANCE = (Kernel32) Native.loadLibrary("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS); + Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS); /** * Retrieves the number of milliseconds that have elapsed since the system diff --git a/src/main/java/org/chorem/jtimer/system/win32/User32.java b/src/main/java/org/chorem/jtimer/system/win32/User32.java index e9f7380..9e0cade 100644 --- a/src/main/java/org/chorem/jtimer/system/win32/User32.java +++ b/src/main/java/org/chorem/jtimer/system/win32/User32.java @@ -45,7 +45,7 @@ import java.util.List; public interface User32 extends StdCallLibrary { /** Instance. */ - User32 INSTANCE = (User32) Native.loadLibrary("user32", User32.class, W32APIOptions.DEFAULT_OPTIONS); + User32 INSTANCE = Native.load("user32", User32.class, W32APIOptions.DEFAULT_OPTIONS); /** * Contains the time of the last input. diff --git a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties index 3ee3f51..5c40182 100644 --- a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties +++ b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties @@ -25,7 +25,7 @@ aboutIcon = jtimer-logo-orange.jpg # About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2018, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2019, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> aboutLicenseTitle = License aboutLicense = You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ${Application.title}. All rights reserved. No guarantees are provided for use of this program. diff --git a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties index 5f2b6cc..ca514b7 100644 --- a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties @@ -22,7 +22,7 @@ # About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2018, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2019, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> aboutLicenseTitle = Licence aboutLicense = Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec ${Application.title}. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm