Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[18168] plugins/Beauty/trunk/src/beauty/parsers/jsp
|
From: <dal...@us...> - 2010-06-30 21:54:39
|
Revision: 18168
http://jedit.svn.sourceforge.net/jedit/?rev=18168&view=rev
Author: daleanson
Date: 2010-06-30 21:54:32 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
Cleaning up TODOs.
Modified Paths:
--------------
plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParser.java
plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParserTokenManager.java
plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp.jj
plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp_clean.jj
Modified: plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParser.java
===================================================================
--- plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParser.java 2010-06-30 21:16:36 UTC (rev 18167)
+++ plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParser.java 2010-06-30 21:54:32 UTC (rev 18168)
@@ -435,7 +435,7 @@
}
}
catch(ParserException pe) {
- // TODO: handle this
+ {if (true) throw new ParseException(pe.getMessage());}
}
--token_source.level;
@@ -759,7 +759,7 @@
endTagName = jj_consume_token(TAG_NAME);
add(endTagName);
if (! tagName.equalsIgnoreCase(endTagName.image)) {
- // TODO: handle this
+ {if (true) throw new ParseException("Mismatch end tag: start tag '" + tagName + "' does not match end tag '" + endTagName + "'");}
}
t = jj_consume_token(TAG_END);
trimWhitespace();
@@ -1165,7 +1165,7 @@
}
}
catch(ParserException pe) {
- // TODO: handle this
+ {if (true) throw new ParseException(pe.getMessage());}
}
if (endToken != null) {
add(endToken);
@@ -1209,7 +1209,7 @@
}
}
catch(ParserException pe) {
- // TODO: handle this
+ {if (true) throw new ParseException(pe.getMessage());}
}
if (endToken != null) {
add(endToken);
@@ -1411,6 +1411,11 @@
return false;
}
+ private boolean jj_3R_22() {
+ if (jj_3R_26()) return true;
+ return false;
+ }
+
private boolean jj_3R_34() {
if (jj_scan_token(SINGLE_QUOTE)) return true;
Token xsp;
@@ -1426,7 +1431,7 @@
return false;
}
- private boolean jj_3R_22() {
+ private boolean jj_3R_19() {
if (jj_3R_26()) return true;
return false;
}
@@ -1436,11 +1441,6 @@
return false;
}
- private boolean jj_3R_19() {
- if (jj_3R_26()) return true;
- return false;
- }
-
private boolean jj_3R_33() {
if (jj_scan_token(DOUBLE_QUOTE)) return true;
Token xsp;
@@ -1467,11 +1467,6 @@
return false;
}
- private boolean jj_3R_51() {
- if (jj_scan_token(EL_EXPRESSION_IN_ATTRIBUTE)) return true;
- return false;
- }
-
private boolean jj_3R_21() {
if (jj_3R_25()) return true;
return false;
@@ -1487,6 +1482,11 @@
return false;
}
+ private boolean jj_3R_51() {
+ if (jj_scan_token(EL_EXPRESSION_IN_ATTRIBUTE)) return true;
+ return false;
+ }
+
private boolean jj_3_2() {
Token xsp;
while (true) {
@@ -1507,11 +1507,6 @@
return false;
}
- private boolean jj_3R_52() {
- if (jj_scan_token(VALUE_BINDING_IN_ATTRIBUTE)) return true;
- return false;
- }
-
private boolean jj_3R_14() {
Token xsp;
xsp = jj_scanpos;
@@ -1527,6 +1522,11 @@
return false;
}
+ private boolean jj_3R_52() {
+ if (jj_scan_token(VALUE_BINDING_IN_ATTRIBUTE)) return true;
+ return false;
+ }
+
private boolean jj_3_1() {
Token xsp;
while (true) {
Modified: plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParserTokenManager.java
===================================================================
--- plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParserTokenManager.java 2010-06-30 21:16:36 UTC (rev 18167)
+++ plugins/Beauty/trunk/src/beauty/parsers/jsp/JspParserTokenManager.java 2010-06-30 21:54:32 UTC (rev 18168)
@@ -415,7 +415,7 @@
outputBuffer.append(line).append(ls);
// handle the remaining lines, put stars in front of them.
- // TODO: this needs work. Need to preserve whitepsace after
+ // TODO: this needs work. Need to preserve whitespace after
// the star.
for (int i = 1; i < lines.length; i++) {
line = lines[i].trim();
Modified: plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp.jj
===================================================================
--- plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp.jj 2010-06-30 21:16:36 UTC (rev 18167)
+++ plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp.jj 2010-06-30 21:54:32 UTC (rev 18168)
@@ -574,7 +574,6 @@
void Content() :
{}
{
- // TODO: can this be refactored for more simplicity?
( Text() | ContentElementPossiblyWithText() )
( ContentElementPossiblyWithText() )*
}
@@ -673,7 +672,7 @@
}
}
catch(ParserException pe) {
- // TODO: handle this
+ throw new ParseException(pe.getMessage());
}
--token_source.level;
@@ -954,7 +953,7 @@
{
add(endTagName);
if (! tagName.equalsIgnoreCase(endTagName.image)) {
- // TODO: handle this
+ throw new ParseException("Mismatch end tag: start tag '" + tagName + "' does not match end tag '" + endTagName + "'");
}
}
t=<TAG_END>
@@ -1241,7 +1240,7 @@
}
}
catch(ParserException pe) {
- // TODO: handle this
+ throw new ParseException(pe.getMessage());
}
if (endToken != null) {
add(endToken);
@@ -1282,7 +1281,7 @@
}
}
catch(ParserException pe) {
- // TODO: handle this
+ throw new ParseException(pe.getMessage());
}
if (endToken != null) {
add(endToken);
@@ -1707,7 +1706,7 @@
outputBuffer.append(line).append(ls);
// handle the remaining lines, put stars in front of them.
- // TODO: this needs work. Need to preserve whitepsace after
+ // TODO: this needs work. Need to preserve whitespace after
// the star.
for (int i = 1; i < lines.length; i++) {
line = lines[i].trim();
Modified: plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp_clean.jj
===================================================================
--- plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp_clean.jj 2010-06-30 21:16:36 UTC (rev 18167)
+++ plugins/Beauty/trunk/src/beauty/parsers/jsp/jsp_clean.jj 2010-06-30 21:54:32 UTC (rev 18168)
@@ -7,9 +7,6 @@
* captured as a single token, which means the token image can be passed off to
* a javascript beautifier.
*
- * TODO: check that code inside <style> ... </style> is not parsed. -- Need to
- * to the same with <style> as with <script> so that the tag body is parsed as
- * a single token, then the token image can be passed off to the css beautifier.
*/
options {
@@ -363,7 +360,6 @@
void Content() :
{}
{
- // TODO: can this be refactored for more simplicity?
( Text() | ContentElementPossiblyWithText() )
( ContentElementPossiblyWithText() )*
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|