From 5516618de4b17da9c0238ea5856ac09815c644e2 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Tue, 10 Mar 2020 17:58:17 +0100 Subject: [PATCH] removed static modifier from nested enums, they are implicitly static --- .../component/schemahandling/ResourceDependencyEditor.java | 6 +----- .../page/admin/configuration/dto/DebugConfDialogDto.java | 2 +- .../web/page/admin/reports/dto/ReportDeleteDialogDto.java | 5 +---- .../com/evolveum/midpoint/web/util/ExpressionUtil.java | 7 ++----- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java index cbfa5984ec9..5dfc2213a49 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java @@ -11,7 +11,6 @@ import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.exception.CommonException; @@ -41,12 +40,9 @@ import java.util.List; import java.util.Map; -/** - * @author shood - * */ public class ResourceDependencyEditor extends BasePanel> { - private static enum ChangeState{ + private enum ChangeState{ SKIP, FIRST, LAST } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java index efa43915631..85b50accb0e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java @@ -20,7 +20,7 @@ */ public class DebugConfDialogDto implements Serializable { - public static enum Operation { + public enum Operation { DELETE_SELECTED, DELETE_ALL_TYPE, DELETE_RESOURCE_SHADOWS; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDeleteDialogDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDeleteDialogDto.java index dd22314e848..c3607ef8b0f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDeleteDialogDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDeleteDialogDto.java @@ -11,12 +11,9 @@ import java.io.Serializable; import java.util.List; -/** - * @author shood - * */ public class ReportDeleteDialogDto implements Serializable{ - public static enum Operation{ + public enum Operation{ DELETE_SINGLE, DELETE_SELECTED, DELETE_ALL } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java index 5d104600b62..42e99e83779 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java @@ -34,14 +34,11 @@ import javax.xml.namespace.QName; import java.util.*; -/** - * @author shood - * */ public class ExpressionUtil { private static final Trace LOGGER = TraceManager.getTrace(ExpressionUtil.class); - public static enum ExpressionEvaluatorType{ + public enum ExpressionEvaluatorType{ LITERAL, AS_IS, PATH, @@ -49,7 +46,7 @@ public static enum ExpressionEvaluatorType{ GENERATE } - public static enum Language{ + public enum Language{ GROOVY("http://midpoint.evolveum.com/xml/ns/public/expression/language#Groovy"), XPATH("http://www.w3.org/TR/xpath/"), JAVASCRIPT("http://midpoint.evolveum.com/xml/ns/public/expression/language#ECMAScript");