http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/OffsetCue.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/OffsetCue.java b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/OffsetCue.java index f41dff5..e72328e 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/OffsetCue.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/OffsetCue.java @@ -19,7 +19,7 @@ package org.apache.flex.compiler.internal.parsing.as; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * <h3>Background</h3> Imagine an ActionScript source as a character stream @@ -116,7 +116,7 @@ public class OffsetCue @Override public String toString() { - return Objects + return MoreObjects .toStringHelper(this) .add("absolute", absolute) .add("adjustment", adjustment)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java index c476566..41900e9 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java @@ -40,7 +40,6 @@ import org.apache.flex.compiler.parsing.MXMLTokenTypes; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.InternalCompilerProblem2; import org.apache.flex.compiler.problems.MXMLUnclosedTagProblem; -import org.apache.flex.compiler.problems.UnexpectedTokenProblem; import org.apache.flex.utils.NonLockingStringReader; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java index 94d1f30..61570ba 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/FlexProject.java @@ -23,7 +23,6 @@ import static com.google.common.collect.Lists.transform; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -71,8 +70,6 @@ import org.apache.flex.compiler.internal.definitions.ClassDefinition; import org.apache.flex.compiler.internal.definitions.FunctionDefinition; import org.apache.flex.compiler.internal.definitions.NamespaceDefinition; import org.apache.flex.compiler.internal.definitions.PackageDefinition; -import org.apache.flex.compiler.internal.definitions.metadata.MetaTag; -import org.apache.flex.compiler.internal.definitions.metadata.MetaTagAttribute; import org.apache.flex.compiler.internal.mxml.MXMLDialect; import org.apache.flex.compiler.internal.mxml.MXMLManifestManager; import org.apache.flex.compiler.internal.mxml.MXMLNamespaceMapping; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/projects/SourcePathManager.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/SourcePathManager.java b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/SourcePathManager.java index f0b3fdd..41eba79 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/projects/SourcePathManager.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/projects/SourcePathManager.java @@ -48,7 +48,7 @@ import org.apache.flex.utils.FilenameNormalization; import com.google.common.base.Function; import com.google.common.base.Joiner; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; @@ -212,7 +212,7 @@ public final class SourcePathManager // if the source path already exists, no need to re-add files which // already exist Set<QNameFile> existingEntriesForSourcePath = - Objects.<Set<QNameFile>> firstNonNull(sourcePaths.get(directoryId), Collections.<QNameFile> emptySet()); + MoreObjects.<Set<QNameFile>> firstNonNull(sourcePaths.get(directoryId), Collections.<QNameFile> emptySet()); // Any qname file that is in filesInPath, but not in existingEntriesForSourcePath // is a new qname file that we need to create a compilation unit for. @@ -229,7 +229,7 @@ public final class SourcePathManager for (Map.Entry<DirectoryID, HashSet<QNameFile>> e : sourcePaths.entrySet()) { Set<QNameFile> newSourcePathFiles = - Objects.<Set<QNameFile>>firstNonNull(newSourcePaths.get(e.getKey()), Collections.<QNameFile>emptySet()); + MoreObjects.<Set<QNameFile>>firstNonNull(newSourcePaths.get(e.getKey()), Collections.<QNameFile>emptySet()); Set<QNameFile> filesToRemove = Sets.difference(e.getValue(), newSourcePathFiles); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScopeCache.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScopeCache.java b/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScopeCache.java index 9396dea..eedfb40 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScopeCache.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/scopes/ASScopeCache.java @@ -33,7 +33,6 @@ import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.projects.ICompilerProject; import com.google.common.collect.MapMaker; -import com.google.common.collect.Sets; import java.lang.ref.SoftReference; import java.util.Collections; @@ -466,7 +465,7 @@ public class ASScopeCache set = builtinTypeDependencyCache != null ? builtinTypeDependencyCache.get() : null; if (set == null) { - set = Sets.newSetFromMap(mapMaker.<IASLanguageConstants.BuiltinType, Boolean> makeMap()); + set = Collections.newSetFromMap(mapMaker.<IASLanguageConstants.BuiltinType, Boolean> makeMap()); builtinTypeDependencyCache = new SoftReference<Set<IASLanguageConstants.BuiltinType>>(set); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java b/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java index 144ba5f..1044686 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/targets/SWFTarget.java @@ -49,7 +49,6 @@ import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.definitions.references.IResolvedQualifiersReference; import org.apache.flex.compiler.definitions.references.ReferenceFactory; import org.apache.flex.compiler.exceptions.BuildCanceledException; -import org.apache.flex.compiler.internal.caches.SWFCache; import org.apache.flex.compiler.internal.definitions.ClassDefinition; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.projects.FlexProject; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/EmbedNode.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/EmbedNode.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/EmbedNode.java index 14b67c7..8110308 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/EmbedNode.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/EmbedNode.java @@ -26,7 +26,6 @@ import java.util.Collection; import org.apache.commons.io.FileUtils; import org.apache.flex.compiler.common.IEmbedResolver; -import org.apache.flex.compiler.common.ISourceLocation; import org.apache.flex.compiler.definitions.ITypeDefinition; import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute; import org.apache.flex.compiler.internal.embedding.EmbedAttribute; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/UnaryOperatorNodeBase.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/UnaryOperatorNodeBase.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/UnaryOperatorNodeBase.java index 1a0469b..bdf3527 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/UnaryOperatorNodeBase.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/as/UnaryOperatorNodeBase.java @@ -36,11 +36,6 @@ import org.apache.flex.compiler.tree.as.IUnaryOperatorNode; public abstract class UnaryOperatorNodeBase extends OperatorNodeBase implements IUnaryOperatorNode { /** - * Length of post-fix operators: {@code ++} and {@code --}. - */ - private static final int POSTFIX_OPERATOR_LENGTH = 2; - - /** * Factory method for various kinds of unary prefix operator nodes. */ public static UnaryOperatorNodeBase createPrefix(IASToken operatorToken, ExpressionNodeBase operand) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java index 0de95b3..5e07812 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java @@ -35,7 +35,6 @@ import org.apache.flex.compiler.definitions.IStyleDefinition; import org.apache.flex.compiler.definitions.IVariableDefinition; import org.apache.flex.compiler.internal.definitions.ClassDefinition; import org.apache.flex.compiler.internal.mxml.MXMLDialect; -import org.apache.flex.compiler.internal.mxml.MXMLTagData; import org.apache.flex.compiler.internal.projects.FlexProject; import org.apache.flex.compiler.internal.scopes.ASProjectScope; import org.apache.flex.compiler.internal.tree.as.NodeBase; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/203e7697/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java b/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java index 0ae3bc0..fcd0e8d 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/units/CompilationUnitBase.java @@ -68,7 +68,6 @@ import org.apache.flex.compiler.internal.units.requests.RequestMaker; import org.apache.flex.compiler.internal.units.requests.SyntaxTreeRequestResult; import org.apache.flex.compiler.mxml.IXMLNameResolver; import org.apache.flex.compiler.problems.ICompilerProblem; -import org.apache.flex.compiler.problems.InternalCompilerProblem; import org.apache.flex.compiler.problems.InternalCompilerProblem2; import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.projects.IFlexProject;
