*fix
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/parser/JavaScriptSourceElementParser.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/parser/JavaScriptSourceElementParser.java index 29049e9..3426103 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/parser/JavaScriptSourceElementParser.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/parser/JavaScriptSourceElementParser.java
@@ -29,7 +29,7 @@ import org.eclipse.dltk.internal.javascript.typeinference.HostCollection; import org.eclipse.dltk.internal.javascript.typeinference.IReference; import org.eclipse.dltk.internal.javascript.typeinference.TypeInferencer; -import org.eclipse.dltk.internal.javascript.typeinference.UncknownReference; +import org.eclipse.dltk.internal.javascript.typeinference.UnknownReference; import com.xored.org.mozilla.javascript.CompilerEnvirons; import com.xored.org.mozilla.javascript.ErrorReporter; @@ -225,8 +225,8 @@ Object o = it.next(); if (o instanceof IReference) { IReference ref = (IReference) o; - if (ref instanceof UncknownReference) { - UncknownReference uref = (UncknownReference) ref; + if (ref instanceof UnknownReference) { + UnknownReference uref = (UnknownReference) ref; ISourceElementRequestor.FieldInfo fieldInfo1 = new ISourceElementRequestor.FieldInfo(); fieldInfo1.name = ref.getName(); fieldInfo1.nameSourceStart = uref.getOffset();
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/ReferenceFactory.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/ReferenceFactory.java index 420b988..38a629f 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/ReferenceFactory.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/ReferenceFactory.java
@@ -15,14 +15,14 @@ public class ReferenceFactory { public static IReference createNumberReference( String name,double number){ - return new UncknownReference(name,false); + return new UnknownReference(name,false); } public static IReference createStringReference(String name,String string) { - return new UncknownReference(name,false); + return new UnknownReference(name,false); } public static IReference createBooleanReference(String name,boolean b) { - return new UncknownReference(name,false); + return new UnknownReference(name,false); } }
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/TypeInferencer.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/TypeInferencer.java index 00a2cd0..9f1b665 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/TypeInferencer.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/TypeInferencer.java
@@ -275,7 +275,7 @@ contexts.push(collection); collection = new HostCollection(collection.getParent()); String name = n1.getString(); - collection.setReference(name, new UncknownReference(name, true)); + collection.setReference(name, new UnknownReference(name, true)); node.getFirstChild(); processScriptNode(node, arg); HostCollection pop = (HostCollection) contexts.pop(); @@ -369,7 +369,7 @@ collection.setName(functionNode.getFunctionName()); for (int am = 0; am < functionNode.getParamCount(); am++) { String paramOrVarName = functionNode.getParamOrVarName(am); - UncknownReference uncknownReference = new UncknownReference( + UnknownReference uncknownReference = new UnknownReference( paramOrVarName, false); uncknownReference.setLocationInformation(module, functionNode.nameStart, functionNode.getFunctionName() @@ -408,7 +408,7 @@ IReference evaluateReference = evaluateReference(key, firstChild.getFirstChild(), cs); if (evaluateReference == null) { - evaluateReference = new UncknownReference(key, false); + evaluateReference = new UnknownReference(key, false); } evaluateReference.setLocationInformation(module, firstChild .getPosition(), key.length()); @@ -458,7 +458,7 @@ IReference root = (IReference) collection .getReferenceNoParentContext(rootName); if (root == null) { - root = new UncknownReference(rootName, true); + root = new UnknownReference(rootName, true); root.setLocationInformation(module, node.getPosition(), fieldId .length()); HostCollection parent = collection.getParent(); @@ -483,7 +483,7 @@ field = objId.substring(pos); IReference child = root.getChild(field, false); if (child == null) { - child = new UncknownReference(field, true); + child = new UnknownReference(field, true); child.setLocationInformation(module, node.getPosition(), fieldId.length()); @@ -596,7 +596,7 @@ IReference internalEvaluate = internalEvaluate(collection, key, expression, module, cs); if (internalEvaluate == null) - return new UncknownReference(key, false); + return new UnknownReference(key, false); return internalEvaluate; } @@ -612,7 +612,7 @@ expression.getFirstChild(), parent, cs); case Token.NUMBER: { NewReference newReference = new NewReference(key, "Number", cs); - UncknownReference uncknownReference = new UncknownReference(key, + UnknownReference uncknownReference = new UnknownReference(key, false); return new OrReferenceWriteSecond(newReference, uncknownReference); } @@ -620,14 +620,14 @@ // .getDouble()); case Token.STRING: { NewReference newReference = new NewReference(key, "String", cs); - UncknownReference uncknownReference = new UncknownReference(key, + UnknownReference uncknownReference = new UnknownReference(key, false); return new OrReferenceWriteSecond(newReference, uncknownReference); } case Token.TRUE: case Token.FALSE: { NewReference newReference = new NewReference(key, "Boolean", cs); - UncknownReference uncknownReference = new UncknownReference(key, + UnknownReference uncknownReference = new UnknownReference(key, false); return new OrReferenceWriteSecond(newReference, uncknownReference); } @@ -669,7 +669,7 @@ CallResultReference ref = new CallResultReference(collection2, key, id, cs); OrReferenceWriteSecond ws = new OrReferenceWriteSecond(ref, - new UncknownReference(key, false)); + new UnknownReference(key, false)); return ws; } @@ -681,7 +681,7 @@ if (id == null) return null; NewReference ref = new NewReference(key, id, cs); - UncknownReference uncknownReference = new UncknownReference(key, false); + UnknownReference uncknownReference = new UnknownReference(key, false); if (id.equals("XML")) { try { String string = expression.getLastChild().getString(); @@ -708,25 +708,25 @@ } private static void modifyReferenceXML( - final UncknownReference uncknownReference, String string) { + final UnknownReference uncknownReference, String string) { try { parser.parse(new ByteArrayInputStream(string.getBytes()), new DefaultHandler() { boolean has = false; - UncknownReference curReference = uncknownReference; + UnknownReference curReference = uncknownReference; Stack stack = new Stack(); public void endElement(String uri, String localName, String name) throws SAXException { if (!stack.isEmpty()) - curReference = (UncknownReference) stack.pop(); + curReference = (UnknownReference) stack.pop(); } public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException { - UncknownReference uncknownReference2 = new UncknownReference( + UnknownReference uncknownReference2 = new UnknownReference( name, true); int length = attributes.getLength(); @@ -737,7 +737,7 @@ } for (int a = 0; a < length; a++) { String val = "@" + attributes.getQName(a); - UncknownReference uncknownReference3 = new UncknownReference( + UnknownReference uncknownReference3 = new UnknownReference( val, true); curReference.setChild(val, uncknownReference3); } @@ -764,14 +764,14 @@ ArrayList positions = (ArrayList) expression .getProp(Node.DESCENDANTS_FLAG); Node child = expression.getFirstChild(); - UncknownReference uRef = new UncknownReference(key, false); + UnknownReference uRef = new UnknownReference(key, false); for (int a = 0; a < ids.length; a++) { if (ids[a] instanceof String) { String name = (String) ids[a]; IReference internalEvaluate = internalEvaluate(col, name, child, parent, cs); if (internalEvaluate == null) - internalEvaluate = new UncknownReference(name, false); + internalEvaluate = new UnknownReference(name, false); internalEvaluate.setLocationInformation(parent, ((Integer) positions.get(a)).intValue() - name.length() - 1, name.length());
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/UncknownReference.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/UnknownReference.java similarity index 95% rename from plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/UncknownReference.java rename to plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/UnknownReference.java index 498b70f..5cf9b09 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/UncknownReference.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/typeinference/UnknownReference.java
@@ -16,7 +16,7 @@ import org.eclipse.dltk.internal.core.ModelElement; -public class UncknownReference implements IReference { +public class UnknownReference implements IReference { private String name; private final boolean childIsh; @@ -35,7 +35,7 @@ return length; } - public UncknownReference(String paramOrVarName, boolean childIsh) { + public UnknownReference(String paramOrVarName, boolean childIsh) { this.name = paramOrVarName; this.childIsh = childIsh;
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/internal/core/codeassist/completion/JavaScriptCompletionEngine.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/internal/core/codeassist/completion/JavaScriptCompletionEngine.java index c682dab..973320b 100644 --- a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/internal/core/codeassist/completion/JavaScriptCompletionEngine.java +++ b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/internal/core/codeassist/completion/JavaScriptCompletionEngine.java
@@ -42,7 +42,7 @@ import org.eclipse.dltk.internal.javascript.typeinference.HostCollection; import org.eclipse.dltk.internal.javascript.typeinference.IClassReference; import org.eclipse.dltk.internal.javascript.typeinference.IReference; -import org.eclipse.dltk.internal.javascript.typeinference.UncknownReference; +import org.eclipse.dltk.internal.javascript.typeinference.UnknownReference; import org.eclipse.dltk.javascript.core.JavaScriptKeywords; import org.eclipse.dltk.javascript.internal.core.codeassist.AssitUtils; import org.eclipse.dltk.javascript.internal.core.codeassist.AssitUtils.PositionCalculator; @@ -261,10 +261,10 @@ for (Iterator iterator = functions.iterator(); iterator.hasNext();) { IReference name = (IReference) iterator.next(); choices[ia] = name.getName().toCharArray(); - if (name instanceof UncknownReference) + if (name instanceof UnknownReference) { - parameterNames.put(choices[ia], ((UncknownReference)name).getParameterNames()); - proposalInfo.put(choices[ia], ((UncknownReference)name).getProposalInfo()); + parameterNames.put(choices[ia], ((UnknownReference)name).getParameterNames()); + proposalInfo.put(choices[ia], ((UnknownReference)name).getProposalInfo()); } ia++; } @@ -387,10 +387,10 @@ IReference name = (IReference) next; String refa = name.getName(); choices[ia] = refa.toCharArray(); - if (name instanceof UncknownReference) + if (name instanceof UnknownReference) { - parameterNames.put(choices[ia], ((UncknownReference)name).getParameterNames()); - proposalInfo.put(choices[ia], ((UncknownReference)name).getProposalInfo()); + parameterNames.put(choices[ia], ((UnknownReference)name).getParameterNames()); + proposalInfo.put(choices[ia], ((UnknownReference)name).getProposalInfo()); } ia++; }