From 3f2fb658c87d681af4af0d4e12b1888c9392a45d Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 17 Aug 2011 10:13:54 +0000
Subject: [PATCH] fix: compile warnings
SVN: 22530
---
.../AbstractOmniscientTopLevelDataSetRegistrator.java | 2 +-
.../cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java | 1 +
.../dss/generic/server/plugins/demo/DemoOverviewPlugin.java | 2 --
.../server/plugins/jython/PluginScriptRunnerFactory.java | 2 --
.../etlserver/registrator/api/v1/impl/RollbackStackTest.java | 1 +
.../cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java | 1 +
6 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
index 38657ef0012..9269f6550c0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -477,7 +477,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
final IDelegatedActionWithResult<Boolean> cleanAfterwardsAction,
ITopLevelDataSetRegistratorDelegate delegate)
{
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
DataSetRegistrationService<T> service =
new DataSetRegistrationService(this, incomingDataSetFile,
new DefaultDataSetRegistrationDetailsFactory(getRegistratorState(),
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
index 18f56916447..1a4cb18cba5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
@@ -44,6 +44,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
*/
public abstract class AbstractDssServiceRpc<T> extends AbstractServiceWithLogger<T>
{
+ @SuppressWarnings("hiding")
static protected final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
AbstractDssServiceRpc.class);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
index 5cff1754ee4..518711d6a13 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
@@ -40,8 +40,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ImageResolutionKind;
*/
public class DemoOverviewPlugin implements IDatasetImageOverviewPlugin
{
- private static final long serialVersionUID = 1L;
-
private static final String LABEL_PROPERTY_KEY = "label";
private static final String SMALL_IMAGE_FILE = "resource/overview-small.png";
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
index 36abacd746e..c180735bd04 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
@@ -170,8 +170,6 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
private final Evaluator evaluator;
- private static final long serialVersionUID = 1L;
-
ReportingPluginScriptRunner(Evaluator evaluator)
{
this.evaluator = evaluator;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java
index 003d4370632..87237007f2f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java
@@ -241,6 +241,7 @@ public class RollbackStackTest extends AbstractTestWithRollbackStack
private boolean rolledbackBeforePredecessor = false;
+ @SuppressWarnings("unused")
private int rollbackCount = 0;
protected TrackingCommand()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
index c7095dc2012..9afc066d263 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
@@ -121,6 +121,7 @@ public class DssComponentTest extends AbstractFileSystemTestCase
//
// AbstractAutoProxyCreator
//
+ @SuppressWarnings({"rawtypes"})
@Override
protected final Object[] getAdvicesAndAdvisorsForBean(final Class beanClass,
final String beanName, final TargetSource customTargetSource)
--
GitLab