diff options
author | Ketan Padegaonkar | 2011-09-21 15:04:01 +0000 |
---|---|---|
committer | Ketan Padegaonkar | 2011-09-21 21:51:02 +0000 |
commit | 35621196197c14e3e76f7aa1eb6043e91e0e2e2d (patch) | |
tree | e9c0afe1ac23c73f8a2c9c5129faaa01bebe8011 | |
parent | 59d2a03828bf3f3ef3f7087ccf1be49c93511485 (diff) | |
download | org.eclipse.swtbot-35621196197c14e3e76f7aa1eb6043e91e0e2e2d.tar.gz org.eclipse.swtbot-35621196197c14e3e76f7aa1eb6043e91e0e2e2d.tar.xz org.eclipse.swtbot-35621196197c14e3e76f7aa1eb6043e91e0e2e2d.zip |
Remove some more eclipse 3.4 relater stuff since it is no longer supported.
4 files changed, 8 insertions, 34 deletions
diff --git a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java index fbe2ca00..f19d992f 100644 --- a/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java +++ b/org.eclipse.swtbot.eclipse.finder.test/src/org/eclipse/swtbot/eclipse/finder/widgets/helpers/PackageExplorerView.java @@ -12,14 +12,12 @@ package org.eclipse.swtbot.eclipse.finder.widgets.helpers; import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; -import org.eclipse.core.runtime.Platform; import org.eclipse.swt.widgets.Button; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; @@ -38,23 +36,12 @@ public class PackageExplorerView { tree.setFocus(); tree.select(projectName); bot.menu("Edit").menu("Delete").click(); - String version = Platform.getBundle("org.eclipse.core.runtime").getHeaders().get("Bundle-Version"); - if (version.startsWith("3.3")) { - SWTBotShell shell = bot.shell("Confirm Project Delete"); - shell.activate(); - Button button = bot.widget(widgetOfType(Button.class), shell.widget); - new SWTBotRadio(button).click(); - bot.button("Yes").click(); - bot.waitUntil(Conditions.shellCloses(shell)); - } - if (version.startsWith("3.4") || version.startsWith("3.5") || version.startsWith("3.6")) { - SWTBotShell shell = bot.shell("Delete Resources"); - shell.activate(); - Button button = bot.widget(widgetOfType(Button.class), shell.widget); - new SWTBotCheckBox(button).select(); - bot.button("OK").click(); - bot.waitUntil(Conditions.shellCloses(shell)); - } + SWTBotShell shell = bot.shell("Delete Resources"); + shell.activate(); + Button button = bot.widget(widgetOfType(Button.class), shell.widget); + new SWTBotCheckBox(button).select(); + bot.button("OK").click(); + bot.waitUntil(Conditions.shellCloses(shell)); } /** diff --git a/org.eclipse.swtbot.releng/build-conf/e34.properties b/org.eclipse.swtbot.releng/build-conf/e34.properties deleted file mode 100644 index 6773c079..00000000 --- a/org.eclipse.swtbot.releng/build-conf/e34.properties +++ /dev/null @@ -1,13 +0,0 @@ -## The location from where eclipse SDK will be downloaded in case there's none in the releng/externals directory -## Don't add the trailing file name, the file name is automatically appended based on eclipse.sdk.archive -## for locations of the eclipse SDKs -## see http://download.eclipse.org/eclipse/downloads/ and http://archive.eclipse.org/eclipse/downloads/index.php - -#eclipse.sdk.url = http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800 - -eclipse.sdk.url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.4.2-200902111700 - -eclipse.buildId = 3.4.2 -eclipse.qualifier = e34 - -update.site.base.url = http://www.eclipse.org/downloads/download.php?r=1&file=/technology/swtbot/ganymede/dev-build/update-site diff --git a/org.eclipse.swtbot.releng/build.developer.properties.sample b/org.eclipse.swtbot.releng/build.developer.properties.sample index a3e6669c..bc8e7a7b 100644 --- a/org.eclipse.swtbot.releng/build.developer.properties.sample +++ b/org.eclipse.swtbot.releng/build.developer.properties.sample @@ -4,5 +4,5 @@ os = macosx ws = cocoa arch = x86_64 -# provide 34, 35 or 36 +# provide 35, 36 or 37 eclipse.version = 37 diff --git a/org.eclipse.swtbot.releng/make-release.rb b/org.eclipse.swtbot.releng/make-release.rb index 6940da51..8246089d 100755 --- a/org.eclipse.swtbot.releng/make-release.rb +++ b/org.eclipse.swtbot.releng/make-release.rb @@ -50,9 +50,9 @@ class Release end end - #version=34, code_name=ganymede #version=35, code_name=galileo #version=36, code_name=helios + #version=37, code_name=indigo def self.build_swtbot(version, code_name) FileUtils.rm_rf("to-upload/#{code_name}") |