Permalink
Browse files

Cleanup of imports and whitespace

  • Loading branch information...
1 parent f3c426b commit 54cb1f62ac1ddd336d513bf53e027667c7cc71cc @joelkuiper joelkuiper committed Apr 27, 2012
Showing with 63 additions and 52 deletions.
  1. +0 −1 common-lib/src/main/java/org/drugis/common/beans/AbstractObservable.java
  2. +6 −6 common-lib/src/main/java/org/drugis/common/beans/ListPropertyChangeProxy.java
  3. +0 −2 common-lib/src/main/java/org/drugis/common/threading/SuspendableThreadWrapper.java
  4. +0 −2 common-lib/src/main/java/org/drugis/common/threading/TaskUtil.java
  5. +2 −2 common-lib/src/main/java/org/drugis/common/validation/BooleanAndModel.java
  6. +1 −1 common-lib/src/main/java/org/drugis/common/validation/ListMinimumSizeModel.java
  7. +5 −5 common-lib/src/main/java/org/drugis/common/validation/PropertyUniqueModel.java
  8. +2 −2 common-lib/src/main/java/org/drugis/common/validation/StringMatchesModel.java
  9. +2 −2 common-lib/src/main/java/org/drugis/common/validation/StringNotEmptyModel.java
  10. +1 −3 common-lib/src/test/java/org/drugis/common/CollectionUtilTest.java
  11. +1 −1 common-lib/src/test/java/org/drugis/common/DateUtilTest.java
  12. +1 −2 common-lib/src/test/java/org/drugis/common/StudentTTableTest.java
  13. +0 −2 common-lib/src/test/java/org/drugis/common/beans/FilteredObservableListTest.java
  14. +3 −1 common-lib/src/test/java/org/drugis/common/beans/GuardedObservableListTest.java
  15. +3 −2 common-lib/src/test/java/org/drugis/common/beans/SortedSetModelTest.java
  16. +2 −1 common-lib/src/test/java/org/drugis/common/stat/StatisticsTest.java
  17. +8 −2 common-lib/src/test/java/org/drugis/common/threading/SimpleSuspendableTaskTest.java
  18. +2 −1 common-lib/src/test/java/org/drugis/common/threading/activity/ActivityModelTest.java
  19. +4 −1 common-lib/src/test/java/org/drugis/common/threading/activity/DecisionTransitionTest.java
  20. +3 −1 common-lib/src/test/java/org/drugis/common/threading/activity/JoinTransitionTest.java
  21. +1 −1 common-lib/src/test/java/org/drugis/common/threading/event/EventTest.java
  22. +4 −1 common-lib/src/test/java/org/drugis/common/threading/event/ListenerManagerTest.java
  23. +6 −5 common-lib/src/test/java/org/drugis/common/validation/ListMinimumSizeModelTest.java
  24. +6 −5 common-lib/src/test/java/org/drugis/common/validation/StringNotEmptyModelTest.java
@@ -24,7 +24,6 @@
import java.beans.PropertyChangeListener;
-
import com.jgoodies.binding.beans.Observable;
public abstract class AbstractObservable implements Observable {
@@ -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.
*/
@@ -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;
@@ -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;
@@ -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.
@@ -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;
@@ -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;
/**
@@ -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.
@@ -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.
@@ -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;
@@ -1,6 +1,6 @@
package org.drugis.common;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.Date;
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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
@@ -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

0 comments on commit 54cb1f6

Please sign in to comment.