Repository: flex-falcon Updated Branches: refs/heads/develop 8e7955930 -> 38ca9c957
clean up most 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/bb4cbcf1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bb4cbcf1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bb4cbcf1 Branch: refs/heads/develop Commit: bb4cbcf168aa216b3e10de46d701aaa7a9545d29 Parents: 8e79559 Author: Alex Harui <aha...@apache.org> Authored: Wed Oct 12 12:39:48 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed Oct 12 12:39:48 2016 -0700 ---------------------------------------------------------------------- .../apache/flex/compiler/clients/ASDOCJSC.java | 13 -- .../apache/flex/compiler/clients/COMPJSC.java | 2 - .../internal/codegen/js/JSSessionModel.java | 1 - .../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 63 ------ .../internal/codegen/js/jx/AccessorEmitter.java | 2 - .../codegen/js/jx/BinaryOperatorEmitter.java | 2 - .../internal/codegen/js/jx/FieldEmitter.java | 14 -- .../codegen/js/jx/IdentifierEmitter.java | 4 - .../codegen/js/jx/MemberAccessEmitter.java | 3 - .../codegen/js/jx/SuperCallEmitter.java | 2 - .../mxml/flexjs/MXMLFlexJSASDocEmitter.java | 210 ------------------- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 6 +- .../driver/js/goog/ASDocConfiguration.java | 2 - .../driver/mxml/ASDocASSourceFileHandler.java | 1 - .../mxml/flexjs/MXMLFlexJSASDocBackend.java | 5 - .../internal/projects/FlexJSProject.java | 1 - .../flex/compiler/internal/scopes/ASScope.java | 2 - .../compiler/internal/tree/as/ImportNode.java | 1 - .../src/test/java/as/ASInheritanceTests.java | 1 - 19 files changed, 2 insertions(+), 333 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/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 5bab139..db232fa 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 @@ -24,19 +24,11 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; -import java.util.Enumeration; import java.util.List; import java.util.Set; -import java.util.zip.Deflater; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipOutputStream; - import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; import org.apache.flex.compiler.codegen.as.IASWriter; import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.driver.js.IJSApplication; @@ -49,22 +41,17 @@ import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration; import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocBackend; -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.driver.mxml.vf2js.MXMLVF2JSSWCBackend; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.targets.FlexJSSWCTarget; import org.apache.flex.compiler.internal.targets.JSTarget; -import org.apache.flex.compiler.problems.FileNotFoundProblem; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.InternalCompilerProblem; -import org.apache.flex.compiler.problems.LibraryNotFoundProblem; 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.flex.swc.ISWC; -import org.apache.flex.swc.io.SWCReader; /** * @author Erik de Bruin http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/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 697954f..97ba7c2 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 @@ -53,7 +53,6 @@ import org.apache.flex.compiler.internal.driver.mxml.vf2js.MXMLVF2JSSWCBackend; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.targets.FlexJSSWCTarget; import org.apache.flex.compiler.internal.targets.JSTarget; -import org.apache.flex.compiler.problems.FileNotFoundProblem; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.InternalCompilerProblem; import org.apache.flex.compiler.problems.LibraryNotFoundProblem; @@ -61,7 +60,6 @@ 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.flex.swc.ISWC; import org.apache.flex.swc.io.SWCReader; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java index 7238c3d..3964802 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java @@ -31,7 +31,6 @@ import org.apache.flex.compiler.tree.as.IGetterNode; 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.tree.metadata.IMetaTagsNode; /** * @author Michael Schmalle http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/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 1fffbc1..e1b658f 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 @@ -28,91 +28,28 @@ import java.util.Set; import org.apache.flex.compiler.asdoc.IASDocTag; import org.apache.flex.compiler.asdoc.flexjs.ASDocComment; import org.apache.flex.compiler.codegen.js.flexjs.IJSFlexJSEmitter; -import org.apache.flex.compiler.codegen.js.goog.IJSGoogDocEmitter; -import org.apache.flex.compiler.constants.IASKeywordConstants; import org.apache.flex.compiler.constants.IASLanguageConstants; -import org.apache.flex.compiler.constants.INamespaceConstants; import org.apache.flex.compiler.definitions.IAccessorDefinition; -import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.definitions.IDefinition; -import org.apache.flex.compiler.definitions.INamespaceDefinition; import org.apache.flex.compiler.definitions.IPackageDefinition; -import org.apache.flex.compiler.definitions.ITypeDefinition; 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.as.ASEmitterTokens; -import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter; -import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; -import org.apache.flex.compiler.internal.codegen.js.jx.AccessorEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.AsIsEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.BinaryOperatorEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.BindableEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.ClassEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.DefinePropertyFunctionEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.FieldEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.ForEachEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.FunctionCallEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.IdentifierEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.InterfaceEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.LiteralEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.MemberAccessEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.MethodEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.ObjectDefinePropertyEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.PackageFooterEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.PackageHeaderEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.SelfReferenceEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.SuperCallEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.VarDeclarationEmitter; -import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSASDocEmitter; -import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSEmitter; -import org.apache.flex.compiler.internal.definitions.AccessorDefinition; -import org.apache.flex.compiler.internal.definitions.FunctionDefinition; -import org.apache.flex.compiler.internal.definitions.GetterDefinition; -import org.apache.flex.compiler.internal.projects.FlexJSProject; -import org.apache.flex.compiler.internal.projects.FlexProject; -import org.apache.flex.compiler.internal.tree.as.BinaryOperatorAsNode; -import org.apache.flex.compiler.internal.tree.as.BlockNode; -import org.apache.flex.compiler.internal.tree.as.DynamicAccessNode; -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.IdentifierNode; -import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode; -import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode; -import org.apache.flex.compiler.internal.tree.as.NumericLiteralNode; import org.apache.flex.compiler.internal.tree.as.metadata.EventTagNode; -import org.apache.flex.compiler.projects.ICompilerProject; -import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IAccessorNode; -import org.apache.flex.compiler.tree.as.IBinaryOperatorNode; import org.apache.flex.compiler.tree.as.IClassNode; -import org.apache.flex.compiler.tree.as.IContainerNode; import org.apache.flex.compiler.tree.as.IDefinitionNode; -import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IFileNode; -import org.apache.flex.compiler.tree.as.IForLoopNode; -import org.apache.flex.compiler.tree.as.IFunctionCallNode; import org.apache.flex.compiler.tree.as.IFunctionNode; -import org.apache.flex.compiler.tree.as.IFunctionObjectNode; import org.apache.flex.compiler.tree.as.IGetterNode; -import org.apache.flex.compiler.tree.as.IIdentifierNode; import org.apache.flex.compiler.tree.as.IInterfaceNode; -import org.apache.flex.compiler.tree.as.ILiteralNode; -import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode; -import org.apache.flex.compiler.tree.as.INamespaceDecorationNode; import org.apache.flex.compiler.tree.as.INamespaceNode; import org.apache.flex.compiler.tree.as.IPackageNode; -import org.apache.flex.compiler.tree.as.IScopedNode; import org.apache.flex.compiler.tree.as.ISetterNode; -import org.apache.flex.compiler.tree.as.IUnaryOperatorNode; import org.apache.flex.compiler.tree.as.IVariableNode; import org.apache.flex.compiler.tree.metadata.IMetaTagNode; -import org.apache.flex.compiler.utils.ASNodeUtils; - -import com.google.common.base.Joiner; import org.apache.flex.compiler.utils.NativeUtils; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AccessorEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AccessorEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AccessorEmitter.java index 0b82abb..abba383 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AccessorEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/AccessorEmitter.java @@ -33,7 +33,6 @@ import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.definitions.INamespaceDefinition; import org.apache.flex.compiler.definitions.ITypeDefinition; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; -import org.apache.flex.compiler.internal.codegen.js.JSDocEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.PropertyNodes; import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter; @@ -41,7 +40,6 @@ 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.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; -import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.semantics.SemanticUtils; import org.apache.flex.compiler.internal.tree.as.FunctionNode; import org.apache.flex.compiler.internal.tree.as.SetterNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/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 141949b..0e237d2 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 @@ -32,13 +32,11 @@ import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; 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.definitions.AccessorDefinition; -import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.tree.as.DynamicAccessNode; 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.projects.ICompilerProject; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IBinaryOperatorNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java index 8892220..c330c56 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java @@ -26,19 +26,12 @@ import org.apache.flex.compiler.common.ASModifier; import org.apache.flex.compiler.common.ModifiersSet; import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.definitions.IVariableDefinition; -import org.apache.flex.compiler.internal.codegen.Emitter; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo; import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter; import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils; -import org.apache.flex.compiler.internal.definitions.VariableDefinition; import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode; -import org.apache.flex.compiler.internal.tree.as.GetterNode; -import org.apache.flex.compiler.internal.tree.as.SetterNode; -import org.apache.flex.compiler.internal.tree.as.VariableNode; -import org.apache.flex.compiler.internal.tree.as.parts.FunctionContentsPart; -import org.apache.flex.compiler.parsing.IASToken; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IExpressionNode; @@ -178,13 +171,6 @@ public class FieldEmitter extends JSSubEmitter implements { IDefinition definition = EmitterUtils.getClassDefinition(node); - IDefinition def = null; - IExpressionNode enode = node.getVariableTypeNode();//getAssignedValueNode(); - if (enode != null) - { - def = enode.resolveType(getProject()); - } - IDefinition ndef = node.getDefinition(); String className = null; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/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 0b27b39..7573db4 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,11 +36,7 @@ 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.scopes.CatchScope; -import org.apache.flex.compiler.internal.scopes.FunctionScope; -import org.apache.flex.compiler.internal.scopes.TypeScope; import org.apache.flex.compiler.internal.tree.as.NonResolvingIdentifierNode; -import org.apache.flex.compiler.scopes.IASScope; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IFunctionObjectNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/MemberAccessEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/MemberAccessEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/MemberAccessEmitter.java index 14ea245..a54dfac 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/MemberAccessEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/MemberAccessEmitter.java @@ -30,16 +30,13 @@ 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.definitions.AccessorDefinition; import org.apache.flex.compiler.internal.definitions.FunctionDefinition; -import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.tree.as.FunctionCallNode; import org.apache.flex.compiler.internal.tree.as.GetterNode; 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.NamespaceAccessExpressionNode; -import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; -import org.apache.flex.compiler.tree.as.IClassNode; import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IIdentifierNode; import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/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 0dc766d..12dc411 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 @@ -33,12 +33,10 @@ 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.codegen.js.utils.EmitterUtils; import org.apache.flex.compiler.internal.definitions.FunctionDefinition; -import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.tree.as.BinaryOperatorAssignmentNode; 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.projects.ICompilerProject; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IClassNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java index 26b3f2a..1a91e6e 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java @@ -20,68 +20,33 @@ package org.apache.flex.compiler.internal.codegen.mxml.flexjs; -import java.io.File; import java.io.FilterWriter; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; 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.IASGlobalFunctionConstants; import org.apache.flex.compiler.codegen.as.IASEmitter; import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLFlexJSEmitter; -import org.apache.flex.compiler.common.ASModifier; -import org.apache.flex.compiler.constants.IASKeywordConstants; -import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.definitions.IDefinition; -import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.databinding.BindingDatabase; import org.apache.flex.compiler.internal.codegen.databinding.BindingInfo; -import org.apache.flex.compiler.internal.codegen.databinding.FunctionWatcherInfo; -import org.apache.flex.compiler.internal.codegen.databinding.PropertyWatcherInfo; -import org.apache.flex.compiler.internal.codegen.databinding.StaticPropertyWatcherInfo; -import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase; -import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType; -import org.apache.flex.compiler.internal.codegen.databinding.XMLWatcherInfo; -import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.PropertyNodes; -import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSASDocEmitter; 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.codegen.js.jx.BindableEmitter; -import org.apache.flex.compiler.internal.codegen.js.jx.PackageFooterEmitter; import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils; import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter; -import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.projects.FlexProject; -import org.apache.flex.compiler.internal.scopes.ASProjectScope; -import org.apache.flex.compiler.internal.targets.ITargetAttributes; -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.mxml.MXMLDocumentNode; -import org.apache.flex.compiler.internal.tree.mxml.MXMLFileNode; -import org.apache.flex.compiler.mxml.IMXMLLanguageConstants; import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.*; -import org.apache.flex.compiler.tree.metadata.IMetaTagNode; -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.mxml.IMXMLBlockWalker; -import org.apache.flex.swc.ISWC; - -import com.google.common.base.Joiner; /** * @author Erik de Bruin @@ -100,13 +65,11 @@ public class MXMLFlexJSASDocEmitter extends MXMLEmitter implements // all instances in the current document or subdocument private ArrayList<MXMLDescriptorSpecifier> instances; // all instances in the document AND its subdocuments - private ArrayList<MXMLDescriptorSpecifier> allInstances = new ArrayList<MXMLDescriptorSpecifier>(); private ArrayList<MXMLScriptSpecifier> scripts; //private ArrayList<MXMLStyleSpecifier> styles; private IClassDefinition classDefinition; private IClassDefinition documentDefinition; private ArrayList<String> usedNames = new ArrayList<String>(); - private ArrayList<IMXMLMetadataNode> metadataNodes = new ArrayList<IMXMLMetadataNode>(); private int eventCounter; private int idCounter; @@ -118,7 +81,6 @@ public class MXMLFlexJSASDocEmitter extends MXMLEmitter implements private StringBuilder subDocuments = new StringBuilder(); private ArrayList<String> subDocumentNames = new ArrayList<String>(); - private String interfaceList; /** * This keeps track of the entries in our temporary array of @@ -212,7 +174,6 @@ public class MXMLFlexJSASDocEmitter extends MXMLEmitter implements public void emitSubDocument(IMXMLComponentNode node) { // visit MXML - IClassDefinition oldClassDef = classDefinition; IClassDefinition cdef = node.getContainedClassDefinition(); classDefinition = cdef; IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker()) @@ -989,14 +950,6 @@ public class MXMLFlexJSASDocEmitter extends MXMLEmitter implements @Override public void emitScript(IMXMLScriptNode node) { - IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker()) - .getASEmitter(); - - String nl = ASEmitterTokens.NEW_LINE.getToken(); - - StringBuilder sb = null; - MXMLScriptSpecifier scriptSpecifier = null; - int len = node.getChildCount(); if (len > 0) { @@ -1163,167 +1116,6 @@ public class MXMLFlexJSASDocEmitter extends MXMLEmitter implements // JS output //-------------------------------------------------------------------------- - private void emitHeader(IMXMLDocumentNode node) - { - String cname = node.getFileNode().getName(); - String bcname = node.getBaseClassName(); - - FlexJSProject project = (FlexJSProject) getMXMLWalker().getProject(); - List<File> sourcePaths = project.getSourcePath(); - String sourceName = node.getSourcePath(); - for (File sourcePath : sourcePaths) - { - if (sourceName.startsWith(sourcePath.getAbsolutePath())) - { - sourceName = sourceName.substring(sourcePath.getAbsolutePath().length() + 1); - } - } - writeNewline("/**"); - writeNewline(" * Generated by Apache Flex Cross-Compiler from " + sourceName); - writeNewline(" * " + cname); - writeNewline(" *"); - writeNewline(" * @fileoverview"); - writeNewline(" *"); - writeNewline(" * @suppress {checkTypes|accessControls}"); - writeNewline(" */"); - writeNewline(); - - ArrayList<String> writtenInstances = new ArrayList<String>(); - emitHeaderLine(cname, true); // provide - for (String subDocumentName : subDocumentNames) - { - emitHeaderLine(subDocumentName, true); - writtenInstances.add(formatQualifiedName(subDocumentName)); - } - writeNewline(); - emitHeaderLine(bcname); - writtenInstances.add(formatQualifiedName(cname)); // make sure we don't add ourselves - writtenInstances.add(formatQualifiedName(bcname)); // make sure we don't add the baseclass twice - allInstances.addAll(0, instances); - for (MXMLDescriptorSpecifier instance : allInstances) - { - String name = instance.name; - if (writtenInstances.indexOf(name) == -1) - { - emitHeaderLine(name); - writtenInstances.add(name); - } - } - ASProjectScope projectScope = (ASProjectScope) project.getScope(); - IDefinition cdef = node.getDefinition(); - ICompilationUnit cu = projectScope - .getCompilationUnitForDefinition(cdef); - ArrayList<String> deps = project.getRequires(cu); - - // TODO (mschmalle) will remove this cast as more things get abstracted - JSFlexJSASDocEmitter fjs = (JSFlexJSASDocEmitter) ((IMXMLBlockWalker) getMXMLWalker()) - .getASEmitter(); - if (fjs.getModel().hasStaticBindableVars()) { - //we need to add EventDispatcher - if (deps.indexOf(BindableEmitter.DISPATCHER_CLASS_QNAME) == -1) - deps.add(BindableEmitter.DISPATCHER_CLASS_QNAME); - if (usedNames.indexOf(BindableEmitter.DISPATCHER_CLASS_QNAME) == -1) - usedNames.add(BindableEmitter.DISPATCHER_CLASS_QNAME); - } - - if (interfaceList != null) - { - String[] interfaces = interfaceList.split(", "); - for (String iface : interfaces) - { - deps.add(iface); - usedNames.add(iface); - } - } - if (deps != null) - { - Collections.sort(deps); - for (String imp : deps) - { - if (imp.indexOf(JSGoogEmitterTokens.AS3.getToken()) != -1) - continue; - - if (imp.equals(cname)) - continue; - - if (imp.equals("mx.binding.Binding")) - continue; - if (imp.equals("mx.binding.BindingManager")) - continue; - if (imp.equals("mx.binding.FunctionReturnWatcher")) - continue; - if (imp.equals("mx.binding.PropertyWatcher")) - continue; - if (imp.equals("mx.binding.StaticPropertyWatcher")) - continue; - if (imp.equals("mx.binding.XMLWatcher")) - continue; - if (imp.equals("mx.events.PropertyChangeEvent")) - continue; - if (imp.equals("mx.events.PropertyChangeEventKind")) - continue; - if (imp.equals("mx.core.DeferredInstanceFromFunction")) - continue; - - if (NativeUtils.isNative(imp)) - continue; - - String formatted = formatQualifiedName(imp, false); - if (writtenInstances.indexOf(formatted) == -1) - { - emitHeaderLine(imp); - writtenInstances.add(formatted); - } - } - } - - // erikdebruin: Add missing language feature support, like the 'is' and - // 'as' operators. We don't need to worry about requiring - // this in every project: ADVANCED_OPTIMISATIONS will NOT - // include any of the code if it is not used in the project. - if (project.mainCU != null && - cu.getName().equals(project.mainCU.getName())) - { - if (project instanceof FlexJSProject) - { - if (((FlexJSProject)project).needLanguage) - emitHeaderLine(JSFlexJSEmitterTokens.LANGUAGE_QNAME.getToken()); - } - } - - writeNewline(); - writeNewline(); - } - - private void emitHeaderLine(String qname) - { - emitHeaderLine(qname, false); - } - - private void emitHeaderLine(String qname, boolean isProvide) - { - write((isProvide) ? JSGoogEmitterTokens.GOOG_PROVIDE - : JSGoogEmitterTokens.GOOG_REQUIRE); - write(ASEmitterTokens.PAREN_OPEN); - write(ASEmitterTokens.SINGLE_QUOTE); - write(formatQualifiedName(qname, false)); - write(ASEmitterTokens.SINGLE_QUOTE); - write(ASEmitterTokens.PAREN_CLOSE); - writeNewline(ASEmitterTokens.SEMICOLON); - } - - private String createRequireLine(String qname, boolean isProvide) { - StringBuilder createHeader = new StringBuilder(); - createHeader.append(isProvide ? JSGoogEmitterTokens.GOOG_PROVIDE.getToken() : JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); - createHeader.append(ASEmitterTokens.PAREN_OPEN.getToken()); - createHeader.append(ASEmitterTokens.SINGLE_QUOTE.getToken()); - createHeader.append(qname); - createHeader.append(ASEmitterTokens.SINGLE_QUOTE.getToken()); - createHeader.append(ASEmitterTokens.PAREN_CLOSE.getToken()); - createHeader.append(ASEmitterTokens.SEMICOLON.getToken()); - return createHeader.toString(); - } - //-------------------------------------------------------------------------- // Utils //-------------------------------------------------------------------------- @@ -1471,8 +1263,6 @@ public class MXMLFlexJSASDocEmitter extends MXMLEmitter implements list.append(iface.getName()); needsComma = true; } - //System.out.println("mxml implements "+list); - interfaceList = list.toString(); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/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 b128388..1f30509 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.IASGlobalFunctionConstants; import org.apache.flex.compiler.codegen.as.IASEmitter; import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLFlexJSEmitter; import org.apache.flex.compiler.common.ASModifier; @@ -41,7 +40,6 @@ import org.apache.flex.compiler.constants.IASKeywordConstants; import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.definitions.IDefinition; -import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.databinding.BindingDatabase; import org.apache.flex.compiler.internal.codegen.databinding.BindingInfo; @@ -745,10 +743,10 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements if (tags.length > 0) { data.metaData = tags; + /* accessors don't need exportProp since they are referenced via the defineProp data structure for (IMetaTagNode tag : tags) { String tagName = tag.getTagName(); - /* accessors don't need exportProp since they are referenced via the defineProp data structure if (exportMetadata.contains(tagName)) { if (data.isStatic) @@ -756,8 +754,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements else exportProperties.add(data.name); } - */ } + */ } } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java index 8291c08..f1b3cca 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/js/goog/ASDocConfiguration.java @@ -22,7 +22,6 @@ package org.apache.flex.compiler.internal.driver.js.goog; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -30,7 +29,6 @@ import org.apache.flex.compiler.config.Configuration; import org.apache.flex.compiler.config.ConfigurationInfo; import org.apache.flex.compiler.config.ConfigurationValue; import org.apache.flex.compiler.exceptions.ConfigurationException; -import org.apache.flex.compiler.internal.config.COMPCConfiguration; /** * A Configuration to override some behaviors of the default configuration. http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java index f49d4b5..90f754e 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java @@ -25,7 +25,6 @@ import org.apache.flex.compiler.internal.projects.DefinitionPriority; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.projects.ISourceFileHandler; import org.apache.flex.compiler.internal.units.ASCompilationUnit; -import org.apache.flex.compiler.internal.units.MXMLCompilationUnit; import org.apache.flex.compiler.units.ICompilationUnit; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java index 44e5c4e..388972f 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java @@ -30,18 +30,13 @@ import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter; import org.apache.flex.compiler.config.Configurator; import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSASDocEmitter; -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.MXMLFlexJSASDocEmitter; import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSBlockWalker; -import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSEmitter; import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration; -import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.flex.compiler.internal.driver.mxml.ASDocASSourceFileHandler; -import org.apache.flex.compiler.internal.driver.mxml.MXMLBackend; -import org.apache.flex.compiler.internal.driver.mxml.MXMLSourceFileHandler; import org.apache.flex.compiler.internal.projects.ISourceFileHandler; 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/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java index 3f51e28..ee91aaf 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java @@ -39,7 +39,6 @@ import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration; import org.apache.flex.compiler.internal.scopes.ASProjectScope.DefinitionPromise; import org.apache.flex.compiler.internal.targets.ITargetAttributes; import org.apache.flex.compiler.internal.targets.LinkageChecker; -import org.apache.flex.compiler.internal.tree.as.FileNode; import org.apache.flex.compiler.internal.tree.mxml.MXMLDocumentNode; import org.apache.flex.compiler.internal.tree.mxml.MXMLFileNode; import org.apache.flex.compiler.internal.units.SWCCompilationUnit; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScope.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScope.java b/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScope.java index 904c547..1742d73 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScope.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScope.java @@ -48,10 +48,8 @@ import org.apache.flex.compiler.internal.definitions.InterfaceDefinition; import org.apache.flex.compiler.internal.definitions.NamespaceDefinition; import org.apache.flex.compiler.internal.definitions.ScopedDefinitionBase; import org.apache.flex.compiler.internal.projects.CompilerProject; -import org.apache.flex.compiler.internal.tree.as.FileNode; import org.apache.flex.compiler.internal.tree.as.ScopedBlockNode; import org.apache.flex.compiler.internal.workspaces.Workspace; -import org.apache.flex.compiler.problems.DuplicateImportAliasProblem; import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.scopes.IDefinitionSet; import org.apache.flex.compiler.tree.as.IScopedNode; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ImportNode.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ImportNode.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ImportNode.java index 709e54a..38adf23 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ImportNode.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/ImportNode.java @@ -36,7 +36,6 @@ import org.apache.flex.compiler.internal.semantics.PostProcessStep; import org.apache.flex.compiler.parsing.IASToken; import org.apache.flex.compiler.problems.DuplicateImportAliasProblem; import org.apache.flex.compiler.problems.ICompilerProblem; -import org.apache.flex.compiler.problems.UnknownImportProblem; import org.apache.flex.compiler.projects.ICompilerProject; 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/bb4cbcf1/compiler/src/test/java/as/ASInheritanceTests.java ---------------------------------------------------------------------- diff --git a/compiler/src/test/java/as/ASInheritanceTests.java b/compiler/src/test/java/as/ASInheritanceTests.java index b9be5cf..4d1d393 100644 --- a/compiler/src/test/java/as/ASInheritanceTests.java +++ b/compiler/src/test/java/as/ASInheritanceTests.java @@ -19,7 +19,6 @@ package as; -import org.apache.flex.utils.StringUtils; import org.junit.Test; /**
