Jtimer-commits

Download

jtimer-commits@list.chorem.org

January 2013

1 participants
1 discussions

r2892 - in trunk: . src/main/java/org/chorem/jtimer/ui/system/unix src/main/java/org/chorem/jtimer/ui/system/win32
by echatellier＠users.chorem.org 30 Jan '13

30 Jan '13

Author: echatellier Date: 2013-01-30 10:33:44 +0100 (Wed, 30 Jan 2013) New Revision: 2892 Url: http://chorem.org/projects/jtimer/repository/revisions/2892 Log: Update libs (swingx, jna, nuiton-utils, testng) Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 13:13:24 UTC (rev 2891) +++ trunk/pom.xml 2013-01-30 09:33:44 UTC (rev 2892) @@ -208,7 +208,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.4.8</version> + <version>2.6.6</version> <scope>compile</scope> <exclusions> <exclusion> @@ -240,19 +240,19 @@ <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.3</version> + <version>1.6.5</version> <scope>compile</scope> </dependency> <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.4.0</version> + <version>3.5.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>platform</artifactId> - <version>3.4.0</version> + <version>3.5.1</version> <scope>compile</scope> </dependency> <dependency> @@ -313,7 +313,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.5.2</version> + <version>6.8</version> <scope>test</scope> <exclusions> <exclusion> Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java 2012-12-29 13:13:24 UTC (rev 2891) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java 2013-01-30 09:33:44 UTC (rev 2892) @@ -25,6 +25,9 @@ package org.chorem.jtimer.ui.system.unix; +import java.util.Arrays; +import java.util.List; + import com.sun.jna.Library; import com.sun.jna.Native; import com.sun.jna.NativeLong; @@ -58,6 +61,10 @@ public NativeLong til_or_since; /* time til or since screen saver */ public NativeLong idle; /* total time since last user input */ public NativeLong eventMask; /* currently selected events for this client */ + @Override + protected List getFieldOrder() { + return Arrays.asList(new String[] { "window", "state", "kind", "til_or_since", "idle", "eventMask"}); + } } /** Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2012-12-29 13:13:24 UTC (rev 2891) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2013-01-30 09:33:44 UTC (rev 2892) @@ -25,6 +25,9 @@ package org.chorem.jtimer.ui.system.win32; +import java.util.Arrays; +import java.util.List; + import com.sun.jna.Native; import com.sun.jna.Structure; import com.sun.jna.win32.StdCallLibrary; @@ -55,6 +58,11 @@ // / Tick count of when the last input event was received. public int dwTime; + + @Override + protected List getFieldOrder() { + return Arrays.asList(new String[] { "cbSize", "dwTime"}); + } } /**

1 0