branch develop updated (7d94fc1 -> 4cd90b3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git from 7d94fc1 fixes #1030: Edition des tâches new 4cd90b3 Use diamond operator The 1 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 4cd90b38b85053c218ddf5651ce40544c7fc8ad6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Feb 24 16:54:52 2016 +0100 Use diamond operator Summary of changes: .../java/org/chorem/jtimer/data/TimerCore.java | 2 +- .../org/chorem/jtimer/data/TimerDataManager.java | 8 +-- .../java/org/chorem/jtimer/entities/TimerTask.java | 14 ++--- .../chorem/jtimer/entities/TimerTaskHelper.java | 8 +-- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 44 +++++++-------- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 6 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 4 +- .../chorem/jtimer/ui/report/ReportGenerator.java | 4 +- .../org/chorem/jtimer/ui/report/ReportUtils.java | 12 ++-- .../org/chorem/jtimer/ui/report/ReportView.java | 6 +- .../ui/report/tree/CheckBoxTreeCellEditor.java | 2 +- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 6 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 8 +-- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 8 +-- .../org/chorem/jtimer/data/CommonVetoableTest.java | 4 +- .../chorem/jtimer/data/TimerDataManagerTest.java | 6 +- .../org/chorem/jtimer/entities/TimerAlertTest.java | 6 +- .../jtimer/io/GTimerIncrementalSaverTest.java | 6 +- .../jtimer/ui/report/ReportGeneratorTest.java | 16 +++--- .../chorem/jtimer/utils/DailySortedMapTest.java | 64 +++++++++++----------- 20 files changed, 116 insertions(+), 118 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 http://git.chorem.org/jtimer.git commit 4cd90b38b85053c218ddf5651ce40544c7fc8ad6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Feb 24 16:54:52 2016 +0100 Use diamond operator --- .../java/org/chorem/jtimer/data/TimerCore.java | 2 +- .../org/chorem/jtimer/data/TimerDataManager.java | 8 +-- .../java/org/chorem/jtimer/entities/TimerTask.java | 14 ++--- .../chorem/jtimer/entities/TimerTaskHelper.java | 8 +-- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 44 +++++++-------- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 6 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 4 +- .../chorem/jtimer/ui/report/ReportGenerator.java | 4 +- .../org/chorem/jtimer/ui/report/ReportUtils.java | 12 ++-- .../org/chorem/jtimer/ui/report/ReportView.java | 6 +- .../ui/report/tree/CheckBoxTreeCellEditor.java | 2 +- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 6 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 8 +-- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 8 +-- .../org/chorem/jtimer/data/CommonVetoableTest.java | 4 +- .../chorem/jtimer/data/TimerDataManagerTest.java | 6 +- .../org/chorem/jtimer/entities/TimerAlertTest.java | 6 +- .../jtimer/io/GTimerIncrementalSaverTest.java | 6 +- .../jtimer/ui/report/ReportGeneratorTest.java | 16 +++--- .../chorem/jtimer/utils/DailySortedMapTest.java | 64 +++++++++++----------- 20 files changed, 116 insertions(+), 118 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/data/TimerCore.java b/src/main/java/org/chorem/jtimer/data/TimerCore.java index 0c7b8bb..4d7e50c 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerCore.java +++ b/src/main/java/org/chorem/jtimer/data/TimerCore.java @@ -127,7 +127,7 @@ public class TimerCore { Collection<TimerProject> projects = saver.load(); // sort loaded collection - List<TimerProject> projectsList = new ArrayList<TimerProject>(projects); + List<TimerProject> projectsList = new ArrayList<>(projects); Collections.sort(projectsList); data.addAllProjects(projectsList); diff --git a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java index 38b32f3..3031466 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java +++ b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java @@ -70,11 +70,11 @@ public class TimerDataManager { public TimerDataManager() { // init data list - projectList = new ArrayList<TimerProject>(); + projectList = new ArrayList<>(); // init support list - dataEventListeners = new ArrayList<DataEventListener>(); - vetoableDataEventListeners = new ArrayList<VetoableDataEventListener>(); + dataEventListeners = new ArrayList<>(); + vetoableDataEventListeners = new ArrayList<>(); } /** @@ -490,7 +490,7 @@ public class TimerDataManager { // task is modified during merge, deep clone it // make sub task list copy (concurrency) - Collection<TimerTask> otherTaskSubTasks = new ArrayList<TimerTask>(otherTask.getSubTasks()); + Collection<TimerTask> otherTaskSubTasks = new ArrayList<>(otherTask.getSubTasks()); for (TimerTask otherTaskSubTask : otherTaskSubTasks) { // first case to care about, a task with same diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTask.java b/src/main/java/org/chorem/jtimer/entities/TimerTask.java index aacfa31..ba4a227 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTask.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTask.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2007 - 2016 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 @@ -94,9 +94,9 @@ public class TimerTask implements Cloneable, public TimerTask() { allDaysTimes = new DailySortedMap<Long>(); // les annoation sont à la seconde pres - allDaysAnnotations = new TreeMap<Date, String>(); - subTasks = new ArrayList<TimerTask>(); - alerts = new ArrayList<TimerAlert>(); + allDaysAnnotations = new TreeMap<>(); + subTasks = new ArrayList<>(); + alerts = new ArrayList<>(); // wrong value to detect bug number = -1; @@ -364,9 +364,9 @@ public class TimerTask implements Cloneable, : (Date) creationDate.clone(); // make new list instance - task.allDaysTimes = new DailySortedMap<Long>(allDaysTimes); - task.allDaysAnnotations = new TreeMap<Date, String>(allDaysAnnotations); - task.subTasks = new ArrayList<TimerTask>(subTasks); + task.allDaysTimes = new DailySortedMap<>(allDaysTimes); + task.allDaysAnnotations = new TreeMap<>(allDaysAnnotations); + task.subTasks = new ArrayList<>(subTasks); } catch (CloneNotSupportedException e) { throw new RuntimeException("Can't clone", e); } diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index b743aca..95ac7e0 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2016 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 @@ -202,7 +202,7 @@ public class TimerTaskHelper { * ordered by ancestorness. */ public static List<String> getTaskPath(TimerTask task) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); if (task.getParent() != null) { result.addAll(getTaskPath(task.getParent())); result.add(task.getName()); @@ -240,7 +240,7 @@ public class TimerTaskHelper { Calendar endCal = (Calendar) beginCal.clone(); endCal.add(Calendar.DAY_OF_YEAR, 1); - SortedMap<Date, String> annotations = new TreeMap<Date, String>(); + SortedMap<Date, String> annotations = new TreeMap<>(); for (Date day : task.getAllDaysAnnotations().keySet()) { if (day.compareTo(beginCal.getTime()) >= 0 @@ -262,7 +262,7 @@ public class TimerTaskHelper { */ public static List<String> getAnnotation(TimerTask task, Date date) { - List<String> annotations = new ArrayList<String>(); + List<String> annotations = new ArrayList<>(); Map<Date, String> annotationMap = getAnnotationMap(task, date); annotations.addAll(annotationMap.values()); diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index 905f913..80195cc 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -149,8 +149,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, public GTimerIncrementalSaver() { // make implementation synchronized - runningTasks = Collections - .synchronizedCollection(new ArrayList<TimerTask>()); + runningTasks = Collections.synchronizedCollection(new ArrayList<>()); autoSaveTimer = new Timer(); } @@ -287,7 +286,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, protected Collection<TimerProject> gTimerLoad() { // map number => project - Map<String, TimerProject> mapNumberProject = new HashMap<String, TimerProject>(); + Map<String, TimerProject> mapNumberProject = new HashMap<>(); // probleme : il faut d'abord lire les "project" avant les task // pour pouvoir fair l'association @@ -334,26 +333,25 @@ 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<TimerTask, TimerProject>( - new Comparator<TimerTask>() { - @Override - public int compare(TimerTask t1, TimerTask t2) { - - int numberOfSeparatorInT1 = t1.getName().split( - GTIMER_SUBTASK_SEPARATOR).length; - int numberOfSeparatorInT2 = t2.getName().split( - GTIMER_SUBTASK_SEPARATOR).length; - - int compare = numberOfSeparatorInT1 - - numberOfSeparatorInT2; - - // seems to delete when return 0 ??? - if (compare == 0) { - compare = -1; - } - return compare; - } - }); + SortedMap<TimerTask, TimerProject> taskToPostManaged = new TreeMap<>(new Comparator<TimerTask>() { + @Override + public int compare(TimerTask t1, TimerTask t2) { + + int numberOfSeparatorInT1 = t1.getName().split( + GTIMER_SUBTASK_SEPARATOR).length; + int numberOfSeparatorInT2 = t2.getName().split( + GTIMER_SUBTASK_SEPARATOR).length; + + int compare = numberOfSeparatorInT1 + - numberOfSeparatorInT2; + + // seems to delete when return 0 ??? + if (compare == 0) { + compare = -1; + } + return compare; + } + }); // now process each file for (File f : gTimerFileDir.listFiles()) { diff --git a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java index 3b92513..998efc2 100644 --- a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java @@ -125,12 +125,12 @@ public class TimerTaskEditor extends JDialog implements ActionListener { * days modified: You can modify any number of days before you apply changes, * this set keep track of days modified (for time, annotations or title). */ - protected Set<Date> dateChanged = new HashSet<Date>(); + protected Set<Date> dateChanged = new HashSet<>(); /** * days where annotation were modified: You can modify any number of days before you apply changes, * this set keep track of days where annotations were modified. */ - protected Set<Date> annotationChanged = new HashSet<Date>(); + protected Set<Date> annotationChanged = new HashSet<>(); /** * selected monthview day: should never be null @@ -711,7 +711,7 @@ public class TimerTaskEditor extends JDialog implements ActionListener { * flag calendar days according to tasktime */ public void updateFlaggedDates() { - ArrayList<Date> dates = new ArrayList<Date>(); + ArrayList<Date> dates = new ArrayList<>(); for (Date date : cloneTask.getAllDaysAndTimes().keySet()) { if (cloneTask.getTime(date) > 0) { diff --git a/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java b/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java index 21a539c..9b6a79d 100644 --- a/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java @@ -89,7 +89,7 @@ public class AlertEditor extends FrameView implements ListSelectionListener { this.timerDataManager = timerDataManager; // build a new editing list for alerts - alerts = new ArrayList<TimerAlert>(); + alerts = new ArrayList<>(); for (TimerAlert alert : task.getAlerts()) { alerts.add(alert.clone()); } @@ -116,7 +116,7 @@ public class AlertEditor extends FrameView implements ListSelectionListener { 1, 1, 1, 1), 0, 0)); // get column labels - List<String> columnIdentifiers = new ArrayList<String>(); + List<String> columnIdentifiers = new ArrayList<>(); columnIdentifiers.add(getResourceMap().getString("alert.type")); columnIdentifiers.add(getResourceMap().getString("alert.duration")); 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 c26e3c2..70b26b9 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2016 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 @@ -168,7 +168,7 @@ public class ReportGenerator { boolean includeIntermediateTotalTime) throws TemplateException, IOException { // Create the root hash - Map<String, Object> root = new HashMap<String, Object>(); + Map<String, Object> root = new HashMap<>(); root.put("projects", projects); root.put("begin", begin); diff --git a/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java b/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java index 63259d8..e96063e 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2016 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 @@ -105,7 +105,7 @@ public class ReportUtils { * @return dates list */ protected List<Date> getPeriodDates(Date begin, Date end, int calendarField) { - List<Date> periods = new ArrayList<Date>(); + List<Date> periods = new ArrayList<>(); Calendar cal = Calendar.getInstance(); cal.setTime(begin); @@ -431,7 +431,7 @@ public class ReportUtils { public Map<Date, String> getWeeklyTaskAnnotation(TimerTask task, Date week, Date fromDay, Date toDay) { - Map<Date, String> result = new HashMap<Date, String>(); + Map<Date, String> result = new HashMap<>(); Calendar beginPeriodDate = Calendar.getInstance(); beginPeriodDate.setTime(week); @@ -473,7 +473,7 @@ public class ReportUtils { */ public Map<Date, String> getMonthlyTaskAnnotation(TimerTask task, Date month, Date fromDay, Date toDay) { - Map<Date, String> result = new HashMap<Date, String>(); + Map<Date, String> result = new HashMap<>(); Calendar beginPeriodDate = Calendar.getInstance(); beginPeriodDate.setTime(month); @@ -515,7 +515,7 @@ public class ReportUtils { public Map<Date, String> getYearlyTaskAnnotation(TimerTask task, Date year, Date fromDay, Date toDay) { - Map<Date, String> result = new HashMap<Date, String>(); + Map<Date, String> result = new HashMap<>(); Calendar beginPeriodDate = Calendar.getInstance(); beginPeriodDate.setTime(year); @@ -552,7 +552,7 @@ public class ReportUtils { * @since 1.4.0 */ public List<TimerTask> getSubTaskOrdered(TimerTask task) { - List<TimerTask> subTask = new ArrayList<TimerTask>(task.getSubTasks()); + List<TimerTask> subTask = new ArrayList<>(task.getSubTasks()); TimerTaskHelper.sortTask(subTask); return subTask; } 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 fb0cbc0..bc8f81d 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java @@ -143,7 +143,7 @@ public class ReportView extends FrameView implements DocumentListener { getFrame().setName("reportFrame"); this.core = core; - this.uncheckedTaskSet = new HashSet<TimerTask>(); + this.uncheckedTaskSet = new HashSet<>(); // set title //setTitle(resourceMap.getString("reportTitle")); @@ -457,7 +457,7 @@ public class ReportView extends FrameView implements DocumentListener { protected List<TimerProject> getSelectedProjects( List<TimerProject> projects, Collection<TimerTask> uncheckedTaskList) { - List<TimerProject> currentProjects = new ArrayList<TimerProject>(); + List<TimerProject> currentProjects = new ArrayList<>(); for (TimerProject project : projects) { // take care of show closed option @@ -489,7 +489,7 @@ public class ReportView extends FrameView implements DocumentListener { protected List<TimerTask> getSelectedTasks(List<? extends TimerTask> tasks, Collection<TimerTask> uncheckedTaskList) { - List<TimerTask> currentTask = new ArrayList<TimerTask>(); + List<TimerTask> currentTask = new ArrayList<>(); for (TimerTask task : tasks) { // take care of show closed option diff --git a/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java b/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java index d7578d1..e1541a8 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java @@ -76,7 +76,7 @@ public class CheckBoxTreeCellEditor extends CheckBoxTreeCellComponent implements super(core, parentTree, uncheckedTaskList); addItemListener(this); - cellEditorListeners = new ArrayList<CellEditorListener>(); + cellEditorListeners = new ArrayList<>(); } @Override 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 b59faa1..6eac732 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2007 - 2016 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 @@ -90,7 +90,7 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer this.treeTable = treeTable; // init - runningTasks = new HashSet<TimerTask>(); + runningTasks = new HashSet<>(); URL runnigIconUrl = ProjectsAndTasksCellRenderer.class .getResource("/org/chorem/jtimer/resources/running.gif"); @@ -176,7 +176,7 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer */ class NodeImageObserver implements ImageObserver { - protected Set<Integer> rows = Collections.synchronizedSet(new HashSet<Integer>()); + protected Set<Integer> rows = Collections.synchronizedSet(new HashSet<>()); public void addRow(Integer row) { rows.add(row); 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 51afa5b..a0ec9b4 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java @@ -113,8 +113,8 @@ public class ProjectsAndTasksModel extends AbstractTreeTableModel implements this.dataManager = core.getData(); this.columnIdentifiers = columnIdentifiers; - taskNameCache = new HashMap<TimerTask, String>(); - subTasksCache = new HashMap<Object, List<TimerTask>>(); + taskNameCache = new HashMap<>(); + subTasksCache = new HashMap<>(); } /* @@ -221,7 +221,7 @@ public class ProjectsAndTasksModel extends AbstractTreeTableModel implements List<TimerTask> result = subTasksCache.get(parent); if (result == null || noCache) { - result = new ArrayList<TimerTask>(); + result = new ArrayList<>(); // get correct list if (parent == root) { // case root node @@ -383,7 +383,7 @@ public class ProjectsAndTasksModel extends AbstractTreeTableModel implements public void dataLoaded(Collection<TimerProject> projects) { // save size - final Collection<TableColumn> tcs = new ArrayList<TableColumn>(); + final Collection<TableColumn> tcs = new ArrayList<>(); for (TableColumn tc : projectsAndTaskTable.getColumns()) { tcs.add(tc); } diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java index 5efd770..9d41b9a 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java @@ -81,7 +81,7 @@ public class ProjectsAndTasksTable extends JXTreeTable { ResourceMap resourceMap = mgr .getResourceMap(ProjectsAndTasksTable.class); // init list - List<String> columnIdentifiers = new ArrayList<String>(); + List<String> columnIdentifiers = new ArrayList<>(); columnIdentifiers.add(resourceMap .getString("projectsAndTaskColumnName")); columnIdentifiers.add(resourceMap.getString("todayTimeColumnName")); @@ -163,7 +163,7 @@ public class ProjectsAndTasksTable extends JXTreeTable { */ public List<TimerTask> getSelectedTasks() { - List<TimerTask> results = new ArrayList<TimerTask>(); + List<TimerTask> results = new ArrayList<>(); // oula, c long de retouver la tache selectionnee TreePath[] paths = getTreeSelectionModel().getSelectionPaths(); @@ -195,7 +195,7 @@ public class ProjectsAndTasksTable extends JXTreeTable { */ public List<TimerTask> getSelectedElements() { - List<TimerTask> results = new ArrayList<TimerTask>(); + List<TimerTask> results = new ArrayList<>(); // oula, c long de retouver la tache selectionnee TreePath[] paths = getTreeSelectionModel().getSelectionPaths(); @@ -227,7 +227,7 @@ public class ProjectsAndTasksTable extends JXTreeTable { */ public List<TimerProject> getSelectedProjects() { - List<TimerProject> results = new ArrayList<TimerProject>(); + List<TimerProject> results = new ArrayList<>(); // oula, c long de retouver la tache selectionnee TreePath[] paths = getTreeSelectionModel().getSelectionPaths(); diff --git a/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java b/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java index 43fa1c7..e5fe15e 100644 --- a/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java +++ b/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 2016 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 @@ -163,7 +163,7 @@ public class CommonVetoableTest extends AbstractJTimerTest { Assert.assertNotNull(task3); Assert.assertNotNull(task4); - Collection<TimerTask> tasksToMove = new HashSet<TimerTask>(); + Collection<TimerTask> tasksToMove = new HashSet<>(); tasksToMove.add(task1); tasksToMove.add(task2); tasksToMove.add(task3); diff --git a/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java b/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java index a4ce723..de9d5e3 100644 --- a/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java +++ b/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 2016 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 @@ -328,7 +328,7 @@ public class TimerDataManagerTest extends AbstractJTimerTest { Assert.assertNotNull(task3); Assert.assertNotNull(task4); - Collection<TimerTask> tasksToMove = new HashSet<TimerTask>(); + Collection<TimerTask> tasksToMove = new HashSet<>(); tasksToMove.add(task1); tasksToMove.add(task2); tasksToMove.add(task3); @@ -582,7 +582,7 @@ public class TimerDataManagerTest extends AbstractJTimerTest { Assert.assertEquals(getRecursiveAlertsCount(Collections.singleton(task3)), 3); // merge tasks - List<TimerTask> othersTask = new ArrayList<TimerTask>(); + List<TimerTask> othersTask = new ArrayList<>(); othersTask.add(task1); othersTask.add(task3); dataManager.mergeTasks(task2, othersTask); diff --git a/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java b/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java index ee6cf5f..20a7454 100644 --- a/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java +++ b/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2016 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 @@ -104,7 +104,7 @@ public class TimerAlertTest extends AbstractJTimerTest { */ @Test public void testAlertList() { - List<TimerAlert> alertList = new ArrayList<TimerAlert>(); + List<TimerAlert> alertList = new ArrayList<>(); alertList.add(new TimerAlert(Type.REACH_DAILY_TIME, 8)); alertList.add(new TimerAlert(Type.REACH_DAILY_TIME, 8)); alertList.add(new TimerAlert(Type.REACH_DAILY_TIME, 7)); @@ -118,7 +118,7 @@ public class TimerAlertTest extends AbstractJTimerTest { */ @Test public void testAlertSet() { - Set<TimerAlert> alertSet = new HashSet<TimerAlert>(); + Set<TimerAlert> alertSet = new HashSet<>(); alertSet.add(new TimerAlert(Type.REACH_DAILY_TIME, 8)); alertSet.add(new TimerAlert(Type.REACH_DAILY_TIME, 8)); alertSet.add(new TimerAlert(Type.REACH_DAILY_TIME, 7)); diff --git a/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java b/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java index 7026627..9f31d1c 100644 --- a/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java +++ b/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2016 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 @@ -166,12 +166,12 @@ public class GTimerIncrementalSaverTest extends AbstractJTimerTest { TimerProject parentProject = new TimerProject(); parentProject.setName("Test"); parentProject.setNumber(1); - Map<String, TimerProject> mapNumberProject = new HashMap<String, TimerProject>(); + Map<String, TimerProject> mapNumberProject = new HashMap<>(); mapNumberProject.put(String.valueOf(parentProject.getNumber()), parentProject); // out map for post parsing - SortedMap<TimerTask, TimerProject> taskToManage = new TreeMap<TimerTask, TimerProject>(); + SortedMap<TimerTask, TimerProject> taskToManage = new TreeMap<>(); TimerTask task = gsaver.parseTaskFromFile(mapNumberProject, new File(taskFilePath), taskToManage); diff --git a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java index 3e301a5..a704156 100644 --- a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java +++ b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2016 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 @@ -65,7 +65,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Date d1 = df.parse("January 1, 2008"); Date d2 = df.parse("December 31, 2008"); - List<TimerProject> projects = new ArrayList<TimerProject>(); + List<TimerProject> projects = new ArrayList<>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, @@ -116,7 +116,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Date d1 = df.parse("November 1, 2008"); Date d2 = df.parse("March 31, 2009"); - List<TimerProject> projects = new ArrayList<TimerProject>(); + List<TimerProject> projects = new ArrayList<>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, @@ -154,7 +154,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Date d1 = df.parse("November 1, 2008"); Date d2 = df.parse("March 31, 2009"); - List<TimerProject> projects = new ArrayList<TimerProject>(); + List<TimerProject> projects = new ArrayList<>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_WEEK_REPORT, @@ -201,7 +201,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Date d1 = df.parse("November 1, 2008"); Date d2 = df.parse("March 31, 2009"); - List<TimerProject> projects = new ArrayList<TimerProject>(); + List<TimerProject> projects = new ArrayList<>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, @@ -238,7 +238,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Date d1 = df.parse("November 1, 2008"); Date d2 = df.parse("March 31, 2009"); - List<TimerProject> projects = new ArrayList<TimerProject>(); + List<TimerProject> projects = new ArrayList<>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, @@ -284,7 +284,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Date d1 = df.parse("January 1, 2008"); Date d2 = df.parse("December 31, 2008"); - List<TimerProject> projects = new ArrayList<TimerProject>(); + List<TimerProject> projects = new ArrayList<>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_YEAR_REPORT, @@ -331,7 +331,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Date d1 = df.parse("January 1, 2008"); Date d2 = df.parse("December 31, 2008"); - List<TimerProject> projects = new ArrayList<TimerProject>(); + List<TimerProject> projects = new ArrayList<>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_PROJECT_REPORT, diff --git a/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java b/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java index bbf42b7..912c5e0 100644 --- a/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java +++ b/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2016 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 @@ -63,7 +63,7 @@ public class DailySortedMapTest { */ @Test public void testConstructor() { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Assert.assertNotNull(map); } @@ -74,13 +74,13 @@ public class DailySortedMapTest { @Test public void testConsctuctorComparator() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>( - new Comparator<Date>() { - @Override - public int compare(Date o1, Date o2) { - return o1.compareTo(o2); - } - }); + DailySortedMap<Long> map = new DailySortedMap<>( + new Comparator<Date>() { + @Override + public int compare(Date o1, Date o2) { + return o1.compareTo(o2); + } + }); Date d1 = df.parse("December 30, 2008"); Date d2 = df.parse("December 29, 2008"); @@ -106,14 +106,14 @@ public class DailySortedMapTest { Date d3 = df.parse("December 31, 2008, 12:00:00 GMT"); Date d4 = df.parse("December 31, 2008, 13:00:00 GMT"); - SortedMap<Date, Long> map = new TreeMap<Date, Long>(); + SortedMap<Date, Long> map = new TreeMap<>(); map.put(d1, 1l); map.put(d2, 2l); map.put(d3, 3l); map.put(d4, 4l); // d2 erase d1, and d4 erase d3 - DailySortedMap<Long> newMap = new DailySortedMap<Long>(map); + DailySortedMap<Long> newMap = new DailySortedMap<>(map); Assert.assertEquals(newMap.size(), 2); Assert.assertEquals(newMap.firstEntry().getValue().longValue(), 2l); Assert.assertEquals(newMap.lastEntry().getValue().longValue(), 4l); @@ -130,14 +130,14 @@ public class DailySortedMapTest { Date d3 = df.parse("December 31, 2008, 12:00:00 GMT"); Date d4 = df.parse("December 31, 2008, 13:00:00 GMT"); - Map<Date, Long> map = new HashMap<Date, Long>(); + Map<Date, Long> map = new HashMap<>(); map.put(d1, 1l); map.put(d2, 2l); map.put(d3, 3l); map.put(d4, 4l); // d2 erase d1, and d4 erase d3 - DailySortedMap<Long> newMap = new DailySortedMap<Long>(map); + DailySortedMap<Long> newMap = new DailySortedMap<>(map); Assert.assertEquals(newMap.size(), 2); Assert.assertEquals(newMap.firstEntry().getValue().longValue(), 2l); Assert.assertEquals(newMap.lastEntry().getValue().longValue(), 4l); @@ -149,7 +149,7 @@ public class DailySortedMapTest { */ @Test public void ceilingEntryTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -170,7 +170,7 @@ public class DailySortedMapTest { */ @Test public void ceilingKeyTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -192,7 +192,7 @@ public class DailySortedMapTest { public void containsKeyTest() throws ParseException { Date d1 = df.parse("December 30, 2008, 12:00:00 GMT"); - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); map.put(d1, 1l); Assert.assertTrue(map.containsKey(d1)); @@ -213,7 +213,7 @@ public class DailySortedMapTest { */ @Test public void floorEntryTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -234,7 +234,7 @@ public class DailySortedMapTest { */ @Test public void floorKeyTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -257,7 +257,7 @@ public class DailySortedMapTest { Date d1 = df.parse("December 30, 2008, 12:00:00 GMT"); Date d2 = df.parse("December 31, 2008, 12:00:00 GMT"); - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); map.put(d1, 1l); map.put(d2, 2l); @@ -280,7 +280,7 @@ public class DailySortedMapTest { */ @Test public void headMapTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -301,7 +301,7 @@ public class DailySortedMapTest { */ @Test public void headMapBooleanTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -322,7 +322,7 @@ public class DailySortedMapTest { */ @Test public void higherEntryTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); //Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -343,7 +343,7 @@ public class DailySortedMapTest { */ @Test public void higherKeyTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); //Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -363,7 +363,7 @@ public class DailySortedMapTest { */ @Test public void lowerEntryTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); //Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -384,7 +384,7 @@ public class DailySortedMapTest { */ @Test public void lowerKeyTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); //Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -410,7 +410,7 @@ public class DailySortedMapTest { Date d4 = df.parse("December 31, 2008, 18:48:00 GMT"); Date d5 = df.parse("December 31, 2008, 00:00:00 GMT"); - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); map.put(d1, 1l); map.put(d2, 2l); Assert.assertEquals(map.size(), 1); @@ -442,7 +442,7 @@ public class DailySortedMapTest { Date d4 = df.parse("December 31, 2008, 18:48:00 GMT"); Date d5 = df.parse("December 31, 2008, 00:00:00 GMT"); - Map<Date, Long> map = new HashMap<Date, Long>(); + Map<Date, Long> map = new HashMap<>(); map.put(d1, 1l); map.put(d2, 2l); map.put(d3, 3l); @@ -450,7 +450,7 @@ public class DailySortedMapTest { map.put(d5, 5l); Assert.assertEquals(2, map.size()); - DailySortedMap<Long> newMap = new DailySortedMap<Long>(); + DailySortedMap<Long> newMap = new DailySortedMap<>(); newMap.putAll(map); Assert.assertEquals(map.size(), 2); Assert.assertEquals(map.get(d1).longValue(), 2l); @@ -463,7 +463,7 @@ public class DailySortedMapTest { */ @Test public void subMapTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -485,7 +485,7 @@ public class DailySortedMapTest { */ @Test public void subMapBooleanTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -507,7 +507,7 @@ public class DailySortedMapTest { */ @Test public void tailMapTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); @@ -528,7 +528,7 @@ public class DailySortedMapTest { */ @Test public void tailMapBooleanTest() throws ParseException { - DailySortedMap<Long> map = new DailySortedMap<Long>(); + DailySortedMap<Long> map = new DailySortedMap<>(); Date d1 = df.parse("May 09, 2009, 12:00:00 GMT"); Date d2 = df.parse("June 12, 2009, 12:00:00 GMT"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm