diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java index 1f772b921a6..5bafec0683e 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java @@ -11,7 +11,6 @@ package org.eclipse.cdt.core.browser; import org.eclipse.cdt.core.CConventions; -import org.eclipse.core.internal.runtime.Assert; import org.eclipse.core.runtime.IStatus; public class QualifiedTypeName implements IQualifiedTypeName { @@ -28,22 +27,18 @@ public class QualifiedTypeName implements IQualifiedTypeName { public static final QualifiedTypeName EMPTY = new QualifiedTypeName(); public QualifiedTypeName(IQualifiedTypeName typeName) { - Assert.isNotNull(typeName); fSegments = typeName.segments(); } public QualifiedTypeName(String qualifiedName) { - Assert.isNotNull(qualifiedName); fSegments = createSegments(qualifiedName); } public QualifiedTypeName(String[] names) { - Assert.isNotNull(names); fSegments = createSegments(names); } public QualifiedTypeName(String name, String[] enclosingNames) { - Assert.isNotNull(name); if (enclosingNames == null) fSegments = createSegments(name); else @@ -78,7 +73,6 @@ public class QualifiedTypeName implements IQualifiedTypeName { lastIndex = qualifierIndex + QUALIFIER.length(); qualifierIndex = qualifiedName.indexOf(QUALIFIER, lastIndex); } - Assert.isTrue(segmentCount == (maxSegments - 1)); // note: we allocate a new string rather than use the returned substring, // otherwise we're holding a reference to the entire original string segments[segmentCount] = new String(qualifiedName.substring(lastIndex)); @@ -176,7 +170,6 @@ public class QualifiedTypeName implements IQualifiedTypeName { } public int matchingFirstSegments(IQualifiedTypeName typeName) { - Assert.isNotNull(typeName); int max = Math.min(fSegments.length, typeName.segmentCount()); int count = 0; for (int i = 0; i < max; ++i) { @@ -189,7 +182,6 @@ public class QualifiedTypeName implements IQualifiedTypeName { } public boolean isPrefixOf(IQualifiedTypeName typeName) { - Assert.isNotNull(typeName); if (fSegments.length == 0) return true; @@ -206,7 +198,6 @@ public class QualifiedTypeName implements IQualifiedTypeName { } public IQualifiedTypeName append(String[] names) { - Assert.isNotNull(names); int length = fSegments.length; int typeNameLength = names.length; String[] newSegments = new String[length + typeNameLength]; @@ -218,7 +209,6 @@ public class QualifiedTypeName implements IQualifiedTypeName { } public IQualifiedTypeName append(IQualifiedTypeName typeName) { - Assert.isNotNull(typeName); int length = fSegments.length; int typeNameLength = typeName.segmentCount(); String[] newSegments = new String[length + typeNameLength]; @@ -232,7 +222,6 @@ public class QualifiedTypeName implements IQualifiedTypeName { } public IQualifiedTypeName append(String qualifiedName) { - Assert.isNotNull(qualifiedName); return append(createSegments(qualifiedName)); } @@ -287,7 +276,6 @@ public class QualifiedTypeName implements IQualifiedTypeName { } public boolean isValidSegment(String segment) { - Assert.isNotNull(segment); if (segment.indexOf(QUALIFIER) != -1) return false; // type name must follow C conventions diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacheManager.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacheManager.java index 0fd2df7cfbc..bb1664c63bc 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacheManager.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacheManager.java @@ -29,7 +29,6 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElementDelta; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.core.internal.runtime.Assert; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.ISafeRunnable; @@ -216,7 +215,6 @@ public class TypeCacheManager implements ITypeCacheChangedListener { } public synchronized ITypeCache getCache(IProject project) { - Assert.isNotNull(project); synchronized(fCacheMap) { ITypeCache cache = (ITypeCache) fCacheMap.get(project); if (cache == null) {