change: - Trying to put some structure in 'ch.systemsx.cisd.common.utilities'.

SVN: 4486

common/resource/dependency-structure.ddf

@@ -12,6 +12,9 @@ check sets [db]
 [exceptions] = ${package}.exceptions.*
 check sets [exceptions]
 
+[collections] = ${package}.collections.*
+check sets [collections]
+
 [logging] = ${package}.logging.*
 check sets [logging]
 
@@ -24,14 +27,14 @@ check sets [process]
 [test] = ${package}.test.*
 check sets [test]
 
-[utilities] = ${package}.utilities.* excluding ${package}.utilities.RecursiveHardLinkMaker
-check sets [utilities]
+# TODO 2008-02-26, Christian Ribeaud: include 'utilities' set into layering.
+# [utilities] = ${package}.utilities.*
+# check sets [utilities]
 
 layer layer0 = [annotation] [exceptions] [logging] [test]
-layer layer1 = [utilities]
-layer layer2 = [process]
-layer layer3 = [db] [parser]
+layer layer1 = [process] [collections]
+layer layer2 = [db] [parser]
 
-check layeringOf layer0 layer1 layer2 layer3
+check layeringOf layer0 layer1 layer2
 
 check [parser] independentOf ${package}.exceptions.UserFailureException 
\ No newline at end of file

common/source/java/ch/systemsx/cisd/common/utilities/CollectionIO.java → common/source/java/ch/systemsx/cisd/common/collections/CollectionIO.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -38,6 +38,7 @@ import org.apache.log4j.Logger;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.utilities.FileUtilities;
 
 /**
  * I/O operations for collections. Allows to read and write collections of {@link String}s and other objects from and

common/source/java/ch/systemsx/cisd/common/utilities/CollectionStyle.java → common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java

-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 /**
  * Controls <code>Collection</code> string representation for {@link CollectionUtils}.

common/source/java/ch/systemsx/cisd/common/utilities/CollectionUtils.java → common/source/java/ch/systemsx/cisd/common/collections/CollectionUtils.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 
+
 /**
  * Some convenience methods/utilities around {@link Collection}.
  * 

common/source/java/ch/systemsx/cisd/common/utilities/FromStringIdentityConverter.java → common/source/java/ch/systemsx/cisd/common/collections/FromStringIdentityConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 /**
  * The identity {@link IFromStringConverter} for {@link String}s, which returns the value itself as the converted

common/source/java/ch/systemsx/cisd/common/utilities/IFromStringConverter.java → common/source/java/ch/systemsx/cisd/common/collections/IFromStringConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 /**
  * This converter represents a role that can convert a <var>String</var> to some other <var>Object</var>.

common/source/java/ch/systemsx/cisd/common/utilities/IToStringConverter.java → common/source/java/ch/systemsx/cisd/common/collections/IToStringConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 /**
  * This converter represents a role that can convert a <var>String</var> to some other <var>Object</var>.

common/source/java/ch/systemsx/cisd/common/utilities/ToStringDefaultConverter.java → common/source/java/ch/systemsx/cisd/common/collections/ToStringDefaultConverter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 /**
  * The default converter: uses {@link Object#toString()} for conversion.

common/source/java/ch/systemsx/cisd/common/parser/MandatoryPropertyMissingException.java

@@ -19,8 +19,8 @@ package ch.systemsx.cisd.common.parser;
 import java.util.Collections;
 import java.util.Set;
 
-import ch.systemsx.cisd.common.utilities.CollectionStyle;
-import ch.systemsx.cisd.common.utilities.CollectionUtils;
+import ch.systemsx.cisd.common.collections.CollectionStyle;
+import ch.systemsx.cisd.common.collections.CollectionUtils;
 
 /**
  * A <code>ParserException</code> extension which signalizes missing of a mandatory property.

common/source/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTask.java

@@ -24,6 +24,7 @@ import java.util.TimerTask;
 
 import org.apache.log4j.Logger;
 
+import ch.systemsx.cisd.common.collections.CollectionIO;
 import ch.systemsx.cisd.common.logging.ISimpleLogger;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;

common/sourceTest/java/ch/systemsx/cisd/common/utilities/CollectionIOTest.java → common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionIOTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 import static org.testng.AssertJUnit.assertEquals;
 
@@ -34,6 +34,9 @@ import java.util.Set;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
+import ch.systemsx.cisd.common.collections.CollectionIO;
+import ch.systemsx.cisd.common.collections.IFromStringConverter;
+import ch.systemsx.cisd.common.collections.IToStringConverter;
 import ch.systemsx.cisd.common.logging.LogInitializer;
 
 /**

common/sourceTest/java/ch/systemsx/cisd/common/utilities/CollectionUtilsTest.java → common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.collections;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.fail;
@@ -24,6 +24,8 @@ import java.util.Collection;
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
+import ch.systemsx.cisd.common.utilities.StringUtilities;
+
 /**
  * Test cases for the {@link CollectionUtils} class.
  * 

common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java

@@ -29,10 +29,10 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.systemsx.cisd.common.collections.CollectionIO;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.logging.LogInitializer;
-import ch.systemsx.cisd.common.utilities.CollectionIO;
 
 /**
  * Test cases for the {@link ProcessExecutionHelper}.

common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java

@@ -30,6 +30,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.systemsx.cisd.common.collections.CollectionIO;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogInitializer;
 import ch.systemsx.cisd.common.logging.LogMonitoringAppender;

common/sourceTest/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMakerTest.java

@@ -28,8 +28,8 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ch.systemsx.cisd.common.collections.CollectionIO;
 import ch.systemsx.cisd.common.logging.LogInitializer;
-import ch.systemsx.cisd.common.utilities.CollectionIO;
 import ch.systemsx.cisd.common.utilities.FileUtilities;
 import ch.systemsx.cisd.common.utilities.IPathImmutableCopier;
 import ch.systemsx.cisd.common.utilities.RecursiveHardLinkMaker;