From 09bdb97990f8ea603436edda28eee3feabecdfc1 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 2 Apr 2010 13:16:17 +0000
Subject: [PATCH] change: replace commons-collections with generified version
SVN: 15341
---
openbis/.classpath | 1 -
.../client/web/server/resultset/CachedResultSetManager.java | 1 -
.../generic/server/business/bo/datasetlister/DatasetLister.java | 2 +-
.../server/business/bo/materiallister/MaterialLister.java | 2 +-
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/openbis/.classpath b/openbis/.classpath
index f3a53909f8b..0f546ae4ed3 100644
--- a/openbis/.classpath
+++ b/openbis/.classpath
@@ -52,7 +52,6 @@
<classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/>
<classpathentry kind="lib" path="/libraries/eodsql/eodsql.jar" sourcepath="/libraries/eodsql/eodsql_src.zip"/>
<classpathentry kind="lib" path="/libraries/fastutil/fastutil.jar" sourcepath="/libraries/fastutil/fastutil-src.zip"/>
- <classpathentry kind="lib" path="/libraries/commons-collections-generic/commons-collections-generic.jar" sourcepath="/libraries/commons-collections-generic/src.zip"/>
<classpathentry kind="lib" path="/libraries/cisd-args4j/cisd-args4j.jar" sourcepath="/libraries/cisd-args4j/cisd-args4j-src.zip"/>
<classpathentry kind="lib" path="/libraries/commons-dbcp/commons-dbcp.jar" sourcepath="/libraries/commons-dbcp/src.zip"/>
<classpathentry kind="output" path="targets/www/WEB-INF/classes"/>
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
index be15e71112d..fbfb953334a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
@@ -548,7 +548,6 @@ public final class CachedResultSetManager<K> implements IResultSetManager<K>, Se
return applySortDir(sortDir, comparator);
}
- @SuppressWarnings("unchecked")
private static <T> Comparator<T> applySortDir(final SortDir sortDir, Comparator<T> comparator)
{
if (sortDir == SortDir.DESC)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
index d6c01cf6a0a..01415dec340 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
@@ -359,7 +359,7 @@ public class DatasetLister implements IDatasetLister
private static <T> List<T> asList(Long2ObjectMap<T> items)
{
List<T> result = new ArrayList<T>();
- org.apache.commons.collections.CollectionUtils.addAll(result, items.values().iterator());
+ result.addAll(items.values());
return result;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
index e3f9ea8eb17..33e7e14d907 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
@@ -185,7 +185,7 @@ public class MaterialLister implements IMaterialLister
private static <T> List<T> asList(Long2ObjectMap<T> items)
{
List<T> result = new ArrayList<T>();
- org.apache.commons.collections.CollectionUtils.addAll(result, items.values().iterator());
+ result.addAll(items.values());
return result;
}
--
GitLab