From a2c984366f119a651851cb4aa8f16466d3ae4e96 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 11:23:21 +0000
Subject: [PATCH] AutoRefactor: remove unnecessary locals before return
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index e3326c0..6b5e47b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -528,12 +528,10 @@
*/
private boolean updatedByUser()
{
- boolean updatedByUser = !javaHome.getText().equals(readJavaHome) ||
- useOpenDSJavaHome.isSelected() != readUseOpenDSJavaHome ||
- useOpenDSJavaArgs.isSelected() != readUseOpenDSJavaArgs ||
- !readJavaArguments.equals(getCurrentJavaArguments());
-
- return updatedByUser;
+ return !javaHome.getText().equals(readJavaHome)
+ || useOpenDSJavaHome.isSelected() != readUseOpenDSJavaHome
+ || useOpenDSJavaArgs.isSelected() != readUseOpenDSJavaArgs
+ || !readJavaArguments.equals(getCurrentJavaArguments());
}
/**
@@ -1028,12 +1026,10 @@
*/
private String getPropertiesFile()
{
- String installPath = getInfo().getServerDescriptor().
- getInstancePath();
- String propertiesFile = Utils.getPath(
+ String installPath = getInfo().getServerDescriptor().getInstancePath();
+ return Utils.getPath(
Utilities.getInstanceRootDirectory(installPath).getAbsolutePath(),
Installation.RELATIVE_JAVA_PROPERTIES_FILE);
- return propertiesFile;
}
private void updateContentsOfPanelWithReadValues()
--
Gitblit v1.10.0