re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

3 files changed, 58 insertions, 78 deletions

diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml
index f242fcc5d9..a6caa37e10 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml
@@ -1,55 +1,57 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.sdc.common</groupId>
-    <name>onap-configuration-management-cli</name>
-    <artifactId>onap-configuration-management-cli</artifactId>
+	<groupId>org.onap.sdc.common</groupId>
+	<name>onap-configuration-management-cli</name>
+	<artifactId>onap-configuration-management-cli</artifactId>
 
-    <parent>
-        <artifactId>onap-common-configuration-management</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-configuration-management</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
-    <dependencies>
-	<dependency>
-	    <groupId>org.onap.sdc.common</groupId>
-	    <artifactId>onap-configuration-management-api</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	<dependency>
-		<groupId>tools</groupId>
-		<artifactId>tools</artifactId>
-		<version>1.8</version>
-		<optional>true</optional>
-	</dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.sdc.common</groupId>
+			<artifactId>onap-configuration-management-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>tools</groupId>
+			<artifactId>tools</artifactId>
+			<version>1.8</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 
-    <build>
-    	<plugins>
-    		<plugin>
-    			<groupId>org.apache.maven.plugins</groupId>
-    			<artifactId>maven-shade-plugin</artifactId>
-    			<version>1.5</version>
-    			<executions>
-    				<execution>
-    					<phase>package</phase>
-    					<goals>
-    						<goal>shade</goal>
-    					</goals>
-    					<configuration>
-			              <transformers>
-			                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-			                  <mainClass>org.onap.config.gui.app.Configuration</mainClass>
-			                </transformer>
-			              </transformers>
-			            </configuration>
-    				</execution>
-    			</executions>
-    		</plugin>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>org.onap.config.gui.app.Configuration</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
-    </build>
+	</build>
 
 </project>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java
index d1a93f0041..03bd4a02e9 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java
@@ -1,17 +1,15 @@
 package org.onap.config.cli.app;
 
-import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.management.JMX;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The type Configuration.
diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java
index fa7cf5b77a..f51d04b68c 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java
@@ -5,26 +5,12 @@ import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.VirtualMachineDescriptor;
 import org.onap.config.api.ConfigurationManager;
 
-import java.awt.BorderLayout;
-import java.awt.Button;
-import java.awt.CardLayout;
-import java.awt.Checkbox;
-import java.awt.CheckboxGroup;
-import java.awt.Choice;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Label;
-import java.awt.Panel;
-import java.awt.ScrollPane;
-import java.awt.TextArea;
-import java.awt.TextField;
-import java.awt.Toolkit;
+import javax.management.JMX;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
 import java.awt.event.ItemEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -34,12 +20,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import javax.management.JMX;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
 
 
 /**