mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 17:56:01 +02:00
fix for 148790 by Vivian Kong
This commit is contained in:
Chris Recoskie
parent
f5f18b8cb2
commit
5524cec83b
3 changed files with 253 additions and 157 deletions
|
|
@ -16,6 +16,7 @@ import org.eclipse.cdt.core.model.ICProject;
|
||||||
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
|
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
|
||||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
|
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
|
||||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMName;
|
import org.eclipse.cdt.internal.core.pdom.dom.PDOMName;
|
||||||
|
import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode;
|
||||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMNotImplementedError;
|
import org.eclipse.cdt.internal.core.pdom.dom.PDOMNotImplementedError;
|
||||||
import org.eclipse.core.runtime.CoreException;
|
import org.eclipse.core.runtime.CoreException;
|
||||||
|
|
||||||
|
|
@ -93,9 +94,21 @@ public class PDOMTypeInfo implements ITypeInfo {
|
||||||
}
|
}
|
||||||
|
|
||||||
public IQualifiedTypeName getQualifiedTypeName() {
|
public IQualifiedTypeName getQualifiedTypeName() {
|
||||||
String bindingName = binding.getName();
|
StringBuffer buf = new StringBuffer(binding.getName());
|
||||||
// TODO really do qualified type names
|
try {
|
||||||
return new QualifiedTypeName(bindingName);
|
PDOMNode parent = binding.getParentNode();
|
||||||
|
while (parent != null)
|
||||||
|
{
|
||||||
|
if (parent instanceof PDOMBinding)
|
||||||
|
{
|
||||||
|
buf.insert(0, ((PDOMBinding)parent).getName() + "::");
|
||||||
|
}
|
||||||
|
parent = parent.getParentNode();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
// TODO: handle exception
|
||||||
|
}
|
||||||
|
return new QualifiedTypeName(buf.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
public ITypeReference[] getReferences() {
|
public ITypeReference[] getReferences() {
|
||||||
|
|
|
||||||
|
|
@ -41,8 +41,8 @@ NewClassCreationWizardPage.namespace.button=Bro&wse...
|
||||||
NewClassCreationWizardPage.error.EnterNamespace=Namespace is empty.
|
NewClassCreationWizardPage.error.EnterNamespace=Namespace is empty.
|
||||||
NewClassCreationWizardPage.error.EnclosingNamespaceNotExists=Enclosing namespace does not exist.
|
NewClassCreationWizardPage.error.EnclosingNamespaceNotExists=Enclosing namespace does not exist.
|
||||||
NewClassCreationWizardPage.error.NamespaceExistsDifferentCase=Namespace with the same name but different case exists.
|
NewClassCreationWizardPage.error.NamespaceExistsDifferentCase=Namespace with the same name but different case exists.
|
||||||
NewClassCreationWizardPage.error.TypeMatchingNamespaceExists=Another type with the same name exists.
|
NewClassCreationWizardPage.error.TypeMatchingNamespaceExists=Another type with the same name as specified namespace exists.
|
||||||
NewClassCreationWizardPage.error.TypeMatchingNamespaceExistsDifferentCase=Another type with the same name but different case exists.
|
NewClassCreationWizardPage.error.TypeMatchingNamespaceExistsDifferentCase=Another type with the same name as specified namespace but different case exists.
|
||||||
NewClassCreationWizardPage.warning.NamespaceNotExists=Namespace does not exist. A new namespace will be created.
|
NewClassCreationWizardPage.warning.NamespaceNotExists=Namespace does not exist. A new namespace will be created.
|
||||||
NewClassCreationWizardPage.error.InvalidNamespace=Namespace is not valid. {0}.
|
NewClassCreationWizardPage.error.InvalidNamespace=Namespace is not valid. {0}.
|
||||||
NewClassCreationWizardPage.warning.NamespaceDiscouraged=Namespace is discouraged. {0}.
|
NewClassCreationWizardPage.warning.NamespaceDiscouraged=Namespace is discouraged. {0}.
|
||||||
|
|
|
||||||
|
|
@ -10,59 +10,11 @@
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.cdt.ui.wizards;
|
package org.eclipse.cdt.ui.wizards;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import org.eclipse.cdt.core.CConventions;
|
|
||||||
import org.eclipse.cdt.core.CCorePlugin;
|
|
||||||
import org.eclipse.cdt.core.browser.AllTypesCache;
|
|
||||||
import org.eclipse.cdt.core.browser.IQualifiedTypeName;
|
|
||||||
import org.eclipse.cdt.core.browser.ITypeInfo;
|
|
||||||
import org.eclipse.cdt.core.browser.ITypeSearchScope;
|
|
||||||
import org.eclipse.cdt.core.browser.PathUtil;
|
|
||||||
import org.eclipse.cdt.core.browser.QualifiedTypeName;
|
|
||||||
import org.eclipse.cdt.core.browser.TypeSearchScope;
|
|
||||||
import org.eclipse.cdt.core.browser.TypeUtil;
|
|
||||||
import org.eclipse.cdt.core.model.CModelException;
|
|
||||||
import org.eclipse.cdt.core.model.CoreModel;
|
|
||||||
import org.eclipse.cdt.core.model.ICContainer;
|
|
||||||
import org.eclipse.cdt.core.model.ICElement;
|
|
||||||
import org.eclipse.cdt.core.model.ICProject;
|
|
||||||
import org.eclipse.cdt.core.model.ISourceRoot;
|
|
||||||
import org.eclipse.cdt.core.parser.IScannerInfo;
|
|
||||||
import org.eclipse.cdt.core.parser.IScannerInfoProvider;
|
|
||||||
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
|
|
||||||
import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
|
|
||||||
import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;
|
|
||||||
import org.eclipse.cdt.internal.ui.util.SWTUtil;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.SourceFolderSelectionDialog;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.BaseClassInfo;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.BaseClassesListDialogField;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.ConstructorMethodStub;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.DestructorMethodStub;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.IBaseClassInfo;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.IMethodStub;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.MethodStubsListDialogField;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.NamespaceSelectionDialog;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewBaseClassSelectionDialog;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassCodeGenerator;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardMessages;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardPrefs;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.SourceFileSelectionDialog;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardUtil;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewBaseClassSelectionDialog.ITypeSelectionListener;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
|
|
||||||
import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField;
|
|
||||||
import org.eclipse.cdt.ui.CUIPlugin;
|
|
||||||
import org.eclipse.core.resources.IFile;
|
import org.eclipse.core.resources.IFile;
|
||||||
import org.eclipse.core.resources.IProject;
|
import org.eclipse.core.resources.IProject;
|
||||||
import org.eclipse.core.resources.IResource;
|
import org.eclipse.core.resources.IResource;
|
||||||
|
|
@ -93,6 +45,67 @@ import org.eclipse.ui.IEditorPart;
|
||||||
import org.eclipse.ui.IWorkbenchPage;
|
import org.eclipse.ui.IWorkbenchPage;
|
||||||
import org.eclipse.ui.IWorkbenchPart;
|
import org.eclipse.ui.IWorkbenchPart;
|
||||||
|
|
||||||
|
import org.eclipse.cdt.core.CConventions;
|
||||||
|
import org.eclipse.cdt.core.CCorePlugin;
|
||||||
|
import org.eclipse.cdt.core.browser.AllTypesCache;
|
||||||
|
import org.eclipse.cdt.core.browser.IQualifiedTypeName;
|
||||||
|
import org.eclipse.cdt.core.browser.ITypeInfo;
|
||||||
|
import org.eclipse.cdt.core.browser.ITypeSearchScope;
|
||||||
|
import org.eclipse.cdt.core.browser.PathUtil;
|
||||||
|
import org.eclipse.cdt.core.browser.QualifiedTypeName;
|
||||||
|
import org.eclipse.cdt.core.browser.TypeSearchScope;
|
||||||
|
import org.eclipse.cdt.core.browser.TypeUtil;
|
||||||
|
import org.eclipse.cdt.core.dom.IPDOMManager;
|
||||||
|
import org.eclipse.cdt.core.dom.ast.IBinding;
|
||||||
|
import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
|
||||||
|
import org.eclipse.cdt.core.model.CModelException;
|
||||||
|
import org.eclipse.cdt.core.model.CoreModel;
|
||||||
|
import org.eclipse.cdt.core.model.ICContainer;
|
||||||
|
import org.eclipse.cdt.core.model.ICElement;
|
||||||
|
import org.eclipse.cdt.core.model.ICProject;
|
||||||
|
import org.eclipse.cdt.core.model.ISourceRoot;
|
||||||
|
import org.eclipse.cdt.core.parser.IScannerInfo;
|
||||||
|
import org.eclipse.cdt.core.parser.IScannerInfoProvider;
|
||||||
|
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
|
||||||
|
import org.eclipse.cdt.ui.CUIPlugin;
|
||||||
|
|
||||||
|
import org.eclipse.cdt.internal.core.pdom.PDOM;
|
||||||
|
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
|
||||||
|
import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode;
|
||||||
|
import org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPClassType;
|
||||||
|
import org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPNamespace;
|
||||||
|
|
||||||
|
import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
|
||||||
|
import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;
|
||||||
|
import org.eclipse.cdt.internal.ui.util.SWTUtil;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.SourceFolderSelectionDialog;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.BaseClassInfo;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.BaseClassesListDialogField;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.ConstructorMethodStub;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.DestructorMethodStub;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.IBaseClassInfo;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.IMethodStub;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.MethodStubsListDialogField;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.NamespaceSelectionDialog;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewBaseClassSelectionDialog;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassCodeGenerator;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardMessages;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardPrefs;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewClassWizardUtil;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.SourceFileSelectionDialog;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.classwizard.NewBaseClassSelectionDialog.ITypeSelectionListener;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
|
||||||
|
import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField;
|
||||||
|
|
||||||
public class NewClassCreationWizardPage extends NewElementWizardPage {
|
public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
|
|
||||||
protected final static String PAGE_NAME = "NewClassWizardPage"; //$NON-NLS-1$
|
protected final static String PAGE_NAME = "NewClassWizardPage"; //$NON-NLS-1$
|
||||||
|
|
@ -1449,7 +1462,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hook method that gets called when the namespace has changed. The method validates the
|
* Hook method that gets called when the namespace has changed. The method validates the
|
||||||
* namespace and returns the status of the validation.
|
* namespace and returns the status of the validation.
|
||||||
*
|
*
|
||||||
|
|
@ -1468,7 +1481,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
IStatus val = CConventions.validateNamespaceName(namespace);
|
IStatus val = CConventions.validateNamespaceName(namespace);
|
||||||
if (val.getSeverity() == IStatus.ERROR) {
|
if (val.getSeverity() == IStatus.ERROR) {
|
||||||
status.setError(NewClassWizardMessages.getFormattedString("NewClassCreationWizardPage.error.InvalidNamespace", val.getMessage())); //$NON-NLS-1$
|
status.setError(NewClassWizardMessages.getFormattedString("NewClassCreationWizardPage.error.InvalidNamespace", val.getMessage())); //$NON-NLS-1$
|
||||||
return status;
|
return status;
|
||||||
|
|
@ -1476,63 +1489,111 @@ public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
status.setWarning(NewClassWizardMessages.getFormattedString("NewClassCreationWizardPage.warning.NamespaceDiscouraged", val.getMessage())); //$NON-NLS-1$
|
status.setWarning(NewClassWizardMessages.getFormattedString("NewClassCreationWizardPage.warning.NamespaceDiscouraged", val.getMessage())); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
IQualifiedTypeName typeName = new QualifiedTypeName(namespace);
|
IQualifiedTypeName typeName = new QualifiedTypeName(namespace);
|
||||||
ICProject project = getCurrentProject();
|
ICProject project = getCurrentProject();
|
||||||
if (project != null) {
|
if (project != null) {
|
||||||
if (typeName.isQualified()) {
|
|
||||||
// make sure enclosing namespace exists
|
|
||||||
ITypeInfo parentNamespace = AllTypesCache.getType(project, ICElement.C_NAMESPACE, typeName.getEnclosingTypeName());
|
|
||||||
if (parentNamespace == null) {
|
|
||||||
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.EnclosingNamespaceNotExists")); //$NON-NLS-1$
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ITypeInfo[] types = AllTypesCache.getTypes(project, typeName, false, true);
|
List patternList = new ArrayList(); //for binding search
|
||||||
if (types.length > 0) {
|
|
||||||
// look for namespace
|
if (typeName.isQualified()) {
|
||||||
boolean foundNamespace = false;
|
/* make sure enclosing namespace exists */
|
||||||
boolean exactMatch = false;
|
String[] enclosingNames = typeName.getEnclosingNames();
|
||||||
for (int i = 0; i < types.length; ++i) {
|
|
||||||
ITypeInfo currType = types[i];
|
if (enclosingNames.length > 0)
|
||||||
if (currType.getCElementType() == ICElement.C_NAMESPACE) {
|
{
|
||||||
foundNamespace = true;
|
//build the pattern list, for qualified enclosing names
|
||||||
exactMatch = currType.getQualifiedTypeName().equals(typeName);
|
for (int j = 0; j < enclosingNames.length; j++)
|
||||||
if (exactMatch) {
|
{
|
||||||
// found a matching namespace
|
patternList.add(Pattern.compile(enclosingNames[j]));
|
||||||
break;
|
}
|
||||||
}
|
Pattern[] patterns = (Pattern[])patternList.toArray(new Pattern[patternList.size()]);
|
||||||
|
|
||||||
|
IPDOMManager pdomManager = CCorePlugin.getPDOMManager();
|
||||||
|
boolean found = false;
|
||||||
|
try {
|
||||||
|
PDOM pdom = (PDOM)pdomManager.getPDOM(project);
|
||||||
|
IBinding[] bindings = pdom.findBindings(patterns);
|
||||||
|
|
||||||
|
//go through the list of bindings found and check if the fully qualified name of each binding
|
||||||
|
//matches the enclosing name
|
||||||
|
for (int i = 0; i < bindings.length; ++i) {
|
||||||
|
PDOMBinding binding = (PDOMBinding)bindings[i];
|
||||||
|
PDOMBinding pdomBinding = pdom.getLinkage(GPPLanguage.getDefault()).adaptBinding(binding);
|
||||||
|
|
||||||
|
//get the fully qualified name of the binding
|
||||||
|
String fullyQualifiedName = getBindingQualifiedName(pdomBinding);
|
||||||
|
if (pdomBinding instanceof PDOMCPPNamespace)
|
||||||
|
{
|
||||||
|
if (fullyQualifiedName.equals(new QualifiedTypeName(enclosingNames).getFullyQualifiedName()))
|
||||||
|
{
|
||||||
|
found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found)
|
||||||
|
{
|
||||||
|
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.EnclosingNamespaceNotExists")); //$NON-NLS-1$
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (CoreException e) {
|
||||||
|
return e.getStatus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (foundNamespace) {
|
|
||||||
if (exactMatch) {
|
|
||||||
// we're good to go
|
|
||||||
status.setOK();
|
|
||||||
} else {
|
|
||||||
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.NamespaceExistsDifferentCase")); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
// look for other types
|
|
||||||
exactMatch = false;
|
|
||||||
for (int i = 0; i < types.length; ++i) {
|
|
||||||
ITypeInfo currType = types[i];
|
|
||||||
if (currType.getCElementType() != ICElement.C_NAMESPACE) {
|
|
||||||
exactMatch = currType.getQualifiedTypeName().equals(typeName);
|
|
||||||
if (exactMatch) {
|
|
||||||
// found a matching type
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (exactMatch) {
|
|
||||||
status.setWarning(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.TypeMatchingNamespaceExists")); //$NON-NLS-1$
|
|
||||||
} else {
|
|
||||||
status.setWarning(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.TypeMatchingNamespaceExistsDifferentCase")); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
status.setWarning(NewClassWizardMessages.getString("NewClassCreationWizardPage.warning.NamespaceNotExists")); //$NON-NLS-1$
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//look for namespace
|
||||||
|
IPDOMManager pdomManager = CCorePlugin.getPDOMManager();
|
||||||
|
try {
|
||||||
|
PDOM pdom = (PDOM)pdomManager.getPDOM(project);
|
||||||
|
//add the namespace name to the list of patterns
|
||||||
|
patternList.add(Pattern.compile(typeName.getName()));
|
||||||
|
Pattern[] patterns = (Pattern[])patternList.toArray(new Pattern[patternList.size()]);
|
||||||
|
IBinding[] bindings = pdom.findBindings(patterns);
|
||||||
|
|
||||||
|
for (int i = 0; i < bindings.length; ++i) {
|
||||||
|
PDOMBinding binding = (PDOMBinding)bindings[i];
|
||||||
|
PDOMBinding pdomBinding = pdom.getLinkage(GPPLanguage.getDefault()).adaptBinding(binding);
|
||||||
|
|
||||||
|
//get the fully qualified name of this binding
|
||||||
|
String bindingFullName = getBindingQualifiedName(pdomBinding);
|
||||||
|
|
||||||
|
if (pdomBinding instanceof PDOMCPPNamespace)
|
||||||
|
{
|
||||||
|
if (bindingFullName.equals(namespace))
|
||||||
|
{
|
||||||
|
status.setOK(); //found an exact match
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.NamespaceExistsDifferentCase")); //$NON-NLS-1$
|
||||||
|
}
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
else //a binding is found but it is not a namespace
|
||||||
|
{
|
||||||
|
if (bindingFullName.equals(namespace))
|
||||||
|
{
|
||||||
|
status.setWarning(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.TypeMatchingNamespaceExists")); //$NON-NLS-1$
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
status.setWarning(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.TypeMatchingNamespaceExistsDifferentCase")); //$NON-NLS-1$
|
||||||
|
}
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bindings.length == 0)
|
||||||
|
{
|
||||||
|
//no namespaces found with the specified name
|
||||||
|
status.setWarning(NewClassWizardMessages.getString("NewClassCreationWizardPage.warning.NamespaceNotExists")); //$NON-NLS-1$
|
||||||
|
}
|
||||||
|
} catch (CoreException e) {
|
||||||
|
return e.getStatus();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val = CConventions.validateNamespaceName(typeName.lastSegment());
|
val = CConventions.validateNamespaceName(typeName.lastSegment());
|
||||||
|
|
@ -1540,10 +1601,30 @@ public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
status.setError(NewClassWizardMessages.getFormattedString("NewClassCreationWizardPage.error.InvalidNamespace", val.getMessage())); //$NON-NLS-1$
|
status.setError(NewClassWizardMessages.getFormattedString("NewClassCreationWizardPage.error.InvalidNamespace", val.getMessage())); //$NON-NLS-1$
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the fully qualified name for a given PDOMBinding
|
||||||
|
* @param pdomBinding
|
||||||
|
* @return binding's fully qualified name
|
||||||
|
* @throws CoreException
|
||||||
|
*/
|
||||||
|
private String getBindingQualifiedName(PDOMBinding pdomBinding) throws CoreException
|
||||||
|
{
|
||||||
|
StringBuffer buf = new StringBuffer(pdomBinding.getName());
|
||||||
|
PDOMNode parent = pdomBinding.getParentNode();
|
||||||
|
while (parent != null)
|
||||||
|
{
|
||||||
|
if (parent instanceof PDOMBinding)
|
||||||
|
{
|
||||||
|
buf.insert(0, ((PDOMBinding)parent).getName() + "::");
|
||||||
|
}
|
||||||
|
parent = parent.getParentNode();
|
||||||
|
}
|
||||||
|
return buf.toString();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hook method that gets called when the class name has changed. The method validates the
|
* Hook method that gets called when the class name has changed. The method validates the
|
||||||
* class name and returns the status of the validation.
|
* class name and returns the status of the validation.
|
||||||
|
|
@ -1561,7 +1642,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
}
|
}
|
||||||
|
|
||||||
IQualifiedTypeName typeName = new QualifiedTypeName(className);
|
IQualifiedTypeName typeName = new QualifiedTypeName(className);
|
||||||
if (typeName.isQualified()) {
|
if (typeName.isQualified()) { //$NON-NLS-1$
|
||||||
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.QualifiedClassName")); //$NON-NLS-1$
|
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.QualifiedClassName")); //$NON-NLS-1$
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
@ -1577,6 +1658,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
|
|
||||||
ICProject project = getCurrentProject();
|
ICProject project = getCurrentProject();
|
||||||
if (project != null) {
|
if (project != null) {
|
||||||
|
|
||||||
IQualifiedTypeName fullyQualifiedName = typeName;
|
IQualifiedTypeName fullyQualifiedName = typeName;
|
||||||
if (isNamespaceSelected()) {
|
if (isNamespaceSelected()) {
|
||||||
String namespace = getNamespaceText();
|
String namespace = getNamespaceText();
|
||||||
|
|
@ -1585,51 +1667,52 @@ public class NewClassCreationWizardPage extends NewElementWizardPage {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ITypeInfo[] types = AllTypesCache.getTypes(project, fullyQualifiedName, false, true);
|
String fullyQualifiedClassName = fullyQualifiedName.getFullyQualifiedName();
|
||||||
if (types.length > 0) {
|
|
||||||
// look for class
|
//build the pattern list, for qualified enclosing names
|
||||||
boolean foundClass = false;
|
String[] enclosingNames = fullyQualifiedName.getEnclosingNames();
|
||||||
boolean exactMatch = false;
|
List patternList = new ArrayList();
|
||||||
for (int i = 0; i < types.length; ++i) {
|
for (int j = 0; j < enclosingNames.length; j++)
|
||||||
ITypeInfo currType = types[i];
|
{
|
||||||
if (currType.getCElementType() == ICElement.C_CLASS
|
patternList.add(Pattern.compile(enclosingNames[j]));
|
||||||
|| currType.getCElementType() == ICElement.C_STRUCT) {
|
}
|
||||||
foundClass = true;
|
//add class name to pattern
|
||||||
exactMatch = currType.getQualifiedTypeName().equals(fullyQualifiedName);
|
patternList.add(Pattern.compile(className));
|
||||||
if (exactMatch) {
|
Pattern[] patterns = (Pattern[])patternList.toArray(new Pattern[patternList.size()]);
|
||||||
// found a matching class
|
|
||||||
break;
|
//look for conflicting class/struct
|
||||||
}
|
IPDOMManager pdomManager = CCorePlugin.getPDOMManager();
|
||||||
|
try {
|
||||||
|
PDOM pdom = (PDOM)pdomManager.getPDOM(project);
|
||||||
|
IBinding[] bindings = pdom.findBindings(patterns);
|
||||||
|
for (int i = 0; i < bindings.length; ++i)
|
||||||
|
{
|
||||||
|
PDOMBinding binding = (PDOMBinding)bindings[i];
|
||||||
|
PDOMBinding pdomBinding = pdom.getLinkage(GPPLanguage.getDefault()).adaptBinding(binding);
|
||||||
|
|
||||||
|
//get the fully qualified name of this binding
|
||||||
|
String bindingFullName = getBindingQualifiedName(pdomBinding);
|
||||||
|
|
||||||
|
if (pdomBinding instanceof PDOMCPPClassType)
|
||||||
|
{
|
||||||
|
if (bindingFullName.equals(fullyQualifiedClassName))
|
||||||
|
{
|
||||||
|
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.ClassNameExists")); //$NON-NLS-1$
|
||||||
|
}
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
}
|
else //a binding is found but it is not a class/struct
|
||||||
if (foundClass) {
|
{
|
||||||
if (exactMatch) {
|
if (bindingFullName.equals(fullyQualifiedClassName))
|
||||||
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.ClassNameExists")); //$NON-NLS-1$
|
{
|
||||||
} else {
|
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.TypeMatchingClassExists")); //$NON-NLS-1$
|
||||||
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.ClassNameExistsDifferentCase")); //$NON-NLS-1$
|
}
|
||||||
}
|
return status;
|
||||||
return status;
|
}
|
||||||
}
|
}
|
||||||
// look for other types
|
} catch (CoreException e) {
|
||||||
exactMatch = false;
|
return e.getStatus();
|
||||||
for (int i = 0; i < types.length; ++i) {
|
}
|
||||||
ITypeInfo currType = types[i];
|
|
||||||
if (currType.getCElementType() != ICElement.C_CLASS
|
|
||||||
&& currType.getCElementType() != ICElement.C_STRUCT) {
|
|
||||||
exactMatch = currType.getQualifiedTypeName().equals(fullyQualifiedName);
|
|
||||||
if (exactMatch) {
|
|
||||||
// found a matching type
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (exactMatch) {
|
|
||||||
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.TypeMatchingClassExists")); //$NON-NLS-1$
|
|
||||||
} else {
|
|
||||||
status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.TypeMatchingClassExistsDifferentCase")); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue