Repository: flex-falcon Updated Branches: refs/heads/develop 0d54651db -> 6322ab361
- Replaced the code in the DebugCLI with an implementation from apache-commons-lang - Removed the animal-sniffer ignore annotations again. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6322ab36 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6322ab36 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6322ab36 Branch: refs/heads/develop Commit: 6322ab36160e40439b46712e6d44ea4e90405916 Parents: 0d54651 Author: Christofer Dutz <[email protected]> Authored: Wed Apr 27 15:45:51 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Wed Apr 27 15:45:51 2016 +0200 ---------------------------------------------------------------------- debugger/pom.xml | 6 +++--- .../main/java/flex/tools/debugger/cli/DebugCLI.java | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6322ab36/debugger/pom.xml ---------------------------------------------------------------------- diff --git a/debugger/pom.xml b/debugger/pom.xml index cc93ad7..6b54ccb 100644 --- a/debugger/pom.xml +++ b/debugger/pom.xml @@ -92,9 +92,9 @@ <version>4.15.0</version> </dependency> <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-annotations</artifactId> - <version>1.9</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6322ab36/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java ---------------------------------------------------------------------- diff --git a/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java b/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java index e60f728..43ee983 100644 --- a/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java +++ b/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java @@ -19,7 +19,6 @@ package flex.tools.debugger.cli; -import com.sun.org.apache.xml.internal.utils.LocaleUtility; import flash.localization.LocalizationManager; import flash.tools.debugger.*; import flash.tools.debugger.concrete.DProtocol; @@ -33,7 +32,7 @@ import flash.util.FieldFormat; import flash.util.Trace; import flex.tools.debugger.cli.ExpressionCache.EvaluationResult; import flex.tools.debugger.cli.FaultActions.FaultActionsBuilder; -import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement; +import org.apache.commons.lang.LocaleUtils; import java.io.*; import java.net.SocketException; @@ -457,14 +456,6 @@ public class DebugCLI implements Runnable, SourceLocator { public void pushStream(LineNumberReader r) { m_readerStack.push(r); } boolean haveStreams() { return !m_readerStack.empty(); } - /** - * It seems that internal calls are excluded from animal-sniffers signature. - * With the @IgnoreJRERequirement annotation we force the animal-sniffer plugin to - * skip analyzing this method. - * - * @param args Args - */ - @IgnoreJRERequirement public void processArgs(String[] args) { for (int i = 0; i < args.length; i++) { String arg = args[i]; @@ -493,7 +484,7 @@ public class DebugCLI implements Runnable, SourceLocator { } else if (arg.equals("-lang")) //$NON-NLS-1$ { if (i + 1 < args.length) - getLocalizationManager().setLocale(LocaleUtility.langToLocale(args[++i])); + getLocalizationManager().setLocale(LocaleUtils.toLocale(args[++i])); } else { err("Unknown command-line argument: " + arg); //$NON-NLS-1$
