This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 68a6cc994554f1341e0ddac242e95ae86668b38c Author: servantie <servantie.c@gmail.com> Date: Wed Jun 29 17:45:17 2016 +0200 corrected all the imports with * --- src/main/java/org/chorem/jtimer/JTimer.java | 5 +++- .../org/chorem/jtimer/data/DataEventListener.java | 5 +++- .../chorem/jtimer/entities/TimerTaskHelper.java | 13 +++++++++- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 15 ++++++++--- .../jtimer/ui/report/TimerTaskUpdaterView.java | 30 +++++++++++++++++++--- .../jtimer/io/GTimerIncrementalSaverTest.java | 13 ++++++++-- 6 files changed, 69 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index c6c5089..3f4a2fb 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -66,7 +66,10 @@ import org.chorem.jtimer.data.DataViolationException; import org.chorem.jtimer.data.TimerCore; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; -import org.chorem.jtimer.ui.*; +import org.chorem.jtimer.ui.HelpFrame; +import org.chorem.jtimer.ui.NewTaskView; +import org.chorem.jtimer.ui.StatusBar; +import org.chorem.jtimer.ui.TimerTaskEditor; import org.chorem.jtimer.ui.alert.AlertEditor; import org.chorem.jtimer.ui.report.ReportView; import org.chorem.jtimer.ui.report.TimerTaskUpdaterView; diff --git a/src/main/java/org/chorem/jtimer/data/DataEventListener.java b/src/main/java/org/chorem/jtimer/data/DataEventListener.java index f51ec8e..19f19be 100644 --- a/src/main/java/org/chorem/jtimer/data/DataEventListener.java +++ b/src/main/java/org/chorem/jtimer/data/DataEventListener.java @@ -22,8 +22,11 @@ package org.chorem.jtimer.data; -import java.util.*; +import java.util.Collection; +import java.util.Date; +import java.util.EventListener; +import java.util.List; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index f5e4678..fa619a9 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -27,7 +27,18 @@ import com.google.gson.JsonObject; import java.time.LocalDate; import java.time.ZoneId; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + /** * Helper to remove process code from entity diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index 61ceb0c..97b77e5 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -1,6 +1,12 @@ package org.chorem.jtimer.io; import com.google.gson.JsonObject; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Timer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.data.DataEventListener; @@ -8,10 +14,13 @@ import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; -import java.io.*; -import java.net.*; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.ProtocolException; +import java.net.URL; import java.time.LocalDateTime; -import java.util.*; /** * diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 01a945f..929c530 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -25,6 +25,7 @@ package org.chorem.jtimer.ui.report; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; @@ -32,24 +33,45 @@ import org.chorem.jtimer.data.TimerCore; import org.chorem.jtimer.entities.SyncInfo; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.io.TimerTaskSynchronizer; -import org.jdesktop.application.*; import org.jdesktop.application.Action; +import org.jdesktop.application.Application; +import org.jdesktop.application.FrameView; import org.jdesktop.swingx.JXDatePicker; import org.jdesktop.swingx.JXTaskPane; import org.jdesktop.swingx.JXTaskPaneContainer; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.JTextArea; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import java.awt.*; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; + import java.text.DateFormat; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.List; import static org.chorem.jtimer.entities.TimerTaskHelper.taskToJSONFormat; diff --git a/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java b/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java index ac99865..44f5241 100644 --- a/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java +++ b/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java @@ -24,11 +24,20 @@ package org.chorem.jtimer.io; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; import org.chorem.jtimer.AbstractJTimerTest; -import org.chorem.jtimer.entities.*; +import org.chorem.jtimer.entities.SyncInfo; +import org.chorem.jtimer.entities.TimerAlert; +import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.entities.TimerTaskHelper; import org.testng.Assert; import org.testng.annotations.Test; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.