Author: vpakan(a)redhat.com Date: 2010-07-13 09:16:31 -0400 (Tue, 13 Jul 2010) New Revision: 23383 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java Log: Fix changed UI labels and support CSS at keywords. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -8,6 +8,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.test.WidgetVariables; public class CSSSelectorJBIDE3288 extends JSFAutoTestCase{ @@ -60,9 +61,9 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ } catch (WidgetNotFoundException e) { tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").getNode("pages").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.menu("File").menu("New").menu("CSS File").click(); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + open.newObject(ActionItem.NewObject.WebCSS.LABEL); bot.shell("New CSS File").activate(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText(CSS_FILE_NAME); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$ bot.button("Finish").click(); //$NON-NLS-1$ } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CssFileParser.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -19,6 +19,7 @@ */ public class CssFileParser { private LinkedList<Properties> cssClasses = new LinkedList<Properties>(); + private Properties atKeywords = new Properties(); private LinkedList<String> fileLines = new LinkedList<String>(); private boolean parsed = false; @@ -40,6 +41,11 @@ public LinkedList<Properties> getCssClasses() { return cssClasses; } + + public Properties getAtKeywords() { + return atKeywords; + } + /** * Adds only non empty lines. Do not change it because parser doesn't * check for empy lines @@ -72,10 +78,14 @@ line = line.trim(); // inside Css Class Definition if (parserStatus.equals(ParserStatus.IN_CLASS_DEFINTION)){ - if (line.equals("}")){ + if (line.startsWith("}")){ parserStatus = ParserStatus.OUT_OF_CLASS_DEFINITION; cssClasses.add(classProperties); classProperties = null; + // parse atKeywords + if (line.length() > 1){ + parseAtKeywords(line.substring(1).trim()); + } } else{ String[] styleLineParts = line.split(":"); @@ -101,8 +111,12 @@ + line); } } - else{ - throw new CssFileParserException("Line should starts with 'cssclass' string but is: " + else if (line.startsWith("@")){ + parseAtKeywords(line); + } + // This is exception for this issue https://jira.jboss.org/browse/JBIDE-6604 + else if (!line.trim().equals("}")){ + throw new CssFileParserException("Line should starts with 'cssclass' or '@' string but is: " + line); } } @@ -122,35 +136,76 @@ } // Compare CSS Files Contents boolean propertiesAreEqual = true; + boolean atKeywordsAreEqual = true; if (this.getCssClasses().size() == cssFileParser.getCssClasses().size()){ Iterator<Properties> itThisProperties = this.getCssClasses().iterator(); Iterator<Properties> cssFileProperties = cssFileParser.getCssClasses().iterator(); while (propertiesAreEqual && itThisProperties.hasNext()){ - Properties propsThis = (Properties)itThisProperties.next().clone(); - Properties propsCssFile = (Properties)cssFileProperties.next().clone(); - boolean styleAttributesAreEqual = true; - Iterator<Object> itThisPropertyName = propsThis.keySet().iterator(); - while (styleAttributesAreEqual && itThisPropertyName.hasNext()){ - String propertyName = (String)itThisPropertyName.next(); - if (propsCssFile.containsKey(propertyName)){ - styleAttributesAreEqual = propsThis.getProperty(propertyName).trim() - .equals(propsCssFile.getProperty(propertyName).trim()); - // Remove checked property from CSS file properties - propsCssFile.remove(propertyName); - } - else{ - styleAttributesAreEqual = false; - } - } - // If there are left properties in CSS file then files are not equal - propertiesAreEqual = styleAttributesAreEqual && propsCssFile.size() == 0; + propertiesAreEqual = compareProperties(itThisProperties.next(), cssFileProperties.next()); } - result = propertiesAreEqual; + // Compare At Keywords + if (propertiesAreEqual){ + atKeywordsAreEqual = compareProperties(getAtKeywords(),cssFileParser.getAtKeywords()); + } + result = propertiesAreEqual && atKeywordsAreEqual; } } return result; } + /** + * Parse At Keywords + * @param line + */ + private void parseAtKeywords(String line) { + if (line.length() > 0) { + if (line.startsWith("@")) { + if (line.length() > 1) { + String[] splitLine = line.split(" "); + atKeywords + .put(splitLine[0], splitLine.length > 1 ? splitLine[1] : ""); + } else { + throw new CssFileParserException( + "Style Definition Line within CSS File has wrong format. At Keyword is empty. Line: " + + line); + } + } else { + throw new CssFileParserException( + "Style Definition Line within CSS File has wrong format. At Keyword is expected but line content is " + + line); + } + } + } + /** + * Compare two sets of properties + * @param props1 + * @param props2 + * @return + */ + private boolean compareProperties (Properties props1 , Properties props2){ + boolean propertiesAreEqual = true; + Properties props2Clone = (Properties)props2.clone(); + Iterator<Object> itProps1Name = props1.keySet().iterator(); + while (propertiesAreEqual && itProps1Name.hasNext()){ + String propertyName = (String)itProps1Name.next(); + if (props2Clone.containsKey(propertyName)){ + propertiesAreEqual = props1.getProperty(propertyName).trim() + .equals(props2Clone.getProperty(propertyName).trim()); + // Remove checked property from props2Clone properties + props2Clone.remove(propertyName); + } + else{ + propertiesAreEqual = false; + } + } + // If there are left properties in CSS file then files are not equal + if (props2Clone.size() > 0){ + propertiesAreEqual = false; + } + + return propertiesAreEqual; + + } // TODO: Remove It public static void main (String[] args){ CssFileParser parser1 = new CssFileParser( @@ -165,7 +220,7 @@ "background-color: red;", "font-weight: lighter;", "text-decoration: overline", - "}"); + "}@CHARSET \"UTF-8\""); CssFileParser parser2 = new CssFileParser( "cssclass{", @@ -179,6 +234,7 @@ "background-color: red;", "text-decoration: overline", "font-weight: lighter;", + "}@CHARSET \"UTF-8\";", "}"); System.out.println(parser1.compare(parser2)); Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -5,6 +5,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.test.WidgetVariables; public class JBIDE3148and4441Test extends JSFAutoTestCase{ @@ -26,9 +27,9 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ } catch (WidgetNotFoundException e) { tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$ - bot.menu("File").menu("New").menu("CSS File").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + open.newObject(ActionItem.NewObject.WebCSS.LABEL); bot.shell("New CSS File").activate(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText(CSS_FILE_NAME); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$ bot.button("Finish").click(); //$NON-NLS-1$ } SWTBotEclipseEditor eclipseEditor = bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor(); //$NON-NLS-1$ @@ -71,7 +72,7 @@ "background-color: red;", //$NON-NLS-1$ "font-weight: lighter;", //$NON-NLS-1$ "text-decoration: overline", //$NON-NLS-1$ - "}")); //$NON-NLS-1$ + "}@CHARSET \"UTF-8\";")); //$NON-NLS-1$ bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -5,6 +5,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.test.WidgetVariables; public class JBIDE3577Test extends JSFAutoTestCase{ @@ -26,9 +27,9 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$ } catch (WidgetNotFoundException e) { tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$ - bot.menu("File").menu("New").menu("CSS File").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + open.newObject(ActionItem.NewObject.WebCSS.LABEL); bot.shell("New CSS File").activate(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText(CSS_FILE_NAME); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$ bot.button("Finish").click(); //$NON-NLS-1$ } SWTBotEclipseEditor eclipseEditor = bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor(); //$NON-NLS-1$ @@ -46,7 +47,7 @@ bot.button("Clear").click(); //$NON-NLS-1$ bot.button("Apply").click(); //$NON-NLS-1$ bot.button("OK").click(); //$NON-NLS-1$ - assertEquals("cssclass{\r\t\r}", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("cssclass{\r\t\r}@CHARSET \"UTF-8\";\n}", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$ bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -5,6 +5,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.test.WidgetVariables; public class JBIDE3579Test extends JSFAutoTestCase{ @@ -26,9 +27,9 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ } catch (WidgetNotFoundException e) { tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$ - bot.menu("File").menu("New").menu("CSS File").click(); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ bot.shell("New CSS File").activate(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText(CSS_FILE_NAME); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$ bot.button("Finish").click(); //$NON-NLS-1$ } SWTBotEclipseEditor eclipseEditor = bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor(); //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -5,6 +5,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.test.WidgetVariables; public class JBIDE3920Test extends JSFAutoTestCase{ @@ -23,9 +24,9 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ } catch (WidgetNotFoundException e) { tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$ - bot.menu("File").menu("New").menu("CSS File").click(); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ bot.shell("New CSS File").activate(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText(CSS_FILE_NAME); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$ bot.button("Finish").click(); //$NON-NLS-1$ } SWTBotEclipseEditor eclipseEditor = bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor(); //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -5,6 +5,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.test.WidgetVariables; public class JBIDE4391Test extends JSFAutoTestCase{ @@ -26,9 +27,9 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ } catch (WidgetNotFoundException e) { tree.getTreeItem(projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$ - bot.menu("File").menu("New").menu("CSS File").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + open.newObject(ActionItem.NewObject.WebCSS.LABEL);; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ bot.shell("New CSS File").activate(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText(CSS_FILE_NAME); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(CSS_FILE_NAME); //$NON-NLS-1$ bot.button("Finish").click(); //$NON-NLS-1$ } SWTBotEclipseEditor eclipseEditor = bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor(); //$NON-NLS-1$ @@ -47,7 +48,7 @@ bot.comboBoxWithLabel("Font Weight:").setSelection("bold"); //$NON-NLS-1$ //$NON-NLS-2$ bot.button("Cancel").click(); //$NON-NLS-1$ assertEquals("cssclass{\r\tcolor:red;\r\t" + //$NON-NLS-1$ - "background-color:green;\r}", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$ + "background-color:green;\r}@CHARSET \"UTF-8\";", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$ bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2010-07-13 09:07:26 UTC (rev 23382) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2010-07-13 13:16:31 UTC (rev 23383) @@ -46,9 +46,9 @@ bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ bot.shell("New").activate(); //$NON-NLS-1$ tree = bot.tree(); - tree.expandNode("JBoss Tools Web").select("XHTML File"); //$NON-NLS-1$ //$NON-NLS-2$ + tree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-NLS-1$ //$NON-NLS-2$ bot.button("Next >").click(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText("echo"); //$NON-NLS-1$ //$NON-NLS-2$ + bot.textWithLabel("File name:").setText("echo"); //$NON-NLS-1$ //$NON-NLS-2$ bot.button("Finish").click(); //$NON-NLS-1$ bot.sleep(2000); SWTBotEclipseEditor editor = bot @@ -74,9 +74,9 @@ bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ bot.shell("New").activate(); //$NON-NLS-1$ tree = bot.tree(); - tree.expandNode("JBoss Tools Web").select("XHTML File"); //$NON-NLS-1$ //$NON-NLS-2$ + tree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-NLS-1$ //$NON-NLS-2$ bot.button("Next >").click(); //$NON-NLS-1$ - bot.textWithLabel("Name*").setText(JSF2_Test_Page_Name); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(JSF2_Test_Page_Name); //$NON-NLS-1$ bot.button("Finish").click(); //$NON-NLS-1$ } SWTBotEclipseEditor editor = bot.editorByTitle(