Author: sdzmitrovich Date: 2008-10-14 12:22:39 -0400 (Tue, 14 Oct 2008) New Revision: 10833 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-2810 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2008-10-14 15:06:57 UTC (rev 10832) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataGrid.xhtml.xml 2008-10-14 16:22:39 UTC (rev 10833) @@ -9,7 +9,7 @@ <TD CLASS="dr-table-cell rich-table-cell"> <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> <DIV CLASS="dr-pnl-h rich-panel-header" - STYLE="background-image: {url(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif)};"> + STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/"> <SPAN> #{data.number}</SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> @@ -20,7 +20,7 @@ <TD CLASS="dr-table-cell rich-table-cell"> <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> <DIV CLASS="dr-pnl-h rich-panel-header" - STYLE="background-image: {url(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif)};"> + STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/"> <SPAN> #{data.number}</SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body"> @@ -33,7 +33,7 @@ <TD CLASS="dr-table-cell rich-table-cell"> <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> <DIV CLASS="dr-pnl-h rich-panel-header" - STYLE="background-image: {url(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif)};"> + STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/"> <SPAN> #{data.number}</SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body" TITLE="rich:panel"> @@ -44,7 +44,7 @@ <TD CLASS="dr-table-cell rich-table-cell"> <DIV CLASS="dr-pnl rich-panel" TITLE="rich:panel"> <DIV CLASS="dr-pnl-h rich-panel-header" - STYLE="background-image: {url(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif)};"> + STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/"> <SPAN> #{data.number}</SPAN> </DIV> <DIV CLASS="dr-pnl-b rich-panel-body" TITLE="rich:panel"> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2008-10-14 15:06:57 UTC (rev 10832) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestDomUtil.java 2008-10-14 16:22:39 UTC (rev 10833) @@ -45,9 +45,9 @@ final public static String ILLEGAL_ATTRIBUTES_SEPARATOR = Constants.COMMA; - final public static String START_REGEX = "{"; //$NON-NLS-1$ + final public static String START_REGEX = "/"; //$NON-NLS-1$ - final public static String END_REGEX = "}"; //$NON-NLS-1$ + final public static String END_REGEX = "/"; //$NON-NLS-1$ public static Document getDocument(File file) throws FileNotFoundException { // create reader @@ -218,41 +218,45 @@ throw new ComparisonException("there is not : \"" + name + "\" attribute"); - if (HTML.ATTR_STYLE.equalsIgnoreCase(name)) { +// if (HTML.ATTR_STYLE.equalsIgnoreCase(name)) { +// +// String[] modelParameters = modelAttr.getNodeValue().split( +// Constants.SEMICOLON); +// String[] vpeParameters = vpeAttr.getNodeValue().split( +// Constants.SEMICOLON); +// +// for (int j = 0; j < modelParameters.length; j++) { +// String modelParam = modelParameters[j]; +// String vpeParam = vpeParameters[j]; +// +// String[] splittedModelParam = modelParam.split( +// Constants.COLON, 2); +// +// String[] splittedVpeParam = vpeParam.split( +// Constants.COLON, 2); +// +// if (!splittedModelParam[0].trim().equals( +// splittedVpeParam[0].trim())) { +// throw new ComparisonException( +// "param of style attribute is\"" +// + splittedVpeParam[0].trim() +// + "\" but must be \"" +// + splittedModelParam[0].trim() +// + "\""); +// } +// +//// compareComplexStrings(splittedModelParam[0].trim(), splittedVpeParam[0].trim()); +// +// +// if (splittedModelParam.length > 1) +// compareComplexStrings(splittedModelParam[1].trim(), +// splittedVpeParam[1].trim()); +// +// } +// +// } + else { - String[] modelParameters = modelAttr.getNodeValue().split( - Constants.SEMICOLON); - String[] vpeParameters = vpeAttr.getNodeValue().split( - Constants.SEMICOLON); - - for (int j = 0; j < modelParameters.length; j++) { - String modelParam = modelParameters[j]; - String vpeParam = vpeParameters[j]; - - String[] splittedModelParam = modelParam.split( - Constants.COLON, 2); - - String[] splittedVpeParam = vpeParam.split( - Constants.COLON, 2); - - if (!splittedModelParam[0].trim().equals( - splittedVpeParam[0].trim())) { - throw new ComparisonException( - "param of style attribute is\"" - + splittedVpeParam[0].trim() - + "\" but must be \"" - + splittedModelParam[0].trim() - + "\""); - } - - if (splittedModelParam.length > 1) - compareComplexStrings(splittedModelParam[1].trim(), - splittedVpeParam[1].trim()); - - } - - } else { - compareComplexStrings(modelAttr.getNodeValue().trim(), vpeAttr.getNodeValue().trim());