From 9ea7b3f8b3730a5be6c441ed1a6e52b00eb1233f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 10 Feb 2014 09:49:48 +0000
Subject: [PATCH] OPENDJ-1337 Remove all code related to dsframework

---
 opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
index e147e55..df6536c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
@@ -27,19 +27,7 @@
 
 package org.opends.server.tools;
 
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.ServerConstants.EOL;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.*;
 import java.util.Enumeration;
 import java.util.Properties;
 
@@ -48,9 +36,13 @@
 import org.opends.quicksetup.Constants;
 import org.opends.quicksetup.util.Utils;
 import org.opends.server.types.NullOutputStream;
-import com.forgerock.opendj.cli.ArgumentException;
 import org.opends.server.util.cli.ConsoleApplication;
 
+import com.forgerock.opendj.cli.ArgumentException;
+
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+
 /**
  * This class is used to update the scripts that are used to launch the command
  * lines.  We read the contents of a given properties file and we update the
@@ -89,7 +81,11 @@
     /**
      * Error writing to destination file.
      */
-    ERROR_WRITING_FILE(3);
+    ERROR_WRITING_FILE(3),
+    /**
+     * Conflicting command line arguments.
+     */
+    CONFLICTING_ARGS(18);
 
     private int returnCode;
     private ErrorReturnCode(int returnCode)
@@ -432,6 +428,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isQuiet()
   {
     return argParser.quietArg.isPresent();
@@ -440,6 +437,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isInteractive()
   {
     return false;
@@ -456,6 +454,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isScriptFriendly() {
     return false;
   }
@@ -463,6 +462,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isAdvancedMode() {
     return false;
   }
@@ -471,6 +471,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isVerbose() {
     return true;
   }

--
Gitblit v1.10.0