mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Changed MouseClickListener to use Parser KeywordSets
This commit is contained in:
parent
dc2bb390ae
commit
880fa77c9e
2 changed files with 19 additions and 8 deletions
|
@ -1,3 +1,7 @@
|
|||
2004-06-06 Bogdan Gheorghe
|
||||
Changed MouseClickListener to use Parser KeywordSets
|
||||
* src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
|
||||
|
||||
2004-06-06 Bogdan Gheorghe
|
||||
Fix for Bug 60629
|
||||
* src/org/eclipse/cdt/internal/ui/CPluginImages.java
|
||||
|
@ -6,8 +10,6 @@
|
|||
* src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java
|
||||
* src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
|
||||
|
||||
|
||||
|
||||
2004-06-03 Alain Magloire
|
||||
|
||||
Fix for PR 60650
|
||||
|
|
|
@ -6,8 +6,13 @@
|
|||
*/
|
||||
package org.eclipse.cdt.internal.ui.editor;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.cdt.core.ICLogConstants;
|
||||
import org.eclipse.cdt.internal.ui.text.CppCodeScanner;
|
||||
import org.eclipse.cdt.core.parser.KeywordSetKey;
|
||||
import org.eclipse.cdt.core.parser.ParserLanguage;
|
||||
import org.eclipse.cdt.internal.core.parser.token.KeywordSets;
|
||||
import org.eclipse.jface.action.IAction;
|
||||
import org.eclipse.jface.preference.IPreferenceStore;
|
||||
import org.eclipse.jface.preference.PreferenceConverter;
|
||||
|
@ -69,7 +74,7 @@ IPropertyChangeListener{
|
|||
this.fViewer = viewer;
|
||||
this.fPrefStore = store;
|
||||
this.fOpenDeclAction = openDeclAction;
|
||||
this.fgKeywords = CppCodeScanner.getKeywords();
|
||||
this.fgKeywords = KeywordSets.getKeywords(KeywordSetKey.ALL,ParserLanguage.CPP);
|
||||
}
|
||||
|
||||
/** The session is active. */
|
||||
|
@ -92,7 +97,7 @@ IPropertyChangeListener{
|
|||
//Temp. Keywords: Once the selection parser is complete, we can use
|
||||
//it to determine if a word can be underlined
|
||||
|
||||
private String[] fgKeywords;
|
||||
private Set fgKeywords;
|
||||
|
||||
public void deactivate() {
|
||||
deactivate(false);
|
||||
|
@ -468,10 +473,14 @@ IPropertyChangeListener{
|
|||
}
|
||||
|
||||
private boolean isKeyWord(String selWord) {
|
||||
for (int i=0; i<fgKeywords.length; i++){
|
||||
if (selWord.equals(fgKeywords[i]))
|
||||
return true;
|
||||
Iterator i = fgKeywords.iterator();
|
||||
|
||||
while (i.hasNext()){
|
||||
String tempWord = (String) i.next();
|
||||
if (selWord.equals(tempWord))
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue