From e80a090ca383bfbf42aea5805f5f9f355d30e4ad Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 10 Mar 2008 07:30:32 +0000
Subject: [PATCH] minor: fix formatting
SVN: 4707
---
.../cisd/common/collections/FilteredCollection.java | 2 +-
.../ch/systemsx/cisd/common/db/DBTableRestrictions.java | 2 +-
.../java/ch/systemsx/cisd/common/logging/LogFactory.java | 2 +-
.../java/ch/systemsx/cisd/common/utilities/BeanUtils.java | 2 +-
.../systemsx/cisd/common/utilities/ExtendedProperties.java | 6 +++---
.../ch/systemsx/cisd/common/utilities/BeanUtilsTest.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java b/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java
index a0492019b42..804f7b97b8a 100644
--- a/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java
+++ b/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java
@@ -76,7 +76,7 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
{
return null;
}
- for (Iterator<? extends E> iter = collection.iterator(); iter.hasNext();)
+ for (Iterator<? extends E> iter = collection.iterator(); iter.hasNext(); )
{
if (validator.isValid(iter.next()) == false)
{
diff --git a/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java b/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java
index ae1d5c5a72f..44c7206d2e6 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java
@@ -38,7 +38,7 @@ public class DBTableRestrictions
public int getLength(String columnName)
{
final Integer columnLength = columnLengthMap.get(columnName);
- assert columnLength != null : "Illegal column '" + columnName +"'.";
+ assert columnLength != null : "Illegal column '" + columnName + "'.";
return columnLength;
}
diff --git a/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java b/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java
index ad2c37b98ea..fd51ae77c70 100644
--- a/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java
+++ b/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java
@@ -51,7 +51,7 @@ public final class LogFactory
{
throw new IllegalArgumentException("Only admin logs are allowed here, but we got " + category + ".");
}
- return category.name() ;
+ return category.name();
}
/**
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java b/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
index 3bcb59cf1d9..06abb2ec956 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
@@ -815,7 +815,7 @@ public final class BeanUtils
final List<PropertyDescriptor> descriptors =
new ArrayList<PropertyDescriptor>(Arrays.asList(Introspector.getBeanInfo(clazz)
.getPropertyDescriptors()));
- for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext();)
+ for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext(); )
{
final PropertyDescriptor descriptor = iter.next();
// If no write method, remove it. For instance 'class' property does not have any
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java b/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java
index 7fee335084b..a811bd2bac5 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java
@@ -87,7 +87,7 @@ public final class ExtendedProperties extends Properties
ExtendedProperties result = new ExtendedProperties();
int prefixLength = prefix.length();
- for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements();)
+ for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements(); )
{
String key = enumeration.nextElement().toString();
if (key.startsWith(prefix))
@@ -99,11 +99,11 @@ public final class ExtendedProperties extends Properties
}
/**
- * Removes all properies with names starting with given prefix
+ * Removes all properties with names starting with given prefix
*/
public void removeSubset(final String prefix)
{
- for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements();)
+ for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements(); )
{
String key = enumeration.nextElement().toString();
if (key.startsWith(prefix))
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java
index 13f7ba59e18..939c6df058a 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java
@@ -56,7 +56,7 @@ public final class BeanUtilsTest
assertEquals(1, descriptors.size());
PropertyDescriptor outerDescriptor = null;
// Play with property 'description'
- for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext();)
+ for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext(); )
{
PropertyDescriptor innerDescriptor = iter.next();
if (innerDescriptor.getName().equals("foo"))
--
GitLab