From caf667cd78b0b1725330df26cf3eab1bb65b84b2 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 17 Aug 2011 10:48:33 +0000
Subject: [PATCH] fix: compiler warnings
SVN: 22538
---
.../AbstractWebStartClientServingServlet.java | 2 --
.../gui/DataSetUploadClientServingServlet.java | 2 --
.../model/EntityGridModelFactory.java | 2 --
.../application/ui/grid/ColumnListener.java | 2 +-
.../ui/widget/SimpleModelComboBox.java | 2 --
.../client/application/util/lang/Entities.java | 17 ++++++++---------
.../client/web/server/UploadServiceServlet.java | 6 +++---
.../web/server/resultset/CacheManager.java | 2 --
.../web/server/resultset/ColumnSortUtils.java | 1 +
.../server/AuthenticationServiceHolder.java | 2 +-
.../authorization/AuthorizationAdvisor.java | 2 +-
.../AuthorizationDataProvider.java | 2 +-
.../server/dataaccess/db/AbstractDAO.java | 4 ++--
.../server/util/HibernateTransformer.java | 2 +-
.../generic/shared/basic/PrimitiveValue.java | 2 +-
.../testframework/PropertyCheckingManager.java | 2 +-
.../authorization/AuthorizationTestUtil.java | 2 +-
.../DefaultReturnValueFilterTest.java | 2 +-
18 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
index a20e94db789..b654c58ecb4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
@@ -42,8 +42,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
*/
public abstract class AbstractWebStartClientServingServlet extends AbstractServlet
{
- private static final long serialVersionUID = 1L;
-
private static final String SERVER_URL = BasicConstant.SERVER_URL_PARAMETER;
private static final String CODEBASE_URL = BasicConstant.CODEBASE_PARAMETER;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
index 2747d1856af..121f501cf7f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
@@ -34,8 +34,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
"/openbis/openbis/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH })
public class DataSetUploadClientServingServlet extends AbstractWebStartClientServingServlet
{
- private static final long serialVersionUID = 1L;
-
private static final Template JNLP_TEMPLATE = new Template(
"<?xml version='1.0' encoding='utf-8'?>\n"
+ "<jnlp spec='1.0+' codebase='${base-URL}'>\n" + " <information>\n"
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityGridModelFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityGridModelFactory.java
index 91a2a787dc1..3469ffc84a5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityGridModelFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityGridModelFactory.java
@@ -52,8 +52,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RealNumberFormatingPara
*/
public class EntityGridModelFactory<T extends IEntityPropertiesHolder>
{
- private static final long serialVersionUID = 1L;
-
private final IViewContext<?> viewContext;
private final IColumnDefinitionKind<T>[] staticColumnDefinitions;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
index 1ea8ccd1ebc..55978cfd72a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
@@ -65,7 +65,7 @@ public final class ColumnListener<T, M extends BaseEntityModel<T>> implements
* This method does nothing if no cell listener has been registered for column determined by the
* event.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void handleEvent(GridEvent be)
{
ICellListener<T> listener = getCellListener(be);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.java
index 7fc5c825bcb..ea011d1157c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.java
@@ -81,11 +81,9 @@ public class SimpleModelComboBox<T> extends SimpleComboBox<LabeledItem<T>>
private void setModel(List<LabeledItem<T>> modelItems)
{
- int i = 0;
for (LabeledItem<T> item : modelItems)
{
add(item);
- i++;
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java
index 50c0180caa4..655cc6fd17d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java
@@ -37,7 +37,6 @@ import java.util.TreeMap;
*
* @author Piotr Buczek
*/
-@SuppressWarnings("unchecked")
class Entities
{
@@ -458,7 +457,7 @@ class Entities
static class PrimitiveEntityMap implements EntityMap
{
- private Map mapNameToValue = new HashMap();
+ private Map<String, Integer> mapNameToValue = new HashMap<String, Integer>();
private IntHashMap mapValueToName = new IntHashMap();
@@ -495,9 +494,9 @@ class Entities
static abstract class MapIntMap implements Entities.EntityMap
{
- protected Map mapNameToValue;
+ protected Map<String, Integer> mapNameToValue;
- protected Map mapValueToName;
+ protected Map<Integer, String> mapValueToName;
/**
* {@inheritDoc}
@@ -513,7 +512,7 @@ class Entities
*/
public String name(int value)
{
- return (String) mapValueToName.get(new Integer(value));
+ return mapValueToName.get(new Integer(value));
}
/**
@@ -537,8 +536,8 @@ class Entities
*/
public HashEntityMap()
{
- mapNameToValue = new HashMap();
- mapValueToName = new HashMap();
+ mapNameToValue = new HashMap<String, Integer>();
+ mapValueToName = new HashMap<Integer, String>();
}
}
@@ -549,8 +548,8 @@ class Entities
*/
public TreeEntityMap()
{
- mapNameToValue = new TreeMap();
- mapValueToName = new TreeMap();
+ mapNameToValue = new TreeMap<String, Integer>();
+ mapValueToName = new TreeMap<Integer, String>();
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
index 6b7b995c11f..017d7905bfb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
@@ -67,8 +67,8 @@ import ch.systemsx.cisd.common.utilities.Message;
{ "/upload", "/openbis/upload" })
public final class UploadServiceServlet extends AbstractCommandController
{
- private static final Logger operationLog =
- LogFactory.getLogger(LogCategory.OPERATION, UploadServiceServlet.class);
+ private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
+ UploadServiceServlet.class);
ISessionFilesSetter sessionFilesSetter;
@@ -86,7 +86,7 @@ public final class UploadServiceServlet extends AbstractCommandController
this(new SessionFilesSetter());
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private final static Iterator<String> cast(final Iterator iterator)
{
return iterator;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.java
index 9cdc013eddc..a0ea9f43f31 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.java
@@ -32,8 +32,6 @@ import ch.systemsx.cisd.common.utilities.TokenGenerator;
*/
public class CacheManager<K, T>
{
- private static final long serialVersionUID = 1L;
-
private final IResultSetKeyGenerator<K> keyProvider;
private static final Logger operationLog =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.java
index fc6a9a08b50..9df9709db6d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.java
@@ -60,6 +60,7 @@ class ColumnSortUtils
return new Comparator<GridRowModel<T>>()
{
+ @SuppressWarnings("rawtypes")
public int compare(GridRowModel<T> o1, GridRowModel<T> o2)
{
Comparable v1 = sortField.tryGetComparableValue(o1);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.java
index dafef7762c2..461900109f6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.java
@@ -48,7 +48,7 @@ public final class AuthenticationServiceHolder implements FactoryBean
return authenticationService;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public final Class getObjectType()
{
return IAuthenticationService.class;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
index 7b7fd488170..5b3850dd816 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
@@ -120,7 +120,7 @@ public final class AuthorizationAdvisor extends DefaultPointcutAdvisor
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private final static Argument<?> toArgument(final Parameter<AuthorizationGuard> parameter,
final Object[] args)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
index 207171f4652..c003c1afa97 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
@@ -392,7 +392,7 @@ final public class AuthorizationDataProvider implements IAuthorizationDataProvid
* methods.
* </p>
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private static final <T> List<T> cast(final List list)
{
return list;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java
index cd4cbe26087..ab851b519f2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java
@@ -90,7 +90,7 @@ public abstract class AbstractDAO extends HibernateDaoSupport
/**
* Validates given <i>Persistence Entity</i> using an appropriate {@link ClassValidator}.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected final static <E> void validatePE(final E pe) throws DataIntegrityViolationException
{
ClassValidator<E> validator = (ClassValidator<E>) validators.get(pe.getClass());
@@ -148,7 +148,7 @@ public abstract class AbstractDAO extends HibernateDaoSupport
* </p>
*/
@SuppressWarnings("unchecked")
- protected static final <T> List<T> cast(final List list)
+ protected static final <T> List<T> cast(@SuppressWarnings("rawtypes") final List list)
{
return list;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/HibernateTransformer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/HibernateTransformer.java
index 615aae5edd5..12ed3b03c92 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/HibernateTransformer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/HibernateTransformer.java
@@ -137,7 +137,7 @@ public final class HibernateTransformer implements MethodInterceptor
// Hibernate3CollectionReplicator
//
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public final <V, T> T replicateCollection(final Collection<V> from, final Class<T> toClass)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
index e6fb997ba1a..dbd07be81e4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
@@ -87,7 +87,7 @@ public class PrimitiveValue implements IsSerializable, Serializable, Comparable<
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public int compareTo(PrimitiveValue o)
{
Integer thisTypeOrdinal = getComparableDataTypeOrdinal();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
index 768ed50277f..5296f7b2ec7 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
@@ -55,10 +55,10 @@ public class PropertyCheckingManager extends Assert
assertProperties(((PropertyGrid) widget).getProperties());
}
- @SuppressWarnings("unchecked")
/**
* Checks the assertion for the specified properties.
*/
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void assertProperties(final Map<String, ?> actualProperties)
{
for (final Map.Entry<String, IValueAssertion> expectedProperty : expectedProperties
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.java
index e2c67fc7022..ec8f0137fd8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.java
@@ -136,7 +136,7 @@ public final class AuthorizationTestUtil
// AbstractAutoProxyCreator
//
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
protected final Object[] getAdvicesAndAdvisorsForBean(final Class beanClass,
final String beanName, final TargetSource customTargetSource)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
index e26e85754d8..a62fb1c1040 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
@@ -150,7 +150,7 @@ public final class DefaultReturnValueFilterTest
assertNull(proceeded);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public final void testProceedWithList()
{
--
GitLab