Author: akazakov Date: 2007-11-16 08:37:05 -0500 (Fri, 16 Nov 2007) New Revision: 4943 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELToken.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java Log: http://jira.jboss.com/jira/browse/JBIDE-1308 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELToken.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELToken.java 2007-11-16 13:31:37 UTC (rev 4942) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELToken.java 2007-11-16 13:37:05 UTC (rev 4943) @@ -24,10 +24,6 @@ public static final int EL_SEPARATOR_TOKEN = 4; public static final int EL_STRING_TOKEN = 5; public static final int EL_NUMBER_TOKEN = 6; -// public static final int EL_START_ROUND_BRACKET_TOKEN = 7; -// public static final int EL_END_ROUND_BRACKET_TOKEN = 8; -// public static final int EL_START_SQUARE_BRACKET_TOKEN = 9; -// public static final int EL_END_SQUARE_BRACKET_TOKEN = 10; private int start; private int length; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java 2007-11-16 13:31:37 UTC (rev 4942) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java 2007-11-16 13:37:05 UTC (rev 4943) @@ -43,6 +43,14 @@ private static final int STRING_SYMBOL = '\''; private static final String RESERVED_WORDS = " null empty div and or not mod eq ne lt gt le ge true false instanceof invalid required "; + private SeamELTokenizer(String expression, int offset) { + this.offset = offset; + this.expression = expression; + index = 0; + fTokens = new ArrayList<ELToken>(); + parse(); + } + /** * Constructs SeamELTokenizer object. * Constructs SeamELTokenizer object @@ -51,14 +59,6 @@ * then tokens are {"var1.pr"," ", "!=", " ", "var2",} * @param expression */ - public SeamELTokenizer(String expression, int offset) { - this.offset = offset; - this.expression = expression; - index = 0; - fTokens = new ArrayList<ELToken>(); - parse(); - } - public SeamELTokenizer(String expression) { this(expression, 0); } @@ -340,14 +340,4 @@ index--; } } - - public static void main(String[] args) throws Exception { - String test = "hotelBooking.bookHotel(hotel.id, user.username).test.rrr().asss not null av.test[] ! = var2 <> var3.test3"; - System.out.println(test); - SeamELTokenizer elTokenizer = new SeamELTokenizer(test); - List<ELToken> tokens = elTokenizer.getTokens(); - for (ELToken token : tokens) { - System.out.println(token); - } - } } \ No newline at end of file