Author: jpeterka Date: 2010-12-20 04:54:21 -0500 (Mon, 20 Dec 2010) New Revision: 27606 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java Log: method closeReportUsageWindowIfOpened improved Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-12-20 04:30:23 UTC (rev 27605) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-12-20 09:54:21 UTC (rev 27606) @@ -496,36 +496,28 @@ } - /** - * Closes RH Report Usage Dialog if found - * @param cancel selecte if ok or cancel button is used - */ -public void closeReportUsageWindowIfOpened(boolean cancel) { - boolean usageWindowAppeared = false; - // Check Usage Reporting For JBT - try { - bot.shell("JBoss Tools Usage").activate(); - bot.button( - cancel ? IDELabel.Button.CANCEL - : IDELabel.Button.OK).click(); - log.info("Report usage window closed"); - usageWindowAppeared = true; - } catch (WidgetNotFoundException wnfe) { - // do nothing continue to try to close JBDS Usage Report Dialog + /** + * Closes RH Report Usage Dialog if found + * + * @param cancel + * select if ok or cancel button is used + */ + public void closeReportUsageWindowIfOpened(boolean cancel) { + + String title; + if (isJBDSRun()) { + title = "JBoss Developer Studio Usage"; + } else { + title = "JBoss Tools Usage"; + } + try { + + bot.shell(title).activate(); + bot.button(cancel ? IDELabel.Button.CANCEL : IDELabel.Button.OK) + .click(); + log.info("Report usage window closed"); + } catch (WidgetNotFoundException wnfe) { + log.info("Report usage window didn't appear"); + } } - // Check Usage Reporting For JBDS - if (!usageWindowAppeared){ - try { - bot.shell("JBoss Developer Studio Usage").activate(); - bot.button( - cancel ? IDELabel.Button.CANCEL - : IDELabel.Button.OK).click(); - log.info("Report usage window closed"); - usageWindowAppeared = true; - } catch (WidgetNotFoundException wnfe) { - log.info("Report usage window didn't appear"); - } - } - } -}