From 6147aebf61cae01cc98d472132bc5854ac0413d0 Mon Sep 17 00:00:00 2001
From: Doug Morato <dm@corp.io>
Date: Fri, 18 Sep 2015 12:40:05 -0400
Subject: [PATCH] Fixing inconsistent merge issues implementing nbaars fixes

---
 .../owasp/webgoat/plugins/PluginExtractor.java | 18 +-----------------
 .../org/owasp/webgoat/util/LabelProvider.java  |  5 -----
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
index ae5052d76..ef04c1d70 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
@@ -17,8 +17,6 @@ import java.util.zip.ZipFile;
 /**
  * Extract the jar file and place them in the system temp directory in the folder webgoat and collect the files
  * and classes.
- *
- * @version $Id: $Id
  */
 public class PluginExtractor {
 
@@ -36,10 +34,6 @@ public class PluginExtractor {
                     boolean processed = processClassFile(zipEntry);
 
                     if (!processed) {
-     * @param target a {@link java.nio.file.Path} object.
-     */
-    public void extract(final Path target) {
-        try (FileSystem zip = createZipFileSystem()) {
                         processed = processPropertyFile(zipFile, zipEntry, targetDirectory);
                     }
                     if (!processed) {
@@ -94,21 +88,11 @@ public class PluginExtractor {
         return targetFile;
     }
 
-    /**
-     * <p>Getter for the field <code>classes</code>.</p>
-     *
-     * @return a {@link java.util.List} object.
-     */
     public List<String> getClasses() {
         return this.classes;
     }
 
-    /**
-     * <p>Getter for the field <code>files</code>.</p>
-     *
-     * @return a {@link java.util.List} object.
-     */
     public List<Path> getFiles() {
         return this.files;
     }
-}
+}
\ No newline at end of file
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
index 8d5926f62..d8a213590 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
@@ -92,11 +92,6 @@ public class LabelProvider {
                 return Thread.currentThread().getContextClassLoader();
             }
         });
-
-    /**
-     * <p>refresh.</p>
-     */
-    public static void refresh() {
         pluginLabels.clearCache();
     }