- Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/87ad72a6 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/87ad72a6 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/87ad72a6 Branch: refs/heads/feature-autobuild/cleanup Commit: 87ad72a6d69ae8f2aff1a84391c7d916a0c887a0 Parents: 7926477 Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Sun Dec 25 20:42:22 2016 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Sun Dec 25 20:42:22 2016 +0100 ---------------------------------------------------------------------- .../apache/flex/compiler/clients/ASDOCJSC.java | 9 +- .../apache/flex/compiler/clients/COMPJSC.java | 15 ++-- .../apache/flex/compiler/clients/EXTERNC.java | 7 +- .../apache/flex/compiler/clients/MXMLJSC.java | 11 ++- .../internal/codegen/as/ASBlockWalker.java | 8 +- .../compiler/internal/codegen/as/ASWriter.java | 7 +- .../externals/reference/MethodReference.java | 6 +- .../codegen/externals/utils/DebugLogUtils.java | 13 ++- .../codegen/externals/utils/FunctionUtils.java | 57 ++++++------ .../internal/codegen/js/JSPublisher.java | 13 +-- .../js/flexjs/JSFlexJSASDocDITAEmitter.java | 55 ++++++------ .../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 70 +++++++-------- .../codegen/js/flexjs/JSFlexJSDocEmitter.java | 20 +++-- .../codegen/js/flexjs/JSFlexJSEmitter.java | 35 ++++---- .../codegen/js/goog/JSGoogPublisher.java | 7 +- .../codegen/js/utils/DocEmitterUtils.java | 7 +- .../internal/codegen/mxml/MXMLWriter.java | 8 +- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 58 ++++++------ .../mxml/flexjs/MXMLFlexJSPublisher.java | 8 +- .../compiler/internal/graph/GoogDepsWriter.java | 95 +++++++++----------- .../utils/JSClosureCompilerWrapper.java | 8 +- .../codegen/externals/TestExternChrome.java | 21 +++-- .../externals/TestExternalsJSCompile.java | 10 ++- .../flex/compiler/internal/test/TestBase.java | 23 ++--- .../org/apache/flex/utils/EnvProperties.java | 42 +++++---- compiler-test-utils/pom.xml | 10 +++ .../org/apache/flex/utils/EnvProperties.java | 49 +++++----- compiler/pom.xml | 10 +++ .../org/apache/flex/compiler/clients/ASC.java | 4 + .../org/apache/flex/compiler/clients/ASDOC.java | 10 ++- .../org/apache/flex/compiler/clients/COMPC.java | 10 ++- .../org/apache/flex/compiler/clients/MXMLC.java | 90 +++++++++---------- .../apache/flex/compiler/clients/Optimizer.java | 19 ++-- .../flex/compiler/config/Configurator.java | 8 +- .../internal/as/codegen/DumpBURMState.java | 10 ++- .../databinding/BindingCodeGenUtils.java | 11 ++- .../codegen/databinding/BindingInfo.java | 7 +- .../databinding/MXMLBindingDirectiveHelper.java | 70 ++++++++------- .../codegen/databinding/WatcherAnalyzer.java | 7 +- .../flex/compiler/internal/common/Counter.java | 9 +- .../internal/config/FileConfigurator.java | 7 +- .../config/FlashBuilderConfigurator.java | 16 ++-- .../internal/fxg/logging/SystemLogger.java | 6 ++ .../flex/compiler/internal/mxml/MXMLData.java | 7 +- .../internal/mxml/MXMLManifestManager.java | 9 +- .../internal/parsing/mxml/MXMLTokenizer.java | 7 +- .../compiler/internal/targets/SWFTarget.java | 8 +- .../tree/mxml/MXMLClassDefinitionNode.java | 9 +- .../java/org/apache/flex/swc/SWCDepends.java | 14 +-- .../java/org/apache/flex/swf/io/SWFDump.java | 28 +++--- .../main/java/org/apache/flex/utils/Base64.java | 15 +++- .../main/java/org/apache/flex/utils/Trace.java | 37 +++++--- compiler/src/main/resources/log4j2.xml | 31 +++++++ .../src/test/java/as/ASFeatureTestsBase.java | 15 ++-- .../java/mxml/tags/MXMLFeatureTestsBase.java | 11 ++- .../internal/tree/mxml/MXMLNodeBaseTests.java | 9 +- .../java/utils/FlashplayerSecurityHandler.java | 13 ++- 57 files changed, 729 insertions(+), 450 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java index a74c7d8..c279fa5 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java @@ -53,6 +53,8 @@ import org.apache.flex.compiler.problems.UnableToBuildSWFProblem; import org.apache.flex.compiler.targets.ITarget.TargetType; import org.apache.flex.compiler.targets.ITargetSettings; import org.apache.flex.compiler.units.ICompilationUnit; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author Erik de Bruin @@ -60,6 +62,9 @@ import org.apache.flex.compiler.units.ICompilationUnit; */ public class ASDOCJSC extends MXMLJSC { + + private static final Logger logger = LogManager.getLogger(ASDOCJSC.class); + /* * Exit code enumerations. */ @@ -153,7 +158,7 @@ public class ASDOCJSC extends MXMLJSC final int exitCode = mxmlc.mainNoExit(args, problems, true); long endTime = System.nanoTime(); - System.out.println((endTime - startTime) / 1e9 + " seconds"); + logger.info((endTime - startTime) / 1e9 + " seconds"); return exitCode; } @@ -223,7 +228,7 @@ public class ASDOCJSC extends MXMLJSC final File outputClassFile = getOutputClassFile( cu.getQualifiedNames().get(0), outputFolder); - System.out.println("Compiling file: " + outputClassFile); + logger.info("Compiling file: " + outputClassFile); ICompilationUnit unit = cu; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java index 0d97e06..0e9aa41 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java @@ -59,6 +59,8 @@ import org.apache.flex.compiler.targets.ITarget.TargetType; import org.apache.flex.compiler.targets.ITargetSettings; import org.apache.flex.compiler.units.ICompilationUnit; import org.apache.flex.swc.io.SWCReader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author Erik de Bruin @@ -66,6 +68,9 @@ import org.apache.flex.swc.io.SWCReader; */ public class COMPJSC extends MXMLJSC { + + private static final Logger logger = LogManager.getLogger(COMPJSC.class); + /* * Exit code enumerations. */ @@ -155,7 +160,7 @@ public class COMPJSC extends MXMLJSC final int exitCode = mxmlc.mainNoExit(args, problems, true); long endTime = System.nanoTime(); - System.out.println((endTime - startTime) / 1e9 + " seconds"); + logger.info((endTime - startTime) / 1e9 + " seconds"); return exitCode; } @@ -280,8 +285,8 @@ public class COMPJSC extends MXMLJSC { final File outputClassFile = getOutputClassFile( cu.getQualifiedNames().get(0), outputFolder); - - System.out.println("Compiling file: " + outputClassFile); + + logger.info("Compiling file: " + outputClassFile); ICompilationUnit unit = cu; @@ -310,7 +315,7 @@ public class COMPJSC extends MXMLJSC { String outputClassFile = getOutputClassFile( cu.getQualifiedNames().get(0), jsOut).getPath(); - System.out.println("Compiling file: " + outputClassFile); + logger.info("Compiling file: " + outputClassFile); ICompilationUnit unit = cu; @@ -359,7 +364,7 @@ public class COMPJSC extends MXMLJSC } catch (Exception e) { - System.out.println(e); + logger.info(e); final ICompilerProblem problem = new InternalCompilerProblem(e); problems.add(problem); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/clients/EXTERNC.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/EXTERNC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/EXTERNC.java index 3ef8703..27082c1 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/EXTERNC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/EXTERNC.java @@ -40,12 +40,17 @@ import org.apache.flex.compiler.targets.ITarget.TargetType; import org.apache.flex.tools.FlexTool; import com.google.javascript.jscomp.Result; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author Michael Schmalle */ public class EXTERNC implements FlexTool { + + private static final Logger logger = LogManager.getLogger(EXTERNC.class); + static enum ExitCode { SUCCESS(0), @@ -154,7 +159,7 @@ public class EXTERNC implements FlexTool final int exitCode = compiler.mainNoExit(args, System.err); long endTime = System.nanoTime(); - System.out.println((endTime - startTime) / 1e9 + " seconds"); + logger.info((endTime - startTime) / 1e9 + " seconds"); return exitCode; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java index 54b1bad..2007563 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSC.java @@ -81,6 +81,8 @@ import org.apache.flex.utils.FilenameNormalization; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author Erik de Bruin @@ -89,6 +91,9 @@ import com.google.common.collect.Iterables; public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider, FlexTool { + + private static final Logger logger = LogManager.getLogger(MXMLJSC.class); + @Override public ProblemQuery getProblemQuery() { @@ -233,7 +238,7 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider, final int exitCode = mxmlc.mainNoExit(args, problems, true); long endTime = System.nanoTime(); - System.out.println((endTime - startTime) / 1e9 + " seconds"); + logger.info((endTime - startTime) / 1e9 + " seconds"); return exitCode; } @@ -419,8 +424,8 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider, { final File outputClassFile = getOutputClassFile( cu.getQualifiedNames().get(0), outputFolder); - - System.out.println("Compiling file: " + outputClassFile); + + logger.info("Compiling file: " + outputClassFile); ICompilationUnit unit = cu; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java index 5247583..7d42daf 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java @@ -21,6 +21,7 @@ package org.apache.flex.compiler.internal.codegen.as; import java.util.List; +import org.apache.flex.compiler.clients.MXMLJSC; import org.apache.flex.compiler.codegen.as.IASEmitter; import org.apache.flex.compiler.definitions.IPackageDefinition; import org.apache.flex.compiler.internal.semantics.SemanticUtils; @@ -84,6 +85,8 @@ import org.apache.flex.compiler.utils.DefinitionUtils; import org.apache.flex.compiler.visitor.IASNodeStrategy; import org.apache.flex.compiler.visitor.as.IASBlockVisitor; import org.apache.flex.compiler.visitor.as.IASBlockWalker; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * A base implementation of the {@link IASBlockVisitor} that will walk the @@ -93,6 +96,9 @@ import org.apache.flex.compiler.visitor.as.IASBlockWalker; */ public class ASBlockWalker implements IASBlockVisitor, IASBlockWalker { + + private static final Logger logger = LogManager.getLogger(ASBlockWalker.class); + boolean isDebug; private IASEmitter emitter; @@ -654,7 +660,7 @@ public class ASBlockWalker implements IASBlockVisitor, IASBlockWalker { if (isDebug) { - System.out.println(message); + logger.info(message); } } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASWriter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASWriter.java index ee65de6..a7ba2b3 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASWriter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASWriter.java @@ -31,9 +31,14 @@ import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.units.ICompilationUnit; import org.apache.flex.compiler.visitor.as.IASBlockWalker; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ASWriter implements IASWriter { + + private static final Logger logger = LogManager.getLogger(ASWriter.class); + private FlexJSProject project; private List<ICompilerProblem> problems; @@ -73,7 +78,7 @@ public class ASWriter implements IASWriter walker.visitCompilationUnit(compilationUnit); - System.out.println(writer.toString()); + logger.info(writer.toString()); try { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java index e978bf7..d769cce 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java @@ -31,10 +31,14 @@ import com.google.javascript.rhino.JSDocInfo; import com.google.javascript.rhino.JSTypeExpression; import com.google.javascript.rhino.Node; import com.google.javascript.rhino.jstype.JSType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class MethodReference extends MemberReference { + private static final Logger logger = LogManager.getLogger(MethodReference.class); + private boolean isStatic; private MethodReference override; private Node paramNode; @@ -135,7 +139,7 @@ public class MethodReference extends MemberReference } else { - System.out.println(getQualifiedName() + " parameters not found! " + " " + comment.getParameterCount()); + logger.info(getQualifiedName() + " parameters not found! " + " " + comment.getParameterCount()); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/DebugLogUtils.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/DebugLogUtils.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/DebugLogUtils.java index 5dcdc48..b22621b 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/DebugLogUtils.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/DebugLogUtils.java @@ -20,9 +20,14 @@ package org.apache.flex.compiler.internal.codegen.externals.utils; import com.google.javascript.rhino.Node; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public final class DebugLogUtils { + + private static final Logger logger = LogManager.getLogger(DebugLogUtils.class); + private static boolean logEnabled = false; private static boolean errEnabled = false; @@ -34,14 +39,16 @@ public final class DebugLogUtils public static void log(String message) { - if (logEnabled) - System.out.println(message); + if (logEnabled) { + logger.info(message); + } } public static void err(String message) { - if (errEnabled) + if (errEnabled) { System.err.println(message); + } } public static void err(Node n) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java index 15d83f4..b7cc069 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java @@ -28,9 +28,14 @@ import com.google.common.base.Strings; import com.google.javascript.rhino.JSDocInfo; import com.google.javascript.rhino.JSTypeExpression; import com.google.javascript.rhino.Node; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class FunctionUtils { + + private static final Logger logger = LogManager.getLogger(FunctionUtils.class); + /** * Compute the type of a function or method parameter. * @@ -162,41 +167,34 @@ public class FunctionUtils String paramType; - if (parameterType == null) - { - System.out.println("no parameter type for " + paramName + " " + reference.getQualifiedName()); + if (parameterType == null) { + logger.info("no parameter type for " + paramName + " " + reference.getQualifiedName()); paramType = "Object"; - if (outputJS) - sb.append(paramName); - } - else if (parameterType.isVarArgs()) - { - if (outputJS) - sb.append("var_").append(paramName); - else - sb.append("...").append(paramName); - } - else - { + if (outputJS) { + sb.append(paramName); + } + } else if (parameterType.isVarArgs()) { + if (outputJS) { + sb.append("var_").append(paramName); + } else { + sb.append("...").append(paramName); + } + } else { paramType = JSTypeUtils.toParamTypeString(reference, paramName); - if (hasTemplate(reference) && containsTemplate(reference, paramType)) - { + if (hasTemplate(reference) && containsTemplate(reference, paramType)) { paramType = "Object"; } - if (outputJS && parameterType.isOptionalArg()) - { + if (outputJS && parameterType.isOptionalArg()) { sb.append("opt_"); sb.append(paramName); + } else { + sb.append(paramName); } - else - sb.append(paramName); - if (!outputJS) - { + if (!outputJS) { sb.append(":"); sb.append(paramType); - if (parameterType.isOptionalArg()) - { + if (parameterType.isOptionalArg()) { sb.append(" = "); sb.append(toDefaultParameterValue(paramType)); } @@ -208,14 +206,15 @@ public class FunctionUtils private static String toDefaultParameterValue(String paramType) { - if (paramType.equals("Function")) + if (paramType.equals("Function")) { return "null"; - else if (paramType.equals("Number")) + } else if (paramType.equals("Number")) { return "0"; - else if (paramType.equals("String")) + } else if (paramType.equals("String")) { return "''"; - else if (paramType.equals("Boolean")) + } else if (paramType.equals("Boolean")) { return "false"; + } return "null"; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java index a3b11c6..0448b8d 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java @@ -27,10 +27,14 @@ import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.codegen.js.IJSPublisher; import org.apache.flex.compiler.config.Configuration; import org.apache.flex.compiler.internal.projects.FlexJSProject; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JSPublisher implements IJSPublisher { + private static final Logger logger = LogManager.getLogger(JSPublisher.class); + public JSPublisher(FlexJSProject project, Configuration config) { this.project = project; @@ -67,21 +71,18 @@ public class JSPublisher implements IJSPublisher private String getOutputFilePath() { - if (configuration.getOutput() == null) - { + if (configuration.getOutput() == null) { final String extension = "." + project.getBackend().getOutputExtension(); return FilenameUtils.removeExtension(configuration.getTargetFile()) .concat(extension); - } - else { + } else { return configuration.getOutput(); } } public boolean publish(ProblemQuery problems) throws IOException { - System.out - .println("The project has been successfully compiled and optimized."); + logger.info("The project has been successfully compiled and optimized."); return true; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java index 04ac05a..746987e 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java @@ -19,10 +19,7 @@ package org.apache.flex.compiler.internal.codegen.js.flexjs; -import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FileWriter; import java.io.FilterWriter; import java.io.IOException; @@ -44,9 +41,7 @@ import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.definitions.IInterfaceDefinition; import org.apache.flex.compiler.definitions.IPackageDefinition; import org.apache.flex.compiler.definitions.IParameterDefinition; -import org.apache.flex.compiler.definitions.metadata.IDeprecationInfo; import org.apache.flex.compiler.definitions.metadata.IMetaTag; -import org.apache.flex.compiler.definitions.references.INamespaceReference; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSASDocEmitter; import org.apache.flex.compiler.internal.definitions.AccessorDefinition; @@ -72,6 +67,8 @@ import org.apache.flex.compiler.tree.as.ISetterNode; import org.apache.flex.compiler.tree.as.IVariableNode; import org.apache.flex.compiler.tree.metadata.IMetaTagNode; import org.apache.flex.compiler.utils.NativeUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Concrete implementation of the 'FlexJS' JavaScript production. @@ -82,6 +79,8 @@ import org.apache.flex.compiler.utils.NativeUtils; public class JSFlexJSASDocDITAEmitter extends JSGoogEmitter implements IJSFlexJSEmitter, IJSFlexJSASDocEmitter { + private static final Logger logger = LogManager.getLogger(JSFlexJSASDocDITAEmitter.class); + private boolean wroteSomething = false; @Override @@ -1032,7 +1031,7 @@ public class JSFlexJSASDocDITAEmitter extends JSGoogEmitter implements IJSFlexJS final File indexFile = new File(outputFolder, "index.json"); FileWriter out = new FileWriter(indexFile); out.write("{ \"index\": ["); - System.out.println("Compiling file: " + indexFile); + logger.info("Compiling file: " + indexFile); Set<String> keys = project.index.keySet(); List<String> keyList = new ArrayList<String>(keys); Collections.sort(keyList); @@ -1042,35 +1041,31 @@ public class JSFlexJSASDocDITAEmitter extends JSGoogEmitter implements IJSFlexJS List<FlexJSASDocProject.ASDocRecord> list = project.index.get(key); for (FlexJSASDocProject.ASDocRecord record : list) { - if (!firstLine) - out.write(",\n"); + if (!firstLine) { + out.write(",\n"); + } firstLine = false; out.write("{ \"name\": \""); out.write(key); out.write("\",\n"); out.write(" \"type\": "); - if (record.definition instanceof ClassDefinition) - out.write("\"Class\",\n"); - else if (record.definition instanceof InterfaceDefinition) - out.write("\"Interface\",\n"); - else if (record.definition instanceof EventDefinition) - out.write("\"Event\",\n"); - else if (record.definition instanceof AccessorDefinition) - { + if (record.definition instanceof ClassDefinition) { + out.write("\"Class\",\n"); + } else if (record.definition instanceof InterfaceDefinition) { + out.write("\"Interface\",\n"); + } else if (record.definition instanceof EventDefinition) { + out.write("\"Event\",\n"); + } else if (record.definition instanceof AccessorDefinition) { out.write("\"Property\",\n"); out.write(" \"class\": \""); out.write(formatQualifiedName(record.definition.getParent().getQualifiedName())); out.write("\",\n"); - } - else if (record.definition instanceof VariableDefinition) - { + } else if (record.definition instanceof VariableDefinition) { out.write("\"Property\",\n"); out.write(" \"class\": \""); out.write(formatQualifiedName(record.definition.getParent().getQualifiedName())); out.write("\",\n"); - } - else if (record.definition instanceof FunctionDefinition) - { + } else if (record.definition instanceof FunctionDefinition) { out.write("\"Method\",\n"); out.write(" \"class\": \""); out.write(formatQualifiedName(record.definition.getParent().getQualifiedName())); @@ -1101,16 +1096,17 @@ public class JSFlexJSASDocDITAEmitter extends JSGoogEmitter implements IJSFlexJS final File indexFile = new File(outputFolder, "classes.json"); FileWriter out = new FileWriter(indexFile); out.write("{ \"classes\": ["); - System.out.println("Compiling file: " + indexFile); + logger.info("Compiling file: " + indexFile); Set<String> keys = project.classes.keySet(); List<String> keyList = new ArrayList<String>(keys); Collections.sort(keyList); boolean firstLine = true; for (String key : keyList) { - if (!firstLine) - out.write(",\n"); - firstLine = false; + if (!firstLine) { + out.write(",\n"); + } + firstLine = false; FlexJSASDocProject.ASDocRecord record = project.classes.get(key); out.write("{ \"name\": \""); out.write(key); @@ -1139,13 +1135,14 @@ public class JSFlexJSASDocDITAEmitter extends JSGoogEmitter implements IJSFlexJS final File indexFile = new File(outputFolder, "tags.json"); FileWriter out = new FileWriter(indexFile); out.write("{ \"tags\": ["); - System.out.println("Compiling file: " + indexFile); + logger.info("Compiling file: " + indexFile); Collections.sort(project.tags); boolean firstLine = true; for (String tag : project.tags) { - if (!firstLine) - out.write(",\n"); + if (!firstLine) { + out.write(",\n"); + } firstLine = false; out.write("\""); out.write(tag); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java index b55920e..a4b120a 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java @@ -19,10 +19,7 @@ package org.apache.flex.compiler.internal.codegen.js.flexjs; -import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FileWriter; import java.io.FilterWriter; import java.io.IOException; @@ -66,10 +63,11 @@ import org.apache.flex.compiler.tree.as.IInterfaceNode; import org.apache.flex.compiler.tree.as.INamespaceNode; import org.apache.flex.compiler.tree.as.IPackageNode; import org.apache.flex.compiler.tree.as.ISetterNode; -import org.apache.flex.compiler.tree.as.ITypeNode; import org.apache.flex.compiler.tree.as.IVariableNode; import org.apache.flex.compiler.tree.metadata.IMetaTagNode; import org.apache.flex.compiler.utils.NativeUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Concrete implementation of the 'FlexJS' JavaScript production. @@ -80,7 +78,9 @@ import org.apache.flex.compiler.utils.NativeUtils; public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmitter, IJSFlexJSASDocEmitter { - private boolean firstMember = true; + private static final Logger logger = LogManager.getLogger(JSFlexJSASDocEmitter.class); + + private boolean firstMember = true; @Override public String postProcess(String output) @@ -786,45 +786,39 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit final File indexFile = new File(outputFolder, "index.json"); FileWriter out = new FileWriter(indexFile); out.write("{ \"index\": ["); - System.out.println("Compiling file: " + indexFile); + logger.info("Compiling file: " + indexFile); Set<String> keys = project.index.keySet(); List<String> keyList = new ArrayList<String>(keys); Collections.sort(keyList); boolean firstLine = true; - for (String key : keyList) - { + for (String key : keyList) { List<FlexJSASDocProject.ASDocRecord> list = project.index.get(key); - for (FlexJSASDocProject.ASDocRecord record : list) - { - if (!firstLine) - out.write(",\n"); + for (FlexJSASDocProject.ASDocRecord record : list) { + if (!firstLine) { + out.write(",\n"); + } firstLine = false; out.write("{ \"name\": \""); out.write(key); out.write("\",\n"); out.write(" \"type\": "); - if (record.definition instanceof ClassDefinition) - out.write("\"Class\",\n"); - else if (record.definition instanceof InterfaceDefinition) - out.write("\"Interface\",\n"); - else if (record.definition instanceof EventDefinition) - out.write("\"Event\",\n"); - else if (record.definition instanceof AccessorDefinition) - { + if (record.definition instanceof ClassDefinition) { + out.write("\"Class\",\n"); + } else if (record.definition instanceof InterfaceDefinition) { + out.write("\"Interface\",\n"); + } else if (record.definition instanceof EventDefinition) { + out.write("\"Event\",\n"); + } else if (record.definition instanceof AccessorDefinition) { out.write("\"Property\",\n"); out.write(" \"class\": \""); out.write(formatQualifiedName(record.definition.getParent().getQualifiedName())); out.write("\",\n"); - } - else if (record.definition instanceof VariableDefinition) - { + } else if (record.definition instanceof VariableDefinition) { out.write("\"Property\",\n"); out.write(" \"class\": \""); out.write(formatQualifiedName(record.definition.getParent().getQualifiedName())); out.write("\",\n"); - } - else if (record.definition instanceof FunctionDefinition) - { + } else if (record.definition instanceof FunctionDefinition) { out.write("\"Method\",\n"); out.write(" \"class\": \""); out.write(formatQualifiedName(record.definition.getParent().getQualifiedName())); @@ -855,15 +849,16 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit final File indexFile = new File(outputFolder, "classes.json"); FileWriter out = new FileWriter(indexFile); out.write("{ \"classes\": ["); - System.out.println("Compiling file: " + indexFile); + logger.info("Compiling file: " + indexFile); Set<String> keys = project.classes.keySet(); List<String> keyList = new ArrayList<String>(keys); Collections.sort(keyList); boolean firstLine = true; for (String key : keyList) { - if (!firstLine) - out.write(",\n"); + if (!firstLine) { + out.write(",\n"); + } firstLine = false; FlexJSASDocProject.ASDocRecord record = project.classes.get(key); out.write("{ \"name\": \""); @@ -871,17 +866,14 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit out.write("\",\n"); DefinitionBase def = (DefinitionBase)record.definition; ASDocComment asDoc = (ASDocComment) def.getExplicitSourceComment(); - if (asDoc != null) - { + if (asDoc != null) { setBufferWrite(true); StringBuilder sb = new StringBuilder(); setBuilder(sb); writeASDoc(asDoc, project); setBufferWrite(false); out.write(sb.toString()); - } - else - { + } else { out.write(" \"description\": \""); out.write(record.description); out.write("\""); @@ -908,13 +900,13 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit final File indexFile = new File(outputFolder, "tags.json"); FileWriter out = new FileWriter(indexFile); out.write("{ \"tags\": ["); - System.out.println("Compiling file: " + indexFile); + logger.info("Compiling file: " + indexFile); Collections.sort(project.tags); boolean firstLine = true; - for (String tag : project.tags) - { - if (!firstLine) - out.write(",\n"); + for (String tag : project.tags) { + if (!firstLine) { + out.write(",\n"); + } firstLine = false; out.write("\""); out.write(tag); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java index 71306d4..9214de2 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java @@ -46,9 +46,14 @@ import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IFunctionNode; import org.apache.flex.compiler.tree.as.IParameterNode; import org.apache.flex.compiler.tree.as.IVariableNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JSFlexJSDocEmitter extends JSGoogDocEmitter { + + private static final Logger logger = LogManager.getLogger(JSFlexJSDocEmitter.class); + private List<String> classIgnoreList; private List<String> ignoreList; private List<String> coercionList; @@ -139,8 +144,10 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter == JSSessionModel.ImplicitBindableImplementation.EXTENDS) { superClass = (IClassDefinition) project.resolveQNameToDefinition(BindableEmitter.DISPATCHER_CLASS_QNAME); if (superClass == null) { - System.out.println(BindableEmitter.DISPATCHER_CLASS_QNAME+" not resolved for implicit super class in "+classDefinition.getQualifiedName()); - } else qname = BindableEmitter.DISPATCHER_CLASS_QNAME; + logger.info(BindableEmitter.DISPATCHER_CLASS_QNAME+" not resolved for implicit super class in "+classDefinition.getQualifiedName()); + } else { + qname = BindableEmitter.DISPATCHER_CLASS_QNAME; + } } } @@ -164,20 +171,21 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter .getContainingScope(), DependencyType.INHERITANCE, true); if (type == null) { - System.out.println(iReference.getDisplayString() + logger.info(iReference.getDisplayString() + " not resolved in " + classDefinition.getQualifiedName()); } else { emitImplements(type, project.getActualPackageName(type.getPackageName())); } - if (type.getQualifiedName() == BindableEmitter.DISPATCHER_INTERFACE_QNAME) - sawIEventDispatcher=true; + if (type.getQualifiedName() == BindableEmitter.DISPATCHER_INTERFACE_QNAME) { + sawIEventDispatcher = true; + } } //support implicit bindable implementation for 'implements' IEventDispatcher: if (needsIEventDispatcher && !sawIEventDispatcher) { ITypeDefinition type = (ITypeDefinition) project.resolveQNameToDefinition(BindableEmitter.DISPATCHER_INTERFACE_QNAME); if (type == null) { - System.out.println(BindableEmitter.DISPATCHER_INTERFACE_QNAME+" not resolved for implicit implementation in "+classDefinition.getQualifiedName()); + logger.info(BindableEmitter.DISPATCHER_INTERFACE_QNAME+" not resolved for implicit implementation in "+classDefinition.getQualifiedName()); } else { emitImplements(type, project.getActualPackageName(type.getPackageName())); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 4bcc3cf..f8695d3 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -115,6 +115,8 @@ import org.apache.flex.compiler.utils.ASNodeUtils; import com.google.common.base.Joiner; import org.apache.flex.compiler.utils.NativeUtils; import org.apache.flex.utils.FilenameNormalization; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Concrete implementation of the 'FlexJS' JavaScript production. @@ -125,6 +127,8 @@ import org.apache.flex.utils.FilenameNormalization; public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter { + private static final Logger logger = LogManager.getLogger(JSFlexJSEmitter.class); + private JSFlexJSDocEmitter docEmitter = null; private PackageHeaderEmitter packageHeaderEmitter; @@ -445,10 +449,11 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter { List<IFunctionNode> anonFns = fnNode.getLocalFunctions(); int i = anonFns.indexOf(node.getFunctionNode()); - if (i < 0) - System.out.println("missing index for " + node.toString()); - else - write("__localFn" + Integer.toString(i) + "__"); + if (i < 0) { + logger.info("missing index for " + node.toString()); + } else { + write("__localFn" + Integer.toString(i) + "__"); + } } } @@ -944,11 +949,11 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter write(ns + "::"); } write(((IIdentifierNode)node).getName()); - } - else if (node.getNodeID() == ASTNodeID.MemberAccessExpressionID) - writeChainName(node); - else - System.out.println("unexpected node in emitClosureEnd"); + } else if (node.getNodeID() == ASTNodeID.MemberAccessExpressionID) { + writeChainName(node); + } else { + logger.info("unexpected node in emitClosureEnd"); + } write(ASEmitterTokens.SINGLE_QUOTE); write(ASEmitterTokens.PAREN_CLOSE); } @@ -966,14 +971,14 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter } private void writeChainName(IASNode node) { - while (node.getNodeID() == ASTNodeID.MemberAccessExpressionID) - { + while (node.getNodeID() == ASTNodeID.MemberAccessExpressionID) { node = ((IMemberAccessExpressionNode)node).getRightOperandNode(); } - if (node.getNodeID() == ASTNodeID.IdentifierID) - write(((IdentifierNode)node).getName()); - else - System.out.println("unexpected node in emitClosureEnd"); + if (node.getNodeID() == ASTNodeID.IdentifierID) { + write(((IdentifierNode) node).getName()); + } else { + logger.info("unexpected node in emitClosureEnd"); + } } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java index 23c5fa1..916707d 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java @@ -37,6 +37,7 @@ import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.codegen.js.IJSPublisher; import org.apache.flex.compiler.config.Configuration; import org.apache.flex.compiler.internal.codegen.js.JSPublisher; +import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.utils.JSClosureCompilerUtil; @@ -49,10 +50,14 @@ import com.google.javascript.jscomp.SourceMap; import com.google.javascript.jscomp.deps.DepsGenerator; import com.google.javascript.jscomp.deps.DepsGenerator.InclusionStrategy; import com.google.javascript.jscomp.deps.ModuleLoader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JSGoogPublisher extends JSPublisher implements IJSPublisher { + private static final Logger logger = LogManager.getLogger(JSGoogPublisher.class); + public static final String GOOG_INTERMEDIATE_DIR_NAME = "js-intermediate"; public static final String GOOG_RELEASE_DIR_NAME = "js-release"; @@ -165,7 +170,7 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher appendSourceMapLocation(projectReleaseJSFile, projectName); - System.out.println("The project '" + projectName + logger.info("The project '" + projectName + "' has been successfully compiled and optimized."); return true; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/DocEmitterUtils.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/DocEmitterUtils.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/DocEmitterUtils.java index 7d7bf16..91d297f 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/DocEmitterUtils.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/DocEmitterUtils.java @@ -24,9 +24,14 @@ import java.util.ArrayList; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSDocEmitter; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitterTokens; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class DocEmitterUtils { + + private static final Logger logger = LogManager.getLogger(DocEmitterUtils.class); + public static void loadImportIgnores(JSFlexJSEmitter emitter, String doc) { ArrayList<String> ignoreList = new ArrayList<String>(); @@ -39,7 +44,7 @@ public class DocEmitterUtils ignorable = ignorable.substring(0, endIndex); ignorable = ignorable.trim(); ignoreList.add(ignorable); - System.out.println("Found ignorable: " + ignorable); + logger.info("Found ignorable: " + ignorable); index = doc.indexOf(ignoreToken, index + endIndex); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java index 84d9421..b9cfcf5 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java @@ -29,14 +29,20 @@ import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter; import org.apache.flex.compiler.driver.js.IJSBackend; import org.apache.flex.compiler.internal.codegen.js.JSFilterWriter; import org.apache.flex.compiler.internal.codegen.js.JSWriter; +import org.apache.flex.compiler.internal.codegen.js.utils.DocEmitterUtils; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.units.ICompilationUnit; import org.apache.flex.compiler.visitor.as.IASBlockWalker; import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class MXMLWriter extends JSWriter { + + private static final Logger logger = LogManager.getLogger(MXMLWriter.class); + /** * Create a JSApplication writer. * @@ -77,7 +83,7 @@ public class MXMLWriter extends JSWriter if (sourceMapOut != null) { String fileName = new File(compilationUnit.getAbsoluteFilename()).getName(); - System.out.println("Source map cannot be generated for '" + fileName + "'."); + logger.info("Source map cannot be generated for '" + fileName + "'."); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java index 4bea612..bd6efa6 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java @@ -80,6 +80,8 @@ import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker; import org.apache.flex.swc.ISWC; import com.google.common.base.Joiner; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author Erik de Bruin @@ -88,7 +90,9 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements IMXMLFlexJSEmitter { - // the instances in a container + private static final Logger logger = LogManager.getLogger(MXMLFlexJSEmitter.class); + + // the instances in a container private ArrayList<MXMLDescriptorSpecifier> currentInstances; private ArrayList<MXMLDescriptorSpecifier> currentPropertySpecifiers; private ArrayList<MXMLDescriptorSpecifier> descriptorTree; @@ -1162,37 +1166,37 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements String s = ""; IExpressionNode left = node.getLeftOperandNode(); - if (left instanceof FunctionCallNode) // probably a cast - { + if (left instanceof FunctionCallNode) { IASNode child = ((FunctionCallNode)left).getArgumentsNode().getChild(0); - if (child instanceof IdentifierNode) - s = getSourceStringFromIdentifierNode((IdentifierNode)child); - else if (child instanceof MemberAccessExpressionNode) - s = getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode)child); - } - else if (left instanceof MemberAccessExpressionNode) - s = getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode)left); - else if (left instanceof IdentifierNode) - s = getSourceStringFromIdentifierNode((IdentifierNode)left); - else - System.out.println("expected binding member access left node" + node.toString()); + if (child instanceof IdentifierNode) { + s = getSourceStringFromIdentifierNode((IdentifierNode) child); + } else if (child instanceof MemberAccessExpressionNode) { + s = getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode) child); + } + } else if (left instanceof MemberAccessExpressionNode) { + s = getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode) left); + } else if (left instanceof IdentifierNode) { + s = getSourceStringFromIdentifierNode((IdentifierNode) left); + } else { + logger.warn("expected binding member access left node" + node.toString()); + } s += "."; IExpressionNode right = node.getRightOperandNode(); - if (right instanceof FunctionCallNode) // probably a cast - { + if (right instanceof FunctionCallNode) { IASNode child = ((FunctionCallNode)right).getArgumentsNode().getChild(0); - if (child instanceof IdentifierNode) - s += getSourceStringFromIdentifierNode((IdentifierNode)child); - else if (child instanceof MemberAccessExpressionNode) - s += getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode)child); - } - else if (right instanceof MemberAccessExpressionNode) - s += getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode)right); - else if (right instanceof IdentifierNode) - s += getSourceStringFromIdentifierNode((IdentifierNode)right); - else - System.out.println("expected binding member access right node" + node.toString()); + if (child instanceof IdentifierNode) { + s += getSourceStringFromIdentifierNode((IdentifierNode) child); + } else if (child instanceof MemberAccessExpressionNode) { + s += getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode) child); + } + } else if (right instanceof MemberAccessExpressionNode) { + s += getSourceStringFromMemberAccessExpressionNode((MemberAccessExpressionNode) right); + } else if (right instanceof IdentifierNode) { + s += getSourceStringFromIdentifierNode((IdentifierNode) right); + } else { + logger.warn("expected binding member access right node" + node.toString()); + } return s; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java index 29943d9..6b887cf 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java @@ -44,6 +44,8 @@ import org.apache.flex.compiler.internal.targets.ITargetAttributes; import org.apache.flex.compiler.utils.JSClosureCompilerWrapper; import org.apache.flex.swc.ISWC; import org.apache.flex.swc.ISWCFileEntry; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.*; import java.net.URL; @@ -53,6 +55,8 @@ import java.util.*; public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher { + private static final Logger logger = LogManager.getLogger(MXMLFlexJSPublisher.class); + public static final String FLEXJS_OUTPUT_DIR_NAME = "bin"; public static final String FLEXJS_INTERMEDIATE_DIR_NAME = "js-debug"; public static final String FLEXJS_RELEASE_DIR_NAME = "js-release"; @@ -285,7 +289,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher String code = IOUtils.toString(is, "UTF-8"); is.close(); JarSourceFile externFile = new JarSourceFile(key, code,true); - System.out.println("using extern: " + key); + logger.info("using extern: " + key); compilerWrapper.addJSExternsFile(externFile); // Write the extern into the filesystem. @@ -369,7 +373,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher } // if (ok) - System.out.println("The project '" + projectName + "' has been successfully compiled and optimized."); + logger.info("The project '" + projectName + "' has been successfully compiled and optimized."); return true; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java index 8b49a88..5d00b59 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java @@ -43,10 +43,14 @@ import org.apache.flex.swc.ISWC; import org.apache.flex.swc.ISWCFileEntry; import com.google.common.io.Files; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class GoogDepsWriter { - public GoogDepsWriter(File outputFolder, String mainClassName, JSGoogConfiguration config, List<ISWC> swcs) + private static final Logger logger = LogManager.getLogger(GoogDepsWriter.class); + + public GoogDepsWriter(File outputFolder, String mainClassName, JSGoogConfiguration config, List<ISWC> swcs) { this.outputFolderPath = outputFolder.getAbsolutePath(); this.mainName = mainClassName; @@ -56,7 +60,7 @@ public class GoogDepsWriter { this.swcs = swcs; for (ISWC swc : swcs) { - System.out.println("using SWC: " + swc.getSWCFile().getAbsolutePath()); + logger.info("using SWC: " + swc.getSWCFile().getAbsolutePath()); } } @@ -144,15 +148,14 @@ public class GoogDepsWriter { visited.put(current.className, current); filePathsInOrder.add(current.filePath); - if (removeCirculars) + if (removeCirculars) { removeCirculars(current); - System.out.println("Dependencies calculated for '" + current.filePath + "'"); + } + logger.info("Dependencies calculated for '" + current.filePath + "'"); ArrayList<String> deps = current.deps; - for (String className : deps) - { - if (!visited.containsKey(className) && !isGoogClass(className)) - { + for (String className : deps) { + if (!visited.containsKey(className) && !isGoogClass(className)) { GoogDep gd = depMap.get(className); sortFunction(gd, arr); } @@ -162,8 +165,9 @@ public class GoogDepsWriter { private void addDeps(String className) { - if (depMap.containsKey(className) || isGoogClass(className)) + if (depMap.containsKey(className) || isGoogClass(className)) { return; + } // build goog dependency list GoogDep gd = new GoogDep(); @@ -186,25 +190,19 @@ public class GoogDepsWriter { ArrayList<String> deps = getDirectDependencies(gd.filePath); gd.deps = new ArrayList<String>(); - for (String dep : deps) - { - if (gd.fileInfo.impls != null && gd.fileInfo.impls.contains(dep)) - { - if (!requireMap.containsKey(dep)) - { + for (String dep : deps) { + if (gd.fileInfo.impls != null && gd.fileInfo.impls.contains(dep)) { + if (!requireMap.containsKey(dep)) { // we are first class that needs this dependency // at prototype initialization time requireMap.put(dep, className); } - } - else if (depMap.containsKey(dep) && !isGoogClass(dep)) - { + } else if (depMap.containsKey(dep) && !isGoogClass(dep)) { continue; } gd.deps.add(dep); } - for (String dep : deps) - { + for (String dep : deps) { addDeps(dep); } } @@ -238,14 +236,14 @@ public class GoogDepsWriter { // don't add the require if some class needs it at static initialization // time and that class is not this class suppressCount++; - System.out.println(gd.filePath + " removing circular (static): " + s); + logger.warn(gd.filePath + " removing circular (static): " + s); continue; } else if (!gd.deps.contains(s)) { // someone require'd this class suppressCount++; - System.out.println(gd.filePath + " removing circular: " + s); + logger.warn(gd.filePath + " removing circular: " + s); continue; } } @@ -262,64 +260,51 @@ public class GoogDepsWriter { { String line = finalLines.get(fi.suppressLine); int c = line.indexOf("@suppress {"); - if (c > -1) - { - if (!line.contains("missingRequire")) - { + if (c > -1) { + if (!line.contains("missingRequire")) { line = line.substring(0, c) + "@suppress {missingRequire|" + line.substring(c + 11); finalLines.remove(fi.suppressLine); finalLines.add(fi.suppressLine, line); } - } - else - System.out.println("Confused by @suppress in " + className); + } else { + logger.error("Confused by @suppress in " + className); + } } else { // the @suppress was for the constructor or some other thing so add a top-level // @suppress - if (fi.fileoverviewLine > -1) - { + if (fi.fileoverviewLine > -1) { // there is already a fileOverview but no @suppress finalLines.add(fi.fileoverviewLine + 1, " * @suppress {missingRequire}"); - } - else if (fi.googProvideLine > -1) - { + } else if (fi.googProvideLine > -1) { finalLines.add(fi.googProvideLine, " */"); finalLines.add(fi.googProvideLine, " * @suppress {missingRequire}"); finalLines.add(fi.googProvideLine, " * @fileoverview"); finalLines.add(fi.googProvideLine, "/**"); - } - else - { - System.out.println("Confused by @suppress in " + className); + } else { + logger.error("Confused by @suppress in " + className); } } } else { - if (fi.fileoverviewLine > -1) - { + if (fi.fileoverviewLine > -1) { // there is already a fileoverview but no @suppress finalLines.add(fi.fileoverviewLine + 1, " * @suppress {missingRequire}"); - } - else if (fi.googProvideLine > -1) - { + } else if (fi.googProvideLine > -1) { finalLines.add(fi.googProvideLine, " */"); finalLines.add(fi.googProvideLine, " * @suppress {missingRequire}"); finalLines.add(fi.googProvideLine, " * @fileoverview"); finalLines.add(fi.googProvideLine, "/**"); - } - else - { - System.out.println("Confused by @suppress in " + className); + } else { + logger.error("Confused by @suppress in " + className); } } } File file = new File(gd.filePath); PrintWriter out = new PrintWriter(new FileWriter(file)); - for (String s : finalLines) - { + for (String s : finalLines) { out.println(s); } out.close(); @@ -486,13 +471,13 @@ public class GoogDepsWriter { File.separator + assetFileName); FileUtils.copyFile(assetFile, destFile); - System.out.println("Copied assets of the '" + nameOfClass + "' class"); + logger.info("Copied assets of the '" + nameOfClass + "' class"); } } } } } catch (IOException e) { - System.out.println("Error copying file for class: " + className); + logger.error("Error copying file for class: " + className); } return fn; } @@ -554,18 +539,18 @@ public class GoogDepsWriter { inStream.close(); outStream.flush(); outStream.close(); - System.out.println("Copied asset " + assetName); + logger.info("Copied asset " + assetName); } } } } catch (IOException e) { - System.out.println("Error copying file for class: " + className); + logger.error("Error copying file for class: " + className); } return fn; } } - - System.out.println("Could not find file for class: " + className); + + logger.error("Could not find file for class: " + className); problems.add(new FileNotFoundProblem(className)); problemsFound = true; return ""; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java index 1757727..2f09791 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java @@ -40,10 +40,14 @@ import com.google.javascript.jscomp.ModuleIdentifier; import com.google.javascript.jscomp.SourceFile; import com.google.javascript.jscomp.SourceMap; import com.google.javascript.jscomp.WarningLevel; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JSClosureCompilerWrapper { + private static final Logger logger = LogManager.getLogger(JSClosureCompilerWrapper.class); + public JSClosureCompilerWrapper(List<String> args) { Compiler.setLoggingLevel(Level.INFO); @@ -116,7 +120,7 @@ public class JSClosureCompilerWrapper } catch (IOException error) { - System.out.println(error); + logger.error(error); } /* @@ -145,7 +149,7 @@ public class JSClosureCompilerWrapper } catch (IOException error) { - System.out.println(error); + logger.error(error); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java index d2582bb..68a12d2 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java @@ -28,22 +28,27 @@ import java.io.IOException; import org.apache.flex.compiler.clients.ExternCConfiguration; import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference; import org.apache.flex.compiler.problems.ICompilerProblem; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Test; import com.google.javascript.jscomp.Result; public class TestExternChrome extends ExternalsTestBase { + + private static final Logger logger = LogManager.getLogger(TestExternChrome.class); + @Test public void test_classes() throws IOException { client.cleanOutput(); Result result = compile(); assertTrue(result.success); - if (model.problems.getProblems().size() > 0) - { - for (ICompilerProblem problem : model.problems.getProblems()) - System.out.println(problem.toString() + " " + problem.getSourcePath() + " " + problem.getLine()); + if (model.problems.getProblems().size() > 0) { + for (ICompilerProblem problem : model.problems.getProblems()) { + logger.info(problem.toString() + " " + problem.getSourcePath() + " " + problem.getLine()); + } } assertEquals(0, model.problems.getProblems().size()); @@ -82,10 +87,10 @@ public class TestExternChrome extends ExternalsTestBase client.cleanOutput(); Result result = compile(); assertTrue(result.success); - if (model.problems.getProblems().size() > 0) - { - for (ICompilerProblem problem : model.problems.getProblems()) - System.out.println(problem.toString() + " " + problem.getSourcePath() + " " + problem.getLine()); + if (model.problems.getProblems().size() > 0) { + for (ICompilerProblem problem : model.problems.getProblems()) { + logger.info(problem.toString() + " " + problem.getSourcePath() + " " + problem.getLine()); + } } assertEquals(0, model.problems.getProblems().size()); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java index ed2104b..a484fb0 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternalsJSCompile.java @@ -36,6 +36,7 @@ import org.apache.flex.compiler.clients.ExternCConfiguration; import org.apache.flex.compiler.codegen.as.IASEmitter; import org.apache.flex.compiler.config.Configurator; import org.apache.flex.compiler.internal.codegen.as.ASFilterWriter; +import org.apache.flex.compiler.internal.codegen.as.ASWriter; import org.apache.flex.compiler.internal.driver.js.flexjs.FlexJSBackend; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.projects.FlexProjectConfigurator; @@ -47,6 +48,8 @@ import org.apache.flex.compiler.visitor.as.IASBlockWalker; import org.apache.flex.utils.FilenameNormalization; import org.apache.flex.utils.ITestAdapter; import org.apache.flex.utils.TestAdapterFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -56,6 +59,9 @@ import com.google.common.collect.Iterables; public class TestExternalsJSCompile { + + private static final Logger logger = LogManager.getLogger(TestExternalsJSCompile.class); + private static ITestAdapter testAdapter = TestAdapterFactory.getTestAdapter(); private static File tempDir = new File(testAdapter.getTempDir()); @@ -205,7 +211,7 @@ public class TestExternalsJSCompile final File outputClassFile = getOutputClassFile(qname + "_output", outputRootDir); - System.out.println(outputClassFile); + logger.info(outputClassFile); ASFilterWriter writer = backend.createWriterBuffer(project); IASEmitter emitter = backend.createEmitter(writer); @@ -214,7 +220,7 @@ public class TestExternalsJSCompile walker.visitCompilationUnit(cu); - System.out.println(writer.toString()); + logger.info(writer.toString()); BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream(outputClassFile)); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/TestBase.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/TestBase.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/TestBase.java index 4bc9cbd..45d8df8 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/TestBase.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/TestBase.java @@ -46,6 +46,7 @@ import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.as.ASFilterWriter; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; +import org.apache.flex.compiler.internal.graph.GoogDepsWriter; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.projects.FlexProject; import org.apache.flex.compiler.internal.projects.FlexProjectConfigurator; @@ -68,6 +69,8 @@ import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker; import org.apache.flex.utils.FilenameNormalization; import org.apache.flex.utils.ITestAdapter; import org.apache.flex.utils.TestAdapterFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -78,6 +81,9 @@ import com.google.common.collect.Iterables; @Ignore public class TestBase implements ITestBase { + + private static final Logger logger = LogManager.getLogger(TestBase.class); + private static ITestAdapter testAdapter = TestAdapterFactory.getTestAdapter(); protected List<ICompilerProblem> errors; @@ -262,20 +268,17 @@ public class TestBase implements ITestBase } IASNode fileNode = null; - try - { + try { ISyntaxTreeRequestResult result = cu.getSyntaxTreeRequest().get(); ICompilerProblem[] problems = result.getProblems(); - if (problems.length > 0) - { - for (ICompilerProblem problem : problems) - System.out.println(problem.toString()); + if (problems.length > 0) { + for (ICompilerProblem problem : problems) { + logger.warn(problem.toString()); + } return null; } fileNode = result.getAST(); - } - catch (InterruptedException e) - { + } catch (InterruptedException e) { e.printStackTrace(); } @@ -324,7 +327,7 @@ public class TestBase implements ITestBase sb.append(error.toString() + "\n"); } } - System.out.println(sb.toString()); + logger.info(sb.toString()); return compiledFileNames; } List<ICompilationUnit> reachableCompilationUnits = project http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java b/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java index ea75057..9e20650 100644 --- a/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java +++ b/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java @@ -19,6 +19,10 @@ package org.apache.flex.utils; +import org.apache.flex.compiler.utils.JSClosureCompilerWrapper; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -35,6 +39,8 @@ import java.util.Properties; */ public class EnvProperties { + private static final Logger logger = LogManager.getLogger(EnvProperties.class); + /** * FLEX_HOME */ @@ -94,12 +100,12 @@ public class EnvProperties { prefix = "env."; } } catch (FileNotFoundException e) { - System.out.println(envFileName + " not found"); + logger.error(envFileName + " not found"); try { File f = new File("unittest.properties"); p.load(new FileInputStream( f )); } catch (FileNotFoundException e1) { - System.out.println("unittest.properties not found"); + logger.error("unittest.properties not found"); } catch (IOException e1) { // Ignore } @@ -108,42 +114,44 @@ public class EnvProperties { } SDK = p.getProperty(prefix + "FLEX_HOME", System.getenv("FLEX_HOME")); - if(SDK == null) - { + if(SDK == null) { SDK = FilenameNormalization.normalize("../../../../flex-sdk"); File mxmlc = new File(SDK + "/lib/mxmlc.jar"); - if (!mxmlc.exists()) + if (!mxmlc.exists()) { SDK = FilenameNormalization.normalize("../../../compiler/lib"); + } } - System.out.println("environment property - FLEX_HOME = " + SDK); + logger.info("environment property - FLEX_HOME = " + SDK); FPSDK = p.getProperty(prefix + "PLAYERGLOBAL_HOME", System.getenv("PLAYERGLOBAL_HOME")); - if(FPSDK == null) + if(FPSDK == null) { FPSDK = FilenameNormalization.normalize("../../../frameworks/libs/player"); - System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK); + } + logger.info("environment property - PLAYERGLOBAL_HOME = " + FPSDK); FPVER = p.getProperty(prefix + "PLAYERGLOBAL_VERSION", System.getenv("PLAYERGLOBAL_VERSION")); - if (FPVER == null) + if (FPVER == null) { FPVER = "11.1"; - System.out.println("environment property - PLAYERGLOBAL_VERSION = " + FPVER); + } + logger.info("environment property - PLAYERGLOBAL_VERSION = " + FPVER); TLF = p.getProperty(prefix + "TLF_HOME", System.getenv("TLF_HOME")); - if (TLF == null) - { + if (TLF == null) { TLF = FilenameNormalization.normalize("../../../../flex-tlf"); } - System.out.println("environment property - TLF_HOME = " + TLF); + logger.info("environment property - TLF_HOME = " + TLF); AIRSDK = p.getProperty(prefix + "AIR_HOME", System.getenv("AIR_HOME")); - System.out.println("environment property - AIR_HOME = " + AIRSDK); + logger.info("environment property - AIR_HOME = " + AIRSDK); FDBG = p.getProperty(prefix + "FLASHPLAYER_DEBUGGER", System.getenv("FLASHPLAYER_DEBUGGER")); - System.out.println("environment property - FLASHPLAYER_DEBUGGER = " + FDBG); + logger.info("environment property - FLASHPLAYER_DEBUGGER = " + FDBG); ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME")); - if (ASJS == null) + if (ASJS == null) { ASJS = FilenameNormalization.normalize("../../../../flex-asjs"); - System.out.println("environment property - ASJS_HOME = " + ASJS); + } + logger.info("environment property - ASJS_HOME = " + ASJS); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index 1d75ac5..6707ce5 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -50,6 +50,16 @@ <artifactId>junit</artifactId> <version>4.10</version> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.7</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.7</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-test-utils/src/main/java/org/apache/flex/utils/EnvProperties.java ---------------------------------------------------------------------- diff --git a/compiler-test-utils/src/main/java/org/apache/flex/utils/EnvProperties.java b/compiler-test-utils/src/main/java/org/apache/flex/utils/EnvProperties.java index 4bd14c4..b2dd618 100644 --- a/compiler-test-utils/src/main/java/org/apache/flex/utils/EnvProperties.java +++ b/compiler-test-utils/src/main/java/org/apache/flex/utils/EnvProperties.java @@ -19,6 +19,9 @@ package org.apache.flex.utils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -34,8 +37,10 @@ import java.util.Properties; * 3) for key FLEX_HOME & PLAYERGLOBAL_HOME sets a default value. */ public class EnvProperties { - - /** + + private static final Logger logger = LogManager.getLogger(EnvProperties.class); + + /** * FLEX_HOME */ public String SDK; @@ -94,12 +99,12 @@ public class EnvProperties { prefix = "env."; } } catch (FileNotFoundException e) { - System.out.println(envFileName + " not found"); + logger.error(envFileName + " not found"); try { File f = new File("unittest.properties"); p.load(new FileInputStream( f )); } catch (FileNotFoundException e1) { - System.out.println("unittest.properties not found"); + logger.error("unittest.properties not found"); } catch (IOException e1) { // Ignore } @@ -108,42 +113,44 @@ public class EnvProperties { } SDK = p.getProperty(prefix + "FLEX_HOME", System.getenv("FLEX_HOME")); - if(SDK == null) - { + if(SDK == null) { SDK = FilenameNormalization.normalize("../../../../flex-sdk"); File mxmlc = new File(SDK + "/lib/mxmlc.jar"); - if (!mxmlc.exists()) - SDK = FilenameNormalization.normalize("../../../compiler/lib"); + if (!mxmlc.exists()) { + SDK = FilenameNormalization.normalize("../../../compiler/lib"); + } } - System.out.println("environment property - FLEX_HOME = " + SDK); + logger.info("environment property - FLEX_HOME = " + SDK); FPSDK = p.getProperty(prefix + "PLAYERGLOBAL_HOME", System.getenv("PLAYERGLOBAL_HOME")); - if(FPSDK == null) + if(FPSDK == null) { FPSDK = FilenameNormalization.normalize("../../../frameworks/libs/player"); - System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK); + } + logger.info("environment property - PLAYERGLOBAL_HOME = " + FPSDK); FPVER = p.getProperty(prefix + "PLAYERGLOBAL_VERSION", System.getenv("PLAYERGLOBAL_VERSION")); - if (FPVER == null) - FPVER = "11.1"; - System.out.println("environment property - PLAYERGLOBAL_VERSION = " + FPVER); + if (FPVER == null) { + FPVER = "11.1"; + } + logger.info("environment property - PLAYERGLOBAL_VERSION = " + FPVER); TLF = p.getProperty(prefix + "TLF_HOME", System.getenv("TLF_HOME")); - if (TLF == null) - { + if (TLF == null) { TLF = FilenameNormalization.normalize("../../../../flex-tlf"); } - System.out.println("environment property - TLF_HOME = " + TLF); + logger.info("environment property - TLF_HOME = " + TLF); AIRSDK = p.getProperty(prefix + "AIR_HOME", System.getenv("AIR_HOME")); - System.out.println("environment property - AIR_HOME = " + AIRSDK); + logger.info("environment property - AIR_HOME = " + AIRSDK); FDBG = p.getProperty(prefix + "FLASHPLAYER_DEBUGGER", System.getenv("FLASHPLAYER_DEBUGGER")); - System.out.println("environment property - FLASHPLAYER_DEBUGGER = " + FDBG); + logger.info("environment property - FLASHPLAYER_DEBUGGER = " + FDBG); ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME")); - if (ASJS == null) + if (ASJS == null) { ASJS = FilenameNormalization.normalize("../../../../flex-asjs"); - System.out.println("environment property - ASJS_HOME = " + ASJS); + } + logger.info("environment property - ASJS_HOME = " + ASJS); } }
