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 77c0615df2b6c38a26fbae2b024c2a13c78b6934 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 29 18:32:25 2016 +0100 Code cleanup --- src/main/java/org/chorem/jtimer/JTimerConfig.java | 4 +- .../org/chorem/jtimer/data/DataEventListener.java | 32 ++++++------ .../org/chorem/jtimer/entities/ConnectionData.java | 61 ---------------------- .../java/org/chorem/jtimer/entities/TimerTask.java | 4 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 26 +++++---- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 37 +++++-------- src/main/java/org/chorem/jtimer/io/Saver.java | 10 ++-- src/main/java/org/chorem/jtimer/ui/HelpFrame.java | 6 +-- .../java/org/chorem/jtimer/ui/NewTaskPanel.java | 4 +- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 6 +-- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 9 ++-- .../chorem/jtimer/ui/alert/AlertCellEditor.java | 2 +- .../chorem/jtimer/ui/alert/AlertCellRenderer.java | 2 +- .../chorem/jtimer/ui/alert/AlertTableModel.java | 2 +- .../chorem/jtimer/ui/report/ReportGenerator.java | 6 +-- .../org/chorem/jtimer/ui/report/ReportView.java | 11 +--- .../org/chorem/jtimer/ui/system/SystemInfo.java | 2 +- .../ui/system/macos/ApplicationServices.java | 4 +- .../java/org/chorem/jtimer/ui/system/unix/Xss.java | 14 ++--- .../chorem/jtimer/ui/system/win32/Kernel32.java | 4 +- .../org/chorem/jtimer/ui/system/win32/User32.java | 2 +- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 2 +- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 38 +++++++------- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 4 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 10 ++-- .../ui/treetable/dnd/TimerTaskTransferHandler.java | 18 ++----- .../java/org/chorem/jtimer/JTimerFactoryTest.java | 2 +- .../chorem/jtimer/data/TimerDataManagerTest.java | 2 +- .../chorem/jtimer/entities/ConnectionDataTest.java | 52 ------------------ .../jtimer/io/GTimerIncrementalSaverTest.java | 2 +- .../chorem/jtimer/utils/DailySortedMapTest.java | 9 +--- 31 files changed, 111 insertions(+), 276 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimerConfig.java b/src/main/java/org/chorem/jtimer/JTimerConfig.java index 5817394..1dff394 100644 --- a/src/main/java/org/chorem/jtimer/JTimerConfig.java +++ b/src/main/java/org/chorem/jtimer/JTimerConfig.java @@ -211,7 +211,7 @@ public class JTimerConfig { protected String key; protected String defaultValue; - private JTimerOption(String key, String defaultValue) { + JTimerOption(String key, String defaultValue) { this.key = key; this.defaultValue = defaultValue; } @@ -226,7 +226,7 @@ public class JTimerConfig { protected String action; protected String[] aliases; - private JTimerAction(String description, String action, String... aliases) { + JTimerAction(String description, String action, String... aliases) { this.description = description; this.action = action; this.aliases = aliases; diff --git a/src/main/java/org/chorem/jtimer/data/DataEventListener.java b/src/main/java/org/chorem/jtimer/data/DataEventListener.java index 59a9262..272dcfd 100644 --- a/src/main/java/org/chorem/jtimer/data/DataEventListener.java +++ b/src/main/java/org/chorem/jtimer/data/DataEventListener.java @@ -45,42 +45,42 @@ public interface DataEventListener extends EventListener { * * @param project project to add */ - public void addProject(TimerProject project); + void addProject(TimerProject project); /** * Add task event. * * @param task task to add */ - public void addTask(TimerTask task); + void addTask(TimerTask task); /** * Modify project. * * @param project modified project */ - public void modifyProject(TimerProject project); + void modifyProject(TimerProject project); /** * Modify task. * * @param task modified task */ - public void modifyTask(TimerTask task); + void modifyTask(TimerTask task); /** * Delete project. * * @param project deleted project */ - public void deleteProject(TimerProject project); + void deleteProject(TimerProject project); /** * Delete task. * * @param task deleted task */ - public void deleteTask(TimerTask task); + void deleteTask(TimerTask task); /** * Add annotation. @@ -89,7 +89,7 @@ public interface DataEventListener extends EventListener { * @param date date * @param annotation new annotation value */ - public void setAnnotation(TimerTask task, Date date, String annotation); + void setAnnotation(TimerTask task, Date date, String annotation); /** * Set task time. @@ -98,28 +98,28 @@ public interface DataEventListener extends EventListener { * @param date date * @param time task time */ - public void setTaskTime(TimerTask task, Date date, Long time); + void setTaskTime(TimerTask task, Date date, Long time); /** * Change task state. * * @param task task */ - public void changeClosedState(TimerTask task); + void changeClosedState(TimerTask task); /** * Pre move task. * * @param task task */ - public void preMoveTask(TimerTask task); + void preMoveTask(TimerTask task); /** * Post move task. * * @param task task */ - public void moveTask(TimerTask task); + void moveTask(TimerTask task); /** * Pre merge task. @@ -127,7 +127,7 @@ public interface DataEventListener extends EventListener { * @param destinationTask task where all other task will be merged * @param otherTasks other tasks to merge */ - public void preMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); + void preMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); /** * Post merge task. @@ -135,26 +135,26 @@ public interface DataEventListener extends EventListener { * @param destinationTask task where all other task will be merged * @param otherTasks other tasks to merge */ - public void postMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); + void postMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); /** * Start task. * * @param task started task */ - public void startTask(TimerTask task); + void startTask(TimerTask task); /** * Stop task. * * @param task stoped task */ - public void stopTask(TimerTask task); + void stopTask(TimerTask task); /** * All data loaded. * * @param projects projects collection */ - public void dataLoaded(Collection<TimerProject> projects); + void dataLoaded(Collection<TimerProject> projects); } diff --git a/src/main/java/org/chorem/jtimer/entities/ConnectionData.java b/src/main/java/org/chorem/jtimer/entities/ConnectionData.java deleted file mode 100644 index aa703d2..0000000 --- a/src/main/java/org/chorem/jtimer/entities/ConnectionData.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * #%L - * jTimer - * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.jtimer.entities; - -import java.io.Serializable; - -/** - * Data class to get login, password... for ws. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class ConnectionData implements Serializable { - - /** serialVersionUID. */ - private static final long serialVersionUID = 8693017788987110830L; - - /** login. */ - protected String login; - - /** - * Get login. - * - * @return the login - */ - public String getLogin() { - return login; - } - - /** - * Set login. - * - * @param login the login to set - */ - public void setLogin(String login) { - this.login = login; - } -} diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTask.java b/src/main/java/org/chorem/jtimer/entities/TimerTask.java index ba4a227..fd3e443 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTask.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTask.java @@ -92,7 +92,7 @@ public class TimerTask implements Cloneable, * Constructor. */ public TimerTask() { - allDaysTimes = new DailySortedMap<Long>(); + allDaysTimes = new DailySortedMap<>(); // les annoation sont à la seconde pres allDaysAnnotations = new TreeMap<>(); subTasks = new ArrayList<>(); @@ -255,7 +255,7 @@ public class TimerTask implements Cloneable, Long t = allDaysTimes.get(date); if (t != null) { - result = t.longValue(); + result = t; } return result; diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 95ac7e0..830dfaa 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -54,19 +54,17 @@ public class TimerTaskHelper { /** * Timer task comparator. */ - protected static Comparator<TimerTask> timerTaskComparator = new Comparator<TimerTask>() { - public int compare(TimerTask o1, TimerTask o2) { - if (o1 == null && o2 == null) { - return 0; - } - if (o1 == null) { - return 1; - } - if (o2 == null) { - return -1; - } - return o1.getName().compareTo(o2.getName()); + protected static Comparator<TimerTask> timerTaskComparator = (o1, o2) -> { + if (o1 == null && o2 == null) { + return 0; + } + if (o1 == null) { + return 1; + } + if (o2 == null) { + return -1; } + return o1.getName().compareTo(o2.getName()); }; /** @@ -91,7 +89,7 @@ public class TimerTaskHelper { long totalTime = 0L; for (Long t : task.getAllDaysAndTimes().values()) { - totalTime += t.longValue(); + totalTime += t; } return totalTime; @@ -108,7 +106,7 @@ public class TimerTaskHelper { long totalTime = 0L; for (Long t : task.getAllDaysAndTimes().values()) { - totalTime += t.longValue(); + totalTime += t; } // add allday subtask time diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index 260248f..85bcaaf 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -48,20 +48,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import java.util.Set; import java.util.SortedMap; import java.util.Timer; import java.util.TreeMap; -import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.ZipEntry; @@ -345,24 +340,21 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, // map to remember tasks to manage after load // sorted on / number in their name - SortedMap<TimerTask, TimerProject> taskToPostManaged = new TreeMap<>(new Comparator<TimerTask>() { - @Override - public int compare(TimerTask t1, TimerTask t2) { + SortedMap<TimerTask, TimerProject> taskToPostManaged = new TreeMap<>((t1, t2) -> { - int numberOfSeparatorInT1 = t1.getName().split( - GTIMER_SUBTASK_SEPARATOR).length; - int numberOfSeparatorInT2 = t2.getName().split( - GTIMER_SUBTASK_SEPARATOR).length; + int numberOfSeparatorInT1 = t1.getName().split( + GTIMER_SUBTASK_SEPARATOR).length; + int numberOfSeparatorInT2 = t2.getName().split( + GTIMER_SUBTASK_SEPARATOR).length; - int compare = numberOfSeparatorInT1 - - numberOfSeparatorInT2; + int compare = numberOfSeparatorInT1 + - numberOfSeparatorInT2; - // seems to delete when return 0 ??? - if (compare == 0) { - compare = -1; - } - return compare; + // seems to delete when return 0 ??? + if (compare == 0) { + compare = -1; } + return compare; }); // now process each file @@ -1484,11 +1476,8 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, protected void saveRunningTasks() { synchronized (runningTasks) { - Iterator<TimerTask> itTasks = runningTasks.iterator(); - - while (itTasks.hasNext()) { - TimerTask task = itTasks.next(); + for (TimerTask task : runningTasks) { saveTask(task); } } @@ -1531,7 +1520,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, "vetoable.saver.empty.name"); } - if (name.indexOf(GTIMER_SUBTASK_SEPARATOR) != -1) { + if (name.contains(GTIMER_SUBTASK_SEPARATOR)) { throw new DataViolationException("Can't add task", "vetoable.saver.invalid.characters"); } diff --git a/src/main/java/org/chorem/jtimer/io/Saver.java b/src/main/java/org/chorem/jtimer/io/Saver.java index 8c302c9..7ff9a36 100644 --- a/src/main/java/org/chorem/jtimer/io/Saver.java +++ b/src/main/java/org/chorem/jtimer/io/Saver.java @@ -44,34 +44,34 @@ public interface Saver extends DataEventListener, VetoableDataEventListener { * * @param directory directory */ - public void setSaveDirectory(String directory); + void setSaveDirectory(String directory); /** * Set auto save delay (in milliseconds). * * @param autoSaveDelay delay in milliseconds */ - public void setAutoSaveDelay(long autoSaveDelay); + void setAutoSaveDelay(long autoSaveDelay); /** * Try to lock current saver directory. * * @throws DataLockingException if can't obtain lock */ - public void lock() throws DataLockingException; + void lock() throws DataLockingException; /** * Try to unlock current saver directory. * * @throws DataLockingException if there is no lock */ - public void unlock() throws DataLockingException; + void unlock() throws DataLockingException; /** * Load a project list. * * @return a collection of projects */ - public Collection<TimerProject> load(); + Collection<TimerProject> load(); } diff --git a/src/main/java/org/chorem/jtimer/ui/HelpFrame.java b/src/main/java/org/chorem/jtimer/ui/HelpFrame.java index 35b11e8..070a19e 100644 --- a/src/main/java/org/chorem/jtimer/ui/HelpFrame.java +++ b/src/main/java/org/chorem/jtimer/ui/HelpFrame.java @@ -179,11 +179,7 @@ public class HelpFrame extends FrameView implements HyperlinkListener { || u.getProtocol().equalsIgnoreCase("ftp")) { Desktop.getDesktop().browse(u.toURI()); } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Error while opening link", e); - } - } catch (URISyntaxException e) { + } catch (IOException | URISyntaxException e) { if (log.isErrorEnabled()) { log.error("Error while opening link", e); } diff --git a/src/main/java/org/chorem/jtimer/ui/NewTaskPanel.java b/src/main/java/org/chorem/jtimer/ui/NewTaskPanel.java index 1e33b27..dc4afde 100644 --- a/src/main/java/org/chorem/jtimer/ui/NewTaskPanel.java +++ b/src/main/java/org/chorem/jtimer/ui/NewTaskPanel.java @@ -26,6 +26,7 @@ import java.awt.GridBagLayout; import java.awt.Insets; import java.util.List; import java.util.Map; +import java.util.Set; import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; @@ -78,7 +79,8 @@ public class NewTaskPanel extends JPanel { if (templates != null && !templates.isEmpty()) { // model - DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(templates.keySet().toArray(new String[0])); + Set<String> templateNames = templates.keySet(); + DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(templateNames.toArray(new String[templateNames.size()])); model.insertElementAt(null, 0); // empty option newTaskTemplateBox.setModel(model); newTaskTemplateBox.setSelectedItem(null); // empty option diff --git a/src/main/java/org/chorem/jtimer/ui/StatusBar.java b/src/main/java/org/chorem/jtimer/ui/StatusBar.java index 9dccff7..99ff3d3 100644 --- a/src/main/java/org/chorem/jtimer/ui/StatusBar.java +++ b/src/main/java/org/chorem/jtimer/ui/StatusBar.java @@ -242,11 +242,9 @@ public class StatusBar extends JPanel implements DataEventListener { message = resourceMap.getString("idleMessage"); } else { if (nbTasksRunning == 1) { - message = resourceMap.getString("runningTaskMessage", Integer - .valueOf(nbTasksRunning)); + message = resourceMap.getString("runningTaskMessage", nbTasksRunning); } else { - message = resourceMap.getString("runningTasksMessage", Integer - .valueOf(nbTasksRunning)); + message = resourceMap.getString("runningTasksMessage", nbTasksRunning); } } lblMessage.setText(message); diff --git a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java index 998efc2..a0117c7 100644 --- a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java @@ -395,12 +395,9 @@ public class TimerTaskEditor extends JDialog implements ActionListener { monthView.setDayForeground(Calendar.SUNDAY, Color.RED); // listener on monthview selection day - monthView.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - if (JXMonthView.COMMIT_KEY.equals(e.getActionCommand())) { - setSelectedDay(monthView.getFirstSelectionDate()); - } + monthView.addActionListener(e -> { + if (JXMonthView.COMMIT_KEY.equals(e.getActionCommand())) { + setSelectedDay(monthView.getFirstSelectionDate()); } }); 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 a63f8a5..cabe6c5 100644 --- a/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java @@ -94,7 +94,7 @@ public class AlertCellEditor extends AbstractCellEditor implements TableCellEdit case 1: DurationEditor durationEditor = new DurationEditor(9999); - long duration = ((Long)value).longValue(); + long duration = (Long) value; durationEditor.setDuration(duration); durationEditor.addPropertyChangeListener("duration", this); durationEditor.setSize(100, 30); diff --git a/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java b/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java index eab6541..9cd129f 100644 --- a/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java @@ -65,7 +65,7 @@ public class AlertCellRenderer extends DefaultTableCellRenderer { case 1: DurationEditor durationEditor = new DurationEditor(9999); - long duration = ((Long)value).longValue(); + long duration = (Long) value; durationEditor.setDuration(duration); c = durationEditor; break; diff --git a/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java b/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java index 3f4a562..01c3e9b 100644 --- a/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java +++ b/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java @@ -126,7 +126,7 @@ public class AlertTableModel extends AbstractTableModel { break; case 1: - long duration = ((Long)value).longValue(); + long duration = (Long) value; alert.setDuration(duration * 1000); break; 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 f725605..86c5dfa 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java @@ -127,11 +127,7 @@ public class ReportGenerator { content = getReportContent(template, projects, begin, end, includeTime, includeAnnotate, includeAnnotateTime, includeIntermediateTotalTime); - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Can't get freemarker template", e); - } - } catch (TemplateException e) { + } catch (IOException | TemplateException e) { if (log.isErrorEnabled()) { log.error("Can't get freemarker template", e); } diff --git a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java index bc025e3..6a4288d 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java @@ -514,9 +514,9 @@ public class ReportView extends FrameView implements DocumentListener { URI mailtoURI = new URI("mailto:?body=" + encodedReport); Desktop.getDesktop().mail(mailtoURI); - } catch (IOException e) { + } catch (IOException | UnsupportedOperationException e) { if (log.isWarnEnabled()) { - log.warn("Cannot open link (maybe defaut browser in not configured ?)"); + log.warn("Cannot open link (maybe default browser in not configured ?)"); } if (log.isDebugEnabled()) { log.debug("Error while opening link", e); @@ -525,13 +525,6 @@ public class ReportView extends FrameView implements DocumentListener { if (log.isErrorEnabled()) { log.error("Error while opening link", e); } - } catch (UnsupportedOperationException e) { - if (log.isWarnEnabled()) { - log.warn("Cannot open link (maybe defaut browser in not configured ?)"); - } - if (log.isDebugEnabled()) { - log.debug("Error while opening link", e); - } } } diff --git a/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java b/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java index 0bc5cf9..4cd31c7 100644 --- a/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java +++ b/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java @@ -38,5 +38,5 @@ public interface SystemInfo { * * @return system idle time in milliseconds */ - public long getIdleTime(); + long getIdleTime(); } diff --git a/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java b/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java index 928aa22..14554d8 100644 --- a/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java +++ b/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java @@ -58,6 +58,6 @@ public interface ApplicationServices extends Library { * * @see <a href="http://developer.apple.com/mac/library/documentation/Carbon/Reference/QuartzEventServicesRef/Reference/reference.html#//apple_ref/c/func/CGEventSourceSecondsSinceLastEventType">Quartz API</a> */ - public double CGEventSourceSecondsSinceLastEventType(int sourceStateId, - int eventType); + double CGEventSourceSecondsSinceLastEventType(int sourceStateId, + int eventType); } 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 90bac0b..344ab2c 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 @@ -50,7 +50,7 @@ public interface Xss extends Library { /** * XScreenSaverInfo struct */ - public static class XScreenSaverInfo extends Structure { + class XScreenSaverInfo extends Structure { public X11.Window window; /* screen saver window - may not exist */ public int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverDisabled */ public int kind; /* ScreenSaverBlanked, ...Internal, ...External */ @@ -59,7 +59,7 @@ public interface Xss extends Library { 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"}); + return Arrays.asList("window", "state", "kind", "til_or_since", "idle", "eventMask"); } } @@ -74,15 +74,15 @@ public interface Xss extends Library { * * @see IntByReference */ - public boolean XScreenSaverQueryExtension(X11.Display display, - IntByReference event_base, IntByReference error_base); + boolean XScreenSaverQueryExtension(X11.Display display, + IntByReference event_base, IntByReference error_base); /** * XScreenSaverAllocInfo. * * @return XScreenSaverInfo instance */ - public XScreenSaverInfo XScreenSaverAllocInfo(); + XScreenSaverInfo XScreenSaverAllocInfo(); /** * XScreenSaverQueryInfo. @@ -92,6 +92,6 @@ public interface Xss extends Library { * @param infos * @return status flag */ - public int XScreenSaverQueryInfo(X11.Display display, - X11.Drawable drawable, XScreenSaverInfo infos); + int XScreenSaverQueryInfo(X11.Display display, + X11.Drawable drawable, XScreenSaverInfo infos); } diff --git a/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java b/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java index b7ba576..0d89d4d 100644 --- a/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java +++ b/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java @@ -47,5 +47,5 @@ public interface Kernel32 extends StdCallLibrary { * @return number of milliseconds that have elapsed since the system was * started. */ - public int GetTickCount(); -}; + int GetTickCount(); +} 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 67d2ddd..d63c28c 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 @@ -58,7 +58,7 @@ public interface User32 extends StdCallLibrary { @Override protected List<?> getFieldOrder() { - return Arrays.asList(new String[] { "cbSize", "dwTime"}); + return Arrays.asList("cbSize", "dwTime"); } } diff --git a/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java b/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java index 7d69efa..801a8c0 100644 --- a/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java +++ b/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java @@ -166,7 +166,7 @@ public class IdleDialog extends JDialog { 10, 5, 10, 10), 0, 0)); // label - JLabel idleLabel = new JLabel(resourceMap.getString("idleMessage", Long.valueOf(JTimer.config.getIdleTime() / (60)))); + JLabel idleLabel = new JLabel(resourceMap.getString("idleMessage", JTimer.config.getIdleTime() / (60))); mainComponent.add(idleLabel, new GridBagConstraints(1, 0, 3, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(5, 0, 0, 3), 0, 0)); diff --git a/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java b/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java index 67f0ff9..243954b 100644 --- a/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java +++ b/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java @@ -106,7 +106,7 @@ public class RunTaskJob extends Task<Void, Void> { this.dataManager = dataManager; // must be init here, checkAlreadyThrownAlerts is called multiples times - alreadyTrownAlerts = new HashSet<TimerAlert>(); + alreadyTrownAlerts = new HashSet<>(); checkAlreadyThrownAlerts(managedTask); // init system info to get idleTime @@ -338,26 +338,24 @@ public class RunTaskJob extends Task<Void, Void> { */ protected void displayAlert(final TimerTask task, final Type alertType, final long alertDuration) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - String alertMessage = null; - String formattedTime = DurationFormatUtils.formatDuration( - alertDuration, "HH:mm:ss"); - if (Type.REACH_DAILY_TIME.equals(alertType)) { - alertMessage = getResourceMap().getString( - "alert.dailyAlertMessage", task.getName(), - formattedTime); - } else if (Type.REACH_TOTAL_TIME.equals(alertType)) { - alertMessage = getResourceMap().getString( - "alert.totalAlertMessage", task.getName(), - formattedTime); - } - - JOptionPane.showMessageDialog(null, alertMessage, - getResourceMap().getString("alert.title"), - JOptionPane.INFORMATION_MESSAGE, getResourceMap() - .getIcon("alert.alertIcon")); + SwingUtilities.invokeLater(() -> { + String alertMessage = null; + String formattedTime = DurationFormatUtils.formatDuration( + alertDuration, "HH:mm:ss"); + if (Type.REACH_DAILY_TIME.equals(alertType)) { + alertMessage = getResourceMap().getString( + "alert.dailyAlertMessage", task.getName(), + formattedTime); + } else if (Type.REACH_TOTAL_TIME.equals(alertType)) { + alertMessage = getResourceMap().getString( + "alert.totalAlertMessage", task.getName(), + formattedTime); } + + JOptionPane.showMessageDialog(null, alertMessage, + getResourceMap().getString("alert.title"), + JOptionPane.INFORMATION_MESSAGE, getResourceMap() + .getIcon("alert.alertIcon")); }); } diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java index 6eac732..d333227 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java @@ -195,9 +195,7 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer if ((flags & (FRAMEBITS | ALLBITS)) != 0) { for (Integer row : rows) { Rectangle rowBounds = treeTable.getCellRect(row, 0, true); - if (rowBounds != null) { - treeTable.repaint(rowBounds); - } + treeTable.repaint(rowBounds); } } return (flags & (ALLBITS | ABORT)) == 0; diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java index a0ec9b4..741e8c7 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java @@ -396,12 +396,10 @@ public class ProjectsAndTasksModel extends AbstractTreeTableModel implements modelSupport.fireNewRoot(); // hack, restore size after - SwingUtilities.invokeLater(new Runnable() { - public void run() { - for (TableColumn tc : tcs) { - projectsAndTaskTable.getColumnExt(tc.getIdentifier()) - .setPreferredWidth(tc.getPreferredWidth()); - } + SwingUtilities.invokeLater(() -> { + for (TableColumn tc : tcs) { + projectsAndTaskTable.getColumnExt(tc.getIdentifier()) + .setPreferredWidth(tc.getPreferredWidth()); } }); } diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java b/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java index 7d1b618..cb4ad67 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java @@ -136,13 +136,9 @@ public class TimerTaskTransferHandler extends TransferHandler { } } } - } catch (IOException e) { + } catch (IOException | UnsupportedFlavorException e) { if (log.isErrorEnabled()) { - log.error("Exception while transfering task", e); - } - } catch (UnsupportedFlavorException e) { - if (log.isErrorEnabled()) { - log.error("Exception while transfering task", e); + log.error("Exception while transferring task", e); } } } @@ -165,7 +161,7 @@ public class TimerTaskTransferHandler extends TransferHandler { // only task can be moved ! List<TimerTask> selectedTasks = treeTable.getSelectedTasks(); if (selectedTasks != null && !selectedTasks.isEmpty()) { - List<TimerTask> tasks = new LinkedList<TimerTask>(selectedTasks); + List<TimerTask> tasks = new LinkedList<>(selectedTasks); transferable = new TimerTaskTranferable(tasks); } @@ -206,13 +202,9 @@ public class TimerTaskTransferHandler extends TransferHandler { JOptionPane.ERROR_MESSAGE); } } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Exception while transfering task", e); - } - } catch (UnsupportedFlavorException e) { + } catch (IOException | UnsupportedFlavorException e) { if (log.isErrorEnabled()) { - log.error("Exception while transfering task", e); + log.error("Exception while transferring task", e); } } } diff --git a/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java b/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java index 2b4eaa1..e72fe5f 100644 --- a/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java +++ b/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java @@ -72,7 +72,7 @@ public class JTimerFactoryTest extends AbstractJTimerTest { @Test public void testJsonTaskTemplates() { Map<String, List<?>> templates = JTimer.config.getTaskTemplates(); - List<?> p1Tpl = (List<?>)templates.get("projet1"); + List<?> p1Tpl = templates.get("projet1"); Assert.assertNotNull(p1Tpl); Assert.assertEquals(p1Tpl.size(), 5); diff --git a/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java b/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java index de9d5e3..106c6a3 100644 --- a/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java +++ b/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java @@ -465,7 +465,7 @@ public class TimerDataManagerTest extends AbstractJTimerTest { // add THE conflict task name TimerTask tTreeTests = new TimerTask("Tree tests"); tTreeTests.setCreationDate(new Date()); - tTreeTests.setTime(new Date(), Long.valueOf(200000)); + tTreeTests.setTime(new Date(), 200000L); dataManager.addTask(task1, tTreeTests, null); Assert.assertEquals(task1.getSubTasks().size(), 3); diff --git a/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java b/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java deleted file mode 100644 index e7d933e..0000000 --- a/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * #%L - * jTimer - * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.jtimer.entities; - -import org.chorem.jtimer.AbstractJTimerTest; -import org.chorem.jtimer.entities.ConnectionData; -import org.testng.Assert; -import org.testng.annotations.Test; - -/** - * Test class for ConnectionData. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class ConnectionDataTest extends AbstractJTimerTest { - - /** - * Test login property. - */ - @Test - public void testLogin() { - - ConnectionData data = new ConnectionData(); - data.setLogin("test"); - - Assert.assertEquals("test", data.getLogin()); - } -} diff --git a/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java b/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java index 9f31d1c..26c0675 100644 --- a/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java +++ b/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java @@ -190,7 +190,7 @@ public class GTimerIncrementalSaverTest extends AbstractJTimerTest { long totalTime = 0; for (Long time : task.getAllDaysAndTimes().values()) { - totalTime += time.longValue(); + totalTime += time; } Assert.assertEquals(totalTime, 11391000); diff --git a/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java b/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java index 912c5e0..d586e6b 100644 --- a/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java +++ b/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java @@ -24,7 +24,6 @@ package org.chorem.jtimer.utils; import java.text.DateFormat; import java.text.ParseException; -import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.Locale; @@ -74,13 +73,7 @@ public class DailySortedMapTest { @Test public void testConsctuctorComparator() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<>( - new Comparator<Date>() { - @Override - public int compare(Date o1, Date o2) { - return o1.compareTo(o2); - } - }); + DailySortedMap<Long> map = new DailySortedMap<>(Date::compareTo); Date d1 = df.parse("December 30, 2008"); Date d2 = df.parse("December 29, 2008"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.