@follow up

plugin_ide.core/src/LANG_PROJECT_ID/ide/core/text/LANGUAGE_PartitionScanner.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2015 Bruno Medeiros and other Contributors.
+ * Copyright (c) 2014 Bruno Medeiros and other Contributors.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,22 +10,21 @@
  *******************************************************************************/
 package LANG_PROJECT_ID.ide.core.text;
 
+import org.eclipse.jface.text.rules.IPredicateRule;
+
 import melnorme.lang.ide.core.TextSettings_Actual.LangPartitionTypes;
-import melnorme.lang.ide.core.text.LexingRulePredicateRule;
-import melnorme.lang.ide.core.text.RuleBasedPartitionScannerExt;
+import melnorme.lang.ide.core.text.LangPartitionScanner;
 import melnorme.lang.tooling.parser.lexer.CharacterLexingRule;
 import melnorme.utilbox.collections.ArrayList2;
 
-import org.eclipse.jface.text.rules.IPredicateRule;
-
-public class LANGUAGE_PartitionScanner extends RuleBasedPartitionScannerExt {
+public class LANGUAGE_PartitionScanner extends LangPartitionScanner {
 
 	public LANGUAGE_PartitionScanner() {
 		super();
 	}
 
 	@Override
-	protected void addRules(ArrayList2<IPredicateRule> rules) {
+	protected void initPredicateRules(ArrayList2<IPredicateRule> rules) {
 		addStandardRules(rules, 
 			LangPartitionTypes.LINE_COMMENT.getId(), 
 			LangPartitionTypes.BLOCK_COMMENT.getId(), 

plugin_ide.ui/src/LANG_PROJECT_ID/ide/ui/text/LANGUAGE_CodeScanner.java

@@ -10,17 +10,14 @@
  *******************************************************************************/
 package LANG_PROJECT_ID.ide.ui.text;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import melnorme.lang.ide.ui.text.coloring.AbstractLangScanner;
-
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.WhitespaceRule;
 import org.eclipse.jface.text.rules.WordRule;
 
 import _org.eclipse.cdt.ui.text.ITokenStoreFactory;
+import melnorme.lang.ide.ui.text.AbstractLangScanner;
+import melnorme.utilbox.collections.ArrayList2;
 
 /**
  * Sample LANGUAGE code scanner
@@ -35,11 +32,10 @@ public class LANGUAGE_CodeScanner extends AbstractLangScanner {
 
 	public LANGUAGE_CodeScanner(ITokenStoreFactory factory) {
 		super(factory.createTokenStore(tokenPrefProperties));
-		setRules(createRules());
 	}
 
-	protected List<IRule> createRules() {
-		List<IRule> rules = new ArrayList<IRule>();
+	@Override
+	protected void initRules(ArrayList2<IRule> rules) {
 
 		IToken tkOther = getToken(LANGUAGE_ColorPreferences.DEFAULT.key);
 		IToken tkKeywords = getToken(LANGUAGE_ColorPreferences.KEYWORDS.key);
@@ -60,7 +56,6 @@ protected List<IRule> createRules() {
 		rules.add(wordRule);
 
 		setDefaultReturnToken(tkOther);
-		return rules;
 	}
 
 }