From 227893d551caa94ee526d41d02829d13faaa171a Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 12 Jul 2012 14:44:59 +0000
Subject: [PATCH] MINOR : Fixing warnings
SVN: 26097
---
.../VocabularyListDeletionConfirmationDialog.java | 6 +++---
.../authorization/predicate/AtomicOperationsPredicate.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
index 61795f33109..c591e6d1cad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
@@ -33,7 +33,7 @@ public final class VocabularyListDeletionConfirmationDialog extends
AbstractDataListPermanentDeletionConfirmationDialog<TableModelRowWithObject<Vocabulary>>
{
- private final IViewContext<ICommonClientServiceAsync> viewContext;
+ private final IViewContext<ICommonClientServiceAsync> localViewContext;
public VocabularyListDeletionConfirmationDialog(
IViewContext<ICommonClientServiceAsync> viewContext,
@@ -41,13 +41,13 @@ public final class VocabularyListDeletionConfirmationDialog extends
AbstractAsyncCallback<Void> callback)
{
super(viewContext, vocabularies, callback);
- this.viewContext = viewContext;
+ this.localViewContext = viewContext;
}
@Override
protected void executeDeletion(AsyncCallback<Void> deletionCallback)
{
- viewContext.getCommonService().deleteVocabularies(TechId.createList(data),
+ localViewContext.getCommonService().deleteVocabularies(TechId.createList(data),
reason.getValue(), deletionCallback);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java
index d1f68993cfb..6e881fd358f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AtomicOperationsPredicate.java
@@ -181,9 +181,9 @@ public class AtomicOperationsPredicate extends AbstractPredicate<AtomicEntityOpe
}
}
- private Status isInstanceEtlServer(PersonPE person)
+ private Status isInstanceEtlServer(PersonPE aPerson)
{
- for (RoleAssignmentPE role : person.getRoleAssignments())
+ for (RoleAssignmentPE role : aPerson.getRoleAssignments())
{
if (role.getSpace() == null)
{
@@ -196,7 +196,7 @@ public class AtomicOperationsPredicate extends AbstractPredicate<AtomicEntityOpe
}
return Status.createError(false,
"None of method roles '[INSTANCE_ETL_SERVER, INSTANCE_ADMIN]' could be found in roles of user '"
- + person.getUserId() + "'.");
+ + aPerson.getUserId() + "'.");
}
private Status evaluateExperimentUpdatePredicate()
--
GitLab