You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/04/27 15:36:55 UTC

git commit: [flex-falcon] [refs/heads/develop] - - Included the calls again animal-sniffer was complaining about. - Added a @IgnoreJRERequirement annotation to the method to make the plugin skip that method.

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 88d6a683d -> aedd91b4e


- Included the calls again animal-sniffer was complaining about.
- Added a @IgnoreJRERequirement annotation to the method to make the plugin skip that method.


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/aedd91b4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/aedd91b4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/aedd91b4

Branch: refs/heads/develop
Commit: aedd91b4ea80ce28afe2c468bb008cb2e50a66db
Parents: 88d6a68
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Wed Apr 27 15:36:47 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Wed Apr 27 15:36:47 2016 +0200

----------------------------------------------------------------------
 debugger/pom.xml                                       |  5 +++++
 .../main/java/flex/tools/debugger/cli/DebugCLI.java    | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aedd91b4/debugger/pom.xml
----------------------------------------------------------------------
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 40b9b3d..cc93ad7 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -91,6 +91,11 @@
             <artifactId>swfutils</artifactId>
             <version>4.15.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>animal-sniffer-annotations</artifactId>
+            <version>1.9</version>
+        </dependency>
 
         <dependency>
             <groupId>args4j</groupId>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/aedd91b4/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 84d17e7..d8d2623 100644
--- a/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java
+++ b/debugger/src/main/java/flex/tools/debugger/cli/DebugCLI.java
@@ -33,6 +33,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 java.io.*;
 import java.net.SocketException;
@@ -456,6 +457,14 @@ 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];
@@ -484,8 +493,8 @@ public class DebugCLI implements Runnable, SourceLocator {
 				} else if (arg.equals("-lang")) //$NON-NLS-1$
 				{
 					// TODO: either raise the java version to 7 or refactor the code to be valid on java 6
-//					if (i + 1 < args.length)
-//						getLocalizationManager().setLocale(LocaleUtility.langToLocale(args[++i]));
+					if (i + 1 < args.length)
+						getLocalizationManager().setLocale(LocaleUtility.langToLocale(args[++i]));
 
 				} else {
 					err("Unknown command-line argument: " + arg); //$NON-NLS-1$