From c7a105c72969e9e6b73e8176974b321e38b55270 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Wed, 18 Aug 2010 09:47:15 +0000
Subject: [PATCH] Cleanup. Remove references to Java 5 since we no longer support it. Cleanup messages, removing unnecessary casts (due to bugs in early versions of Java 5), removing dead code. The minimal version has been set to Java 1.6.0_10. Also cleanup the Java Stubs for MacOS, removed the StatusPanel (replaced by ControlPanel since 1.2), and update Info.plist to require 1.6 or higher, show 2.3 as version.
---
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index 454b892..20414f0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -95,7 +95,7 @@
*/
public class InstallDS extends ConsoleApplication
{
- private PlainTextProgressMessageFormatter formatter =
+ private final PlainTextProgressMessageFormatter formatter =
new PlainTextProgressMessageFormatter();
/** Prefix for log files. */
static public final String LOG_FILE_PREFIX = "opends-setup-";
@@ -388,7 +388,7 @@
LOG.log(Level.WARNING, "Error while trying to update the contents of "+
"the set-java-home file in test only mode: "+t, t);
}
- // Test that we are running a compatible java 1.5 version.
+ // Test that we are running a compatible java 1.6 version.
try
{
Utils.checkJavaVersion();
@@ -703,6 +703,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isQuiet()
{
return argParser.quietArg.isPresent();
@@ -711,6 +712,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isInteractive()
{
return !argParser.noPromptArg.isPresent();
@@ -727,6 +729,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isScriptFriendly() {
return false;
}
@@ -734,6 +737,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isAdvancedMode() {
return false;
}
@@ -742,6 +746,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isVerbose() {
return argParser.verboseArg.isPresent();
}
--
Gitblit v1.10.0