Author: scabanovich Date: 2008-09-30 09:32:44 -0400 (Tue, 30 Sep 2008) New Revision: 10565 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/ELParserFactory.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java Log: JBIDE-1497. Minor improvements Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/ELParserFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/ELParserFactory.java 2008-09-30 13:01:08 UTC (rev 10564) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/ELParserFactory.java 2008-09-30 13:32:44 UTC (rev 10565) @@ -51,9 +51,6 @@ Tokenizer t = createTokenizer(); LexicalToken token = t.parse(source, start, length); errors = t.getErrors(); - if(token == null) { - return null; - } ELModelImpl model = impl.parse(token); model.setSource(source); model.setErrors(errors); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java 2008-09-30 13:01:08 UTC (rev 10564) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java 2008-09-30 13:32:44 UTC (rev 10565) @@ -33,13 +33,13 @@ public boolean isStart(Tokenizer tokenizer, int offset) { char ch = tokenizer.lookUpChar(offset); - return Character.isJavaIdentifierStart(ch); + return Character.isJavaIdentifierStart(ch) && ch != '\0'; } public boolean read(Tokenizer tokenizer, int offset) { int i = offset; char ch = '\0'; - while(Character.isJavaIdentifierPart(ch = tokenizer.readNextChar())) { + while(Character.isJavaIdentifierPart(ch = tokenizer.readNextChar()) && ch != '\0') { i++; } if(ch != '\0') {