From 9e64ccf8a4168c4ae9c8212b0b47e4ae869d57d6 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Fri, 11 Apr 2008 18:43:25 +0000
Subject: [PATCH] change: - 'CollectionStyle.DEFAULT_COLLECTION_STYLE' -->
'CollectionStyle.DEFAULT', 'CollectionStyle.NO_BOUNDARY_COLLECTION_STYLE'
---> 'CollectionStyle.NO_BOUNDARY', 'CollectionStyle.NICE_COLLECTION_STYLE'
---> 'CollectionStyle.SINGLE_QUOTE_BOUNDARY'.
SVN: 5479
---
.../common/collections/CollectionStyle.java | 3 +--
.../common/collections/CollectionUtils.java | 22 +++++++++----------
.../MandatoryPropertyMissingException.java | 2 +-
.../collections/CollectionUtilsTest.java | 2 +-
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java b/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java
index 35783b9113a..f3a4787a8ef 100644
--- a/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java
+++ b/common/source/java/ch/systemsx/cisd/common/collections/CollectionStyle.java
@@ -24,8 +24,7 @@ package ch.systemsx.cisd.common.collections;
public enum CollectionStyle
{
/** Default <code>CollectionStyle</code>. */
- DEFAULT_COLLECTION_STYLE("[", "]", ", "), NO_BOUNDARY_COLLECTION_STYLE("", "", ", "),
- NICE_COLLECTION_STYLE("'", "'", "', '");
+ DEFAULT("[", "]", ", "), NO_BOUNDARY("", "", ", "), SINGLE_QUOTE_BOUNDARY("'", "'", "', '");
private final String collectionStart;
diff --git a/common/source/java/ch/systemsx/cisd/common/collections/CollectionUtils.java b/common/source/java/ch/systemsx/cisd/common/collections/CollectionUtils.java
index 1d627dcc727..8eddbfee82e 100644
--- a/common/source/java/ch/systemsx/cisd/common/collections/CollectionUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/collections/CollectionUtils.java
@@ -36,7 +36,7 @@ public final class CollectionUtils
* Abbreviates a given array of <code>Object</code>.
* <p>
* By default it shows the number of items left,
- * {@link CollectionStyle#DEFAULT_COLLECTION_STYLE} and {@link ToStringDefaultConverter} are
+ * {@link CollectionStyle#DEFAULT} and {@link ToStringDefaultConverter} are
* used.
* </p>
*
@@ -52,7 +52,7 @@ public final class CollectionUtils
* Abbreviates a given <code>Collection</code>.
* <p>
* By default it shows the number of items left,
- * {@link CollectionStyle#DEFAULT_COLLECTION_STYLE} and {@link ToStringDefaultConverter} are
+ * {@link CollectionStyle#DEFAULT} and {@link ToStringDefaultConverter} are
* used.
* </p>
*
@@ -107,7 +107,7 @@ public final class CollectionUtils
final IToStringConverter<? super T> converter)
{
return abbreviate(collection, maxLength, converter,
- CollectionStyle.DEFAULT_COLLECTION_STYLE);
+ CollectionStyle.DEFAULT);
}
/**
@@ -128,7 +128,7 @@ public final class CollectionUtils
/**
* Abbreviates a given array of <code>Object</code>.
* <p>
- * By default {@link CollectionStyle#DEFAULT_COLLECTION_STYLE} and
+ * By default {@link CollectionStyle#DEFAULT} and
* {@link ToStringDefaultConverter} are used.
* </p>
*
@@ -144,7 +144,7 @@ public final class CollectionUtils
/**
* Abbreviates a given <code>Collection</code>.
* <p>
- * By default {@link CollectionStyle#DEFAULT_COLLECTION_STYLE} and
+ * By default {@link CollectionStyle#DEFAULT} and
* {@link ToStringDefaultConverter} are used.
* </p>
*
@@ -160,7 +160,7 @@ public final class CollectionUtils
/**
* Abbreviates a given array of <code>Object</code>.
* <p>
- * By default {@link CollectionStyle#DEFAULT_COLLECTION_STYLE} is used.
+ * By default {@link CollectionStyle#DEFAULT} is used.
* </p>
*
* @param maxLength the maximum number of items that should be shown. If <code>-1</code> then
@@ -170,25 +170,25 @@ public final class CollectionUtils
final boolean showLeft, final IToStringConverter<? super T> converter)
{
return abbreviate(objects, maxLength, showLeft, converter,
- CollectionStyle.DEFAULT_COLLECTION_STYLE);
+ CollectionStyle.DEFAULT);
}
/**
* Abbreviates a given array of <code>Object</code>.
* <p>
- * {@link CollectionStyle#DEFAULT_COLLECTION_STYLE} is used and all items is displayed.
+ * {@link CollectionStyle#DEFAULT} is used and all items is displayed.
* </p>
*/
public final static <T> String abbreviate(final T[] objects,
final IToStringConverter<? super T> converter)
{
- return abbreviate(objects, -1, false, converter, CollectionStyle.DEFAULT_COLLECTION_STYLE);
+ return abbreviate(objects, -1, false, converter, CollectionStyle.DEFAULT);
}
/**
* Abbreviates a given <code>Collection</code>.
* <p>
- * By default {@link CollectionStyle#DEFAULT_COLLECTION_STYLE} is used.
+ * By default {@link CollectionStyle#DEFAULT} is used.
* </p>
*
* @param maxLength the maximum number of items that should be shown. If <code>-1</code> then
@@ -198,7 +198,7 @@ public final class CollectionUtils
final boolean showLeft, final IToStringConverter<? super T> converter)
{
return abbreviate(collection, maxLength, showLeft, converter,
- CollectionStyle.DEFAULT_COLLECTION_STYLE);
+ CollectionStyle.DEFAULT);
}
/**
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/MandatoryPropertyMissingException.java b/common/source/java/ch/systemsx/cisd/common/parser/MandatoryPropertyMissingException.java
index c9042342c27..f4c5c7ded00 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/MandatoryPropertyMissingException.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/MandatoryPropertyMissingException.java
@@ -58,7 +58,7 @@ public final class MandatoryPropertyMissingException extends ParserException
final static String toString(final Set<String> set)
{
- return CollectionUtils.abbreviate(set, -1, CollectionStyle.NO_BOUNDARY_COLLECTION_STYLE);
+ return CollectionUtils.abbreviate(set, -1, CollectionStyle.NO_BOUNDARY);
}
public final Set<String> getMissingMandatoryProperties()
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java
index 2507007ae71..cc149476136 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java
@@ -59,7 +59,7 @@ public final class CollectionUtilsTest
public final void testAbbreviateWithArray()
{
final String[] s = StringUtilities.getStrings(5);
- final CollectionStyle collectionStyle = CollectionStyle.DEFAULT_COLLECTION_STYLE;
+ final CollectionStyle collectionStyle = CollectionStyle.DEFAULT;
String string =
collectionStyle.getCollectionStart()
+ StringUtils.join(s, collectionStyle.getCollectionSeparator())
--
GitLab