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 7028f62cef311e7d23f54207cce65e1c4f3850c5 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Feb 23 11:32:06 2016 +0100 refs #1322: Use filter api instead of commons-collection --- pom.xml | 5 ----- .../jtimer/ui/report/tree/CheckBoxTreeModel.java | 22 ++++++---------------- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 19 +++++-------------- 3 files changed, 11 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index c8c67c9..5bb391c 100644 --- a/pom.xml +++ b/pom.xml @@ -332,11 +332,6 @@ <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>4.1</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>3.4</version> </dependency> diff --git a/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java b/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java index 85eea50..3ed9d41 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java +++ b/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2009 - 2012 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 @@ -24,13 +24,12 @@ package org.chorem.jtimer.ui.report.tree; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.data.TimerCore; @@ -116,7 +115,7 @@ public class CheckBoxTreeModel implements TreeModel { */ protected List<TimerTask> getFiteredSubListFor(Object parent) { - List<TimerTask> result = new ArrayList<TimerTask>(); + List<TimerTask> result = new ArrayList<>(); // get correct list if (parent == root) { // case root node @@ -128,18 +127,9 @@ public class CheckBoxTreeModel implements TreeModel { // filter list, if only show closed if (!showClosed) { - CollectionUtils.filter(result, new Predicate() { - @Override - public boolean evaluate(Object object) { - - boolean result = false; - if (object instanceof TimerTask) { - TimerTask task = (TimerTask) object; - result = !task.isClosed(); - } - return result; - } - }); + result = result.stream() + .filter(task -> !task.isClosed()) + .collect(Collectors.toList()); } // Since sort is not supported by the table, do a manual sorting. 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 b3cc61f..51afa5b 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.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 @@ -28,13 +28,12 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.swing.SwingUtilities; import javax.swing.table.TableColumn; import javax.swing.tree.TreePath; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -235,17 +234,9 @@ public class ProjectsAndTasksModel extends AbstractTreeTableModel implements // filter list, if only show closed if (!showClosedTask) { - CollectionUtils.filter(result, new Predicate() { - @Override - public boolean evaluate(Object object) { - boolean result = false; - if (object instanceof TimerTask) { - TimerTask task = (TimerTask) object; - result = !task.isClosed(); - } - return result; - } - }); + result = result.stream() + .filter(task -> !task.isClosed()) + .collect(Collectors.toList()); } // Since sort is not supported by the table, do a manual sorting. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.