Repository: flex-falcon Updated Branches: refs/heads/maven fb8462aea -> a7a21def1 (forced update)
clean up dead code, unused imports, etc caused by stripping out stuff it appears we don't need Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/83236614 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/83236614 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/83236614 Branch: refs/heads/maven Commit: 83236614e5ec4e8b1a51635d6af8d2bd36379f5a Parents: aa8685a Author: Alex Harui <[email protected]> Authored: Fri Apr 4 11:30:07 2014 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Apr 4 11:30:07 2014 -0700 ---------------------------------------------------------------------- .../src/flex2/compiler/CompilerAPI.java | 8 +++---- .../src/flex2/compiler/Source.java | 17 +++++++------ .../src/flex2/compiler/SourceList.java | 4 ---- .../src/flex2/compiler/SourcePath.java | 8 +------ .../compiler/common/CompilerConfiguration.java | 6 +++-- .../flex2/compiler/common/Configuration.java | 3 +-- .../compiler/common/FontsConfiguration.java | 7 ++---- .../compiler/common/MxmlConfiguration.java | 4 ++-- .../config/CommandLineConfigurator.java | 1 - .../compiler/config/ConfigurationBuffer.java | 14 ++++++++--- .../flex2/compiler/config/FileConfigurator.java | 2 +- .../config/ServicesDependenciesWrapper.java | 15 ++++++++---- .../src/flex2/compiler/io/LocalFile.java | 3 ++- .../flex2/compiler/mxml/lang/StandardDefs.java | 2 +- .../flex2/compiler/mxml/lang/TextParser.java | 14 ++++------- .../src/flex2/compiler/util/NameFormatter.java | 1 - .../src/flex2/linker/SimpleMovie.java | 2 +- .../flex2/tools/CommandLineConfiguration.java | 3 --- .../src/flex2/tools/CompcConfiguration.java | 6 ----- flex-compiler-oem/src/flex2/tools/PreLink.java | 6 ++--- .../src/flex2/tools/ToolsConfiguration.java | 8 ++----- .../tools/flexbuilder/BuilderApplication.java | 5 ++-- .../flex2/tools/flexbuilder/BuilderLibrary.java | 5 ++-- .../src/flex2/tools/oem/Application.java | 25 +++++--------------- .../src/flex2/tools/oem/Library.java | 24 ++++--------------- .../ApplicationCompilerConfiguration.java | 2 +- .../internal/LibraryCompilerConfiguration.java | 1 - .../tools/oem/internal/OEMConfiguration.java | 9 +++---- .../flex2/tools/oem/internal/OEMLogAdapter.java | 1 - .../src/flex2/tools/oem/internal/OEMReport.java | 2 +- .../src/flex2/tools/oem/internal/OEMUtil.java | 15 ------------ .../src/macromedia/asc/util/ObjectList.java | 7 +++++- 32 files changed, 86 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/CompilerAPI.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/CompilerAPI.java b/flex-compiler-oem/src/flex2/compiler/CompilerAPI.java index 00d8376..54cd78e 100644 --- a/flex-compiler-oem/src/flex2/compiler/CompilerAPI.java +++ b/flex-compiler-oem/src/flex2/compiler/CompilerAPI.java @@ -47,10 +47,10 @@ import flex2.compiler.common.PathResolver; */ public final class CompilerAPI { - private final static int INHERITANCE = 1; - private final static int NAMESPACES = 2; - private final static int TYPES = 3; - private final static int EXPRESSIONS = 4; + //private final static int INHERITANCE = 1; + //private final static int NAMESPACES = 2; + //private final static int TYPES = 3; + //private final static int EXPRESSIONS = 4; static String constructClassName(String namespaceURI, String localPart) { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/Source.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/Source.java b/flex-compiler-oem/src/flex2/compiler/Source.java index a610047..91a1ce6 100644 --- a/flex-compiler-oem/src/flex2/compiler/Source.java +++ b/flex-compiler-oem/src/flex2/compiler/Source.java @@ -20,7 +20,6 @@ package flex2.compiler; import flex2.compiler.io.VirtualFile; -import java.util.*; /** * This class represents the information associated with a single file @@ -38,7 +37,7 @@ public final class Source implements Comparable<Source> public Source(VirtualFile file, Source original) { this(file, original.pathRoot, original.relativePath, original.shortName, original.owner, original.isInternal, original.isRoot, original.isDebuggable); - this.delegate = original; + //this.delegate = original; } // used by InterfaceCompiler.createInlineComponentUnit(). Note the owner will be set @@ -47,7 +46,7 @@ public final class Source implements Comparable<Source> public Source(VirtualFile file, Source original, String shortName, boolean isInternal, boolean isRoot) { this(file, original.pathRoot, original.relativePath, shortName, null, isInternal, isRoot, true); - this.delegate = original; + //this.delegate = original; } // used by FileSpec @@ -81,10 +80,10 @@ public final class Source implements Comparable<Source> if (file != null) { - fileTime = file.getLastModified(); + //fileTime = file.getLastModified(); } - fileIncludeTimes = new HashMap<VirtualFile, Long>(4); + //fileIncludeTimes = new HashMap<VirtualFile, Long>(4); } private VirtualFile file; @@ -94,15 +93,15 @@ public final class Source implements Comparable<Source> private boolean isInternal; private boolean isRoot; private boolean isDebuggable; - private boolean isPreprocessed; + //private boolean isPreprocessed; - private long fileTime; - private Map<VirtualFile, Long> fileIncludeTimes; + //private long fileTime; + //private Map<VirtualFile, Long> fileIncludeTimes; // 1. path resolution // 2. backing file // 3. source fragments - private Source delegate; + //private Source delegate; public int compareTo(Source source) { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/SourceList.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/SourceList.java b/flex-compiler-oem/src/flex2/compiler/SourceList.java index 1e2e3e0..ef5258c 100644 --- a/flex-compiler-oem/src/flex2/compiler/SourceList.java +++ b/flex-compiler-oem/src/flex2/compiler/SourceList.java @@ -23,11 +23,7 @@ import flex2.compiler.io.FileUtil; import flex2.compiler.io.LocalFile; import flex2.compiler.io.VirtualFile; import flex2.compiler.util.CompilerMessage; -import flex2.compiler.util.NameFormatter; -import flex2.compiler.util.QName; import flex2.compiler.util.ThreadLocalToolkit; -import flex2.tools.oem.ApplicationCache; - import java.io.File; import java.util.*; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/SourcePath.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/SourcePath.java b/flex-compiler-oem/src/flex2/compiler/SourcePath.java index 4e356a0..3e8ad86 100644 --- a/flex-compiler-oem/src/flex2/compiler/SourcePath.java +++ b/flex-compiler-oem/src/flex2/compiler/SourcePath.java @@ -24,12 +24,6 @@ import flex2.compiler.io.FileUtil; import flex2.compiler.io.LocalFile; import flex2.compiler.io.VirtualFile; import flex2.compiler.util.CompilerMessage; -import flex2.compiler.util.MimeMappings; -import flex2.compiler.util.NameFormatter; -import flex2.compiler.util.QName; -import flex2.compiler.util.ThreadLocalToolkit; -import flex2.tools.oem.ApplicationCache; - import java.io.File; import java.util.*; @@ -44,7 +38,7 @@ public class SourcePath extends SourcePathBase implements SinglePathResolver { protected final List<File> directories; - private ApplicationCache applicationCache; + //private ApplicationCache applicationCache; public SourcePath(VirtualFile[] classPath, VirtualFile appPath, String[] mimeTypes, boolean allowSourcePathOverlap) { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/common/CompilerConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/common/CompilerConfiguration.java b/flex-compiler-oem/src/flex2/compiler/common/CompilerConfiguration.java index ba7411c..24c8998 100644 --- a/flex-compiler-oem/src/flex2/compiler/common/CompilerConfiguration.java +++ b/flex-compiler-oem/src/flex2/compiler/common/CompilerConfiguration.java @@ -319,6 +319,7 @@ public class CompilerConfiguration implements As3Configuration, } } + /* private VirtualFile[] toVirtualFileArray(String[] files, ConfigurationValue cv) throws ConfigurationException { @@ -329,7 +330,8 @@ public class CompilerConfiguration implements As3Configuration, } return vfiles; } - + */ + private VirtualFile getVirtualFile(String file, ConfigurationValue cv) throws ConfigurationException { @@ -3271,7 +3273,7 @@ public class CompilerConfiguration implements As3Configuration, return advancedTelemetry; } - public void setAdvancedTelemetry(boolean accessible) + public void setAdvancedTelemetry(boolean advancedTelemetry) { this.advancedTelemetry = advancedTelemetry; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/common/Configuration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/common/Configuration.java b/flex-compiler-oem/src/flex2/compiler/common/Configuration.java index 952ec0b..7f26804 100644 --- a/flex-compiler-oem/src/flex2/compiler/common/Configuration.java +++ b/flex-compiler-oem/src/flex2/compiler/common/Configuration.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.HashMap; import java.util.List; import java.util.LinkedList; -import java.util.Locale; import java.util.HashSet; import java.util.Set; import java.util.Collection; @@ -1354,7 +1353,7 @@ public class Configuration implements LinkerConfiguration, Cloneable } private List<RslPathInfo> rslPathInfoList; // list of CdRslInfo objects - private Set<String> loadedRsls; // swc location of the rsls that will be loaded + //private Set<String> loadedRsls; // swc location of the rsls that will be loaded /** * @return List of of all the -runtime-shared-libraries-path options. http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/common/FontsConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/common/FontsConfiguration.java b/flex-compiler-oem/src/flex2/compiler/common/FontsConfiguration.java index b8b17da..62d2dab 100644 --- a/flex-compiler-oem/src/flex2/compiler/common/FontsConfiguration.java +++ b/flex-compiler-oem/src/flex2/compiler/common/FontsConfiguration.java @@ -29,8 +29,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Properties; -import java.util.Map; -import java.util.HashMap; /** * This class defines the fonts related configuration options. These @@ -39,14 +37,13 @@ import java.util.HashMap; * @author Kyle Quevillon * @author Peter Farland */ -@SuppressWarnings("unchecked") public class FontsConfiguration { - private CompilerConfiguration compilerConfig; + //private CompilerConfiguration compilerConfig; public void setCompilerConfiguration(CompilerConfiguration compilerConfig) { - this.compilerConfig = compilerConfig; + //this.compilerConfig = compilerConfig; } private ConfigurationPathResolver configResolver; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/common/MxmlConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/common/MxmlConfiguration.java b/flex-compiler-oem/src/flex2/compiler/common/MxmlConfiguration.java index d496c32..c8043e5 100644 --- a/flex-compiler-oem/src/flex2/compiler/common/MxmlConfiguration.java +++ b/flex-compiler-oem/src/flex2/compiler/common/MxmlConfiguration.java @@ -38,11 +38,11 @@ import flex2.compiler.config.ConfigurationInfo; */ public class MxmlConfiguration { - private ConfigurationPathResolver configResolver; + //private ConfigurationPathResolver configResolver; public void setConfigPathResolver( ConfigurationPathResolver resolver ) { - this.configResolver = resolver; + //this.configResolver = resolver; } // http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/config/CommandLineConfigurator.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/config/CommandLineConfigurator.java b/flex-compiler-oem/src/flex2/compiler/config/CommandLineConfigurator.java index f459a40..9632b47 100644 --- a/flex-compiler-oem/src/flex2/compiler/config/CommandLineConfigurator.java +++ b/flex-compiler-oem/src/flex2/compiler/config/CommandLineConfigurator.java @@ -24,7 +24,6 @@ package flex2.compiler.config; import java.util.Arrays; import java.util.List; import java.util.LinkedList; -import java.util.TreeSet; import java.util.Set; import java.util.Iterator; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/config/ConfigurationBuffer.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/config/ConfigurationBuffer.java b/flex-compiler-oem/src/flex2/compiler/config/ConfigurationBuffer.java index 340780d..9116885 100644 --- a/flex-compiler-oem/src/flex2/compiler/config/ConfigurationBuffer.java +++ b/flex-compiler-oem/src/flex2/compiler/config/ConfigurationBuffer.java @@ -225,6 +225,7 @@ public final class ConfigurationBuffer if (value == null) { + /* if (false && isValidVar( token )) { if (varMap.containsKey( token )) @@ -246,6 +247,7 @@ public final class ConfigurationBuffer value = first.getArgs().get( 0 ); } } + */ if (value == null) { @@ -290,6 +292,7 @@ public final class ConfigurationBuffer } } + @SuppressWarnings("unchecked") private void storeValue( String avar, ConfigurationValue val, boolean append ) throws ConfigurationException { String var = unalias( avar ); @@ -327,11 +330,13 @@ public final class ConfigurationBuffer return varCache.keySet().iterator(); } + /* private Iterator<String> getSetVarIterator() { return varMap.keySet().iterator(); } - + */ + public void merge( ConfigurationBuffer other ) { assert ( configClass == other.configClass ); @@ -430,6 +435,7 @@ public final class ConfigurationBuffer return ((basename == null)? membername : (basename + "." + membername)); } + @SuppressWarnings("unchecked") private static ConfigurationInfo createInfo( Method setterMethod ) { ConfigurationInfo info = null; @@ -466,6 +472,7 @@ public final class ConfigurationBuffer return info; } + /* private static ConfigurationInfo createChildInfo( Method childGetMethod ) { ConfigurationInfo info = null; @@ -503,11 +510,12 @@ public final class ConfigurationBuffer { info = new ConfigurationInfo(); } - + return info; } - + */ + /** * load - prefetch all the interesting names into a dictionary so that we can find them * again more easily. At the end of this call, we will have a list of every variable http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/config/FileConfigurator.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/config/FileConfigurator.java b/flex-compiler-oem/src/flex2/compiler/config/FileConfigurator.java index bf11dce..f96e500 100644 --- a/flex-compiler-oem/src/flex2/compiler/config/FileConfigurator.java +++ b/flex-compiler-oem/src/flex2/compiler/config/FileConfigurator.java @@ -509,7 +509,7 @@ public class FileConfigurator this.ignore = false; } - public String localVar; + //public String localVar; public String var; public String base; public String item; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/config/ServicesDependenciesWrapper.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/config/ServicesDependenciesWrapper.java b/flex-compiler-oem/src/flex2/compiler/config/ServicesDependenciesWrapper.java index 15d85d1..ba8c522 100644 --- a/flex-compiler-oem/src/flex2/compiler/config/ServicesDependenciesWrapper.java +++ b/flex-compiler-oem/src/flex2/compiler/config/ServicesDependenciesWrapper.java @@ -19,13 +19,8 @@ package flex2.compiler.config; -import java.io.File; import java.lang.reflect.*; -import java.util.ArrayList; -import java.util.HashSet; import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -42,6 +37,7 @@ public class ServicesDependenciesWrapper private Object servicesDependenciesInstance; private Class servicesDependenciesClass; + @SuppressWarnings("unchecked") public ServicesDependenciesWrapper(String path, String parserClass, String contextRoot) { try @@ -81,6 +77,7 @@ public class ServicesDependenciesWrapper } } + @SuppressWarnings("unchecked") public Set getLazyAssociations(String destination) { if (servicesDependenciesClass != null) @@ -101,6 +98,7 @@ public class ServicesDependenciesWrapper return null; } + @SuppressWarnings("unchecked") public void addLazyAssociation(String destination, String associationProp) { if (servicesDependenciesClass != null) @@ -120,6 +118,7 @@ public class ServicesDependenciesWrapper } } + @SuppressWarnings("unchecked") public String getServerConfigXmlInit() { if (servicesDependenciesClass != null) @@ -139,6 +138,7 @@ public class ServicesDependenciesWrapper return null; } + @SuppressWarnings("unchecked") public String getImports() { if (servicesDependenciesClass != null) @@ -158,6 +158,7 @@ public class ServicesDependenciesWrapper return null; } + @SuppressWarnings("unchecked") public String getReferences() { if (servicesDependenciesClass != null) @@ -177,6 +178,7 @@ public class ServicesDependenciesWrapper return null; } + @SuppressWarnings("unchecked") public List getChannelClasses() { if (servicesDependenciesClass != null) @@ -196,6 +198,7 @@ public class ServicesDependenciesWrapper return null; } + @SuppressWarnings("unchecked") public void addChannelClass(String className) { if (servicesDependenciesClass != null) @@ -213,6 +216,7 @@ public class ServicesDependenciesWrapper } } + @SuppressWarnings("unchecked") public void addConfigPath(String path, long modified) { if (servicesDependenciesClass != null) @@ -232,6 +236,7 @@ public class ServicesDependenciesWrapper } } + @SuppressWarnings("unchecked") public Map getConfigPaths() { if (servicesDependenciesClass != null) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/io/LocalFile.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/io/LocalFile.java b/flex-compiler-oem/src/flex2/compiler/io/LocalFile.java index 1980267..346b9c5 100644 --- a/flex-compiler-oem/src/flex2/compiler/io/LocalFile.java +++ b/flex-compiler-oem/src/flex2/compiler/io/LocalFile.java @@ -69,7 +69,8 @@ public class LocalFile implements VirtualFile return getName(); } - public String getURL() + @SuppressWarnings("deprecation") + public String getURL() { try { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/mxml/lang/StandardDefs.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/mxml/lang/StandardDefs.java b/flex-compiler-oem/src/flex2/compiler/mxml/lang/StandardDefs.java index 177fa8e..eb28175 100644 --- a/flex-compiler-oem/src/flex2/compiler/mxml/lang/StandardDefs.java +++ b/flex-compiler-oem/src/flex2/compiler/mxml/lang/StandardDefs.java @@ -152,7 +152,7 @@ public abstract class StandardDefs // spark.* private static final String PACKAGE_SPARK_COMPONENTS = "spark.components"; private static final String PACKAGE_SPARK_CORE = "spark.core"; - private static final String PACKAGE_SPARK_PRIMITIVES = "spark.primitives"; + //private static final String PACKAGE_SPARK_PRIMITIVES = "spark.primitives"; private static final String PACKAGE_TEXT_ELEMENTS = "flashx.textLayout.elements"; private static final String PACKAGE_TEXT_FORMATS = "flashx.textLayout.formats"; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/mxml/lang/TextParser.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/mxml/lang/TextParser.java b/flex-compiler-oem/src/flex2/compiler/mxml/lang/TextParser.java index d267d7f..ed90994 100644 --- a/flex-compiler-oem/src/flex2/compiler/mxml/lang/TextParser.java +++ b/flex-compiler-oem/src/flex2/compiler/mxml/lang/TextParser.java @@ -19,12 +19,6 @@ package flex2.compiler.mxml.lang; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * MXML text parser, used to parse attribute values and text * content. Some utility functionality is also exposed in static @@ -35,17 +29,17 @@ public abstract class TextParser /** * valid percentage expressions are: [whitespace] positive-whole-or-decimal-number [whitespace] % [whitespace] */ - private static final Pattern percentagePattern = Pattern.compile("\\s*((\\d+)(.(\\d)+)?)\\s*%\\s*"); + //private static final Pattern percentagePattern = Pattern.compile("\\s*((\\d+)(.(\\d)+)?)\\s*%\\s*"); /** * valid qualified names are series of 1 or more leading-alpha-or-_-followed-by-alphanumerics words, separated by dots */ - private static final Pattern qualifiedNamePattern = Pattern.compile("([a-zA-Z_]\\w*)(\\.([a-zA-Z_]\\w*))*"); + //private static final Pattern qualifiedNamePattern = Pattern.compile("([a-zA-Z_]\\w*)(\\.([a-zA-Z_]\\w*))*"); /** * valid AS RegExps are: / 0-or-more-of-anything / 0-or-more-flag chars. We leave pattern validation to ASC. */ - private static final Pattern regExpPattern = Pattern.compile("/.*/[gimsx]*"); + //private static final Pattern regExpPattern = Pattern.compile("/.*/[gimsx]*"); // error codes public final static int Ok = 0; @@ -132,9 +126,9 @@ public abstract class TextParser /** * - */ private static boolean isQualifiedName(String text) { return qualifiedNamePattern.matcher(text).matches() && !StandardDefs.isReservedWord(text); } + */ } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/compiler/util/NameFormatter.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/compiler/util/NameFormatter.java b/flex-compiler-oem/src/flex2/compiler/util/NameFormatter.java index b03cf51..9abc74d 100644 --- a/flex-compiler-oem/src/flex2/compiler/util/NameFormatter.java +++ b/flex-compiler-oem/src/flex2/compiler/util/NameFormatter.java @@ -19,7 +19,6 @@ package flex2.compiler.util; -import flex2.compiler.Source; import flex2.compiler.SymbolTable; import flex2.compiler.mxml.lang.StandardDefs; //import flex2.compiler.swc.SwcScript; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/linker/SimpleMovie.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/linker/SimpleMovie.java b/flex-compiler-oem/src/flex2/linker/SimpleMovie.java index 7c6ce78..223caca 100644 --- a/flex-compiler-oem/src/flex2/linker/SimpleMovie.java +++ b/flex-compiler-oem/src/flex2/linker/SimpleMovie.java @@ -35,7 +35,7 @@ public class SimpleMovie extends Movie * Use this dummy password instead of generating one. * @see http://bugs.adobe.com/jira/browse/SDK-27210 */ - private static final String NO_PASSWORD = "NO-PASSWORD"; + //private static final String NO_PASSWORD = "NO-PASSWORD"; public SimpleMovie(LinkerConfiguration configuration) { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/CommandLineConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/CommandLineConfiguration.java b/flex-compiler-oem/src/flex2/tools/CommandLineConfiguration.java index 2673be5..b0a4f12 100644 --- a/flex-compiler-oem/src/flex2/tools/CommandLineConfiguration.java +++ b/flex-compiler-oem/src/flex2/tools/CommandLineConfiguration.java @@ -27,9 +27,6 @@ import flex2.compiler.config.ConfigurationException; import flex2.compiler.config.ConfigurationInfo; import flex2.compiler.config.ConfigurationValue; import flex2.compiler.io.VirtualFile; -import flex2.compiler.util.ThreadLocalToolkit; - -import java.io.File; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/CompcConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/CompcConfiguration.java b/flex-compiler-oem/src/flex2/tools/CompcConfiguration.java index 2738d54..78cac66 100644 --- a/flex-compiler-oem/src/flex2/tools/CompcConfiguration.java +++ b/flex-compiler-oem/src/flex2/tools/CompcConfiguration.java @@ -26,14 +26,8 @@ import flex2.compiler.config.ConfigurationBuffer; import flex2.compiler.config.ConfigurationException; import flex2.compiler.config.ConfigurationInfo; import flex2.compiler.config.ConfigurationValue; -import flex2.compiler.config.FileConfigurator; import flex2.compiler.io.VirtualFile; -import flex2.compiler.util.ThreadLocalToolkit; - import java.io.File; -import java.io.PrintWriter; -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; import java.util.HashMap; import java.util.LinkedList; import java.util.List; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/PreLink.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/PreLink.java b/flex-compiler-oem/src/flex2/tools/PreLink.java index e8c792d..f1bd25e 100644 --- a/flex-compiler-oem/src/flex2/tools/PreLink.java +++ b/flex-compiler-oem/src/flex2/tools/PreLink.java @@ -34,9 +34,9 @@ import flex2.compiler.util.CompilerMessage; */ public class PreLink// implements flex2.compiler.PreLink { - private final static String DEFAULTS_CSS = "defaults.css"; - private final static String DEFAULTS_DASH = "defaults-"; - private final static String DOT_CSS = ".css"; + //private final static String DEFAULTS_CSS = "defaults.css"; + //private final static String DEFAULTS_DASH = "defaults-"; + //private final static String DOT_CSS = ".css"; public static class CouldNotParseNumber extends CompilerMessage.CompilerError http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/ToolsConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/ToolsConfiguration.java b/flex-compiler-oem/src/flex2/tools/ToolsConfiguration.java index 4929925..5646562 100644 --- a/flex-compiler-oem/src/flex2/tools/ToolsConfiguration.java +++ b/flex-compiler-oem/src/flex2/tools/ToolsConfiguration.java @@ -31,12 +31,8 @@ import flex2.compiler.io.VirtualFile; import flex2.compiler.util.CompilerMessage; //import flex2.compiler.util.ThreadLocalToolkit; -import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.PrintWriter; -import java.lang.reflect.Method; import java.util.Iterator; /** @@ -64,8 +60,8 @@ public abstract class ToolsConfiguration extends Configuration if (info.isDeprecated() && configurationBuffer.getVar(var) != null) { CompilerMessage.CompilerWarning warning = info.getDeprecatedMessage(); - String replacement = info.getDeprecatedReplacement(); - String since = info.getDeprecatedSince(); + //String replacement = info.getDeprecatedReplacement(); + //String since = info.getDeprecatedSince(); if (warning != null) { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderApplication.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderApplication.java b/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderApplication.java index 5e75030..19eb852 100644 --- a/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderApplication.java +++ b/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderApplication.java @@ -27,7 +27,6 @@ import java.util.Set; import flex2.compiler.config.ConfigurationBuffer; import flex2.compiler.config.ConfigurationException; -import flex2.compiler.io.FileUtil; import flex2.tools.oem.Application; import flex2.tools.oem.Configuration; import flex2.tools.oem.LibraryCache; @@ -114,7 +113,7 @@ public class BuilderApplication extends Application protected int compile(boolean incremental) { - File dumpConfigFile = null; + //File dumpConfigFile = null; OEMConfiguration config = null; // step over special-cased configuration options: @@ -366,6 +365,7 @@ public class BuilderApplication extends Application int result = super.compile(incremental); + /* if (dumpConfigFile != null && config != null && config.cfgbuf != null) { try @@ -378,6 +378,7 @@ public class BuilderApplication extends Application ex.printStackTrace(); } } + */ return result; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderLibrary.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderLibrary.java b/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderLibrary.java index 4f2f606..10679be 100644 --- a/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderLibrary.java +++ b/flex-compiler-oem/src/flex2/tools/flexbuilder/BuilderLibrary.java @@ -29,7 +29,6 @@ import java.util.Set; import flex2.compiler.config.ConfigurationBuffer; import flex2.compiler.config.ConfigurationException; import flex2.compiler.config.ConfigurationValue; -import flex2.compiler.io.FileUtil; import flex2.tools.oem.Configuration; import flex2.tools.oem.Library; import flex2.tools.oem.internal.OEMConfiguration; @@ -105,7 +104,7 @@ public class BuilderLibrary extends Library protected int compile(boolean incremental) { - File dumpConfigFile = null; + //File dumpConfigFile = null; OEMConfiguration config = null; // step over special-cased configuration options: @@ -354,6 +353,7 @@ public class BuilderLibrary extends Library int result = super.compile(incremental); + /* if (dumpConfigFile != null && config != null && config.cfgbuf != null) { try @@ -366,6 +366,7 @@ public class BuilderLibrary extends Library ex.printStackTrace(); } } + */ return result; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/Application.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/Application.java b/flex-compiler-oem/src/flex2/tools/oem/Application.java index df89790..a39e92b 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/Application.java +++ b/flex-compiler-oem/src/flex2/tools/oem/Application.java @@ -19,29 +19,20 @@ package flex2.tools.oem; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.RandomAccessFile; import java.lang.annotation.Annotation; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; - import org.apache.flex.compiler.clients.MXMLC; import org.apache.flex.compiler.clients.problems.ProblemQuery; import org.apache.flex.compiler.problems.CompilerProblemSeverity; @@ -51,13 +42,8 @@ import org.apache.flex.swf.ISWF; import org.apache.flex.swf.types.RGB; import flash.swf.tags.SetBackgroundColor; -import flex2.compiler.CompilerException; import flex2.compiler.Source; import flex2.compiler.SourceList; -import flex2.compiler.SymbolTable; -import flex2.compiler.common.CompilerConfiguration; -import flex2.compiler.common.FontsConfiguration; -import flex2.compiler.config.ConfigurationException; import flex2.compiler.io.FileUtil; import flex2.compiler.io.LocalFile; import flex2.compiler.io.VirtualFile; @@ -66,11 +52,9 @@ import flex2.compiler.util.CompilerControl; import flex2.compiler.util.CompilerMessage; import flex2.compiler.util.MimeMappings; import flex2.compiler.util.PerformanceData; -import flex2.compiler.util.QName; import flex2.compiler.util.ThreadLocalToolkit; import flex2.linker.SimpleMovie; import flex2.tools.ToolsConfiguration; -import flex2.tools.oem.internal.ApplicationCompilerConfiguration; import flex2.tools.oem.internal.OEMConfiguration; import flex2.tools.oem.internal.OEMReport; import flex2.tools.oem.internal.OEMUtil; @@ -277,6 +261,7 @@ public class Application implements Builder * * @param files */ + @SuppressWarnings("unchecked") private void init(VirtualFile[] files) { this.files = new ArrayList(files.length); @@ -291,7 +276,7 @@ public class Application implements Builder meter = null; resolver = null; cc = new CompilerControl(); - isGeneratedTargetFile = false; + //isGeneratedTargetFile = false; //data = null; cacheName = null; @@ -307,7 +292,7 @@ public class Application implements Builder private ProgressMeter meter; protected PathResolver resolver; private CompilerControl cc; - private boolean isGeneratedTargetFile; + //private boolean isGeneratedTargetFile; private ApplicationCache applicationCache; private LibraryCache libraryCache; @@ -446,6 +431,7 @@ public class Application implements Builder //TODO PERFORMANCE: A lot of unnecessary recopying and buffering here try { + @SuppressWarnings("unused") int result = compile(incremental); return size; @@ -502,6 +488,7 @@ public class Application implements Builder { try { + @SuppressWarnings("unused") int result = compile(incremental); /* if (result == OK || result == LINK) @@ -632,7 +619,7 @@ public class Application implements Builder cc.run(); OEMUtil.init(OEMUtil.getLogger(logger, messages), mimeMappings, meter, resolver, cc); - Map licenseMap = OEMUtil.getLicenseMap(tempOEMConfiguration.configuration); + //Map licenseMap = OEMUtil.getLicenseMap(tempOEMConfiguration.configuration); mxmlc = new MXMLC(); int returnValue = mxmlc.mainCompileOnly(constructCommandLine2(tempOEMConfiguration.configuration), null); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/Library.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/Library.java b/flex-compiler-oem/src/flex2/tools/oem/Library.java index 38a93d3..7d5b95b 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/Library.java +++ b/flex-compiler-oem/src/flex2/tools/oem/Library.java @@ -19,20 +19,13 @@ package flex2.tools.oem; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.RandomAccessFile; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -43,12 +36,6 @@ import java.net.URI; import org.apache.flex.compiler.clients.COMPC; -import flex2.compiler.CompilerAPI; -import flex2.compiler.CompilerException; -import flex2.compiler.Source; -import flex2.compiler.SourceList; -import flex2.compiler.SourcePath; -import flex2.compiler.SymbolTable; import flex2.compiler.common.CompilerConfiguration; import flex2.compiler.config.ConfigurationException; import flex2.compiler.io.FileUtil; @@ -57,13 +44,8 @@ import flex2.compiler.io.VirtualFile; import flex2.compiler.util.Benchmark; import flex2.compiler.util.CompilerControl; import flex2.compiler.util.MimeMappings; -import flex2.compiler.util.NameFormatter; import flex2.compiler.util.PerformanceData; -import flex2.compiler.util.QName; import flex2.compiler.util.ThreadLocalToolkit; -import flex2.linker.LinkerConfiguration; -import flex2.linker.SimpleMovie; -import flex2.tools.ToolsConfiguration; import flex2.tools.oem.internal.OEMConfiguration; import flex2.tools.oem.internal.OEMReport; import flex2.tools.oem.internal.OEMUtil; @@ -632,6 +614,7 @@ public class Library implements Builder, Cloneable //TODO PERFORMANCE: A lot of unnecessary recopying and buffering here try { + @SuppressWarnings("unused") int result = compile(incremental); return size; @@ -685,6 +668,7 @@ public class Library implements Builder, Cloneable { try { + @SuppressWarnings("unused") int result = compile(incremental); /* @@ -856,7 +840,7 @@ public class Library implements Builder, Cloneable OEMUtil.init(OEMUtil.getLogger(logger, messages), mimeMappings, meter, resolver, cc); // if there is any problem getting the licenses, this method will return. - Map licenseMap = OEMUtil.getLicenseMap(tempOEMConfiguration.configuration); + //Map licenseMap = OEMUtil.getLicenseMap(tempOEMConfiguration.configuration); // if there are no SWC inputs, output an error and return -1 VirtualFile[] includeLibs = (tempOEMConfiguration.configuration == null) ? null : tempOEMConfiguration.configuration.getCompilerConfiguration().getIncludeLibraries(); @@ -970,7 +954,6 @@ public class Library implements Builder, Cloneable * @param s1 * @param s2 * @return - */ private <T> boolean isDifferent(Collection<T> s1, Collection<T> s2) { for (Iterator<T> i = s2.iterator(); i.hasNext(); ) @@ -983,6 +966,7 @@ public class Library implements Builder, Cloneable return s1.size() > s2.size(); } + */ /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/internal/ApplicationCompilerConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/ApplicationCompilerConfiguration.java b/flex-compiler-oem/src/flex2/tools/oem/internal/ApplicationCompilerConfiguration.java index 604d7ef..e7f2bcc 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/internal/ApplicationCompilerConfiguration.java +++ b/flex-compiler-oem/src/flex2/tools/oem/internal/ApplicationCompilerConfiguration.java @@ -19,7 +19,6 @@ package flex2.tools.oem.internal; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; @@ -177,6 +176,7 @@ public class ApplicationCompilerConfiguration extends ToolsConfiguration return resourceBundles; } + @SuppressWarnings("unchecked") public void cfgIncludeResourceBundles(ConfigurationValue val, List includeResourceBundles) { resourceBundles.addAll(toQNameString(includeResourceBundles)); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/internal/LibraryCompilerConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/LibraryCompilerConfiguration.java b/flex-compiler-oem/src/flex2/tools/oem/internal/LibraryCompilerConfiguration.java index 6062445..be0df19 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/internal/LibraryCompilerConfiguration.java +++ b/flex-compiler-oem/src/flex2/tools/oem/internal/LibraryCompilerConfiguration.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Map; import flex2.compiler.common.Configuration; -import flex2.compiler.config.ConfigurationBuffer; import flex2.compiler.config.ConfigurationException; import flex2.compiler.config.ConfigurationInfo; import flex2.compiler.config.ConfigurationValue; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/internal/OEMConfiguration.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMConfiguration.java b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMConfiguration.java index d48f8fd..f8f3ff1 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMConfiguration.java +++ b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMConfiguration.java @@ -2104,7 +2104,6 @@ public class OEMConfiguration implements Configuration, ConfigurationConstants, * * @param key * @param urls - */ private void addURLs(String key, URL[] urls) { URL[] existing = null; @@ -2127,6 +2126,7 @@ public class OEMConfiguration implements Configuration, ConfigurationConstants, more.put(key, urls); } + */ /** * @@ -2158,7 +2158,8 @@ public class OEMConfiguration implements Configuration, ConfigurationConstants, * @param f * @return */ - private URL toURL(VirtualFile f) + @SuppressWarnings({ "unused", "deprecation" }) + private URL toURL(VirtualFile f) { try { @@ -2174,11 +2175,11 @@ public class OEMConfiguration implements Configuration, ConfigurationConstants, * * @param p * @return - */ private File toFile(String p) { return (p != null) ? new File(p) : null; } + */ /** * @@ -2215,7 +2216,6 @@ public class OEMConfiguration implements Configuration, ConfigurationConstants, * * @param list * @return - */ private URL[] toURLs(List list) { URL[] urls = new URL[list == null ? 0 : list.size()]; @@ -2232,6 +2232,7 @@ public class OEMConfiguration implements Configuration, ConfigurationConstants, } return urls; } + */ /** * http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/internal/OEMLogAdapter.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMLogAdapter.java b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMLogAdapter.java index 20730a0..4ca94d7 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMLogAdapter.java +++ b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMLogAdapter.java @@ -21,7 +21,6 @@ package flex2.tools.oem.internal; import flex2.compiler.ILocalizableMessage; import flex2.compiler.util.AbstractLogger; -import flex2.compiler.util.ThreadLocalToolkit; import flex2.tools.oem.*; /** http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/internal/OEMReport.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMReport.java b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMReport.java index e718736..0181884 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMReport.java +++ b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMReport.java @@ -288,7 +288,7 @@ public class OEMReport implements Report private String linkReport, sizeReport, configurationReport; private Message[] messages; - private String[][] assetNames, definitionNames; + //private String[][] assetNames, definitionNames; private List<File> sourceListPaths; public boolean contentUpdated() http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java index 08ccd6c..09c3037 100644 --- a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java +++ b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java @@ -19,23 +19,11 @@ package flex2.tools.oem.internal; -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.RandomAccessFile; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import flex2.compiler.CompilerAPI; -import flex2.compiler.Source; import flex2.compiler.common.CompilerConfiguration; import flex2.compiler.common.DefaultsConfigurator; import flex2.compiler.config.CommandLineConfigurator; @@ -43,11 +31,8 @@ import flex2.compiler.config.ConfigurationBuffer; import flex2.compiler.config.ConfigurationException; import flex2.compiler.config.FileConfigurator; import flex2.compiler.config.SystemPropertyConfigurator; -import flex2.compiler.io.FileUtil; -import flex2.compiler.io.VirtualFile; import flex2.compiler.util.CompilerControl; import flex2.compiler.util.MimeMappings; -import flex2.compiler.util.QName; import flex2.compiler.util.ThreadLocalToolkit; import flex2.tools.CommandLineConfiguration; import flex2.tools.CompcConfiguration; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/83236614/flex-compiler-oem/src/macromedia/asc/util/ObjectList.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/macromedia/asc/util/ObjectList.java b/flex-compiler-oem/src/macromedia/asc/util/ObjectList.java index ba4af50..a20be86 100644 --- a/flex-compiler-oem/src/macromedia/asc/util/ObjectList.java +++ b/flex-compiler-oem/src/macromedia/asc/util/ObjectList.java @@ -28,7 +28,12 @@ import java.util.List; */ public class ObjectList<E> extends ArrayList<E> { - public ObjectList() + /** + * + */ + private static final long serialVersionUID = -1316638550648554823L; + + public ObjectList() { super(0); }
