From b8c6b80da1cb6118167a934daa480eb381c59e0e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jul 2015 08:06:00 +0000
Subject: [PATCH] opendj-server-legacy maven module: Enabled "NeedBraces" checkstyle rule. This brings opendj-server-legacy's checkstyle rules closer to ForgeRock's checkstyle rules.
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index 3c278fc..29260e1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -247,7 +247,10 @@
public void parentObjectClassesChanged(
SuperiorObjectClassesChangedEvent ev)
{
- if (ignoreChangeEvents) return;
+ if (ignoreChangeEvents)
+ {
+ return;
+ }
updateAttributesWithParent(true);
checkEnableSaveChanges();
if (ev.getNewObjectClasses().size() > 1)
@@ -903,26 +906,26 @@
private void checkEnableSaveChanges()
{
- if (ignoreChangeEvents) return;
- boolean changed;
+ if (!ignoreChangeEvents)
+ {
+ saveChanges.setEnabled(hasChanged());
+ }
+ }
+ private boolean hasChanged()
+ {
if (objectClass != null)
{
try
{
- changed = !objectClass.toString().equals(
- getNewObjectClass().toString());
+ return !objectClass.toString().equals(getNewObjectClass().toString());
}
catch (Throwable t)
{
- changed = true;
+ return true;
}
}
- else
- {
- changed = false;
- }
- saveChanges.setEnabled(changed);
+ return false;
}
private Set<String> getAliases()
--
Gitblit v1.10.0