This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 5970b85b0b01ad52cdfb36af0a88b126bd4e0770 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Feb 23 11:49:28 2016 +0100 refs #1322: Fix some warning and depreciation --- src/main/java/org/chorem/jtimer/JTimer.java | 4 ++-- src/main/java/org/chorem/jtimer/JTimerConfig.java | 2 +- src/main/java/org/chorem/jtimer/JTimerFactory.java | 2 +- src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java | 2 +- src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java | 4 ++-- src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java | 2 +- src/main/java/org/chorem/jtimer/ui/system/win32/User32.java | 2 +- src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java | 1 + 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index 26d777d..f48a532 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -727,7 +727,7 @@ public class JTimer extends SingleFrameApplication implements RunTaskJob job = null; TaskMonitor tm = getContext().getTaskMonitor(); - for (Task t : tm.getTasks()) { + for (Task<?, ?> t : tm.getTasks()) { TimerTask localtask = ((RunTaskJob) t).getTask(); if (task.equals(localtask)) { job = (RunTaskJob) t; @@ -779,7 +779,7 @@ public class JTimer extends SingleFrameApplication implements public void stopAllTasks() { TaskMonitor tm = getContext().getTaskMonitor(); - for (Task t : tm.getTasks()) { + for (Task<?, ?> t : tm.getTasks()) { // task TimerTask ttask = ((RunTaskJob) t).getTask(); stopTask(ttask); diff --git a/src/main/java/org/chorem/jtimer/JTimerConfig.java b/src/main/java/org/chorem/jtimer/JTimerConfig.java index fe9dd33..2812aa8 100644 --- a/src/main/java/org/chorem/jtimer/JTimerConfig.java +++ b/src/main/java/org/chorem/jtimer/JTimerConfig.java @@ -95,7 +95,7 @@ public class JTimerConfig { } } - public Class getIOSaverClass() { + public Class<?> getIOSaverClass() { return appConfig.getOptionAsClass(JTimerOption.IO_SAVER_CLASS.key); } diff --git a/src/main/java/org/chorem/jtimer/JTimerFactory.java b/src/main/java/org/chorem/jtimer/JTimerFactory.java index 396f810..d723519 100644 --- a/src/main/java/org/chorem/jtimer/JTimerFactory.java +++ b/src/main/java/org/chorem/jtimer/JTimerFactory.java @@ -59,7 +59,7 @@ public class JTimerFactory { if (saver == null) { - Class saverClass = JTimer.config.getIOSaverClass(); + Class<?> saverClass = JTimer.config.getIOSaverClass(); // log if (log.isInfoEnabled()) { diff --git a/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java b/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java index 564afc5..a63f8a5 100644 --- a/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java @@ -67,7 +67,7 @@ public class AlertCellEditor extends AbstractCellEditor implements TableCellEdit Object value = null; if (editor instanceof JComboBox) { - value = ((JComboBox)editor).getSelectedItem(); + value = ((JComboBox<?>)editor).getSelectedItem(); } else if (editor instanceof DurationEditor) { value = ((DurationEditor)editor).getDuration(); diff --git a/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java b/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java index 9a19803..c26e3c2 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java @@ -72,7 +72,7 @@ public class ReportGenerator { */ public ReportGenerator() { - freemarkerConfiguration = new Configuration(); + freemarkerConfiguration = new Configuration(Configuration.VERSION_2_3_23); // needed to overwrite "Defaults to default system encoding." // fix encoding issue on some systems @@ -82,7 +82,7 @@ public class ReportGenerator { ClassTemplateLoader templateLoader = new ClassTemplateLoader(ReportGenerator.class, "/ftl"); freemarkerConfiguration.setTemplateLoader(templateLoader); - freemarkerConfiguration.setObjectWrapper(new BeansWrapper()); + freemarkerConfiguration.setObjectWrapper(new BeansWrapper(Configuration.VERSION_2_3_23)); } /** diff --git a/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java b/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java index 441c6a5..884444c 100644 --- a/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java +++ b/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java @@ -59,7 +59,7 @@ public interface Xss extends Library { public NativeLong idle; /* total time since last user input */ public NativeLong eventMask; /* currently selected events for this client */ @Override - protected List getFieldOrder() { + protected List<?> getFieldOrder() { return Arrays.asList(new String[] { "window", "state", "kind", "til_or_since", "idle", "eventMask"}); } } diff --git a/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java b/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java index 6cd0581..95e2ff5 100644 --- a/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java +++ b/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java @@ -57,7 +57,7 @@ public interface User32 extends StdCallLibrary { public int dwTime; @Override - protected List getFieldOrder() { + protected List<?> getFieldOrder() { return Arrays.asList(new String[] { "cbSize", "dwTime"}); } } diff --git a/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java b/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java index c01445e..171bcdf 100644 --- a/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java +++ b/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java @@ -632,5 +632,6 @@ public class TimerDataManagerTest extends AbstractJTimerTest { core.load(); TimerTask task = dataManager.getTaskForPath("jTimer"); + Assert.assertNotNull(task); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.