You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2015/06/28 18:25:13 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - Fix: EXTERNC -
IMPORT NOT EMITTED
Repository: flex-falcon
Updated Branches:
refs/heads/develop 114a06d8a -> 108dc013d
Fix: EXTERNC - IMPORT NOT EMITTED
Refactored and check better and uniformly
if the given type can be imported.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/abcef355
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/abcef355
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/abcef355
Branch: refs/heads/develop
Commit: abcef35507120a932f660e088a34a597fe9ace6e
Parents: 114a06d
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Sun Jun 28 17:21:03 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Sun Jun 28 17:24:49 2015 +0100
----------------------------------------------------------------------
.../externals/reference/ClassReference.java | 12 ++++----
.../externals/reference/FunctionReference.java | 7 +++--
.../codegen/externals/utils/FunctionUtils.java | 29 ++++++++++++++++++++
3 files changed, 41 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/abcef355/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
index dfaf0a6..d2b1cc8 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
@@ -25,6 +25,7 @@ import com.google.javascript.rhino.JSTypeExpression;
import com.google.javascript.rhino.Node;
import com.google.javascript.rhino.jstype.JSType;
import org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils;
+import org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
import org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
import java.io.File;
@@ -504,7 +505,7 @@ public class ClassReference extends BaseReference
MethodReference method = new MethodReference(getModel(), this, node,
functionName, comment, isStatic);
- final String returnType = getReturnType(method);
+ final String returnType = getReturnTypeToImport(method);
if (returnType != null)
{
addImport(returnType);
@@ -514,7 +515,7 @@ public class ClassReference extends BaseReference
return method;
}
- private String getReturnType(final MethodReference method) {
+ private String getReturnTypeToImport(final MethodReference method) {
String returnType = null;
final JSDocInfo comment = method.getComment();
@@ -523,13 +524,14 @@ public class ClassReference extends BaseReference
try {
final Node firstChild = comment.getReturnType().getRoot().getFirstChild();
returnType = firstChild.getString();
- final ClassReference reference = new ClassReference(null, method.getNode(), returnType);
- returnType = returnType.contains(".") ? getModel().isExcludedClass(reference) == null ? returnType : null : null;
} catch (Exception e) {
returnType = null;
}
}
- return returnType;
+
+ final boolean canBeImported = FunctionUtils.canBeImported(getModel(), getNode(), returnType, getPackageName());
+
+ return canBeImported ? returnType : null;
}
public boolean isMethodOverrideFromInterface(MethodReference reference)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/abcef355/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
index a64d317..2d29240 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
@@ -118,8 +118,11 @@ public class FunctionReference extends BaseReference
private void printImports(final StringBuilder sb)
{
- final String returnType = transformReturnString();
- if (returnType.contains("."))
+ String returnType = transformReturnString();
+
+ final boolean canBeImported = FunctionUtils.canBeImported(getModel(), getNode(), returnType, getPackageName());
+
+ if (canBeImported)
{
sb.append("import ").append(returnType).append(";\n\n");
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/abcef355/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
index 77a5106..337e4ed 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
@@ -19,11 +19,14 @@
package org.apache.flex.compiler.internal.codegen.externals.utils;
+import com.google.common.base.Strings;
import org.apache.flex.compiler.internal.codegen.externals.reference.BaseReference;
import com.google.javascript.rhino.JSDocInfo;
import com.google.javascript.rhino.JSTypeExpression;
import com.google.javascript.rhino.Node;
+import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
public class FunctionUtils
{
@@ -95,6 +98,32 @@ public class FunctionUtils
return sb.toString();
}
+ /**
+ * Check we can import the given type into the given package.
+ *
+ * @param model The containing reference model
+ * @param node The containing node
+ * @param typeName The type we want check
+ * @param currentPackage The current package
+ * @return true if we can import the given type into the given package
+ */
+ public static boolean canBeImported(final ReferenceModel model, final Node node, final String typeName, final String currentPackage)
+ {
+ boolean canImport = false;
+
+ if (model != null && node != null && !Strings.isNullOrEmpty(typeName))
+ {
+ final ClassReference reference = new ClassReference(null, node, typeName);
+
+ final int lastDotPosition = typeName.lastIndexOf(".");
+ canImport = lastDotPosition > 1 && !typeName.substring(0, lastDotPosition).equals(currentPackage);
+ canImport |= lastDotPosition == 0 && !currentPackage.equals("");
+ canImport &= model.isExcludedClass(reference) == null;
+ }
+
+ return canImport;
+ }
+
private static String toParameter(BaseReference reference,
JSDocInfo comment, String paramName, JSTypeExpression parameterType)
{
RE: [2/2] git commit: [flex-falcon] [refs/heads/develop] - Renamed
ExcludedMemeber to ExcludedMember
Posted by Frédéric THOMAS <we...@hotmail.com>.
> I was going to change this last night, you beat me to it.
:-) Yes, it was a bit perturbing.
Frédéric THOMAS
----------------------------------------
> Date: Sun, 28 Jun 2015 12:51:38 -0400
> Subject: Re: [2/2] git commit: [flex-falcon] [refs/heads/develop] - Renamed ExcludedMemeber to ExcludedMember
> From: teotigraphixllc@gmail.com
> To: dev@flex.apache.org
>
> I was going to change this last night, you beat me to it.
>
> Mike
>
> On Sun, Jun 28, 2015 at 12:25 PM, <ft...@apache.org> wrote:
>
>> Renamed ExcludedMemeber to ExcludedMember
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/108dc013
>> Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/108dc013
>> Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/108dc013
>>
>> Branch: refs/heads/develop
>> Commit: 108dc013dcd60380f52fe477898aaf9e5a8e65de
>> Parents: abcef35
>> Author: Frédéric THOMAS <we...@gmail.com>
>> Authored: Sun Jun 28 17:24:02 2015 +0100
>> Committer: Frédéric THOMAS <we...@gmail.com>
>> Committed: Sun Jun 28 17:24:52 2015 +0100
>>
>> ----------------------------------------------------------------------
>> .../compiler/clients/ExternCConfiguration.java | 30 ++++++++++----------
>> .../externals/reference/BaseReference.java | 4 +--
>> .../externals/reference/FieldReference.java | 4 +--
>> .../externals/reference/FunctionReference.java | 4 +--
>> .../externals/reference/MemberReference.java | 4 +--
>> .../externals/reference/MethodReference.java | 4 +--
>> .../externals/reference/ReferenceModel.java | 6 ++--
>> 7 files changed, 28 insertions(+), 28 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
>> b/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
>> index 6dbf4ac..e711e20 100644
>> ---
>> a/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
>> +++
>> b/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
>> @@ -54,9 +54,9 @@ public class ExternCConfiguration extends Configuration
>> private List<ExternalFile> externalExterns = new
>> ArrayList<ExternalFile>();
>>
>> private List<String> classToFunctions = new ArrayList<String>();
>> - private List<ExcludedMemeber> excludesClass = new
>> ArrayList<ExcludedMemeber>();
>> - private List<ExcludedMemeber> excludesField = new
>> ArrayList<ExcludedMemeber>();
>> - private List<ExcludedMemeber> excludes = new
>> ArrayList<ExcludedMemeber>();
>> + private List<ExcludedMember> excludesClass = new
>> ArrayList<ExcludedMember>();
>> + private List<ExcludedMember> excludesField = new
>> ArrayList<ExcludedMember>();
>> + private List<ExcludedMember> excludes = new
>> ArrayList<ExcludedMember>();
>>
>> public ExternCConfiguration()
>> {
>> @@ -195,9 +195,9 @@ public class ExternCConfiguration extends Configuration
>> return false;
>> }
>>
>> - public ExcludedMemeber isExcludedClass(ClassReference classReference)
>> + public ExcludedMember isExcludedClass(ClassReference classReference)
>> {
>> - for (ExcludedMemeber memeber : excludesClass)
>> + for (ExcludedMember memeber : excludesClass)
>> {
>> if (memeber.isExcluded(classReference, null))
>> return memeber;
>> @@ -205,18 +205,18 @@ public class ExternCConfiguration extends
>> Configuration
>> return null;
>> }
>>
>> - public ExcludedMemeber isExcludedMember(ClassReference classReference,
>> + public ExcludedMember isExcludedMember(ClassReference classReference,
>> MemberReference memberReference)
>> {
>> if (memberReference instanceof FieldReference)
>> {
>> - for (ExcludedMemeber memeber : excludesField)
>> + for (ExcludedMember memeber : excludesField)
>> {
>> if (memeber.isExcluded(classReference, memberReference))
>> return memeber;
>> }
>> }
>> - for (ExcludedMemeber memeber : excludes)
>> + for (ExcludedMember memeber : excludes)
>> {
>> if (memeber.isExcluded(classReference, memberReference))
>> return memeber;
>> @@ -243,12 +243,12 @@ public class ExternCConfiguration extends
>> Configuration
>>
>> public void addExclude(String className, String name)
>> {
>> - excludes.add(new ExcludedMemeber(className, name));
>> + excludes.add(new ExcludedMember(className, name));
>> }
>>
>> public void addExclude(String className, String name, String
>> description)
>> {
>> - excludes.add(new ExcludedMemeber(className, name, description));
>> + excludes.add(new ExcludedMember(className, name, description));
>> }
>>
>> @Config(allowMultiple = true)
>> @@ -270,7 +270,7 @@ public class ExternCConfiguration extends Configuration
>>
>> public void addFieldExclude(String className, String fieldName)
>> {
>> - excludesField.add(new ExcludedMemeber(className, fieldName, ""));
>> + excludesField.add(new ExcludedMember(className, fieldName, ""));
>> }
>>
>> @Config(allowMultiple = true)
>> @@ -283,10 +283,10 @@ public class ExternCConfiguration extends
>> Configuration
>> }
>> public void addClassExclude(String className)
>> {
>> - excludesClass.add(new ExcludedMemeber(className, null, ""));
>> + excludesClass.add(new ExcludedMember(className, null, ""));
>> }
>>
>> - public static class ExcludedMemeber
>> + public static class ExcludedMember
>> {
>> private String className;
>> private String name;
>> @@ -307,13 +307,13 @@ public class ExternCConfiguration extends
>> Configuration
>> return description;
>> }
>>
>> - public ExcludedMemeber(String className, String name)
>> + public ExcludedMember(String className, String name)
>> {
>> this.className = className;
>> this.name = name;
>> }
>>
>> - public ExcludedMemeber(String className, String name, String
>> description)
>> + public ExcludedMember(String className, String name, String
>> description)
>> {
>> this.className = className;
>> this.name = name;
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
>> index cfbc2e9..ea29a2f 100644
>> ---
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
>> +++
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
>> @@ -22,7 +22,7 @@ package
>> org.apache.flex.compiler.internal.codegen.externals.reference;
>> import java.io.File;
>> import java.util.Set;
>>
>> -import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
>> +import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>>
>> import com.google.javascript.rhino.JSDocInfo;
>> import com.google.javascript.rhino.JSDocInfo.Marker;
>> @@ -112,7 +112,7 @@ public abstract class BaseReference
>> this.comment = comment;
>> }
>>
>> - public ExcludedMemeber isExcluded()
>> + public ExcludedMember isExcluded()
>> {
>> return null;
>> }
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
>> index 328f89d..9cb6f09 100644
>> ---
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
>> +++
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
>> @@ -19,7 +19,7 @@
>>
>> package org.apache.flex.compiler.internal.codegen.externals.reference;
>>
>> -import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
>> +import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>> import
>> org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
>>
>> import com.google.javascript.rhino.JSDocInfo;
>> @@ -94,7 +94,7 @@ public class FieldReference extends MemberReference
>>
>> emitComment(sb);
>>
>> - ExcludedMemeber excluded = isExcluded();
>> + ExcludedMember excluded = isExcluded();
>> if (excluded != null)
>> {
>> excluded.print(sb);
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
>> index 2d29240..e47cb83 100644
>> ---
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
>> +++
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
>> @@ -21,7 +21,7 @@ package
>> org.apache.flex.compiler.internal.codegen.externals.reference;
>>
>> import com.google.javascript.rhino.JSDocInfo;
>> import com.google.javascript.rhino.Node;
>> -import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
>> +import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>> import
>> org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
>>
>> import java.io.File;
>> @@ -83,7 +83,7 @@ public class FunctionReference extends BaseReference
>>
>> emitComment(sb);
>>
>> - ExcludedMemeber excluded = isExcluded();
>> + ExcludedMember excluded = isExcluded();
>> if (excluded != null)
>> {
>> excluded.print(sb);
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
>> index b73afbe..8e753ed 100644
>> ---
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
>> +++
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
>> @@ -19,7 +19,7 @@
>>
>> package org.apache.flex.compiler.internal.codegen.externals.reference;
>>
>> -import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
>> +import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>>
>> import com.google.javascript.rhino.JSDocInfo;
>> import com.google.javascript.rhino.Node;
>> @@ -42,7 +42,7 @@ public abstract class MemberReference extends
>> BaseReference
>> }
>>
>> @Override
>> - public ExcludedMemeber isExcluded()
>> + public ExcludedMember isExcluded()
>> {
>> return getClassReference().getModel().isExcludedMember(
>> getClassReference(), this);
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
>> index 7f88ffe..d031945 100644
>> ---
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
>> +++
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
>> @@ -21,7 +21,7 @@ package
>> org.apache.flex.compiler.internal.codegen.externals.reference;
>>
>> import java.util.Set;
>>
>> -import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
>> +import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>> import
>> org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
>>
>> import com.google.javascript.rhino.JSDocInfo;
>> @@ -96,7 +96,7 @@ public class MethodReference extends MemberReference
>>
>> emitComment(sb);
>>
>> - ExcludedMemeber excluded = isExcluded();
>> + ExcludedMember excluded = isExcluded();
>> if (excluded != null)
>> {
>> excluded.print(sb);
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
>> index 099a3f8..adfa8c9 100644
>> ---
>> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
>> +++
>> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
>> @@ -25,7 +25,7 @@ import java.util.HashMap;
>> import java.util.List;
>>
>> import org.apache.flex.compiler.clients.ExternCConfiguration;
>> -import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
>> +import
>> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>> import
>> org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils;
>>
>> import com.google.javascript.jscomp.Compiler;
>> @@ -311,12 +311,12 @@ public class ReferenceModel
>>
>>
>> //--------------------------------------------------------------------------
>>
>> - public ExcludedMemeber isExcludedClass(ClassReference classReference)
>> + public ExcludedMember isExcludedClass(ClassReference classReference)
>> {
>> return getConfiguration().isExcludedClass(classReference);
>> }
>>
>> - public ExcludedMemeber isExcludedMember(ClassReference classReference,
>> + public ExcludedMember isExcludedMember(ClassReference classReference,
>> MemberReference memberReference)
>> {
>> return getConfiguration().isExcludedMember(classReference,
>>
>>
Re: [2/2] git commit: [flex-falcon] [refs/heads/develop] - Renamed
ExcludedMemeber to ExcludedMember
Posted by Michael Schmalle <te...@gmail.com>.
I was going to change this last night, you beat me to it.
Mike
On Sun, Jun 28, 2015 at 12:25 PM, <ft...@apache.org> wrote:
> Renamed ExcludedMemeber to ExcludedMember
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/108dc013
> Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/108dc013
> Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/108dc013
>
> Branch: refs/heads/develop
> Commit: 108dc013dcd60380f52fe477898aaf9e5a8e65de
> Parents: abcef35
> Author: Frédéric THOMAS <we...@gmail.com>
> Authored: Sun Jun 28 17:24:02 2015 +0100
> Committer: Frédéric THOMAS <we...@gmail.com>
> Committed: Sun Jun 28 17:24:52 2015 +0100
>
> ----------------------------------------------------------------------
> .../compiler/clients/ExternCConfiguration.java | 30 ++++++++++----------
> .../externals/reference/BaseReference.java | 4 +--
> .../externals/reference/FieldReference.java | 4 +--
> .../externals/reference/FunctionReference.java | 4 +--
> .../externals/reference/MemberReference.java | 4 +--
> .../externals/reference/MethodReference.java | 4 +--
> .../externals/reference/ReferenceModel.java | 6 ++--
> 7 files changed, 28 insertions(+), 28 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
> ----------------------------------------------------------------------
> diff --git
> a/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
> b/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
> index 6dbf4ac..e711e20 100644
> ---
> a/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
> +++
> b/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
> @@ -54,9 +54,9 @@ public class ExternCConfiguration extends Configuration
> private List<ExternalFile> externalExterns = new
> ArrayList<ExternalFile>();
>
> private List<String> classToFunctions = new ArrayList<String>();
> - private List<ExcludedMemeber> excludesClass = new
> ArrayList<ExcludedMemeber>();
> - private List<ExcludedMemeber> excludesField = new
> ArrayList<ExcludedMemeber>();
> - private List<ExcludedMemeber> excludes = new
> ArrayList<ExcludedMemeber>();
> + private List<ExcludedMember> excludesClass = new
> ArrayList<ExcludedMember>();
> + private List<ExcludedMember> excludesField = new
> ArrayList<ExcludedMember>();
> + private List<ExcludedMember> excludes = new
> ArrayList<ExcludedMember>();
>
> public ExternCConfiguration()
> {
> @@ -195,9 +195,9 @@ public class ExternCConfiguration extends Configuration
> return false;
> }
>
> - public ExcludedMemeber isExcludedClass(ClassReference classReference)
> + public ExcludedMember isExcludedClass(ClassReference classReference)
> {
> - for (ExcludedMemeber memeber : excludesClass)
> + for (ExcludedMember memeber : excludesClass)
> {
> if (memeber.isExcluded(classReference, null))
> return memeber;
> @@ -205,18 +205,18 @@ public class ExternCConfiguration extends
> Configuration
> return null;
> }
>
> - public ExcludedMemeber isExcludedMember(ClassReference classReference,
> + public ExcludedMember isExcludedMember(ClassReference classReference,
> MemberReference memberReference)
> {
> if (memberReference instanceof FieldReference)
> {
> - for (ExcludedMemeber memeber : excludesField)
> + for (ExcludedMember memeber : excludesField)
> {
> if (memeber.isExcluded(classReference, memberReference))
> return memeber;
> }
> }
> - for (ExcludedMemeber memeber : excludes)
> + for (ExcludedMember memeber : excludes)
> {
> if (memeber.isExcluded(classReference, memberReference))
> return memeber;
> @@ -243,12 +243,12 @@ public class ExternCConfiguration extends
> Configuration
>
> public void addExclude(String className, String name)
> {
> - excludes.add(new ExcludedMemeber(className, name));
> + excludes.add(new ExcludedMember(className, name));
> }
>
> public void addExclude(String className, String name, String
> description)
> {
> - excludes.add(new ExcludedMemeber(className, name, description));
> + excludes.add(new ExcludedMember(className, name, description));
> }
>
> @Config(allowMultiple = true)
> @@ -270,7 +270,7 @@ public class ExternCConfiguration extends Configuration
>
> public void addFieldExclude(String className, String fieldName)
> {
> - excludesField.add(new ExcludedMemeber(className, fieldName, ""));
> + excludesField.add(new ExcludedMember(className, fieldName, ""));
> }
>
> @Config(allowMultiple = true)
> @@ -283,10 +283,10 @@ public class ExternCConfiguration extends
> Configuration
> }
> public void addClassExclude(String className)
> {
> - excludesClass.add(new ExcludedMemeber(className, null, ""));
> + excludesClass.add(new ExcludedMember(className, null, ""));
> }
>
> - public static class ExcludedMemeber
> + public static class ExcludedMember
> {
> private String className;
> private String name;
> @@ -307,13 +307,13 @@ public class ExternCConfiguration extends
> Configuration
> return description;
> }
>
> - public ExcludedMemeber(String className, String name)
> + public ExcludedMember(String className, String name)
> {
> this.className = className;
> this.name = name;
> }
>
> - public ExcludedMemeber(String className, String name, String
> description)
> + public ExcludedMember(String className, String name, String
> description)
> {
> this.className = className;
> this.name = name;
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
> ----------------------------------------------------------------------
> diff --git
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
> index cfbc2e9..ea29a2f 100644
> ---
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
> +++
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
> @@ -22,7 +22,7 @@ package
> org.apache.flex.compiler.internal.codegen.externals.reference;
> import java.io.File;
> import java.util.Set;
>
> -import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
> +import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>
> import com.google.javascript.rhino.JSDocInfo;
> import com.google.javascript.rhino.JSDocInfo.Marker;
> @@ -112,7 +112,7 @@ public abstract class BaseReference
> this.comment = comment;
> }
>
> - public ExcludedMemeber isExcluded()
> + public ExcludedMember isExcluded()
> {
> return null;
> }
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
> ----------------------------------------------------------------------
> diff --git
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
> index 328f89d..9cb6f09 100644
> ---
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
> +++
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
> @@ -19,7 +19,7 @@
>
> package org.apache.flex.compiler.internal.codegen.externals.reference;
>
> -import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
> +import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
> import
> org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
>
> import com.google.javascript.rhino.JSDocInfo;
> @@ -94,7 +94,7 @@ public class FieldReference extends MemberReference
>
> emitComment(sb);
>
> - ExcludedMemeber excluded = isExcluded();
> + ExcludedMember excluded = isExcluded();
> if (excluded != null)
> {
> excluded.print(sb);
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
> ----------------------------------------------------------------------
> diff --git
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
> index 2d29240..e47cb83 100644
> ---
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
> +++
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
> @@ -21,7 +21,7 @@ package
> org.apache.flex.compiler.internal.codegen.externals.reference;
>
> import com.google.javascript.rhino.JSDocInfo;
> import com.google.javascript.rhino.Node;
> -import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
> +import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
> import
> org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
>
> import java.io.File;
> @@ -83,7 +83,7 @@ public class FunctionReference extends BaseReference
>
> emitComment(sb);
>
> - ExcludedMemeber excluded = isExcluded();
> + ExcludedMember excluded = isExcluded();
> if (excluded != null)
> {
> excluded.print(sb);
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
> ----------------------------------------------------------------------
> diff --git
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
> index b73afbe..8e753ed 100644
> ---
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
> +++
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
> @@ -19,7 +19,7 @@
>
> package org.apache.flex.compiler.internal.codegen.externals.reference;
>
> -import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
> +import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
>
> import com.google.javascript.rhino.JSDocInfo;
> import com.google.javascript.rhino.Node;
> @@ -42,7 +42,7 @@ public abstract class MemberReference extends
> BaseReference
> }
>
> @Override
> - public ExcludedMemeber isExcluded()
> + public ExcludedMember isExcluded()
> {
> return getClassReference().getModel().isExcludedMember(
> getClassReference(), this);
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
> ----------------------------------------------------------------------
> diff --git
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
> index 7f88ffe..d031945 100644
> ---
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
> +++
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
> @@ -21,7 +21,7 @@ package
> org.apache.flex.compiler.internal.codegen.externals.reference;
>
> import java.util.Set;
>
> -import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
> +import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
> import
> org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
>
> import com.google.javascript.rhino.JSDocInfo;
> @@ -96,7 +96,7 @@ public class MethodReference extends MemberReference
>
> emitComment(sb);
>
> - ExcludedMemeber excluded = isExcluded();
> + ExcludedMember excluded = isExcluded();
> if (excluded != null)
> {
> excluded.print(sb);
>
>
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
> ----------------------------------------------------------------------
> diff --git
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
> index 099a3f8..adfa8c9 100644
> ---
> a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
> +++
> b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
> @@ -25,7 +25,7 @@ import java.util.HashMap;
> import java.util.List;
>
> import org.apache.flex.compiler.clients.ExternCConfiguration;
> -import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
> +import
> org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
> import
> org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils;
>
> import com.google.javascript.jscomp.Compiler;
> @@ -311,12 +311,12 @@ public class ReferenceModel
>
>
> //--------------------------------------------------------------------------
>
> - public ExcludedMemeber isExcludedClass(ClassReference classReference)
> + public ExcludedMember isExcludedClass(ClassReference classReference)
> {
> return getConfiguration().isExcludedClass(classReference);
> }
>
> - public ExcludedMemeber isExcludedMember(ClassReference classReference,
> + public ExcludedMember isExcludedMember(ClassReference classReference,
> MemberReference memberReference)
> {
> return getConfiguration().isExcludedMember(classReference,
>
>
[2/2] git commit: [flex-falcon] [refs/heads/develop] - Renamed
ExcludedMemeber to ExcludedMember
Posted by ft...@apache.org.
Renamed ExcludedMemeber to ExcludedMember
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/108dc013
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/108dc013
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/108dc013
Branch: refs/heads/develop
Commit: 108dc013dcd60380f52fe477898aaf9e5a8e65de
Parents: abcef35
Author: Frédéric THOMAS <we...@gmail.com>
Authored: Sun Jun 28 17:24:02 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Sun Jun 28 17:24:52 2015 +0100
----------------------------------------------------------------------
.../compiler/clients/ExternCConfiguration.java | 30 ++++++++++----------
.../externals/reference/BaseReference.java | 4 +--
.../externals/reference/FieldReference.java | 4 +--
.../externals/reference/FunctionReference.java | 4 +--
.../externals/reference/MemberReference.java | 4 +--
.../externals/reference/MethodReference.java | 4 +--
.../externals/reference/ReferenceModel.java | 6 ++--
7 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java b/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
index 6dbf4ac..e711e20 100644
--- a/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
+++ b/compiler.jx/src/org/apache/flex/compiler/clients/ExternCConfiguration.java
@@ -54,9 +54,9 @@ public class ExternCConfiguration extends Configuration
private List<ExternalFile> externalExterns = new ArrayList<ExternalFile>();
private List<String> classToFunctions = new ArrayList<String>();
- private List<ExcludedMemeber> excludesClass = new ArrayList<ExcludedMemeber>();
- private List<ExcludedMemeber> excludesField = new ArrayList<ExcludedMemeber>();
- private List<ExcludedMemeber> excludes = new ArrayList<ExcludedMemeber>();
+ private List<ExcludedMember> excludesClass = new ArrayList<ExcludedMember>();
+ private List<ExcludedMember> excludesField = new ArrayList<ExcludedMember>();
+ private List<ExcludedMember> excludes = new ArrayList<ExcludedMember>();
public ExternCConfiguration()
{
@@ -195,9 +195,9 @@ public class ExternCConfiguration extends Configuration
return false;
}
- public ExcludedMemeber isExcludedClass(ClassReference classReference)
+ public ExcludedMember isExcludedClass(ClassReference classReference)
{
- for (ExcludedMemeber memeber : excludesClass)
+ for (ExcludedMember memeber : excludesClass)
{
if (memeber.isExcluded(classReference, null))
return memeber;
@@ -205,18 +205,18 @@ public class ExternCConfiguration extends Configuration
return null;
}
- public ExcludedMemeber isExcludedMember(ClassReference classReference,
+ public ExcludedMember isExcludedMember(ClassReference classReference,
MemberReference memberReference)
{
if (memberReference instanceof FieldReference)
{
- for (ExcludedMemeber memeber : excludesField)
+ for (ExcludedMember memeber : excludesField)
{
if (memeber.isExcluded(classReference, memberReference))
return memeber;
}
}
- for (ExcludedMemeber memeber : excludes)
+ for (ExcludedMember memeber : excludes)
{
if (memeber.isExcluded(classReference, memberReference))
return memeber;
@@ -243,12 +243,12 @@ public class ExternCConfiguration extends Configuration
public void addExclude(String className, String name)
{
- excludes.add(new ExcludedMemeber(className, name));
+ excludes.add(new ExcludedMember(className, name));
}
public void addExclude(String className, String name, String description)
{
- excludes.add(new ExcludedMemeber(className, name, description));
+ excludes.add(new ExcludedMember(className, name, description));
}
@Config(allowMultiple = true)
@@ -270,7 +270,7 @@ public class ExternCConfiguration extends Configuration
public void addFieldExclude(String className, String fieldName)
{
- excludesField.add(new ExcludedMemeber(className, fieldName, ""));
+ excludesField.add(new ExcludedMember(className, fieldName, ""));
}
@Config(allowMultiple = true)
@@ -283,10 +283,10 @@ public class ExternCConfiguration extends Configuration
}
public void addClassExclude(String className)
{
- excludesClass.add(new ExcludedMemeber(className, null, ""));
+ excludesClass.add(new ExcludedMember(className, null, ""));
}
- public static class ExcludedMemeber
+ public static class ExcludedMember
{
private String className;
private String name;
@@ -307,13 +307,13 @@ public class ExternCConfiguration extends Configuration
return description;
}
- public ExcludedMemeber(String className, String name)
+ public ExcludedMember(String className, String name)
{
this.className = className;
this.name = name;
}
- public ExcludedMemeber(String className, String name, String description)
+ public ExcludedMember(String className, String name, String description)
{
this.className = className;
this.name = name;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
index cfbc2e9..ea29a2f 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/BaseReference.java
@@ -22,7 +22,7 @@ package org.apache.flex.compiler.internal.codegen.externals.reference;
import java.io.File;
import java.util.Set;
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
+import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
import com.google.javascript.rhino.JSDocInfo;
import com.google.javascript.rhino.JSDocInfo.Marker;
@@ -112,7 +112,7 @@ public abstract class BaseReference
this.comment = comment;
}
- public ExcludedMemeber isExcluded()
+ public ExcludedMember isExcluded()
{
return null;
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
index 328f89d..9cb6f09 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FieldReference.java
@@ -19,7 +19,7 @@
package org.apache.flex.compiler.internal.codegen.externals.reference;
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
+import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
import org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
import com.google.javascript.rhino.JSDocInfo;
@@ -94,7 +94,7 @@ public class FieldReference extends MemberReference
emitComment(sb);
- ExcludedMemeber excluded = isExcluded();
+ ExcludedMember excluded = isExcluded();
if (excluded != null)
{
excluded.print(sb);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
index 2d29240..e47cb83 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/FunctionReference.java
@@ -21,7 +21,7 @@ package org.apache.flex.compiler.internal.codegen.externals.reference;
import com.google.javascript.rhino.JSDocInfo;
import com.google.javascript.rhino.Node;
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
+import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
import org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
import java.io.File;
@@ -83,7 +83,7 @@ public class FunctionReference extends BaseReference
emitComment(sb);
- ExcludedMemeber excluded = isExcluded();
+ ExcludedMember excluded = isExcluded();
if (excluded != null)
{
excluded.print(sb);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
index b73afbe..8e753ed 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MemberReference.java
@@ -19,7 +19,7 @@
package org.apache.flex.compiler.internal.codegen.externals.reference;
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
+import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
import com.google.javascript.rhino.JSDocInfo;
import com.google.javascript.rhino.Node;
@@ -42,7 +42,7 @@ public abstract class MemberReference extends BaseReference
}
@Override
- public ExcludedMemeber isExcluded()
+ public ExcludedMember isExcluded()
{
return getClassReference().getModel().isExcludedMember(
getClassReference(), this);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
index 7f88ffe..d031945 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/MethodReference.java
@@ -21,7 +21,7 @@ package org.apache.flex.compiler.internal.codegen.externals.reference;
import java.util.Set;
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
+import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
import org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
import com.google.javascript.rhino.JSDocInfo;
@@ -96,7 +96,7 @@ public class MethodReference extends MemberReference
emitComment(sb);
- ExcludedMemeber excluded = isExcluded();
+ ExcludedMember excluded = isExcluded();
if (excluded != null)
{
excluded.print(sb);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/108dc013/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
index 099a3f8..adfa8c9 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/reference/ReferenceModel.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMemeber;
+import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
import org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils;
import com.google.javascript.jscomp.Compiler;
@@ -311,12 +311,12 @@ public class ReferenceModel
//--------------------------------------------------------------------------
- public ExcludedMemeber isExcludedClass(ClassReference classReference)
+ public ExcludedMember isExcludedClass(ClassReference classReference)
{
return getConfiguration().isExcludedClass(classReference);
}
- public ExcludedMemeber isExcludedMember(ClassReference classReference,
+ public ExcludedMember isExcludedMember(ClassReference classReference,
MemberReference memberReference)
{
return getConfiguration().isExcludedMember(classReference,