Author: pyaschenko Date: 2008-11-18 09:46:12 -0500 (Tue, 18 Nov 2008) New Revision: 11216 Modified: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java Log: some regexp fixes Modified: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java =================================================================== --- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 14:41:00 UTC (rev 11215) +++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 14:46:12 UTC (rev 11216) @@ -48,7 +48,7 @@ private final static String SPECIFIC_SCRIPT_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.js"; private final static String SPECIFIC_XCSS_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.xcss"; - private final static String REGEXP = "\\<(script|link|img)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>"; + private final static Pattern REGEXP = Pattern.compile("\\<(script|link|img|iframe)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>", Pattern.CASE_INSENSITIVE); /** * @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs() @@ -115,18 +115,17 @@ String scriptSuffix = getSriptMappingSuffix(); String cssSuffix = getCssMappingSuffix(); - Pattern pattern = Pattern.compile(REGEXP, Pattern.CASE_INSENSITIVE); + Pattern pattern = REGEXP; try { while (br.ready()) { String line = br.readLine(); - Matcher matcher = pattern.matcher(line); if (matcher.find()){ String tagName = matcher.group(1); - if(scriptSuffix != null && tagName.toLowerCase().equals("script")){ + if(scriptSuffix != null && (tagName.toLowerCase().equals("script")||tagName.toLowerCase().equals("iframe"))){ String path = matcher.group(2); String extension = matcher.group(3); line = line.replace(path + "." + extension, path + "." + extension + scriptSuffix); @@ -143,7 +142,7 @@ if(cssSuffix != null && tagName.toLowerCase().equals("link")){ String path = matcher.group(2); String extension = matcher.group(3); - line = line.replace(path + "." + extension, path + "." + "xcss" + cssSuffix); + line = line.replace(path + "." + extension, path + "." + (extension.charAt(0)=='c' ? "xcss" : "XCSS") + cssSuffix); } } bw.write(line);