From e40d216b9119c3305ed33e0c630dccc83ec870ae Mon Sep 17 00:00:00 2001
From: Andrew Ferguson
Date: Tue, 22 Apr 2008 08:24:51 +0000
Subject: fix warnings
---
.../core/index/composite/AbstractCompositeFactory.java | 7 ++++---
.../internal/core/index/composite/CompositeArrayType.java | 2 +-
.../core/index/composite/CompositeFunctionType.java | 2 +-
.../core/index/composite/CompositePointerType.java | 2 +-
.../core/index/composite/CompositeQualifierType.java | 2 +-
.../cdt/internal/core/index/composite/CompositeScope.java | 14 ++++++++------
.../core/index/composite/c/CCompositesFactory.java | 9 ++++-----
.../core/index/composite/c/CompositeCEnumeration.java | 3 +--
.../core/index/composite/c/CompositeCStructure.java | 3 +--
.../composite/cpp/CompositeCPPClassSpecialization.java | 6 ++----
.../composite/cpp/CompositeCPPFunctionSpecialization.java | 3 +--
.../composite/cpp/CompositeCPPPointerToMemberType.java | 5 +++--
12 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java
index 56f2b8d2196..1c15412ac5e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java
@@ -77,9 +77,10 @@ public abstract class AbstractCompositeFactory implements ICompositesFactory {
* context) which is equivalent to the specified binding. If no definition is found,
* a declaration is returned if allowDeclaration
is set, otherwise an
* arbitrary binding is returned if available.
- * @param index
- * @param binding
- * @return
+ * @param binding the binding to find a representative for
+ * @param allowDeclaration whether declarations should be considered when a definition is
+ * unavailable
+ * @return the representative binding as defined above
*/
protected IIndexFragmentBinding findOneBinding(IBinding binding, boolean allowDeclaration) {
try{
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java
index 1af61227bd1..76d4326b3bd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.core.dom.ast.IArrayType;
import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
import org.eclipse.cdt.internal.core.index.ArrayTypeClone;
-public class CompositeArrayType extends CompositeTypeContainer implements IArrayType, ITypeContainer {
+public class CompositeArrayType extends CompositeTypeContainer implements IArrayType {
public CompositeArrayType(IArrayType arrayType, ICompositesFactory cf) {
super((ITypeContainer) arrayType, cf);
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java
index 7858b8a1333..23449d23650 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java
@@ -15,7 +15,7 @@ import org.eclipse.cdt.core.dom.ast.IFunctionType;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.internal.core.index.IIndexType;
-public class CompositeFunctionType extends CompositeType implements IFunctionType, IIndexType {
+public class CompositeFunctionType extends CompositeType implements IFunctionType {
public CompositeFunctionType(IFunctionType rtype, ICompositesFactory cf) {
super(rtype, cf);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java
index e2e3953e4bf..6827591aec7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
import org.eclipse.cdt.internal.core.index.PointerTypeClone;
-public class CompositePointerType extends CompositeTypeContainer implements IPointerType, ITypeContainer {
+public class CompositePointerType extends CompositeTypeContainer implements IPointerType {
public CompositePointerType(IPointerType pointerType, ICompositesFactory cf) throws DOMException {
super((ITypeContainer) pointerType, cf);
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java
index c7814328af6..51ecefd7a8a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
import org.eclipse.cdt.internal.core.index.QualifierTypeClone;
-public class CompositeQualifierType extends CompositeTypeContainer implements IQualifierType, ITypeContainer {
+public class CompositeQualifierType extends CompositeTypeContainer implements IQualifierType {
public CompositeQualifierType(IQualifierType qualifierType, ICompositesFactory cf) throws DOMException {
super((ITypeContainer) qualifierType, cf);
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java
index 47cc9cc958d..2a7089b6c4d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java
@@ -70,8 +70,8 @@ public abstract class CompositeScope implements IIndexScope {
/**
* For bindings that are not known statically to be index bindings, we must decide how to
* process them by run-time type. This method processes a single binding accordingly.
- * @param binding
- * @return
+ * @param binding a binding from the fragment layer
+ * @return a suitable binding at the composite layer
*/
protected final IBinding processUncertainBinding(IBinding binding) {
if(binding instanceof IIndexFragmentBinding) {
@@ -100,11 +100,13 @@ public abstract class CompositeScope implements IIndexScope {
* @return a non-null IBinding[]
*/
protected final IBinding[] processUncertainBindings(IBinding[] frgBindings) {
- IBinding[] result= new IBinding[frgBindings==null ? 0 : frgBindings.length];
- for(int i=0; i