Menu
▾
▴
[E-p-i-c-commits] org.epic.ext.cbg.editor/src/cbg/editor/jedit SyntaxListener.java,1.5,1.6 Type.java,1.5,1.6 Mode.java,1.5,1.6 Span.java,1.5,1.6 ModeReader.java,1.5,1.6
|
From: Jochen L. <lue...@us...> - 2005-01-20 17:29:39
|
Update of /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/jedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6157/src/cbg/editor/jedit Modified Files: SyntaxListener.java Type.java Mode.java Span.java ModeReader.java Log Message: Rule extensions and proper Handling of HERE-Documents Index: Span.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/jedit/Span.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Span.java 25 Dec 2004 08:35:03 -0000 1.5 +++ Span.java 20 Jan 2005 17:29:30 -0000 1.6 @@ -1,7 +1,7 @@ package cbg.editor.jedit; public class Span extends TextSequence { - protected String begin, end, afterTag, beforeTag; + protected String begin, end, countDelimterChars, afterTag, beforeTag; protected boolean noLineBreak, noWordBreak, excludeMatch, matchBracket; protected boolean requireEndTag, dynamicTagging; protected int noMultipleEndTag, noMaxChar; @@ -53,7 +53,10 @@ public final String[] getGroupContent() { return groupContent; } - + + public final String getCountDelimterChars() { + return countDelimterChars; + } public final String getBeforeTag(){ return beforeTag; } Index: Mode.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/jedit/Mode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Mode.java 25 Dec 2004 08:35:03 -0000 1.5 +++ Mode.java 20 Jan 2005 17:29:30 -0000 1.6 @@ -37,13 +37,13 @@ boolean matchBracket, int noMultipleEndTag, boolean requireEndTag, boolean dynamicTagging, int noMaxChar, String[] groupContent, - String beforeTag, String afterTag, + String countDelimterChars, String beforeTag, String afterTag, String delegate) { currentRule.add(Type.newSpan(type, begin, end, atLineStart, excludeMatch, noLineBreak, noWordBreak, matchBracket, noMultipleEndTag, requireEndTag, dynamicTagging, noMaxChar, groupContent, - beforeTag, afterTag, + countDelimterChars, beforeTag, afterTag, delegate)); } Index: ModeReader.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/jedit/ModeReader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ModeReader.java 25 Dec 2004 08:35:03 -0000 1.5 +++ ModeReader.java 20 Jan 2005 17:29:30 -0000 1.6 @@ -144,18 +144,10 @@ if (noMaxChar < 1) { noMaxChar = 1; } - String beforeTag = spanElement.attributeValue("DELIMITER_TAG_CHARS"); - if (beforeTag == null) - beforeTag = ""; + String countDelimterChars = spanElement.attributeValue("DELIMITER_TAG_CHARS"); + if (countDelimterChars == null) + countDelimterChars = ""; - String afterTag = spanElement.attributeValue("REQUIRE_AFTER_TAG"); - if (afterTag == null) - afterTag = ""; - if (afterTag.indexOf(":LINEFEED:") >= 0) { - afterTag = afterTag.replaceAll(":LINEFEED:",""); - afterTag = afterTag.concat("\n\r"); - } - String delegate = spanElement.attributeValue("DELEGATE"); begin =""; if (spanElement.element("BEGIN") != null) { @@ -167,11 +159,19 @@ end =""; } + String beforeTag = spanElement.attributeValue("REQUIRE_BEFORE_DELIMITER_CHAR"); + if (beforeTag == null) + beforeTag = ""; + + String afterTag = spanElement.attributeValue("REQUIRE_AFTER_DELIMITER_CHAR"); + if (afterTag == null) + afterTag = ""; + String[] myGroupContent=readGroupContent(spanElement, true); //so the 'begin is modified properly listener.newSpan(type, begin, end, atLineStart, excludeMatch, noLineBreak, noWordBreak, matchBracket, noMultipleEndTag, requireEndTag, dynamicTagging, noMaxChar, - myGroupContent, beforeTag, afterTag, + myGroupContent, countDelimterChars, beforeTag, afterTag, delegate); } Index: SyntaxListener.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/jedit/SyntaxListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- SyntaxListener.java 25 Dec 2004 08:35:03 -0000 1.5 +++ SyntaxListener.java 20 Jan 2005 17:29:30 -0000 1.6 @@ -10,7 +10,7 @@ boolean matchBracket, int noMultipleEndTag, boolean requireEndTag, boolean dynamicTagging, int noMaxChar, String[] groupContent, - String beforeTag, String afterTag, + String countDelimterChars, String beforeTag, String afterTag, String delegate); void newKeywords(KeywordMap keywords); void newTextSequence(String type, String text, String[] groupContent, boolean atLineStart, boolean atWhitespaceEnd, Index: Type.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.ext.cbg.editor/src/cbg/editor/jedit/Type.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Type.java 25 Dec 2004 08:35:03 -0000 1.5 +++ Type.java 20 Jan 2005 17:29:30 -0000 1.6 @@ -36,7 +36,8 @@ boolean atLineStart, boolean excludeMatch, boolean noLineBreak, boolean noWordBreak, boolean matchBracket, int noMultipleEndTag, boolean requireEndTag, boolean dynamicTagging, - int noMaxChar, String[] groupContent, String beforeTag, String afterTag, + int noMaxChar, String[] groupContent, + String countDelimterChars, String beforeTag, String afterTag, String delegate) { Span span = new Span(); @@ -54,6 +55,7 @@ span.dynamicTagging = dynamicTagging; span.noMaxChar = noMaxChar; span.groupContent = groupContent; + span.countDelimterChars = countDelimterChars; span.beforeTag = beforeTag; span.afterTag = afterTag; |