[jbosstools-commits] JBoss Tools SVN: r42278 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle.

[jbosstools-commits at lists.jboss.org]

Author: dmaliarevich
Date: 2012-06-28 08:44:08 -0400 (Thu, 28 Jun 2012)
New Revision: 42278

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java
Log:
https://issues.jboss.org/browse/JBIDE-10531 - Getting the bundle value should not succeed if the EL is missing any required token.

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java	2012-06-28 12:24:23 UTC (rev 42277)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java	2012-06-28 12:44:08 UTC (rev 42278)
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc.
  * Distributed under license by Red Hat, Inc. All rights reserved.
  * This program is made available under the terms of the
  * Eclipse Public License v1.0 which accompanies this distribution,
@@ -453,22 +453,29 @@
 	}
 	
 	public String getBundleValue(String name) {
-//		System.out.println("\n1 BM -> getBundleValue -> " + name);
-//		System.out.println("2 BM -> showBundleUsageAsEL = "
-//				+ showBundleUsageAsEL);
 		String bundleValue = name;
 		if (!showBundleUsageAsEL) {
 			List<ELInstance> is = parseJSFExpression(name);
 			if (is != null) {
 				StringBuffer sb = new StringBuffer();
 				int index = 0;
+				boolean parsingErrors = false;
 				for (ELInstance i : is) {
+					/*
+					 * https://issues.jboss.org/browse/JBIDE-10531
+					 * Getting the bundle value should not succeed 
+					 * if the EL is missing any required token.
+					 */
+					if (!i.getErrors().isEmpty()) {
+						parsingErrors = true;
+						break;
+					}
 					int start = i.getStartPosition();
 					sb.append(name.substring(index, start));
 					index = start;
 					if (i.getExpression() instanceof ELInvocationExpression) {
-						ELInvocationExpression expr = (ELInvocationExpression) i
-								.getExpression();
+						ELInvocationExpression expr = 
+								(ELInvocationExpression) i.getExpression();
 						String[] values = getCall(expr);
 						if (values != null) {
 							String value = getBundleValue(values[0], values[1]);
@@ -476,12 +483,13 @@
 								sb.append(value);
 								index = i.getEndPosition();
 							}
-
 						}
 					}
 					if (index < i.getEndPosition()) {
-						// fix has been added by Maksim Areshkau
-						// https://jira.jboss.org/jira/browse/JBIDE-6064
+						/*
+						 * https://jira.jboss.org/jira/browse/JBIDE-6064
+						 * CA out of range error occurs sometimes
+						 */
 						if (name.length() > i.getEndPosition()) {
 							sb.append(name.substring(index, i.getEndPosition()));
 							index = i.getEndPosition();
@@ -491,10 +499,11 @@
 						}
 					}
 				}
-				bundleValue = sb.append(name.substring(index)).toString();
+				if (!parsingErrors) {
+					bundleValue = sb.append(name.substring(index)).toString();
+				}
 			}
 		}
-//		System.out.println("3 BM -> getBundleValue -> " + bundleValue);
 		return bundleValue;
 	}