[jbosstools-commits] JBoss Tools SVN: r36368 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

Author: dmaliarevich Date: 2011-11-16 09:46:08 -0500 (Wed, 16 Nov 2011) New Revision: 36368 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java Log: https://issues.jboss.org/browse/JBIDE-10178 - regexp for getting the URL string was added. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-11-16 14:27:12 UTC (rev 36367) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2011-11-16 14:46:08 UTC (rev 36368) @@ -20,6 +20,8 @@ import java.net.URL; import java.net.URLDecoder; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -487,17 +489,30 @@ } private static String[] splitURL(String url) { - int startAttr = url.indexOf(ATTR_URL); - int startPathIndex = url.indexOf(OPEN_BRACKET, startAttr); -// int endPathIndex = url.lastIndexOf(CLOSE_BRACKET, startPathIndex + 1); - int endPathIndex = url.lastIndexOf(CLOSE_BRACKET, url.length()); - if (startPathIndex < 0 || endPathIndex < 0) { - return null; + /* + * https://issues.jboss.org/browse/JBIDE-10178 + * The index of closing bracket was wrong. + * Thus replaced with java regexp. + */ + String urlRegExp = "(?<=\\burl\\b)\\((.*)\\)(?=(?>[^\\)]*;|[^\\)]*))"; //$NON-NLS-1$ + Pattern p = Pattern.compile(urlRegExp); + Matcher m = p.matcher(url); + String[] res = null; + if (m.find()) { + res = new String[3]; + /* + * Before URL + */ + res[0] = url.substring(0, m.start(1)); + /* + * The URL string itself + */ + res[1] = m.group(1); + /* + * After the URL string + */ + res[2] = url.substring(m.end(1), url.length()); } - String[] res = new String[3]; - res[0] = url.substring(0, startPathIndex + 1); - res[1] = url.substring(startPathIndex + 1, endPathIndex); - res[2] = url.substring(endPathIndex, url.length()); return res; }