Menu
▾
▴
[E-p-i-c-commits] org.epic.ext.cbg.editor/src/cbg/editor ColoringEditorTools.java,1.10,1.11
|
From: Jochen L. <lue...@us...> - 2005-03-30 15:22:52
|
Update of /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15469/src/cbg/editor Modified Files: ColoringEditorTools.java Log Message: Performance improvements Index: ColoringEditorTools.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/ColoringEditorTools.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ColoringEditorTools.java 17 Feb 2005 22:03:08 -0000 1.10 +++ ColoringEditorTools.java 30 Mar 2005 15:22:08 -0000 1.11 @@ -1,158 +1,159 @@ -package cbg.editor; - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.PatternRule; -import org.eclipse.jface.util.PropertyChangeEvent; - -import cbg.editor.jedit.EOLSpan; -import cbg.editor.jedit.IVisitor; -import cbg.editor.jedit.Mark; -import cbg.editor.jedit.Mode; -import cbg.editor.jedit.Rule; -import cbg.editor.jedit.Span; -import cbg.editor.jedit.TextSequence; -import cbg.editor.jedit.Type; -import cbg.editor.prefs.ColorsPreferencePage; -import cbg.editor.rules.ColoringWhitespaceDetector; -import cbg.editor.rules.ColoringWordDetector; -import cbg.editor.rules.DelegateToken; -import cbg.editor.rules.EndOfLineRule; -import cbg.editor.rules.ExtendedPatternRule; -import cbg.editor.rules.ITokenFactory; -import cbg.editor.rules.StarRule; -import cbg.editor.rules.TextSequenceRule; - -public class ColoringEditorTools { - static ColoringWhitespaceDetector myWhitespaceDetector=new ColoringWhitespaceDetector(); - - public static void add(Rule rule, List rules, ITokenFactory factory) { - List allTypes = rule.getTypes(); - for (Iterator typeI = allTypes.iterator(); typeI.hasNext();) { - Type type = (Type) typeI.next(); - add(rule, type, factory, rules); - } - } - public static void add(final Rule rule, final Type type, ITokenFactory factory, final List rules) { - final IToken token = factory.makeToken(type); - final Mode mode = rule.getMode(); - final boolean ignoreCase = rule.getIgnoreCase(); - type.accept(new IVisitor() { - public void acceptSpan(Span span) { - IToken defaultToken = token; - if(span.hasDelegate()) { - Rule delegateRule = mode.getRule(span.getDelegate()); - defaultToken = new DelegateToken(type, delegateRule, span.getEnd()); - } - PatternRule pat = null; - boolean checkCase = (span.getStart().toUpperCase() == span.getStart().toLowerCase()) && - (span.getEnd().toUpperCase() == span.getEnd().toLowerCase()) ; - if (ignoreCase) { - checkCase = ignoreCase && ! checkCase; - } else { - checkCase = false; - } - - if (span.matchBracket() || span.noMultipleEndTag() > 1 || span.requireEndTag() - || span.getGroupContent() != null || checkCase || span.dynamicTagging() - || span.getRequireAfterWhitespace() || span.getRequireBeforeWhitespace()) { - pat = new ExtendedPatternRule(span.getStart(), span.getEnd(), - defaultToken, mode.getDefaultRuleSet().getEscape(), span.noLineBreak(), span.noMaxChar(), span.getGroupContent() - , span.matchBracket(), span.noMultipleEndTag(), span.requireEndTag(), ignoreCase, span.dynamicTagging(), - span.getCountDelimterChars(), span.getBeforeTag(), span.getAfterTag(), - span.getRequireBeforeWhitespace() , span.getRequireAfterWhitespace(), - span.optinalModifiers(), - myWhitespaceDetector); - } else { - //the last parameter makes a default handling, - //i.e. if the End-Tag is missing => mark till the end of File - pat = new PatternRule(span.getStart(), span.getEnd(), - defaultToken, mode.getDefaultRuleSet().getEscape(), span.noLineBreak(),true); - } - rules.add(pat); - } - public void acceptTextSequence(TextSequence text) { - /* If the text sequence can be recognized as a word, don't - * add it. This reduces the number of partitions created. If - * the text sequence can not be recognized as a word add it - * as a text sequence. - */ - if((text.getText().length() == 1) && !isWordStart(text.getText().charAt(0))) { - /** - * EPIC workaround -- Add Operators to whitespace characters => - * i.e. $t='x' will be also correctly recognized as $t ='x' - */ - myWhitespaceDetector.addWhiteSpaceChar(text.getText()); - rules.add(new TextSequenceRule(text.getText(), text.groupContent(), token, - ignoreCase, myWhitespaceDetector, false)); - } else { - rules.add(new TextSequenceRule(text.getText(), text.groupContent(), token, - ignoreCase, myWhitespaceDetector, true)); - } - } - public void acceptEolSpan(EOLSpan eolSpan) { - rules.add(new EndOfLineRule(eolSpan.getText(), token, ignoreCase)); - } - public void acceptMark(Mark mark) { - rules.add(new StarRule(mark, myWhitespaceDetector, - wordDetector, token)); - } - }); - } - protected static ColoringWordDetector wordDetector = new ColoringWordDetector(); - - public ColoringEditorTools() { - } - - protected static boolean isWordStart(char c) { - return wordDetector.isWordStart(c); - } - - public boolean affectsTextPresentation(PropertyChangeEvent event) { - String property = event.getProperty(); - if(property == null) return false; - if(property.endsWith("Bold")) { - property = property.substring(0, property.length() - ColorsPreferencePage.BOLD_SUFFIX.length()); - } - boolean affects = property.equals(ColorsPreferencePage.COMMENT1_COLOR) || - property.equals(ColorsPreferencePage.COMMENT2_COLOR) || - property.equals(ColorsPreferencePage.LITERAL1_COLOR) || - property.equals(ColorsPreferencePage.LITERAL2_COLOR) || - property.equals(ColorsPreferencePage.LABEL_COLOR) || - property.equals(ColorsPreferencePage.KEYWORD1_COLOR) || - property.equals(ColorsPreferencePage.KEYWORD2_COLOR) || - property.equals(ColorsPreferencePage.KEYWORD3_COLOR) || - property.equals(ColorsPreferencePage.FUNCTION_COLOR) || - property.equals(ColorsPreferencePage.MARKUP_COLOR) || - property.equals(ColorsPreferencePage.OPERATOR_COLOR) || - property.equals(ColorsPreferencePage.DIGIT_COLOR) || - property.equals(ColorsPreferencePage.INVALID_COLOR) || - property.equals(ColorsPreferencePage.NULL_COLOR); - System.out.println(affects); - return affects; - } - - /** - * Answer the file associated with name. This handles the - * case of running as a plugin and running standalone which - * happens during testing. - * - * @param filename - * @return File - */ - public static File getFile(String filename) throws IOException { - if(EditorPlugin.getDefault() != null) { - URL installURL = EditorPlugin.getDefault().getBundle().getEntry("/"); - URL mode = Platform.resolve(new URL(installURL, filename)); - return new File(mode.getFile()); - } else { - return new File(filename); - } - } +package cbg.editor; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.PatternRule; +import org.eclipse.jface.util.PropertyChangeEvent; + +import cbg.editor.jedit.EOLSpan; +import cbg.editor.jedit.IVisitor; +import cbg.editor.jedit.Mark; +import cbg.editor.jedit.Mode; +import cbg.editor.jedit.Rule; +import cbg.editor.jedit.Span; +import cbg.editor.jedit.TextSequence; +import cbg.editor.jedit.Type; +import cbg.editor.prefs.ColorsPreferencePage; +import cbg.editor.rules.ColoringWhitespaceDetector; +import cbg.editor.rules.ColoringWordDetector; +import cbg.editor.rules.DelegateToken; +import cbg.editor.rules.EndOfLineRule; +import cbg.editor.rules.ExtendedPatternRule; +import cbg.editor.rules.ITokenFactory; +import cbg.editor.rules.StarRule; +import cbg.editor.rules.TextSequenceRule; + +public class ColoringEditorTools { + static ColoringWhitespaceDetector myWhitespaceDetector=new ColoringWhitespaceDetector(); + + public static void add(Rule rule, List rules, ITokenFactory factory) { + List allTypes = rule.getTypes(); + for (Iterator typeI = allTypes.iterator(); typeI.hasNext();) { + Type type = (Type) typeI.next(); + add(rule, type, factory, rules); + } + } + public static void add(final Rule rule, final Type type, ITokenFactory factory, final List rules) { + final IToken token = factory.makeToken(type); + final Mode mode = rule.getMode(); + final boolean ignoreCase = rule.getIgnoreCase(); + type.accept(new IVisitor() { + public void acceptSpan(Span span) { + IToken defaultToken = token; + if(span.hasDelegate()) { + Rule delegateRule = mode.getRule(span.getDelegate()); + defaultToken = new DelegateToken(type, delegateRule, span.getEnd()); + } + PatternRule pat = null; + boolean checkCase = (span.getStart().toUpperCase() == span.getStart().toLowerCase()) && + (span.getEnd().toUpperCase() == span.getEnd().toLowerCase()) ; + if (ignoreCase) { + checkCase = ignoreCase && ! checkCase; + } else { + checkCase = false; + } + + if (span.matchBracket() || span.noMultipleEndTag() > 1 || span.requireEndTag() + || span.getGroupContent() != null || checkCase || span.dynamicTagging() + || span.getRequireAfterWhitespace() || span.getRequireBeforeWhitespace()) { + pat = new ExtendedPatternRule(span.getStart(), span.getEnd(), + defaultToken, mode.getDefaultRuleSet().getEscape(), span.noLineBreak(), span.noMaxChar(), + span.rejectDelimWithFirstChar(), span.getGroupContent() + , span.matchBracket(), span.noMultipleEndTag(), span.requireEndTag(), ignoreCase, span.dynamicTagging(), + span.getCountDelimterChars(), span.getBeforeTag(), span.getAfterTag(), + span.getRequireBeforeWhitespace() , span.getRequireAfterWhitespace(), + span.optinalModifiers(), + myWhitespaceDetector); + } else { + //the last parameter makes a default handling, + //i.e. if the End-Tag is missing => mark till the end of File + pat = new PatternRule(span.getStart(), span.getEnd(), + defaultToken, mode.getDefaultRuleSet().getEscape(), span.noLineBreak(),true); + } + rules.add(pat); + } + public void acceptTextSequence(TextSequence text) { + /* If the text sequence can be recognized as a word, don't + * add it. This reduces the number of partitions created. If + * the text sequence can not be recognized as a word add it + * as a text sequence. + */ + if((text.getText().length() == 1) && !isWordStart(text.getText().charAt(0))) { + /** + * EPIC workaround -- Add Operators to whitespace characters => + * i.e. $t='x' will be also correctly recognized as $t ='x' + */ + myWhitespaceDetector.addWhiteSpaceChar(text.getText()); + rules.add(new TextSequenceRule(text.getText(), text.groupContent(), token, + ignoreCase, myWhitespaceDetector, false)); + } else { + rules.add(new TextSequenceRule(text.getText(), text.groupContent(), token, + ignoreCase, myWhitespaceDetector, true)); + } + } + public void acceptEolSpan(EOLSpan eolSpan) { + rules.add(new EndOfLineRule(eolSpan.getText(), token, ignoreCase)); + } + public void acceptMark(Mark mark) { + rules.add(new StarRule(mark, myWhitespaceDetector, + wordDetector, token)); + } + }); + } + protected static ColoringWordDetector wordDetector = new ColoringWordDetector(); + + public ColoringEditorTools() { + } + + protected static boolean isWordStart(char c) { + return wordDetector.isWordStart(c); + } + + public boolean affectsTextPresentation(PropertyChangeEvent event) { + String property = event.getProperty(); + if(property == null) return false; + if(property.endsWith("Bold")) { + property = property.substring(0, property.length() - ColorsPreferencePage.BOLD_SUFFIX.length()); + } + boolean affects = property.equals(ColorsPreferencePage.COMMENT1_COLOR) || + property.equals(ColorsPreferencePage.COMMENT2_COLOR) || + property.equals(ColorsPreferencePage.LITERAL1_COLOR) || + property.equals(ColorsPreferencePage.LITERAL2_COLOR) || + property.equals(ColorsPreferencePage.LABEL_COLOR) || + property.equals(ColorsPreferencePage.KEYWORD1_COLOR) || + property.equals(ColorsPreferencePage.KEYWORD2_COLOR) || + property.equals(ColorsPreferencePage.KEYWORD3_COLOR) || + property.equals(ColorsPreferencePage.FUNCTION_COLOR) || + property.equals(ColorsPreferencePage.MARKUP_COLOR) || + property.equals(ColorsPreferencePage.OPERATOR_COLOR) || + property.equals(ColorsPreferencePage.DIGIT_COLOR) || + property.equals(ColorsPreferencePage.INVALID_COLOR) || + property.equals(ColorsPreferencePage.NULL_COLOR); + System.out.println(affects); + return affects; + } + + /** + * Answer the file associated with name. This handles the + * case of running as a plugin and running standalone which + * happens during testing. + * + * @param filename + * @return File + */ + public static File getFile(String filename) throws IOException { + if(EditorPlugin.getDefault() != null) { + URL installURL = EditorPlugin.getDefault().getBundle().getEntry("/"); + URL mode = Platform.resolve(new URL(installURL, filename)); + return new File(mode.getFile()); + } else { + return new File(filename); + } + } } \ No newline at end of file |