"A::B::C", or "C".
+ * Validate the given CPP class name, either simple or qualified. For
+ * example, "A::B::C", or "C".
*
*
* @param name the name of a class
* @return a status object with code IStatus.OK if
- * the given name is valid as a CPP class name,
+ * the given name is valid as a CPP class name,
* a status with code IStatus.WARNING
- * indicating why the given name is discouraged,
- * otherwise a status object indicating what is wrong with
+ * indicating why the given name is discouraged,
+ * otherwise a status object indicating what is wrong with
* the name
*/
public static IStatus validateClassName(String name) {
@@ -89,9 +91,9 @@ public class CConventions {
// simple name
IStatus status = validateIdentifier(name);
if (!status.isOK()){
- return status;
+ return status;
}
-
+
scannedID = name.toCharArray();
} else {
// qualified name
@@ -103,11 +105,11 @@ public class CConventions {
String type = name.substring(index + scopeResolutionOperator.length()).trim();
status = validateIdentifier(type);
if (!status.isOK()){
- return status;
+ return status;
}
scannedID = type.toCharArray();
}
-
+
if (scannedID != null) {
if (CharOperation.contains('$', scannedID)) {
return new Status(IStatus.WARNING, CCorePlugin.PLUGIN_ID, -1, Util.bind("convention.class.dollarName"), null); //$NON-NLS-1$
@@ -124,11 +126,11 @@ public class CConventions {
* Validate the given scope name.
*
* @return a status object with code IStatus.OK if
- * the given name is valid as a class name, otherwise a status
+ * the given name is valid as a class name, otherwise a status
* object indicating what is wrong with the name
*/
public static IStatus validateScopeName(String name) {
-
+
if (name == null) {
return new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, Util.bind("convention.scope.nullName"), null); //$NON-NLS-1$
}
@@ -148,7 +150,7 @@ public class CConventions {
while (st.hasMoreTokens()) {
String typeName = st.nextToken();
typeName = typeName.trim(); // grammar allows spaces
- char[] scannedID = typeName.toCharArray();
+ char[] scannedID = typeName.toCharArray();
if (scannedID == null) {
return new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, Util.bind("convention.illegalIdentifier", typeName), null); //$NON-NLS-1$
}
@@ -167,13 +169,13 @@ public class CConventions {
*
* @param name the name of a field
* @return a status object with code IStatus.OK if
- * the given name is valid as a field name, otherwise a status
+ * the given name is valid as a field name, otherwise a status
* object indicating what is wrong with the name
*/
public static IStatus validateFieldName(String name) {
return validateIdentifier(name);
}
-
+
/**
* Validate the given C identifier.
* The identifier must not have the same spelling as a C keyword,
@@ -183,21 +185,21 @@ public class CConventions {
*
* @param id the C identifier
* @return a status object with code IStatus.OK if
- * the given identifier is a valid C identifier, otherwise a status
+ * the given identifier is a valid C identifier, otherwise a status
* object indicating what is wrong with the identifier
*/
public static IStatus validateIdentifier(String id) {
- if (isLegalIdentifier(id)) {
- if(!isValidIdentifier(id)){
- return CModelStatus.VERIFIED_OK;
- } else {
- return new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, Util.bind("convention.invalid", id), null); //$NON-NLS-1$
- }
- } else {
+ if (!isLegalIdentifier(id)) {
return new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, Util.bind("convention.illegalIdentifier", id), null); //$NON-NLS-1$
}
+
+ if (!isValidIdentifier(id)) {
+ return new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1, Util.bind("convention.invalid", id), null); //$NON-NLS-1$
+ }
+
+ return CModelStatus.VERIFIED_OK;
}
-
+
/**
* Validate the given method name.
* The special names "<init>" and "<clinit>" are not valid.
@@ -207,36 +209,44 @@ public class CConventions {
*
* @param name the name of a method
* @return a status object with code IStatus.OK if
- * the given name is valid as a method name, otherwise a status
+ * the given name is valid as a method name, otherwise a status
* object indicating what is wrong with the name
*/
public static IStatus validateMethodName(String name) {
- if(name.startsWith("~"))
- return validateIdentifier(name.substring(1, name.length()));
+ if(name.startsWith("~")) //$NON-NLS-1$
+ return validateIdentifier(name.substring(1));
else
return validateIdentifier(name);
}
-
+
public static boolean isValidIdentifier(String name){
// create a scanner and get the type of the token
// assuming that you are given a valid identifier
IToken token = null;
IScanner scanner = ParserFactory.createScanner(
new CodeReader(name.toCharArray()),
- new ScannerInfo(),
- ParserMode.QUICK_PARSE,
- ParserLanguage.CPP,
- null,
- null,
+ new ScannerInfo(),
+ ParserMode.QUICK_PARSE,
+ ParserLanguage.CPP,
+ null,
+ null,
null
);
- try{
+
+ try {
token = scanner.nextToken();
} catch (Exception e) {
}
- if((token != null) && (token.getType() != IToken.tIDENTIFIER))
- return true;
- return false;
+
+ if ((token != null) && (token.getType() == IToken.tIDENTIFIER)) {
+ try {
+ scanner.nextToken();
+ } catch (EndOfFileException e) {
+ return true;
+ } catch (Exception e) {
+ }
+ }
+
+ return false;
}
-
}
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 9ceb46fc69c..eef04687744 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-06 Hoda Amer
+ Fix for PR 69330 : Outline is flickering.
+
+2004-07-06 Chris Wiebe
+ This patch fixes a problem when using the class wizard, where the system
+ include separator '<' was used for project-relative include path instead
+ of '"'.
+
2004-06-29 Alain Magloire
Fix for PR 68820.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
index d295c8c39cc..77f73f5956f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
@@ -93,10 +93,8 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS
public void run() {
if (!treeViewer.getControl().isDisposed()) {
ISelection sel= treeViewer.getSelection();
- treeViewer.getControl().setRedraw(false);
- treeViewer.refresh();
treeViewer.setSelection(updateSelection(sel));
- treeViewer.getControl().setRedraw(true);
+ treeViewer.refresh();
}
}
});
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizardPage.java
index 21a82ab9591..22170855cd7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizardPage.java
@@ -908,7 +908,8 @@ public class NewClassWizardPage extends WizardPage implements Listener {
IPath projectPath = fSelectedProject.getFullPath();
IPath relativePath = location.getRelativeIncludePath(fSelectedProject);
if (!relativePath.equals(location.getLocation())) {
- systemIncludePath = true;
+ if (!projectPath.isPrefixOf(location.getPath()))
+ systemIncludePath = true;
} else {
if (projectPath.isPrefixOf(location.getPath()) && projectPath.isPrefixOf(header.getPath()))
relativePath = location.getRelativePath(header.getPath());