summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorTomasz Zarna2012-07-30 23:58:55 (EDT)
committer Jayaprakash Arthanareeswaran2012-08-10 02:59:19 (EDT)
commit63c8a2ec89eae9c5f71458dc20e19fe16c16341b (patch)
tree0b373653cc00968831198c7046c98ad68d31a938
parent0b7acd17e6eef2f223228752e14e0589f5cac72e (diff)
downloadeclipse.jdt.core-63c8a2ec89eae9c5f71458dc20e19fe16c16341b.zip
eclipse.jdt.core-63c8a2ec89eae9c5f71458dc20e19fe16c16341b.tar.gz
eclipse.jdt.core-63c8a2ec89eae9c5f71458dc20e19fe16c16341b.tar.bz2
Typos, javadoc updates and minor formatting fixes
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CharOperation.java15
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NameReference.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/MethodReferenceMatch.java4
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java4
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java7
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PathCollector.java12
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/SourceIndexer.java8
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ConstructorPattern.java6
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java4
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java6
15 files changed, 37 insertions, 46 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CharOperation.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CharOperation.java
index 6a8b4da..54b3bb1 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CharOperation.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CharOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -2417,15 +2417,14 @@ final static public char[] lastSegment(char[] array, char separator) {
}
/**
- * Answers true if the pattern matches the given name, false otherwise. This char[] pattern matching
- * accepts wild-cards '*' and '?'.
+ * <p>Answers true if the pattern matches the given name, false otherwise. This char[] pattern matching
+ * accepts wild-cards '*' and '?'.</p>
*
- * When not case sensitive, the pattern is assumed to already be lowercased, the
- * name will be lowercased character per character as comparing.
- * If name is null, the answer is false.
+ * <p>When not case sensitive, the pattern is assumed to already be lowercased, the
+ * name will be lowercased character per character as comparing.<br>
+ * If name is null, the answer is false.<br>
* If pattern is null, the answer is true if name is not null.
- * <br>
- * <br>
+ * </p>
* For example:
* <ol>
* <li><pre>
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
index b2774fa..6f85571 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
@@ -77,7 +77,7 @@ public class CompilationUnitDeclaration extends ASTNode implements ProblemSeveri
long[] suppressWarningScopePositions; // (start << 32) + end
int suppressWarningsCount;
-public CompilationUnitDeclaration(ProblemReporter problemReporter, CompilationResult compilationResult, int sourceLength) {
+public CompilationUnitDeclaration(ProblemReporter problemReporter, CompilationResult compilationResult, int sourceLength) {
this.problemReporter = problemReporter;
this.compilationResult = compilationResult;
//by definition of a compilation unit....
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java
index e585a58..33bd8de8 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java
@@ -563,7 +563,7 @@ public boolean checkUnsafeCast(Scope scope, TypeBinding castType, TypeBinding ex
public void computeConversion(Scope scope, TypeBinding runtimeType, TypeBinding compileTimeType) {
if (runtimeType == null || compileTimeType == null)
return;
- if (this.implicitConversion != 0) return; // already set independantly
+ if (this.implicitConversion != 0) return; // already set independently
// it is possible for a Byte to be unboxed to a byte & then converted to an int
// but it is not possible for a byte to become Byte & then assigned to an Integer,
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NameReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NameReference.java
index a67b519..81600f0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NameReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NameReference.java
@@ -25,8 +25,8 @@ public abstract class NameReference extends Reference implements InvocationSite
//the error printing
//some name reference are build as name reference but
//only used as type reference. When it happens, instead of
- //creating a new objet (aTypeReference) we just flag a boolean
- //This concesion is valuable while their are cases when the NameReference
+ //creating a new object (aTypeReference) we just flag a boolean
+ //This concesion is valuable while there are cases when the NameReference
//will be a TypeReference (static message sends.....) and there is
//no changeClass in java.
public NameReference() {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java
index 0eb9624..0676cbb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java
@@ -986,7 +986,7 @@ public TypeBinding resolveType(BlockScope scope) {
return this.resolvedType = type;
}
}
- // error scenarii
+ // error scenario
return this.resolvedType = reportError(scope);
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
index e8c3207..d239691 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
@@ -1354,7 +1354,7 @@ public void traverse(ASTVisitor visitor, CompilationUnitScope unitScope) {
}
/**
- * Iteration for a local innertype
+ * Iteration for a local inner type
*/
public void traverse(ASTVisitor visitor, BlockScope blockScope) {
try {
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/MethodReferenceMatch.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/MethodReferenceMatch.java
index acb5306..06a5571 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/MethodReferenceMatch.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/MethodReferenceMatch.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -119,7 +119,7 @@ public final boolean isSynthetic() {
* the search target, depending on the run-time type of the receiver object.
*
* @return <code>true</code> if the reference is on a message sent from
- * a super-type of the searched method declaring class, <code>false </code> otherwise
+ * a super-type of the searched method declaring class, <code>false</code> otherwise
* @since 3.3
*/
public boolean isSuperInvocation() {
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java
index 37b8436..586cd89 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -570,7 +570,7 @@ public class SearchEngine {
* being searched (for example, search method declarations in a case sensitive way).
*
* @param pattern the pattern to search
- * @param participants the particpants in the search
+ * @param participants the participants in the search
* @param scope the search scope
* @param requestor the requestor to report the matches to
* @param monitor the progress monitor used to report progress
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java
index 8e09289..e29b5a7 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -164,7 +164,7 @@ HashtableOfObject addQueryResults(char[][] categories, char[] key, int matchRule
HashtableOfObject results = null; // initialized if needed
- // No need to check the results table for duplicacy while processing the
+ // No need to check the results table for duplicates while processing the
// first category table or if the first category tables doesn't have any results.
boolean prevResults = false;
if (key == null) {
@@ -226,7 +226,6 @@ HashtableOfObject addQueryResults(char[][] categories, char[] key, int matchRule
}
}
- if (results == null) return null;
return results;
}
private void cacheDocumentNames() throws IOException {
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java
index 8caa73c..cac1956 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/Index.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,12 +20,11 @@ import org.eclipse.jdt.internal.core.search.indexing.ReadWriteMonitor;
/**
* An <code>Index</code> maps document names to their referenced words in various categories.
- *
+ * <p>
* Queries can search a single category or several at the same time.
- *
+ * </p>
* Indexes are not synchronized structures and should only be queried/updated one at a time.
*/
-
public class Index {
public String containerPath;
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PathCollector.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PathCollector.java
index 2261dbd..fb16879 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PathCollector.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PathCollector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
package org.eclipse.jdt.internal.core.search;
import java.util.HashSet;
-import java.util.Iterator;
import org.eclipse.jdt.core.search.SearchParticipant;
import org.eclipse.jdt.core.search.SearchPattern;
@@ -26,7 +25,7 @@ public class PathCollector extends IndexQueryRequestor {
public HashSet paths = new HashSet(5);
/* (non-Javadoc)
- * @seeIndexQueryRequestor#acceptIndexMatch(IndexRecord, SearchParticipant, SearchPattern)
+ * @see IndexQueryRequestor#acceptIndexMatch(String, SearchPattern, SearchParticipant, AccessRuleSet)
*/
public boolean acceptIndexMatch(String documentPath, SearchPattern indexRecord, SearchParticipant participant, AccessRuleSet access) {
this.paths.add(documentPath);
@@ -37,11 +36,6 @@ public class PathCollector extends IndexQueryRequestor {
* Returns the paths that have been collected.
*/
public String[] getPaths() {
- String[] result = new String[this.paths.size()];
- int i = 0;
- for (Iterator iter = this.paths.iterator(); iter.hasNext();) {
- result[i++] = (String)iter.next();
- }
- return result;
+ return (String[]) this.paths.toArray(new String[this.paths.size()]);
}
}
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/SourceIndexer.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/SourceIndexer.java
index b7c2569..3fdf60c 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/SourceIndexer.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/SourceIndexer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,12 +24,12 @@ import org.eclipse.jdt.internal.core.search.processing.JobManager;
/**
* A SourceIndexer indexes java files using a java parser. The following items are indexed:
- * Declarations of:
+ * Declarations of:<br>
* - Classes<br>
- * - Interfaces; <br>
+ * - Interfaces;<br>
* - Methods;<br>
* - Fields;<br>
- * References to:
+ * References to:<br>
* - Methods (with number of arguments); <br>
* - Fields;<br>
* - Types;<br>
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ConstructorPattern.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ConstructorPattern.java
index 1192314..2cdb4a3 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ConstructorPattern.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ConstructorPattern.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -342,7 +342,7 @@ public ConstructorPattern(
this.mustResolve = mustResolve();
}
/*
- * Instanciate a method pattern with signatures for generics search
+ * Instantiate a method pattern with signatures for generics search
*/
public ConstructorPattern(
char[] declaringSimpleName,
@@ -404,7 +404,7 @@ public ConstructorPattern(
if (hasConstructorArguments()) this.mustResolve = true;
}
/*
- * Instanciate a method pattern with signatures for generics search
+ * Instantiate a method pattern with signatures for generics search
*/
public ConstructorPattern(
char[] declaringSimpleName,
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
index 0a9a458..ccd1838 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
@@ -1141,11 +1141,11 @@ protected void locateMatches(JavaProject javaProject, PossibleMatch[] possibleMa
process(possibleMatch, bindingsWereCreated);
} catch (AbortCompilation e) {
// problem with class path: it could not find base classes
- // continue and try next matching openable reporting innacurate matches (since bindings will be null)
+ // continue and try next matching openable reporting inaccurate matches (since bindings will be null)
bindingsWereCreated = false;
} catch (JavaModelException e) {
// problem with class path: it could not find base classes
- // continue and try next matching openable reporting innacurate matches (since bindings will be null)
+ // continue and try next matching openable reporting inaccurate matches (since bindings will be null)
bindingsWereCreated = false;
} finally {
if (this.progressMonitor != null) {
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java
index a993d8a..6cb561f 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -149,7 +149,7 @@ protected char[] getQualifiedPattern(char[] simpleNamePattern, char[] qualificat
}
/* (non-Javadoc)
* Modify PatternLocator.qualifiedSourceName behavior:
- * also concatene enclosing type name when type is a only a member type.
+ * also concatenate enclosing type name when type is a only a member type.
*/
protected char[] getQualifiedSourceName(TypeBinding binding) {
TypeBinding type = binding instanceof ArrayBinding ? ((ArrayBinding)binding).leafComponentType : binding;
@@ -602,7 +602,7 @@ protected void updateMatch(TypeBinding[] argumentsBinding, MatchLocator locator,
continue;
}
- // Verify tha pattern binding is compatible with match type argument binding
+ // Verify the pattern binding is compatible with match type argument binding
switch (patternWildcard) {
case Signature.C_STAR : // UNBOUND pattern
// unbound always match => skip to next argument