1.1 --- a/html.editor/src/org/netbeans/modules/html/editor/xhtml/XhtmlElLexer.java Fri Jul 23 13:33:28 2010 +0200
1.2 +++ b/html.editor/src/org/netbeans/modules/html/editor/xhtml/XhtmlElLexer.java Fri Jul 23 14:21:02 2010 +0200
1.3 @@ -83,6 +83,7 @@
1.4 } else {
1.5 lexerState = ((Integer) info.state()).intValue();
1.6 }
1.7 + // let EL be always enabled, needed EL infrastructure
1.8 // if (inputAttributes != null) {
1.9 // EL_ENABLED = inputAttributes.getValue(LanguagePath.get(XhtmlElTokenId.language()), "el_enabled") != null; //NOI18N
1.10 // } else {
2.1 --- a/libs.elimpl/nbproject/project.xml Fri Jul 23 13:33:28 2010 +0200
2.2 +++ b/libs.elimpl/nbproject/project.xml Fri Jul 23 14:21:02 2010 +0200
2.3 @@ -61,7 +61,6 @@
2.4 </module-dependencies>
2.5 <friend-packages>
2.6 <friend>org.netbeans.modules.web.el</friend>
2.7 - <friend>org.netbeans.modules.web.jsf.editor</friend>
2.8 <package>com.sun.el</package>
2.9 <package>com.sun.el.lang</package>
2.10 <package>com.sun.el.parser</package>
3.1 --- a/web.jsf.editor/nbproject/project.xml Fri Jul 23 13:33:28 2010 +0200
3.2 +++ b/web.jsf.editor/nbproject/project.xml Fri Jul 23 14:21:02 2010 +0200
3.3 @@ -320,15 +320,6 @@
3.4 </run-dependency>
3.5 </dependency>
3.6 <dependency>
3.7 - <code-name-base>org.netbeans.libs.elimpl</code-name-base>
3.8 - <build-prerequisite/>
3.9 - <compile-dependency/>
3.10 - <run-dependency>
3.11 - <release-version>1</release-version>
3.12 - <specification-version>1.0</specification-version>
3.13 - </run-dependency>
3.14 - </dependency>
3.15 - <dependency>
3.16 <code-name-base>org.netbeans.modules.web.jspparser</code-name-base>
3.17 <build-prerequisite/>
3.18 <compile-dependency/>
4.1 --- a/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/hints/HintsRegistry.java Fri Jul 23 13:33:28 2010 +0200
4.2 +++ b/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/hints/HintsRegistry.java Fri Jul 23 14:21:02 2010 +0200
4.3 @@ -71,7 +71,6 @@
4.4 //init providers
4.5 PROVIDERS.add(new ComponentUsagesChecker());
4.6 PROVIDERS.add(new LibraryDeclarationChecker());
4.7 -// PROVIDERS.add(new ELSyntaxChecker());
4.8 // PROVIDERS.add(new ElChecker());
4.9 }
4.10
5.1 --- a/web.jsf.editor/test/unit/data/testfiles/home.xhtml Fri Jul 23 13:33:28 2010 +0200
5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
5.3 @@ -1,42 +0,0 @@
5.4 -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
5.5 -<html xmlns="http://www.w3.org/1999/xhtml"
5.6 - xmlns:ui="http://java.sun.com/jsf/facelets"
5.7 - xmlns:h="http://java.sun.com/jsf/html"
5.8 - xmlns:f="http://java.sun.com/jsf/core">
5.9 -
5.10 - <h:head>
5.11 - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5.12 - <title>JSF 2.0 Weld Example</title>
5.13 - </h:head>
5.14 -
5.15 - <h:body>
5.16 - <h:form id="NumberGuessMain">
5.17 - <h:panelGrid styleClass="title-panel">
5.18 - <h:outputText value="Guess Number" styleClass="title-panel-text"/>
5.19 - <h:outputText value="Powered By JavaServer Faces 2.0 and Weld" styleClass="title-panel-subtext"/>
5.20 - </h:panelGrid>
5.21 -
5.22 - <div style="color: black; font-size: 24px;">
5.23 - I'm thinking of a number between <span style="color: blue">#{game.smallest}</span> and <span style="color: blue">#{game.biggest}</span>. You have <span style="color: blue">#{game.remainingGuesses}</span> guesses.
5.24 - </div>
5.25 -
5.26 - <h:panelGrid border="1" columns="5" style="font-size: 18px;">
5.27 - Number:
5.28 - <h:inputText id="inputGuess" value="#{game.guess}" required="true" size="3" disabled="#{game.number eq game.guess}"
5.29 - validator="#{game.validateNumberRange}">
5.30 - </h:inputText>
5.31 - <h:commandButton id="GuessButton" value="Guess" action="#{game.check}" disabled="#{game.number eq game.guess}"/>
5.32 - <h:commandButton id="RestartButton" value="Reset" action="#{game.reset}" immediate="true" />
5.33 - <h:outputText id="Higher" value="Higher!" rendered="#{game.number gt game.guess and game.guess ne 0}" style="color: red"/>
5.34 - <h:outputText id="Lower" value="Lower!" rendered="#{game.number lt game.guess and game.guess ne 0}" style="color: red"/>
5.35 - </h:panelGrid>
5.36 -
5.37 - <div style="color: red; font-size: 14px;">
5.38 - <h:messages id="messages" globalOnly="false"/>
5.39 - </div>
5.40 -
5.41 - <h:outputStylesheet name="stylesheet.css" />
5.42 - </h:form>
5.43 - </h:body>
5.44 -
5.45 -</html>
6.1 --- a/web.jsf.editor/test/unit/data/testfiles/home_with_errors.xhtml Fri Jul 23 13:33:28 2010 +0200
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,42 +0,0 @@
6.4 -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
6.5 -<html xmlns="http://www.w3.org/1999/xhtml"
6.6 - xmlns:ui="http://java.sun.com/jsf/facelets"
6.7 - xmlns:h="http://java.sun.com/jsf/html"
6.8 - xmlns:f="http://java.sun.com/jsf/core">
6.9 -
6.10 - <h:head>
6.11 - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6.12 - <title>JSF 2.0 Weld Example</title>
6.13 - </h:head>
6.14 -
6.15 - <h:body>
6.16 - <h:form id="NumberGuessMain">
6.17 - <h:panelGrid styleClass="title-panel">
6.18 - <h:outputText value="Guess Number" styleClass="title-panel-text"/>
6.19 - <h:outputText value="Powered By JavaServer Faces 2.0 and Weld" styleClass="title-panel-subtext"/>
6.20 - </h:panelGrid>
6.21 -
6.22 - <div style="color: black; font-size: 24px;">
6.23 - I'm thinking of a number between <span style="color: blue">#{game.smallest}</span> and <span style="color: blue">#{game.biggest}</span>. You have <span style="color: blue">#{game remainingGuesses}</span> guesses.
6.24 - </div>
6.25 -
6.26 - <h:panelGrid border="1" columns="5" style="font-size: 18px;">
6.27 - Number:
6.28 - <h:inputText id="inputGuess" value="#{game.guess}" required="true" size="3" disabled="#{game.number e game.guess}"
6.29 - validator="#{game.validateNumberRange}">
6.30 - </h:inputText>
6.31 - <h:commandButton id="GuessButton" value="Guess" action="#{game.check}" disabled="#{game.number eq game.guess}"/>
6.32 - <h:commandButton id="RestartButton" value="Reset" action="#{game.reset}" immediate="true" />
6.33 - <h:outputText id="Higher" value="Higher!" rendered="#{game.number gt game.guess and game.guess ne 0}" style="color: red"/>
6.34 - <h:outputText id="Lower" value="Lower!" rendered="#{game.number lt game.guess and game.guess ne 0}" style="color: red"/>
6.35 - </h:panelGrid>
6.36 -
6.37 - <div style="color: red; font-size: 14px;">
6.38 - <h:messages id="messages" globalOnly="false"/>
6.39 - </div>
6.40 -
6.41 - <h:outputStylesheet name="stylesheet.css" />
6.42 - </h:form>
6.43 - </h:body>
6.44 -
6.45 -</html>