[155790] Missing HTML-ish functions on IDOMModel created from XHTML text/xml JSP file -- branchOnly: tempBug155790
diff --git a/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex b/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex
index fd13884..c47ae1c 100644
--- a/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex
+++ b/bundles/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex
@@ -200,7 +200,7 @@
// following are some simply rules to identify JSP content as "XHTML"
// see http://www.rfc-editor.org/rfc/rfc3236.txt
"<!DOCTYPE" {S}* "html" {S}* "PUBLIC" .* "//DTD XHTML" {isXHTML = true;}
- "<html" {S}* "xmlns" {S}* "=" {S}* "http://www.w3.org/1999/xhtml" {isXHTML = true;}
+ "<html" {S}* "xmlns" {S}* "=" {S}* (\" | \') "http://www.w3.org/1999/xhtml" {isXHTML = true;}
// another case that's part of the "HTML family" is WML 1.0 (WML 2.0 is part of XHTML)
"<!DOCTYPE" {S}* "wml" {S}* "PUBLIC" .* "//DTD WML" {isWML = true;}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java
index 7db7d42..7ec777b 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPHeadTokenizer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4 on 9/17/06 10:48 PM */
+/* The following code was generated by JFlex 1.4 on 9/18/06 2:12 PM */
/*******************************************************************************
* Copyright (c) 2005 IBM Corporation and others.
@@ -26,7 +26,7 @@
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4
- * on 9/17/06 10:48 PM from the specification file
+ * on 9/18/06 2:12 PM from the specification file
* <tt>D:/builds/Workspaces/WTP15maintenance/org.eclipse.jst.jsp.core/DevTimeSupport/HeadParsers/JSPHeadTokenizer.jFlex</tt>
*/
public class JSPHeadTokenizer {
@@ -60,14 +60,14 @@
* Translates characters to character classes
*/
private static final String ZZ_CMAP_PACKED =
- "\11\0\1\6\1\11\2\0\1\10\22\0\1\34\1\17\1\55\2\0"+
- "\1\47\1\0\1\56\6\0\1\41\1\33\1\0\1\45\1\0\1\42"+
- "\5\0\1\46\1\37\1\0\1\12\1\7\1\54\1\13\1\50\1\51"+
- "\1\31\1\22\1\20\1\26\1\0\1\44\1\27\1\32\1\52\1\0"+
- "\1\16\1\15\1\35\1\21\1\25\1\0\1\43\1\36\1\23\1\30"+
- "\1\53\1\40\1\14\1\24\7\0\1\51\1\31\1\22\1\20\1\26"+
- "\1\0\1\44\1\27\1\32\1\52\1\0\1\16\1\15\1\35\1\21"+
- "\1\25\1\0\1\43\1\36\1\23\1\30\1\53\1\40\1\14\1\24"+
+ "\11\0\1\6\1\11\2\0\1\10\22\0\1\34\1\17\1\37\2\0"+
+ "\1\51\1\0\1\40\6\0\1\43\1\33\1\0\1\47\1\0\1\44"+
+ "\5\0\1\50\1\41\1\0\1\12\1\7\1\56\1\13\1\52\1\53"+
+ "\1\31\1\22\1\20\1\26\1\0\1\46\1\27\1\32\1\54\1\0"+
+ "\1\16\1\15\1\35\1\21\1\25\1\0\1\45\1\36\1\23\1\30"+
+ "\1\55\1\42\1\14\1\24\7\0\1\53\1\31\1\22\1\20\1\26"+
+ "\1\0\1\46\1\27\1\32\1\54\1\0\1\16\1\15\1\35\1\21"+
+ "\1\25\1\0\1\45\1\36\1\23\1\30\1\55\1\42\1\14\1\24"+
"\101\0\1\4\3\0\1\5\17\0\1\3\16\0\1\1\20\0\1\3"+
"\16\0\1\1\1\2\170\0\1\2\ufe87\0";
@@ -83,14 +83,14 @@
private static final String ZZ_ACTION_PACKED_0 =
"\10\0\20\1\2\2\1\1\1\3\1\4\1\5\1\6"+
- "\2\5\1\7\1\5\1\7\1\10\2\11\4\0\1\12"+
+ "\1\5\1\7\2\5\1\7\1\10\2\11\4\0\1\12"+
"\1\13\6\0\1\14\5\0\1\15\1\16\1\0\1\17"+
- "\1\20\5\0\1\21\36\0\1\22\20\0\1\23\2\0"+
- "\1\24\6\0\1\25\1\26\22\0\1\27\5\0\1\30"+
- "\52\0\1\31\5\0\1\32\11\0\1\32";
+ "\1\0\1\20\4\0\1\21\36\0\1\22\20\0\1\23"+
+ "\2\0\1\24\6\0\1\25\1\26\22\0\1\27\5\0"+
+ "\1\30\52\0\1\31\5\0\1\32\12\0\1\32";
private static int [] zzUnpackAction() {
- int [] result = new int[211];
+ int [] result = new int[212];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
@@ -642,7 +642,7 @@
case 28: zzIsFinal = true; zzState = 15; break zzForNext;
case 11: zzIsFinal = true; zzState = 16; break zzForNext;
case 22: zzIsFinal = true; zzState = 17; break zzForNext;
- case 43: zzIsFinal = true; zzState = 18; break zzForNext;
+ case 45: zzIsFinal = true; zzState = 18; break zzForNext;
default: zzIsFinal = true; zzNoLookAhead = true; zzState = 8; break zzForNext;
}
@@ -652,7 +652,7 @@
case 18: zzIsFinal = true; zzState = 20; break zzForNext;
case 21: zzIsFinal = true; zzState = 21; break zzForNext;
case 27: zzIsFinal = true; zzState = 22; break zzForNext;
- case 39: zzIsFinal = true; zzState = 23; break zzForNext;
+ case 41: zzIsFinal = true; zzState = 23; break zzForNext;
default: zzIsFinal = true; zzNoLookAhead = true; zzState = 8; break zzForNext;
}
@@ -662,8 +662,8 @@
case 8:
case 28: zzIsFinal = true; zzState = 25; break zzForNext;
case 9: zzIsFinal = true; zzState = 26; break zzForNext;
- case 45: zzIsFinal = true; zzNoLookAhead = true; zzState = 27; break zzForNext;
- case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 28; break zzForNext;
+ case 31: zzIsFinal = true; zzNoLookAhead = true; zzState = 27; break zzForNext;
+ case 32: zzIsFinal = true; zzNoLookAhead = true; zzState = 28; break zzForNext;
default: zzIsFinal = true; zzNoLookAhead = true; zzState = 24; break zzForNext;
}
@@ -672,9 +672,9 @@
case 8:
case 9: zzIsFinal = true; zzNoLookAhead = true; zzState = 30; break zzForNext;
case 11: zzIsFinal = true; zzState = 31; break zzForNext;
- case 39: zzIsFinal = true; zzState = 32; break zzForNext;
- case 45: zzIsFinal = true; zzNoLookAhead = true; zzState = 33; break zzForNext;
- case 46: zzIsFinal = true; zzState = 34; break zzForNext;
+ case 31: zzIsFinal = true; zzNoLookAhead = true; zzState = 32; break zzForNext;
+ case 32: zzIsFinal = true; zzState = 33; break zzForNext;
+ case 41: zzIsFinal = true; zzState = 34; break zzForNext;
default: zzIsFinal = true; zzNoLookAhead = true; zzState = 29; break zzForNext;
}
@@ -682,21 +682,21 @@
switch (zzInput) {
case 8:
case 9: zzIsFinal = true; zzNoLookAhead = true; zzState = 30; break zzForNext;
- case 39: zzIsFinal = true; zzState = 32; break zzForNext;
- case 46: zzIsFinal = true; zzState = 35; break zzForNext;
+ case 41: zzIsFinal = true; zzState = 34; break zzForNext;
+ case 32: zzIsFinal = true; zzState = 35; break zzForNext;
default: zzIsFinal = true; zzNoLookAhead = true; zzState = 29; break zzForNext;
}
case 7:
switch (zzInput) {
case 11:
- case 39: zzIsFinal = true; zzState = 32; break zzForNext;
+ case 41: zzIsFinal = true; zzState = 34; break zzForNext;
case 6:
case 8:
case 9:
case 28: zzIsFinal = true; zzNoLookAhead = true; zzState = 36; break zzForNext;
- case 45: zzIsFinal = true; zzNoLookAhead = true; zzState = 37; break zzForNext;
- case 46: zzIsFinal = true; zzState = 38; break zzForNext;
+ case 31: zzIsFinal = true; zzNoLookAhead = true; zzState = 37; break zzForNext;
+ case 32: zzIsFinal = true; zzState = 38; break zzForNext;
default: zzIsFinal = true; zzNoLookAhead = true; zzState = 29; break zzForNext;
}
@@ -704,8 +704,8 @@
switch (zzInput) {
case 15: zzState = 39; break zzForNext;
case 23: zzState = 40; break zzForNext;
- case 39: zzState = 41; break zzForNext;
- case 42: zzState = 42; break zzForNext;
+ case 41: zzState = 41; break zzForNext;
+ case 44: zzState = 42; break zzForNext;
default: break zzForAction;
}
@@ -741,8 +741,8 @@
switch (zzInput) {
case 15: zzState = 39; break zzForNext;
case 23: zzState = 40; break zzForNext;
- case 39: zzState = 41; break zzForNext;
- case 42: zzState = 42; break zzForNext;
+ case 41: zzState = 41; break zzForNext;
+ case 44: zzState = 42; break zzForNext;
case 11: zzState = 48; break zzForNext;
default: break zzForAction;
}
@@ -759,7 +759,7 @@
case 16:
switch (zzInput) {
- case 44: zzIsFinal = true; zzNoLookAhead = true; zzState = 51; break zzForNext;
+ case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 51; break zzForNext;
default: break zzForAction;
}
@@ -777,7 +777,7 @@
case 19:
switch (zzInput) {
- case 41: zzState = 54; break zzForNext;
+ case 43: zzState = 54; break zzForNext;
default: break zzForAction;
}
@@ -789,19 +789,19 @@
case 21:
switch (zzInput) {
- case 41: zzState = 56; break zzForNext;
+ case 43: zzState = 56; break zzForNext;
default: break zzForAction;
}
case 22:
switch (zzInput) {
- case 44: zzIsFinal = true; zzNoLookAhead = true; zzState = 57; break zzForNext;
+ case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 57; break zzForNext;
default: break zzForAction;
}
case 23:
switch (zzInput) {
- case 44: zzIsFinal = true; zzNoLookAhead = true; zzState = 58; break zzForNext;
+ case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 58; break zzForNext;
default: break zzForAction;
}
@@ -825,31 +825,31 @@
case 31:
switch (zzInput) {
- case 44: zzIsFinal = true; zzNoLookAhead = true; zzState = 60; break zzForNext;
+ case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 60; break zzForNext;
default: break zzForAction;
}
- case 32:
+ case 33:
switch (zzInput) {
- case 44: zzIsFinal = true; zzNoLookAhead = true; zzState = 61; break zzForNext;
+ case 10: zzState = 61; break zzForNext;
default: break zzForAction;
}
case 34:
switch (zzInput) {
- case 10: zzState = 62; break zzForNext;
+ case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 62; break zzForNext;
default: break zzForAction;
}
case 35:
switch (zzInput) {
- case 10: zzState = 62; break zzForNext;
+ case 10: zzState = 61; break zzForNext;
default: break zzForAction;
}
case 38:
switch (zzInput) {
- case 10: zzState = 62; break zzForNext;
+ case 10: zzState = 61; break zzForNext;
default: break zzForAction;
}
@@ -871,7 +871,7 @@
case 8:
case 9:
case 28: zzState = 41; break zzForNext;
- case 40: zzState = 65; break zzForNext;
+ case 42: zzState = 65; break zzForNext;
default: break zzForAction;
}
@@ -921,7 +921,7 @@
case 50:
switch (zzInput) {
- case 44: zzIsFinal = true; zzNoLookAhead = true; zzState = 51; break zzForNext;
+ case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 51; break zzForNext;
default: break zzForAction;
}
@@ -933,7 +933,7 @@
case 53:
switch (zzInput) {
- case 35: zzState = 70; break zzForNext;
+ case 37: zzState = 70; break zzForNext;
default: break zzForAction;
}
@@ -951,7 +951,7 @@
case 56:
switch (zzInput) {
- case 36: zzState = 73; break zzForNext;
+ case 38: zzState = 73; break zzForNext;
default: break zzForAction;
}
@@ -964,9 +964,9 @@
default: zzIsFinal = true; zzNoLookAhead = true; zzState = 24; break zzForNext;
}
- case 62:
+ case 61:
switch (zzInput) {
- case 46: zzIsFinal = true; zzNoLookAhead = true; zzState = 30; break zzForNext;
+ case 32: zzIsFinal = true; zzNoLookAhead = true; zzState = 30; break zzForNext;
default: break zzForAction;
}
@@ -1018,7 +1018,7 @@
case 71:
switch (zzInput) {
- case 36: zzState = 81; break zzForNext;
+ case 38: zzState = 81; break zzForNext;
default: break zzForAction;
}
@@ -1048,13 +1048,13 @@
case 76:
switch (zzInput) {
- case 41: zzState = 86; break zzForNext;
+ case 43: zzState = 86; break zzForNext;
default: break zzForAction;
}
case 77:
switch (zzInput) {
- case 31: zzState = 87; break zzForNext;
+ case 33: zzState = 87; break zzForNext;
default: break zzForAction;
}
@@ -1112,7 +1112,7 @@
case 86:
switch (zzInput) {
- case 36: zzState = 96; break zzForNext;
+ case 38: zzState = 96; break zzForNext;
default: break zzForAction;
}
@@ -1145,7 +1145,7 @@
case 91:
switch (zzInput) {
- case 41: zzState = 101; break zzForNext;
+ case 43: zzState = 101; break zzForNext;
default: break zzForAction;
}
@@ -1208,7 +1208,7 @@
case 101:
switch (zzInput) {
- case 36: zzState = 110; break zzForNext;
+ case 38: zzState = 110; break zzForNext;
default: break zzForAction;
}
@@ -1247,13 +1247,13 @@
case 107:
switch (zzInput) {
- case 35: zzState = 116; break zzForNext;
+ case 37: zzState = 116; break zzForNext;
default: break zzForAction;
}
case 108:
switch (zzInput) {
- case 36: zzState = 117; break zzForNext;
+ case 38: zzState = 117; break zzForNext;
default: break zzForAction;
}
@@ -1360,7 +1360,7 @@
case 9:
case 28: zzState = 122; break zzForNext;
case 23: zzState = 129; break zzForNext;
- case 32: zzState = 130; break zzForNext;
+ case 34: zzState = 130; break zzForNext;
default: break zzForAction;
}
@@ -1464,7 +1464,8 @@
case 8:
case 9:
case 28: zzState = 137; break zzForNext;
- case 23: zzState = 143; break zzForNext;
+ case 31:
+ case 32: zzState = 143; break zzForNext;
default: break zzForAction;
}
@@ -1486,7 +1487,7 @@
case 140:
switch (zzInput) {
- case 36: zzState = 146; break zzForNext;
+ case 38: zzState = 146; break zzForNext;
default: break zzForAction;
}
@@ -1508,13 +1509,13 @@
case 143:
switch (zzInput) {
- case 19: zzState = 149; break zzForNext;
+ case 23: zzState = 149; break zzForNext;
default: break zzForAction;
}
case 144:
switch (zzInput) {
- case 43: zzState = 150; break zzForNext;
+ case 45: zzState = 150; break zzForNext;
default: break zzForAction;
}
@@ -1588,13 +1589,13 @@
case 154:
switch (zzInput) {
- case 21: zzState = 158; break zzForNext;
+ case 19: zzState = 158; break zzForNext;
default: break zzForAction;
}
case 155:
switch (zzInput) {
- case 33: zzState = 159; break zzForNext;
+ case 35: zzState = 159; break zzForNext;
default: break zzForAction;
}
@@ -1612,7 +1613,7 @@
case 158:
switch (zzInput) {
- case 31: zzState = 162; break zzForNext;
+ case 21: zzState = 162; break zzForNext;
default: break zzForAction;
}
@@ -1636,7 +1637,7 @@
case 162:
switch (zzInput) {
- case 27: zzState = 165; break zzForNext;
+ case 33: zzState = 165; break zzForNext;
default: break zzForAction;
}
@@ -1673,7 +1674,7 @@
case 168:
switch (zzInput) {
- case 32: zzState = 171; break zzForNext;
+ case 27: zzState = 171; break zzForNext;
default: break zzForAction;
}
@@ -1693,7 +1694,7 @@
case 171:
switch (zzInput) {
- case 32: zzState = 174; break zzForNext;
+ case 34: zzState = 174; break zzForNext;
default: break zzForAction;
}
@@ -1714,7 +1715,7 @@
case 174:
switch (zzInput) {
- case 32: zzState = 177; break zzForNext;
+ case 34: zzState = 177; break zzForNext;
default: break zzForAction;
}
@@ -1736,7 +1737,7 @@
case 177:
switch (zzInput) {
- case 33: zzState = 180; break zzForNext;
+ case 34: zzState = 180; break zzForNext;
default: break zzForAction;
}
@@ -1758,7 +1759,7 @@
case 180:
switch (zzInput) {
- case 32: zzState = 183; break zzForNext;
+ case 35: zzState = 183; break zzForNext;
default: break zzForAction;
}
@@ -1795,14 +1796,14 @@
case 185:
switch (zzInput) {
case 27: zzState = 170; break zzForNext;
- case 32: zzState = 188; break zzForNext;
+ case 34: zzState = 188; break zzForNext;
case 9: break zzForAction;
default: zzState = 167; break zzForNext;
}
case 186:
switch (zzInput) {
- case 33: zzState = 189; break zzForNext;
+ case 36: zzState = 189; break zzForNext;
default: break zzForAction;
}
@@ -1824,7 +1825,7 @@
case 189:
switch (zzInput) {
- case 17: zzState = 192; break zzForNext;
+ case 35: zzState = 192; break zzForNext;
default: break zzForAction;
}
@@ -1846,7 +1847,7 @@
case 192:
switch (zzInput) {
- case 35: zzState = 195; break zzForNext;
+ case 17: zzState = 195; break zzForNext;
default: break zzForAction;
}
@@ -1867,7 +1868,7 @@
case 195:
switch (zzInput) {
- case 36: zzState = 197; break zzForNext;
+ case 37: zzState = 197; break zzForNext;
default: break zzForAction;
}
@@ -1881,7 +1882,7 @@
case 197:
switch (zzInput) {
- case 27: zzState = 199; break zzForNext;
+ case 38: zzState = 199; break zzForNext;
default: break zzForAction;
}
@@ -1895,7 +1896,7 @@
case 199:
switch (zzInput) {
- case 37: zzState = 201; break zzForNext;
+ case 27: zzState = 201; break zzForNext;
default: break zzForAction;
}
@@ -1908,55 +1909,61 @@
case 201:
switch (zzInput) {
- case 38: zzState = 202; break zzForNext;
+ case 39: zzState = 202; break zzForNext;
default: break zzForAction;
}
case 202:
switch (zzInput) {
- case 38: zzState = 203; break zzForNext;
+ case 40: zzState = 203; break zzForNext;
default: break zzForAction;
}
case 203:
switch (zzInput) {
- case 38: zzState = 204; break zzForNext;
+ case 40: zzState = 204; break zzForNext;
default: break zzForAction;
}
case 204:
switch (zzInput) {
- case 27: zzState = 205; break zzForNext;
+ case 40: zzState = 205; break zzForNext;
default: break zzForAction;
}
case 205:
switch (zzInput) {
- case 12: zzState = 206; break zzForNext;
+ case 27: zzState = 206; break zzForNext;
default: break zzForAction;
}
case 206:
switch (zzInput) {
- case 23: zzState = 207; break zzForNext;
+ case 12: zzState = 207; break zzForNext;
default: break zzForAction;
}
case 207:
switch (zzInput) {
- case 19: zzState = 208; break zzForNext;
+ case 23: zzState = 208; break zzForNext;
default: break zzForAction;
}
case 208:
switch (zzInput) {
- case 13: zzState = 209; break zzForNext;
+ case 19: zzState = 209; break zzForNext;
default: break zzForAction;
}
case 209:
switch (zzInput) {
- case 14: zzIsFinal = true; zzNoLookAhead = true; zzState = 210; break zzForNext;
+ case 13: zzState = 210; break zzForNext;
+ default: break zzForAction;
+ }
+
+ case 210:
+ switch (zzInput) {
+ case 14: zzIsFinal = true; zzNoLookAhead = true; zzState = 211; break zzForNext;
default: break zzForAction;
}
