reduce warnings
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/203e7697 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/203e7697 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/203e7697 Branch: refs/heads/develop Commit: 203e769754b6e85f8a3934213e434033cc4a74d9 Parents: 376b9689 Author: Alex Harui <aha...@apache.org> Authored: Wed Jul 12 16:08:35 2017 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed Jul 12 16:08:43 2017 -0700 ---------------------------------------------------------------------- .../apache/flex/compiler/clients/COMPJSC.java | 8 ---- .../flex/compiler/clients/COMPJSCFlex.java | 7 ---- .../flex/compiler/clients/COMPJSCNative.java | 5 --- .../apache/flex/compiler/clients/EXTERNC.java | 2 - .../flex/compiler/clients/FlexJSToolGroup.java | 2 - .../flex/compiler/clients/JSConfiguration.java | 3 -- .../apache/flex/compiler/clients/MXMLJSC.java | 11 ------ .../flex/compiler/clients/MXMLJSCFlex.java | 7 ---- .../compiler/clients/MXMLJSCFlexCordova.java | 7 ---- .../flex/compiler/clients/MXMLJSCNative.java | 7 ---- .../flex/compiler/clients/MXMLJSCNode.java | 7 ---- .../flex/compiler/codegen/as/IASEmitter.java | 1 - .../codegen/mxml/flexjs/IMXMLFlexJSEmitter.java | 1 - .../externals/pass/ReferenceCompiler.java | 1 - .../externals/reference/ReferenceModel.java | 2 - .../compiler/internal/codegen/js/JSEmitter.java | 5 --- .../internal/codegen/js/JSSharedData.java | 9 ----- .../compiler/internal/codegen/js/JSWriter.java | 2 - .../js/flexjs/JSFlexJSASDocDITAEmitter.java | 14 ------- .../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 5 --- .../codegen/js/flexjs/JSFlexJSDocEmitter.java | 1 - .../internal/codegen/js/goog/JSGoogEmitter.java | 2 - .../codegen/js/goog/JSGoogPublisher.java | 2 - .../internal/codegen/js/goog/JarSourceFile.java | 1 - .../codegen/js/jx/BinaryOperatorEmitter.java | 11 +++++- .../internal/codegen/js/jx/ClassEmitter.java | 2 - .../codegen/js/jx/IdentifierEmitter.java | 1 - .../codegen/js/jx/PackageFooterEmitter.java | 4 +- .../codegen/js/jx/ParameterEmitter.java | 2 - .../codegen/js/jx/SuperCallEmitter.java | 2 - .../internal/codegen/mxml/MXMLWriter.java | 1 - .../mxml/flexjs/MXMLFlexJSCordovaPublisher.java | 2 - .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 - .../mxml/flexjs/MXMLFlexJSPublisher.java | 8 ---- .../mxml/flexjs/MXMLFlexJSCordovaBackend.java | 22 ----------- .../compiler/internal/graph/GoogDepsWriter.java | 7 +--- .../internal/graph/GoogDepsWriterCordova.java | 19 ---------- .../internal/projects/FlexJSASDocProject.java | 1 - .../internal/targets/FlexJSSWCTarget.java | 1 - .../compiler/internal/targets/JSTarget.java | 2 - .../codegen/externals/ExternalsTestBase.java | 2 - .../codegen/externals/TestExternNode.java | 1 - .../codegen/externals/TestTypeExternals.java | 2 - .../codegen/js/flexjs/TestFlexJSEmitter.java | 1 - .../js/flexjs/TestFlexJSExpressions.java | 1 - .../js/flexjs/TestFlexJSGlobalClasses.java | 40 ++++++++++++++++++++ .../js/flexjs/TestFlexJSGlobalFunctions.java | 1 - .../sourcemaps/TestSourceMapMXMLScript.java | 4 -- .../internal/test/FlexJSSourceMapTestBase.java | 1 - .../flex/compiler/internal/test/TestBase.java | 9 +---- .../org/apache/flex/compiler/clients/COMPC.java | 1 - .../flex/compiler/config/ConfigurationInfo.java | 4 +- .../config/FlashBuilderConfigurator.java | 1 - .../flex/compiler/internal/css/CSSSelector.java | 1 - .../css/codegen/CSSCompilationSession.java | 1 - .../internal/parsing/as/IncludeHandler.java | 4 +- .../compiler/internal/parsing/as/OffsetCue.java | 4 +- .../internal/parsing/mxml/MXMLTokenizer.java | 1 - .../compiler/internal/projects/FlexProject.java | 3 -- .../internal/projects/SourcePathManager.java | 6 +-- .../compiler/internal/scopes/ASScopeCache.java | 3 +- .../compiler/internal/targets/SWFTarget.java | 1 - .../compiler/internal/tree/as/EmbedNode.java | 1 - .../internal/tree/as/UnaryOperatorNodeBase.java | 5 --- .../tree/mxml/MXMLClassReferenceNodeBase.java | 1 - .../internal/units/CompilationUnitBase.java | 1 - 66 files changed, 67 insertions(+), 232 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 f9fcd9c..5e5772b 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 @@ -38,23 +38,15 @@ import java.util.zip.ZipOutputStream; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.flex.compiler.clients.MXMLJSC.ExitCode; -import org.apache.flex.compiler.clients.MXMLJSC.JSTargetType; import org.apache.flex.compiler.clients.problems.ProblemPrinter; import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter; import org.apache.flex.compiler.codegen.as.IASWriter; -import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.driver.js.IJSApplication; import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.internal.codegen.js.JSWriter; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogCompcConfiguration; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSSWCBackend; -import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.targets.FlexJSSWCTarget; import org.apache.flex.compiler.internal.targets.JSTarget; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java index 3744a67..5580635 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCFlex.java @@ -29,10 +29,8 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; -import java.util.LinkedList; import java.util.List; import java.util.Set; -import java.util.TreeSet; import java.util.zip.Deflater; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -48,11 +46,7 @@ import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.internal.codegen.js.JSWriter; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSSWCBackend; -import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend; import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.projects.FlexJSProject; @@ -533,7 +527,6 @@ public class COMPJSCFlex extends MXMLJSCFlex public List<String> getSourceList() { ArrayList<String> list = new ArrayList<String>(); - LinkedList<ICompilerProblem> problemList = new LinkedList<ICompilerProblem>(); try { Collection<ICompilerProblem> errors = new ArrayList<ICompilerProblem>(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCNative.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCNative.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCNative.java index c578249..fdbb7e6 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCNative.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSCNative.java @@ -46,11 +46,6 @@ import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.internal.codegen.js.JSWriter; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; -import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSSWCBackend; import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend; import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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..a3fb2f4 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 @@ -22,8 +22,6 @@ package org.apache.flex.compiler.clients; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; -import java.util.HashSet; -import java.util.Set; import org.apache.commons.io.FileUtils; import org.apache.flex.compiler.clients.problems.ProblemFormatter; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/FlexJSToolGroup.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/FlexJSToolGroup.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/FlexJSToolGroup.java index 63f1c35..01e9445 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/FlexJSToolGroup.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/FlexJSToolGroup.java @@ -20,8 +20,6 @@ package org.apache.flex.compiler.clients; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocDITABackend; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSBackend; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSSWCBackend; import org.apache.flex.tools.AbstractFlexToolGroup; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java index 4427df4..ab1c73c 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/JSConfiguration.java @@ -25,10 +25,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.flex.compiler.clients.MXMLJSC.JSOutputType; import org.apache.flex.compiler.clients.MXMLJSC.JSTargetType; import org.apache.flex.compiler.config.Configuration; -import org.apache.flex.compiler.config.ConfigurationBuffer; import org.apache.flex.compiler.config.ConfigurationValue; import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.exceptions.ConfigurationException.CannotOpen; @@ -37,7 +35,6 @@ import org.apache.flex.compiler.internal.config.annotations.Config; import org.apache.flex.compiler.internal.config.annotations.FlexOnly; import org.apache.flex.compiler.internal.config.annotations.InfiniteArguments; import org.apache.flex.compiler.internal.config.annotations.Mapping; -import org.apache.flex.compiler.internal.config.annotations.SoftPrerequisites; import org.apache.flex.compiler.internal.mxml.MXMLNamespaceMapping; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 1c72e74..cd67a51 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 @@ -28,13 +28,11 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.TreeSet; import org.apache.commons.io.FilenameUtils; -import org.apache.flex.compiler.clients.MXMLC.ExitCode; import org.apache.flex.compiler.clients.problems.ProblemPrinter; import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.clients.problems.ProblemQueryProvider; @@ -46,20 +44,13 @@ import org.apache.flex.compiler.config.Configuration; import org.apache.flex.compiler.config.ConfigurationBuffer; import org.apache.flex.compiler.config.Configurator; import org.apache.flex.compiler.config.ICompilerSettingsConstants; -import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.driver.js.IJSApplication; import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource; import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; -import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend; -import org.apache.flex.compiler.internal.driver.js.node.NodeBackend; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSBackend; import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.projects.FlexJSProject; @@ -79,7 +70,6 @@ import org.apache.flex.compiler.targets.ITarget; 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.compiler.units.ICompilationUnit.UnitType; import org.apache.flex.swf.ISWF; import org.apache.flex.swf.SWF; import org.apache.flex.swf.types.RGB; @@ -89,7 +79,6 @@ import org.apache.flex.utils.ArgumentUtil; import org.apache.flex.utils.FilenameNormalization; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java index 76186f3..49de954 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlex.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -50,12 +49,7 @@ import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource; import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; -import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend; -import org.apache.flex.compiler.internal.driver.js.node.NodeBackend; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSBackend; import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; @@ -749,7 +743,6 @@ public class MXMLJSCFlex implements JSCompilerEntryPoint, ProblemQueryProvider, public List<String> getSourceList() { ArrayList<String> list = new ArrayList<String>(); - LinkedList<ICompilerProblem> problemList = new LinkedList<ICompilerProblem>(); try { ArrayList<ICompilationUnit> roots = new ArrayList<ICompilationUnit>(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlexCordova.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlexCordova.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlexCordova.java index fe0b16e..a6024ee 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlexCordova.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCFlexCordova.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -50,12 +49,7 @@ import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource; import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; -import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend; -import org.apache.flex.compiler.internal.driver.js.node.NodeBackend; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSCordovaBackend; import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; @@ -749,7 +743,6 @@ public class MXMLJSCFlexCordova implements JSCompilerEntryPoint, ProblemQueryPro public List<String> getSourceList() { ArrayList<String> list = new ArrayList<String>(); - LinkedList<ICompilerProblem> problemList = new LinkedList<ICompilerProblem>(); try { ArrayList<ICompilationUnit> roots = new ArrayList<ICompilationUnit>(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNative.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNative.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNative.java index 2a33277..d394f30 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNative.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNative.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -50,13 +49,8 @@ import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource; import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend; -import org.apache.flex.compiler.internal.driver.js.node.NodeBackend; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSBackend; import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.projects.FlexJSProject; @@ -744,7 +738,6 @@ public class MXMLJSCNative implements JSCompilerEntryPoint, ProblemQueryProvider public List<String> getSourceList() { ArrayList<String> list = new ArrayList<String>(); - LinkedList<ICompilerProblem> problemList = new LinkedList<ICompilerProblem>(); try { ArrayList<ICompilationUnit> roots = new ArrayList<ICompilationUnit>(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java index 6ae1999..a3717b2 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/MXMLJSCNode.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -50,13 +49,8 @@ import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource; import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator; -import org.apache.flex.compiler.internal.driver.as.ASBackend; -import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; -import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; -import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend; import org.apache.flex.compiler.internal.driver.js.node.NodeBackend; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSBackend; import org.apache.flex.compiler.internal.parsing.as.FlexJSASDocDelegate; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.projects.FlexJSProject; @@ -746,7 +740,6 @@ public class MXMLJSCNode implements JSCompilerEntryPoint, ProblemQueryProvider, public List<String> getSourceList() { ArrayList<String> list = new ArrayList<String>(); - LinkedList<ICompilerProblem> problemList = new LinkedList<ICompilerProblem>(); try { ArrayList<ICompilationUnit> roots = new ArrayList<ICompilationUnit>(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java index 3716aba..077a824 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java @@ -22,7 +22,6 @@ package org.apache.flex.compiler.codegen.as; import java.io.Writer; import org.apache.flex.compiler.codegen.IDocEmitter; -import org.apache.flex.compiler.codegen.IEmitter; import org.apache.flex.compiler.codegen.INestingEmitter; import org.apache.flex.compiler.definitions.IPackageDefinition; import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java index b023864..1a00da9 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java @@ -22,7 +22,6 @@ package org.apache.flex.compiler.codegen.mxml.flexjs; import java.io.Writer; import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter; -import org.apache.flex.compiler.tree.as.ITypeNode; import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode; import org.apache.flex.compiler.visitor.IASNodeStrategy; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java index 7a17d84..e941944 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java @@ -29,7 +29,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel; -import com.google.common.collect.ImmutableList; import com.google.javascript.jscomp.*; import com.google.javascript.jscomp.Compiler; import com.google.javascript.jscomp.CompilerOptions.LanguageMode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java index 9a4a784..1e0a6ec 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java @@ -23,13 +23,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; -import java.util.Set; import org.apache.flex.compiler.clients.ExternCConfiguration; import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember; import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils; -import org.apache.flex.compiler.problems.ICompilerProblem; import com.google.javascript.jscomp.Compiler; import com.google.javascript.jscomp.NodeUtil; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java index db31fa0..c70b98c 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java @@ -22,16 +22,13 @@ package org.apache.flex.compiler.internal.codegen.js; import java.io.FilterWriter; import java.util.ArrayList; import java.util.List; -import java.util.Stack; import org.apache.flex.compiler.codegen.IEmitter; import org.apache.flex.compiler.codegen.ISubEmitter; import org.apache.flex.compiler.codegen.js.IJSEmitter; import org.apache.flex.compiler.codegen.js.IMappingEmitter; -import org.apache.flex.compiler.common.ASModifier; import org.apache.flex.compiler.common.ISourceLocation; import org.apache.flex.compiler.definitions.IDefinition; -import org.apache.flex.compiler.definitions.ITypeDefinition; import org.apache.flex.compiler.internal.codegen.as.ASEmitter; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.jx.BlockCloseEmitter; @@ -60,7 +57,6 @@ import org.apache.flex.compiler.internal.codegen.js.jx.TryEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.UnaryOperatorEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.WhileLoopEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.WithEmitter; -import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils; import org.apache.flex.compiler.internal.tree.as.FunctionNode; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.ICatchNode; @@ -77,7 +73,6 @@ import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode; import org.apache.flex.compiler.tree.as.ILiteralContainerNode; import org.apache.flex.compiler.tree.as.INumericLiteralNode; import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode; -import org.apache.flex.compiler.tree.as.IPackageNode; import org.apache.flex.compiler.tree.as.IParameterNode; import org.apache.flex.compiler.tree.as.IReturnNode; import org.apache.flex.compiler.tree.as.ISwitchNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSharedData.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSharedData.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSharedData.java index 39b84c1..be82477 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSharedData.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSharedData.java @@ -19,15 +19,6 @@ package org.apache.flex.compiler.internal.codegen.js; -import java.io.PrintStream; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import org.apache.flex.compiler.driver.IBackend; -import org.apache.flex.compiler.internal.workspaces.Workspace; - // TODO (mschmalle) This class sucks, figure out some other way instead of using // a static singleton class like this, change when implementing Configuration public class JSSharedData http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java index 7076009..2013c66 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSWriter.java @@ -21,7 +21,6 @@ package org.apache.flex.compiler.internal.codegen.js; import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -35,7 +34,6 @@ import org.apache.flex.compiler.codegen.js.IMappingEmitter; import org.apache.flex.compiler.driver.js.IJSBackend; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.problems.ICompilerProblem; -import org.apache.flex.compiler.projects.IASProject; import org.apache.flex.compiler.units.ICompilationUnit; import org.apache.flex.compiler.visitor.as.IASBlockWalker; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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..082ec24 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; @@ -82,8 +77,6 @@ import org.apache.flex.compiler.utils.NativeUtils; public class JSFlexJSASDocDITAEmitter extends JSGoogEmitter implements IJSFlexJSEmitter, IJSFlexJSASDocEmitter { - private boolean wroteSomething = false; - @Override public String postProcess(String output) { @@ -897,13 +890,6 @@ public class JSFlexJSASDocDITAEmitter extends JSGoogEmitter implements IJSFlexJS return linkText.toString(); } - @Override - public void write(String value) - { - super.write(value); - wroteSomething = true; - } - public void writeEventTagNode(IMetaTagNode node, IClassDefinition classDef) { EventTagNode evt = (EventTagNode)node; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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..7a628f1 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,7 +63,6 @@ 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; @@ -316,7 +312,6 @@ public class JSFlexJSASDocEmitter extends JSGoogEmitter implements IJSFlexJSEmit write(formatQualifiedName(node.getQualifiedName())); write("\""); IExpressionNode bases[] = node.getExtendedInterfaceNodes(); - String baseNames[] = node.getExtendedInterfaces(); if (bases.length > 0) { writeNewline(","); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 2c49b25..0cb1309 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 @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.flex.compiler.asdoc.flexjs.ASDocComment; -import org.apache.flex.compiler.clients.MXMLJSC; import org.apache.flex.compiler.codegen.js.IJSEmitter; import org.apache.flex.compiler.common.ASModifier; import org.apache.flex.compiler.common.DependencyType; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java index 98a4015..aee174b 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java @@ -46,11 +46,9 @@ import org.apache.flex.compiler.internal.definitions.FunctionDefinition; import org.apache.flex.compiler.internal.definitions.NamespaceDefinition.INamepaceDeclarationDirective; import org.apache.flex.compiler.internal.scopes.PackageScope; import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode; -import org.apache.flex.compiler.internal.tree.as.ExpressionNodeBase; import org.apache.flex.compiler.internal.tree.as.FunctionCallNode; import org.apache.flex.compiler.internal.tree.as.FunctionNode; import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode; -import org.apache.flex.compiler.internal.tree.as.parts.VariableDecorationPart; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.scopes.IASScope; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 1afe68f..2ac3f3b 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 @@ -32,7 +32,6 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; import org.apache.commons.io.filefilter.RegexFileFilter; -import org.apache.flex.compiler.clients.MXMLJSC.JSOutputType; import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.codegen.js.IJSPublisher; import org.apache.flex.compiler.config.Configuration; @@ -304,7 +303,6 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher protected void dumpJar(File jarFile, File outputDir) throws IOException { // TODO (mschmalle) for some reason ide thinks this has not been closed - @SuppressWarnings("resource") JarFile jar = new JarFile(jarFile); for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements();) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JarSourceFile.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JarSourceFile.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JarSourceFile.java index 327df22..5155aa0 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JarSourceFile.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JarSourceFile.java @@ -22,7 +22,6 @@ package org.apache.flex.compiler.internal.codegen.js.goog; import com.google.common.io.CharSource; import com.google.javascript.jscomp.Region; import com.google.javascript.jscomp.SourceFile; -import org.apache.commons.io.IOUtils; import java.io.IOException; import java.io.Reader; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java index 4dab0ea..8b379a2 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java @@ -38,7 +38,6 @@ import org.apache.flex.compiler.internal.tree.as.FunctionCallNode; import org.apache.flex.compiler.internal.tree.as.IdentifierNode; import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode; import org.apache.flex.compiler.internal.tree.as.UnaryOperatorAtNode; -import org.apache.flex.compiler.problems.AssignToReadOnlyPropertyProblem; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IBinaryOperatorNode; @@ -544,6 +543,11 @@ public class BinaryOperatorEmitter extends JSSubEmitter implements { return functionName; } + + public String getValue() + { + return value; + } } public static enum DatePropertiesSetters @@ -577,6 +581,11 @@ public class BinaryOperatorEmitter extends JSSubEmitter implements { return functionName; } + + public String getValue() + { + return value; + } } void specialCaseDate(IBinaryOperatorNode node, MemberAccessExpressionNode leftSide) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java index 573ff54..9ee555e 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java @@ -20,7 +20,6 @@ package org.apache.flex.compiler.internal.codegen.js.jx; import org.apache.flex.compiler.asdoc.flexjs.ASDocComment; -import org.apache.flex.compiler.clients.MXMLJSC; import org.apache.flex.compiler.codegen.ISubEmitter; import org.apache.flex.compiler.codegen.js.IJSEmitter; import org.apache.flex.compiler.definitions.IClassDefinition; @@ -29,7 +28,6 @@ import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; -import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.utils.DocEmitterUtils; import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils; import org.apache.flex.compiler.internal.projects.FlexJSProject; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java index 75d8173..58bcedf 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java @@ -36,7 +36,6 @@ import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils; import org.apache.flex.compiler.internal.definitions.AccessorDefinition; import org.apache.flex.compiler.internal.definitions.FunctionDefinition; import org.apache.flex.compiler.internal.definitions.TypeDefinitionBase; -import org.apache.flex.compiler.internal.tree.as.FunctionNode; import org.apache.flex.compiler.internal.tree.as.NonResolvingIdentifierNode; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java index 65b69d1..abfb297 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java @@ -798,6 +798,7 @@ public class PackageFooterEmitter extends JSSubEmitter implements emitReflectionDataEnd(typeName); } + /* private void writeStringArray(ArrayList<String> sequence) { int l = sequence.size(); int count = 0; @@ -815,7 +816,8 @@ public class PackageFooterEmitter extends JSSubEmitter implements if (l>0) write(ASEmitterTokens.SPACE); writeToken(ASEmitterTokens.SQUARE_CLOSE); } - + */ + /*private void writeIsStatic() { writeToken(ASEmitterTokens.COMMA); write("isStatic"); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ParameterEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ParameterEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ParameterEmitter.java index e04e4ff..176feef 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ParameterEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ParameterEmitter.java @@ -21,9 +21,7 @@ package org.apache.flex.compiler.internal.codegen.js.jx; import org.apache.flex.compiler.codegen.ISubEmitter; import org.apache.flex.compiler.codegen.js.IJSEmitter; -import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter; -import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IParameterNode; public class ParameterEmitter extends JSSubEmitter implements http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java index 0637c43..ad3c6c4 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java @@ -19,8 +19,6 @@ package org.apache.flex.compiler.internal.codegen.js.jx; -import org.apache.flex.compiler.clients.MXMLJSC; -import org.apache.flex.compiler.clients.MXMLJSC.JSOutputType; import org.apache.flex.compiler.codegen.js.IJSEmitter; import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.definitions.IDefinition; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 c127e7b..d0f13dc 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 @@ -30,7 +30,6 @@ import org.apache.flex.compiler.codegen.ISourceMapEmitter; import org.apache.flex.compiler.codegen.js.IJSEmitter; import org.apache.flex.compiler.codegen.js.IMappingEmitter; import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter; -import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLFlexJSEmitter; 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; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java index 6196c44..6465c85 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java @@ -22,12 +22,10 @@ package org.apache.flex.compiler.internal.codegen.mxml.flexjs; import org.apache.commons.io.FilenameUtils; import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.config.Configuration; -import org.apache.flex.compiler.internal.codegen.js.jsc.JSCPublisher; import org.apache.flex.compiler.internal.projects.FlexJSProject; import java.io.File; import java.io.IOException; -import java.util.List; public class MXMLFlexJSCordovaPublisher extends MXMLFlexJSPublisher { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 51737bd..ab57497 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 @@ -33,7 +33,6 @@ import java.util.Set; import org.apache.flex.abc.semantics.MethodInfo; import org.apache.flex.abc.semantics.Name; import org.apache.flex.abc.semantics.Namespace; -import org.apache.flex.compiler.codegen.IEmitterTokens; import org.apache.flex.compiler.codegen.as.IASEmitter; import org.apache.flex.compiler.codegen.js.IJSEmitter; import org.apache.flex.compiler.codegen.js.IMappingEmitter; @@ -81,7 +80,6 @@ import org.apache.flex.compiler.tree.metadata.IMetaTagsNode; import org.apache.flex.compiler.tree.mxml.*; import org.apache.flex.compiler.units.ICompilationUnit; import org.apache.flex.compiler.utils.NativeUtils; -import org.apache.flex.compiler.visitor.IBlockWalker; import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker; import org.apache.flex.swc.ISWC; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 9168d4b..c0c382f 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 @@ -30,7 +30,6 @@ 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.css.ICSSPropertyValue; -import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogPublisher; import org.apache.flex.compiler.internal.codegen.js.goog.JarSourceFile; import org.apache.flex.compiler.internal.css.CSSArrayPropertyValue; @@ -253,13 +252,6 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher ///////////////////////////////////////////////////////////////////////////////// - // FIXME: Don't quite know what this does. - ///////////////////////////////////////////////////////////////////////////////// - - final File projectIntermediateMainFile = new File(intermediateDir, outputFileName); - - - ///////////////////////////////////////////////////////////////////////////////// // Prepare the closure compilation. ///////////////////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java index 841a536..e41921d 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java @@ -19,40 +19,18 @@ package org.apache.flex.compiler.internal.driver.mxml.flexjs; -import java.io.FilterWriter; import java.util.List; -import org.apache.flex.compiler.codegen.IDocEmitter; -import org.apache.flex.compiler.codegen.as.IASEmitter; -import org.apache.flex.compiler.codegen.js.IJSEmitter; -import org.apache.flex.compiler.codegen.js.IJSWriter; -import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter; import org.apache.flex.compiler.config.Configuration; import org.apache.flex.compiler.config.Configurator; import org.apache.flex.compiler.driver.IBackend; -import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; -import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter; import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker; -import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter; -import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSBlockWalker; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSCordovaPublisher; -import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSEmitter; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSPublisher; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; -import org.apache.flex.compiler.internal.driver.mxml.MXMLBackend; import org.apache.flex.compiler.internal.projects.FlexJSProject; -import org.apache.flex.compiler.internal.targets.FlexJSTarget; -import org.apache.flex.compiler.internal.targets.JSTarget; -import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch; -import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch; import org.apache.flex.compiler.problems.ICompilerProblem; -import org.apache.flex.compiler.targets.ITargetProgressMonitor; -import org.apache.flex.compiler.targets.ITargetSettings; import org.apache.flex.compiler.tree.mxml.IMXMLFileNode; -import org.apache.flex.compiler.units.ICompilationUnit; -import org.apache.flex.compiler.visitor.IBlockVisitor; -import org.apache.flex.compiler.visitor.IBlockWalker; -import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker; /** * A concrete implementation of the {@link IBackend} API where the http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 afc8d00..00682e3 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 @@ -19,7 +19,6 @@ package org.apache.flex.compiler.internal.graph; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; @@ -29,18 +28,15 @@ import java.io.PrintWriter; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; -import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Scanner; import java.util.Set; import org.apache.commons.io.FileUtils; import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.common.DependencyType; import org.apache.flex.compiler.common.DependencyTypeSet; -import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.driver.js.JSCompilationUnit; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; @@ -828,6 +824,7 @@ public class GoogDepsWriter { return ""; } + /* private ArrayList<String> getDirectDependencies(String fn) { ArrayList<String> deps = new ArrayList<String>(); @@ -880,6 +877,7 @@ public class GoogDepsWriter { } return deps; } + */ protected void otherScanning(String s) { @@ -938,7 +936,6 @@ public class GoogDepsWriter { } - @SuppressWarnings( "unused" ) private class FileInfo { public ArrayList<String> impls; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriterCordova.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriterCordova.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriterCordova.java index c053381..8ecbb0c 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriterCordova.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriterCordova.java @@ -19,30 +19,11 @@ package org.apache.flex.compiler.internal.graph; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.nio.charset.Charset; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Scanner; -import java.util.Set; -import org.apache.commons.io.FileUtils; -import org.apache.flex.compiler.clients.problems.ProblemQuery; -import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; -import org.apache.flex.compiler.problems.FileNotFoundProblem; import org.apache.flex.swc.ISWC; -import org.apache.flex.swc.ISWCFileEntry; - -import com.google.common.io.Files; public class GoogDepsWriterCordova extends GoogDepsWriter { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java index ad8b722..2853b6a 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.driver.IBackend; -import org.apache.flex.compiler.internal.driver.as.ASBackend; import org.apache.flex.compiler.internal.workspaces.Workspace; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSSWCTarget.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSSWCTarget.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSSWCTarget.java index 5e52367..39d0fe7 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSSWCTarget.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSSWCTarget.java @@ -38,7 +38,6 @@ import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.NoCompilationUnitForDefinitionProblem; import org.apache.flex.compiler.problems.NoSourceForClassInNamespaceProblem; import org.apache.flex.compiler.problems.NoSourceForClassProblem; -import org.apache.flex.compiler.projects.IASProject; import org.apache.flex.compiler.targets.IJSTarget; import org.apache.flex.compiler.targets.ITargetProgressMonitor; import org.apache.flex.compiler.targets.ITargetSettings; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/JSTarget.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/JSTarget.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/JSTarget.java index 2fcb878..a45a1a9 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/JSTarget.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/JSTarget.java @@ -28,10 +28,8 @@ import java.util.Set; import org.apache.flex.compiler.driver.js.IJSApplication; import org.apache.flex.compiler.exceptions.BuildCanceledException; import org.apache.flex.compiler.internal.driver.js.JSApplication; -import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.problems.ICompilerProblem; -import org.apache.flex.compiler.projects.IASProject; import org.apache.flex.compiler.targets.IJSTarget; import org.apache.flex.compiler.targets.ITargetProgressMonitor; import org.apache.flex.compiler.targets.ITargetReport; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestBase.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestBase.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestBase.java index fa33002..9803a52 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestBase.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestBase.java @@ -24,14 +24,12 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; -import java.util.HashSet; import org.apache.flex.compiler.clients.EXTERNC; import org.apache.flex.compiler.clients.ExternCConfiguration; import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.internal.codegen.externals.reference.MethodReference; import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel; -import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.utils.TestAdapterFactory; import org.junit.After; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java index 6563f12..6b8ad3a 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestExternNode.java @@ -32,7 +32,6 @@ import com.google.javascript.jscomp.Result; public class TestExternNode extends ExternalsTestBase { - @SuppressWarnings("unused") @Test public void test_classes() throws IOException { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java index ac01088..a317997 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java @@ -35,7 +35,6 @@ import org.junit.Test; import com.google.javascript.rhino.JSDocInfo; import com.google.javascript.rhino.JSTypeExpression; import com.google.javascript.rhino.jstype.JSType; -import com.google.javascript.rhino.jstype.NamedType; public class TestTypeExternals extends ExternalsTestBase { @@ -52,7 +51,6 @@ public class TestTypeExternals extends ExternalsTestBase assertTrue(model.hasConstant("bar")); } - @SuppressWarnings("unused") @Test public void test_types() throws IOException { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java index 9891e3a..11d9402 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java @@ -19,7 +19,6 @@ package org.apache.flex.compiler.internal.codegen.js.flexjs; -import org.apache.flex.compiler.clients.MXMLJSC; import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogEmitter; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java index 17c9940..6f8d28d 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java @@ -19,7 +19,6 @@ package org.apache.flex.compiler.internal.codegen.js.flexjs; -import org.apache.flex.compiler.clients.MXMLJSC; import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.exceptions.ConfigurationException; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java index ce5bc4a..1b3a0b1 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java @@ -963,4 +963,44 @@ public class TestFlexJSGlobalClasses extends TestGoogGlobalClasses assertOut("var /** @type {RegExp} */ a = /[^\\s+(\\w+)(?:\\s*=\\s*(\".*?\"|'.*?'|[\\w\\.]+))?/sg"); } + @Test + public void testRegExp_LiteralComplex6() + { + IVariableNode node = getVariable("var a:RegExp = /\\/$/g"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /\\/$/g"); + } + + @Test + public void testRegExp_LiteralComplex7() + { + IVariableNode node = getVariable("var a:RegExp = /.+\\//g"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /.+\\//g"); + } + + @Test + public void testRegExp_LiteralComplex8() + { + IVariableNode node = getVariable("var a:RegExp = /.+\\\\/g"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /.+\\\\/g"); + } + + @Test + public void testRegExp_LiteralComplex9() + { + IVariableNode node = getVariable("var a:RegExp = /^\\s*counter\\s*\\(\\s*ordered\\s*,\\s*/g"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /^\\s*counter\\s*\\(\\s*ordered\\s*,\\s*/g"); + } + + @Test + public void testRegExp_LiteralComplex10() + { + IVariableNode node = getVariable("var a:RegExp = /^(?:(?:https?|ftp):\\/\\/)?(?:[-\\w]+\\.)(?:[a-zA-Z\\.]{2,6})(?:[?\\/\\w\\.&=-]*)\\/?$/i"); + asBlockWalker.visitVariable(node); + assertOut("var /** @type {RegExp} */ a = /^(?:(?:https?|ftp):\\/\\/)?(?:[-\\w]+\\.)(?:[a-zA-Z\\.]{2,6})(?:[?\\/\\w\\.&=-]*)\\/?$/i"); + } + } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java index 0ed2fc4..cb31327 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java @@ -27,7 +27,6 @@ import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.tree.as.IBinaryOperatorNode; import org.apache.flex.compiler.tree.as.IFunctionCallNode; import org.apache.flex.compiler.tree.as.IVariableNode; -import org.junit.Ignore; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java index 591e6e5..d43e6cb 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java @@ -19,15 +19,11 @@ package org.apache.flex.compiler.internal.codegen.mxml.sourcemaps; import org.apache.flex.compiler.definitions.IClassDefinition; -import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; import org.apache.flex.compiler.internal.test.FlexJSSourceMapTestBase; -import org.apache.flex.compiler.internal.test.TestBase; -import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IFunctionNode; import org.apache.flex.compiler.tree.as.IVariableNode; import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode; -import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode; import org.junit.Test; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSSourceMapTestBase.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSSourceMapTestBase.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSSourceMapTestBase.java index 9be5b2a..2778820 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSSourceMapTestBase.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSSourceMapTestBase.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.flex.compiler.codegen.js.IMappingEmitter; import org.apache.flex.compiler.tree.as.IASNode; -import org.apache.flex.compiler.tree.mxml.IMXMLNode; import com.google.debugging.sourcemap.FilePosition; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/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 6a165e6..4a6904b 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 @@ -27,7 +27,6 @@ import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; -import java.io.FileFilter; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileWriter; @@ -46,14 +45,9 @@ import org.apache.flex.compiler.clients.MXMLJSC; import org.apache.flex.compiler.codegen.as.IASEmitter; import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter; import org.apache.flex.compiler.config.Configurator; -import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.driver.IBackend; -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.projects.FlexJSProject; -import org.apache.flex.compiler.internal.projects.FlexProject; import org.apache.flex.compiler.internal.projects.FlexProjectConfigurator; import org.apache.flex.compiler.internal.projects.ISourceFileHandler; import org.apache.flex.compiler.internal.targets.JSTarget; @@ -482,6 +476,7 @@ public class TestBase implements ITestBase fw.close(); } + /* private void appendLanguageAndXML(String path, String projectName) throws IOException { StringBuilder appendString = new StringBuilder(); @@ -550,7 +545,7 @@ public class TestBase implements ITestBase } } } - +*/ protected String readCode(File file) { String code = ""; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java b/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java index 0c7ac71..a83b69b 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java +++ b/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java @@ -31,7 +31,6 @@ import org.apache.flex.compiler.common.VersionInfo; import org.apache.flex.compiler.config.Configurator; import org.apache.flex.compiler.config.ICompilerSettingsConstants; import org.apache.flex.compiler.exceptions.ConfigurationException; -import org.apache.flex.compiler.internal.config.COMPCConfiguration; import org.apache.flex.compiler.internal.targets.SWFTarget; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MissingRequirementConfigurationProblem; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/config/ConfigurationInfo.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/config/ConfigurationInfo.java b/compiler/src/main/java/org/apache/flex/compiler/config/ConfigurationInfo.java index 949814d..5897699 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/config/ConfigurationInfo.java +++ b/compiler/src/main/java/org/apache/flex/compiler/config/ConfigurationInfo.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; import org.apache.flex.compiler.internal.config.annotations.DefaultArgumentValue; import com.google.common.base.Joiner; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * Meta information for each configuration options. It is created by @@ -433,7 +433,7 @@ public class ConfigurationInfo @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("alias", arrayAsString(getAliases())) .add("argcount", getArgCount()) .add("argnames", arrayAsString(argnames)) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java b/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java index 23c7a45..c2c26fa 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java @@ -148,7 +148,6 @@ public class FlashBuilderConfigurator private static class ActionScriptPropertiesReader { public String applicationPath; - public String additionalCompilerArguments; public void read(ArrayList<String> fbArgs, String fbFolder, boolean isDebug, String suffix, String sdkdir) throws ConfigurationException { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/css/CSSSelector.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/css/CSSSelector.java b/compiler/src/main/java/org/apache/flex/compiler/internal/css/CSSSelector.java index 0b0258d..405eeac 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/css/CSSSelector.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/css/CSSSelector.java @@ -30,7 +30,6 @@ import org.apache.flex.compiler.css.ConditionType; import org.apache.flex.compiler.css.ICSSCombinator; import org.apache.flex.compiler.css.ICSSSelector; import org.apache.flex.compiler.css.ICSSSelectorCondition; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java b/compiler/src/main/java/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java index 347163f..2a33464 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java @@ -54,7 +54,6 @@ import org.apache.flex.compiler.internal.units.EmbedCompilationUnit; import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.projects.IFlexProject; import com.google.common.base.Function; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/IncludeHandler.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/IncludeHandler.java b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/IncludeHandler.java index 0983a12..6e23f08 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/IncludeHandler.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/IncludeHandler.java @@ -36,7 +36,7 @@ import org.apache.flex.compiler.projects.IASProject; import org.apache.flex.compiler.units.ICompilationUnit; import org.apache.flex.utils.FilenameNormalization; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -82,7 +82,7 @@ public class IncludeHandler @Override public String toString() { - return Objects + return MoreObjects .toStringHelper(this) .add("end", tokenEnd) .add("file", new File(filename).getName())
