diff --git a/common-lib/src/main/java/org/drugis/common/beans/AbstractObservable.java b/common-lib/src/main/java/org/drugis/common/beans/AbstractObservable.java index 409a95f..434c89a 100644 --- a/common-lib/src/main/java/org/drugis/common/beans/AbstractObservable.java +++ b/common-lib/src/main/java/org/drugis/common/beans/AbstractObservable.java @@ -24,7 +24,6 @@ import java.beans.PropertyChangeListener; - import com.jgoodies.binding.beans.Observable; public abstract class AbstractObservable implements Observable { diff --git a/common-lib/src/main/java/org/drugis/common/beans/ListPropertyChangeProxy.java b/common-lib/src/main/java/org/drugis/common/beans/ListPropertyChangeProxy.java index 7c12acd..8ba7ea3 100644 --- a/common-lib/src/main/java/org/drugis/common/beans/ListPropertyChangeProxy.java +++ b/common-lib/src/main/java/org/drugis/common/beans/ListPropertyChangeProxy.java @@ -19,16 +19,16 @@ package org.drugis.common.beans; -import com.jgoodies.binding.list.ObservableList; -import com.jgoodies.binding.beans.Observable; - -import javax.swing.event.ListDataListener; -import javax.swing.event.ListDataEvent; - import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; + +import com.jgoodies.binding.beans.Observable; +import com.jgoodies.binding.list.ObservableList; + /** * Ensures that a PropertyChangeListener is attached to each of the Observables in an ObservableList. */ diff --git a/common-lib/src/main/java/org/drugis/common/threading/SuspendableThreadWrapper.java b/common-lib/src/main/java/org/drugis/common/threading/SuspendableThreadWrapper.java index d7b778e..0f50259 100644 --- a/common-lib/src/main/java/org/drugis/common/threading/SuspendableThreadWrapper.java +++ b/common-lib/src/main/java/org/drugis/common/threading/SuspendableThreadWrapper.java @@ -24,8 +24,6 @@ import java.lang.Thread.State; -import org.drugis.common.threading.Suspendable; - public class SuspendableThreadWrapper { private Thread d_thread; private final Suspendable d_runnable; diff --git a/common-lib/src/main/java/org/drugis/common/threading/TaskUtil.java b/common-lib/src/main/java/org/drugis/common/threading/TaskUtil.java index 11c2df4..2e24e78 100644 --- a/common-lib/src/main/java/org/drugis/common/threading/TaskUtil.java +++ b/common-lib/src/main/java/org/drugis/common/threading/TaskUtil.java @@ -22,8 +22,6 @@ package org.drugis.common.threading; -import org.drugis.common.threading.Task; -import org.drugis.common.threading.ThreadHandler; import org.drugis.common.threading.activity.ActivityModel; import org.drugis.common.threading.activity.ActivityTask; diff --git a/common-lib/src/main/java/org/drugis/common/validation/BooleanAndModel.java b/common-lib/src/main/java/org/drugis/common/validation/BooleanAndModel.java index 3b12497..9080e4a 100644 --- a/common-lib/src/main/java/org/drugis/common/validation/BooleanAndModel.java +++ b/common-lib/src/main/java/org/drugis/common/validation/BooleanAndModel.java @@ -19,13 +19,13 @@ package org.drugis.common.validation; -import java.beans.PropertyChangeListener; import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Arrays; import java.util.List; -import com.jgoodies.binding.value.ValueModel; import com.jgoodies.binding.value.AbstractValueModel; +import com.jgoodies.binding.value.ValueModel; /** * Listens to two nested ValueModels, and converts to true iff both are true. Converts to null if either one is null, or not a Boolean. diff --git a/common-lib/src/main/java/org/drugis/common/validation/ListMinimumSizeModel.java b/common-lib/src/main/java/org/drugis/common/validation/ListMinimumSizeModel.java index e8b088a..0644fc5 100644 --- a/common-lib/src/main/java/org/drugis/common/validation/ListMinimumSizeModel.java +++ b/common-lib/src/main/java/org/drugis/common/validation/ListMinimumSizeModel.java @@ -20,8 +20,8 @@ package org.drugis.common.validation; import javax.swing.ListModel; -import javax.swing.event.ListDataListener; import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; import com.jgoodies.binding.value.AbstractValueModel; diff --git a/common-lib/src/main/java/org/drugis/common/validation/PropertyUniqueModel.java b/common-lib/src/main/java/org/drugis/common/validation/PropertyUniqueModel.java index 2f0109f..6c624e7 100644 --- a/common-lib/src/main/java/org/drugis/common/validation/PropertyUniqueModel.java +++ b/common-lib/src/main/java/org/drugis/common/validation/PropertyUniqueModel.java @@ -19,14 +19,14 @@ package org.drugis.common.validation; -import java.util.List; -import java.beans.PropertyDescriptor; -import java.beans.PropertyChangeListener; import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyDescriptor; +import java.util.List; + import com.jgoodies.binding.BindingUtils; -import com.jgoodies.binding.beans.Observable; import com.jgoodies.binding.beans.BeanUtils; - +import com.jgoodies.binding.beans.Observable; import com.jgoodies.binding.value.AbstractValueModel; /** diff --git a/common-lib/src/main/java/org/drugis/common/validation/StringMatchesModel.java b/common-lib/src/main/java/org/drugis/common/validation/StringMatchesModel.java index f2f4a9b..627b3ca 100644 --- a/common-lib/src/main/java/org/drugis/common/validation/StringMatchesModel.java +++ b/common-lib/src/main/java/org/drugis/common/validation/StringMatchesModel.java @@ -19,13 +19,13 @@ package org.drugis.common.validation; -import java.beans.PropertyChangeListener; import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.jgoodies.binding.value.ValueModel; import com.jgoodies.binding.value.AbstractValueModel; +import com.jgoodies.binding.value.ValueModel; /** * Listens to a nested ValueModel, and converts it to true iff nested matches the given pattern. diff --git a/common-lib/src/main/java/org/drugis/common/validation/StringNotEmptyModel.java b/common-lib/src/main/java/org/drugis/common/validation/StringNotEmptyModel.java index 7e248dd..2280856 100644 --- a/common-lib/src/main/java/org/drugis/common/validation/StringNotEmptyModel.java +++ b/common-lib/src/main/java/org/drugis/common/validation/StringNotEmptyModel.java @@ -19,11 +19,11 @@ package org.drugis.common.validation; -import java.beans.PropertyChangeListener; import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; -import com.jgoodies.binding.value.ValueModel; import com.jgoodies.binding.value.AbstractValueModel; +import com.jgoodies.binding.value.ValueModel; /** * Listens to a nested ValueModel, and converts it to true iff nested is a non-empty String. diff --git a/common-lib/src/test/java/org/drugis/common/CollectionUtilTest.java b/common-lib/src/test/java/org/drugis/common/CollectionUtilTest.java index f412eaa..97970fb 100644 --- a/common-lib/src/test/java/org/drugis/common/CollectionUtilTest.java +++ b/common-lib/src/test/java/org/drugis/common/CollectionUtilTest.java @@ -1,12 +1,10 @@ package org.drugis.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.SortedSet; import java.util.TreeSet; - -import org.drugis.common.CollectionUtil; import org.junit.Before; import org.junit.Test; diff --git a/common-lib/src/test/java/org/drugis/common/DateUtilTest.java b/common-lib/src/test/java/org/drugis/common/DateUtilTest.java index 68e9527..0af6a86 100644 --- a/common-lib/src/test/java/org/drugis/common/DateUtilTest.java +++ b/common-lib/src/test/java/org/drugis/common/DateUtilTest.java @@ -1,6 +1,6 @@ package org.drugis.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.Date; diff --git a/common-lib/src/test/java/org/drugis/common/StudentTTableTest.java b/common-lib/src/test/java/org/drugis/common/StudentTTableTest.java index 2b9659f..a1136e1 100644 --- a/common-lib/src/test/java/org/drugis/common/StudentTTableTest.java +++ b/common-lib/src/test/java/org/drugis/common/StudentTTableTest.java @@ -1,8 +1,7 @@ package org.drugis.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; -import org.drugis.common.StudentTTable; import org.junit.Test; public class StudentTTableTest { diff --git a/common-lib/src/test/java/org/drugis/common/beans/FilteredObservableListTest.java b/common-lib/src/test/java/org/drugis/common/beans/FilteredObservableListTest.java index b946071..5f1c1e7 100644 --- a/common-lib/src/test/java/org/drugis/common/beans/FilteredObservableListTest.java +++ b/common-lib/src/test/java/org/drugis/common/beans/FilteredObservableListTest.java @@ -35,8 +35,6 @@ import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import org.drugis.common.beans.FilteredObservableList; -import org.drugis.common.beans.SortedSetModel; import org.drugis.common.beans.FilteredObservableList.Filter; import org.drugis.common.event.ListDataEventMatcher; import org.junit.Before; diff --git a/common-lib/src/test/java/org/drugis/common/beans/GuardedObservableListTest.java b/common-lib/src/test/java/org/drugis/common/beans/GuardedObservableListTest.java index 6b22e5e..c33ea25 100644 --- a/common-lib/src/test/java/org/drugis/common/beans/GuardedObservableListTest.java +++ b/common-lib/src/test/java/org/drugis/common/beans/GuardedObservableListTest.java @@ -1,6 +1,8 @@ package org.drugis.common.beans; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import java.util.Arrays; diff --git a/common-lib/src/test/java/org/drugis/common/beans/SortedSetModelTest.java b/common-lib/src/test/java/org/drugis/common/beans/SortedSetModelTest.java index f72ef54..63aadd7 100644 --- a/common-lib/src/test/java/org/drugis/common/beans/SortedSetModelTest.java +++ b/common-lib/src/test/java/org/drugis/common/beans/SortedSetModelTest.java @@ -24,7 +24,9 @@ package org.drugis.common.beans; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -36,7 +38,6 @@ import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import org.drugis.common.beans.SortedSetModel; import org.drugis.common.event.ListDataEventMatcher; import org.junit.Before; import org.junit.Test; diff --git a/common-lib/src/test/java/org/drugis/common/stat/StatisticsTest.java b/common-lib/src/test/java/org/drugis/common/stat/StatisticsTest.java index 6c1b136..99014c8 100644 --- a/common-lib/src/test/java/org/drugis/common/stat/StatisticsTest.java +++ b/common-lib/src/test/java/org/drugis/common/stat/StatisticsTest.java @@ -1,7 +1,8 @@ package org.drugis.common.stat; +import static org.junit.Assert.assertEquals; + import org.junit.Test; -import static org.junit.Assert.*; public class StatisticsTest { private static final double EPSILON = 0.000001; diff --git a/common-lib/src/test/java/org/drugis/common/threading/SimpleSuspendableTaskTest.java b/common-lib/src/test/java/org/drugis/common/threading/SimpleSuspendableTaskTest.java index 772ab2d..33a75ab 100644 --- a/common-lib/src/test/java/org/drugis/common/threading/SimpleSuspendableTaskTest.java +++ b/common-lib/src/test/java/org/drugis/common/threading/SimpleSuspendableTaskTest.java @@ -1,7 +1,13 @@ package org.drugis.common.threading; -import static org.junit.Assert.*; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.drugis.common.threading.event.TaskAbortedEvent; import org.drugis.common.threading.event.TaskFailedEvent; diff --git a/common-lib/src/test/java/org/drugis/common/threading/activity/ActivityModelTest.java b/common-lib/src/test/java/org/drugis/common/threading/activity/ActivityModelTest.java index a0116f9..534d85f 100644 --- a/common-lib/src/test/java/org/drugis/common/threading/activity/ActivityModelTest.java +++ b/common-lib/src/test/java/org/drugis/common/threading/activity/ActivityModelTest.java @@ -1,6 +1,7 @@ package org.drugis.common.threading.activity; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collections; diff --git a/common-lib/src/test/java/org/drugis/common/threading/activity/DecisionTransitionTest.java b/common-lib/src/test/java/org/drugis/common/threading/activity/DecisionTransitionTest.java index 9e256d0..f291f22 100644 --- a/common-lib/src/test/java/org/drugis/common/threading/activity/DecisionTransitionTest.java +++ b/common-lib/src/test/java/org/drugis/common/threading/activity/DecisionTransitionTest.java @@ -1,9 +1,12 @@ package org.drugis.common.threading.activity; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.easymock.EasyMock.*; import java.util.ArrayList; import java.util.Collections; diff --git a/common-lib/src/test/java/org/drugis/common/threading/activity/JoinTransitionTest.java b/common-lib/src/test/java/org/drugis/common/threading/activity/JoinTransitionTest.java index 48a6135..30cbddf 100644 --- a/common-lib/src/test/java/org/drugis/common/threading/activity/JoinTransitionTest.java +++ b/common-lib/src/test/java/org/drugis/common/threading/activity/JoinTransitionTest.java @@ -1,6 +1,8 @@ package org.drugis.common.threading.activity; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collections; diff --git a/common-lib/src/test/java/org/drugis/common/threading/event/EventTest.java b/common-lib/src/test/java/org/drugis/common/threading/event/EventTest.java index a9da5fa..1247e68 100644 --- a/common-lib/src/test/java/org/drugis/common/threading/event/EventTest.java +++ b/common-lib/src/test/java/org/drugis/common/threading/event/EventTest.java @@ -1,7 +1,7 @@ package org.drugis.common.threading.event; import static org.drugis.common.JUnitUtil.assertNotEquals; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.drugis.common.threading.Task; import org.junit.Before; diff --git a/common-lib/src/test/java/org/drugis/common/threading/event/ListenerManagerTest.java b/common-lib/src/test/java/org/drugis/common/threading/event/ListenerManagerTest.java index 1f280e4..6240de6 100644 --- a/common-lib/src/test/java/org/drugis/common/threading/event/ListenerManagerTest.java +++ b/common-lib/src/test/java/org/drugis/common/threading/event/ListenerManagerTest.java @@ -1,10 +1,13 @@ package org.drugis.common.threading.event; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import org.drugis.common.threading.Task; import org.drugis.common.threading.TaskListener; import org.junit.Before; import org.junit.Test; -import static org.easymock.EasyMock.*; public class ListenerManagerTest { private Task d_task; diff --git a/common-lib/src/test/java/org/drugis/common/validation/ListMinimumSizeModelTest.java b/common-lib/src/test/java/org/drugis/common/validation/ListMinimumSizeModelTest.java index bf1b83b..92d16bd 100644 --- a/common-lib/src/test/java/org/drugis/common/validation/ListMinimumSizeModelTest.java +++ b/common-lib/src/test/java/org/drugis/common/validation/ListMinimumSizeModelTest.java @@ -19,16 +19,17 @@ package org.drugis.common.validation; -import com.jgoodies.binding.list.ArrayListModel; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.beans.PropertyChangeListener; import java.util.Arrays; -import org.junit.Test; -import static org.junit.Assert.*; import org.drugis.common.JUnitUtil; -import org.drugis.common.validation.ListMinimumSizeModel; +import org.junit.Test; -import static org.easymock.EasyMock.*; +import com.jgoodies.binding.list.ArrayListModel; public class ListMinimumSizeModelTest { @Test diff --git a/common-lib/src/test/java/org/drugis/common/validation/StringNotEmptyModelTest.java b/common-lib/src/test/java/org/drugis/common/validation/StringNotEmptyModelTest.java index 143687a..bf3943e 100644 --- a/common-lib/src/test/java/org/drugis/common/validation/StringNotEmptyModelTest.java +++ b/common-lib/src/test/java/org/drugis/common/validation/StringNotEmptyModelTest.java @@ -19,15 +19,16 @@ package org.drugis.common.validation; -import com.jgoodies.binding.value.ValueHolder; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.beans.PropertyChangeListener; -import org.junit.Test; -import static org.junit.Assert.*; import org.drugis.common.JUnitUtil; -import org.drugis.common.validation.StringNotEmptyModel; +import org.junit.Test; -import static org.easymock.EasyMock.*; +import com.jgoodies.binding.value.ValueHolder; public class StringNotEmptyModelTest { @Test