Merge remote-tracking branch 'origin/GP-0-dragonmacher-removed-debug'

Ghidra/Features/Base/src/main/java/ghidra/app/cmd/label/DemanglerCmd.java

@@ -90,7 +90,7 @@ public class DemanglerCmd extends BackgroundCommand<Program> {
 			// tell a mangled from a non-mangled symbol.
 			// Msg.debug(this, "Unable to demangle name: " + mangled);
 		}
-		catch (Exception e) { e.printStackTrace();
+		catch (Exception e) {
 			// Demangler IndexOutOfBoundsException that we're not sure how to fix 
 			setStatusMsg("Unable to demangle symbol: " + mangled + " at " + addr + ". Message: " +
 				e.getMessage());

Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemangler.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,8 +18,6 @@ package ghidra.app.util.demangler.gnu;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.lang3.StringUtils;
-
 import generic.jar.ResourceFile;
 import ghidra.app.util.demangler.*;
 import ghidra.app.util.opinion.ElfLoader;
@@ -113,7 +111,7 @@ public class GnuDemangler implements Demangler {
 				throw new DemangledException(false);
 			}
 			demangled = demangled.trim();
-			if (demangled.length() == 0 ||  mangled.equals(demangled)) {
+			if (demangled.length() == 0 || mangled.equals(demangled)) {
 				throw new DemangledException(true);
 			}