From e82f8090bb4c9f1198bf476807fdf47f6d1c76a6 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 17 Aug 2011 10:03:24 +0000
Subject: [PATCH] fix compiler warnings
SVN: 22526
---
.../cisd/common/annotation/CollectionMapping.java | 2 +-
.../cisd/common/exceptions/StatusWithResult.java | 2 +-
.../ch/systemsx/cisd/common/utilities/BeanUtils.java | 11 ++++++-----
.../common/process/ProcessExecutionHelperTest.java | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java b/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java
index ca37b13986d..4773bab899e 100644
--- a/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java
+++ b/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java
@@ -37,7 +37,7 @@ public @interface CollectionMapping
/**
* The concrete class to use as a collection.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes" })
// No way to avoid the warning since the compiler doesn't accept something like
// ArrayList<String>.class
Class<? extends Collection> collectionClass();
diff --git a/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java b/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java
index 2f66bec5346..d3bc2edbb3e 100644
--- a/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java
+++ b/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java
@@ -100,7 +100,7 @@ public class StatusWithResult<T> extends Status
@SuppressWarnings("unchecked")
private StatusWithResult<T> toStatusWithResult(Object obj)
{
- return (StatusWithResult) obj;
+ return (StatusWithResult<T>) obj;
}
@Override
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 864c70a0513..9e246853cd4 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
@@ -159,7 +159,7 @@ public final class BeanUtils
{
};
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
static final Set<Class> immutableTypes = new LinkedHashSet<Class>(Arrays.asList(boolean.class,
Boolean.class, byte.class, Byte.class, short.class, Short.class, int.class,
Integer.class, long.class, Long.class, float.class, Float.class, double.class,
@@ -520,9 +520,10 @@ public final class BeanUtils
return (E[]) Array.newInstance(elemClass, length);
}
- @SuppressWarnings("unchecked")
+
// No way to avoid the warning since the compiler doesn't accept something like
// ArrayList<String>.class
+ @SuppressWarnings("rawtypes")
private final static <T> T createCollection(final int size,
final AnnotationMap setterAnnotations) throws InstantiationException,
IllegalAccessException, SecurityException, NoSuchMethodException,
@@ -541,7 +542,7 @@ public final class BeanUtils
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private static <T> T constructCollection(
final Constructor<? extends Collection> constructorWithSize, final int size)
throws InstantiationException, IllegalAccessException, IllegalArgumentException,
@@ -555,7 +556,7 @@ public final class BeanUtils
{ size });
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private final static <T> T constructCollection(final Class<? extends Collection> collectionClazz)
throws InstantiationException, IllegalAccessException
{
@@ -705,7 +706,7 @@ public final class BeanUtils
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private static void addToUntypedCollection(final Collection destination, final Object element)
{
destination.add(element);
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
index 98d92af2259..53de9083e7f 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
@@ -503,6 +503,7 @@ public class ProcessExecutionHelperTest
result.getStartupFailureMessage().indexOf("some_non_existent_executable") >= 0);
}
+ @SuppressWarnings("null")
@Test(groups =
{ "requires_unix", "slow" })
public void testSleepyExecutionWithTermination() throws Exception
@@ -527,7 +528,6 @@ public class ProcessExecutionHelperTest
// Now resultGetter should be done with obtaining the result.
ProcessResult processResult = result.get();
assertTrue(processResult != null);
- assert processResult != null; // avoid compiler warnings
assertFalse(processResult.isOK()); // process terminated unsuccessfully
assertTrue(processResult.isInterruped() || processResult.isTerminated());
}
--
GitLab