mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Changed MouseClickListener to use Parser KeywordSets

Browse source
This commit is contained in:
Bogdan Gheorghe 2004-06-07 02:39:36 +00:00
parent dc2bb390ae
commit 880fa77c9e
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -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 2004-06-06 Bogdan Gheorghe
Fix for Bug 60629 Fix for Bug 60629
* src/org/eclipse/cdt/internal/ui/CPluginImages.java * 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/internal/ui/search/LevelTreeContentProvider.java
* src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java * src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
2004-06-03 Alain Magloire 2004-06-03 Alain Magloire
Fix for PR 60650 Fix for PR 60650

19
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
View file

@ -6,8 +6,13 @@
*/ */
package org.eclipse.cdt.internal.ui.editor; 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.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.action.IAction;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.preference.PreferenceConverter;
@ -69,7 +74,7 @@ IPropertyChangeListener{
this.fViewer = viewer; this.fViewer = viewer;
this.fPrefStore = store; this.fPrefStore = store;
this.fOpenDeclAction = openDeclAction; this.fOpenDeclAction = openDeclAction;
this.fgKeywords = CppCodeScanner.getKeywords(); this.fgKeywords = KeywordSets.getKeywords(KeywordSetKey.ALL,ParserLanguage.CPP);
} }
/** The session is active. */ /** The session is active. */
@ -92,7 +97,7 @@ IPropertyChangeListener{
//Temp. Keywords: Once the selection parser is complete, we can use //Temp. Keywords: Once the selection parser is complete, we can use
//it to determine if a word can be underlined //it to determine if a word can be underlined
private String[] fgKeywords; private Set fgKeywords;
public void deactivate() { public void deactivate() {
deactivate(false); deactivate(false);
@ -468,10 +473,14 @@ IPropertyChangeListener{
} }
private boolean isKeyWord(String selWord) { private boolean isKeyWord(String selWord) {
for (int i=0; i<fgKeywords.length; i++){ Iterator i = fgKeywords.iterator();
if (selWord.equals(fgKeywords[i]))
while (i.hasNext()){
String tempWord = (String) i.next();
if (selWord.equals(tempWord))
return true; return true;
} }
return false; return false;
} }