Improve setup related models; rename the setup tool to "Eclipse Oomph"

13 files changed, 31 insertions, 32 deletions

diff --git a/features/org.eclipse.emf.cdo.releng.setup-feature/feature.properties b/features/org.eclipse.emf.cdo.releng.setup-feature/feature.properties
index e0dae114f9..52ff1b80c4 100644
--- a/features/org.eclipse.emf.cdo.releng.setup-feature/feature.properties
+++ b/features/org.eclipse.emf.cdo.releng.setup-feature/feature.properties
@@ -4,5 +4,5 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 
-featureName = Development Environment Setup
+featureName = Eclipse Oomph
 description = Contains the plugins for setting up development environments.
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties
index 39b2f6d529..846486b8bd 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/plugin.properties
@@ -7,7 +7,7 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-pluginName = Development Environment Setup Edit Support
+pluginName = Eclipse Oomph Edit Support
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java
index efa77464b7..57b3a34adf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/InstallableUnitItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
  * @generated
  */
 public class InstallableUnitItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   private static final String FEATURE_SUFFIX = ".feature.group";
 
@@ -104,7 +104,7 @@ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, II
         getString("_UI_InstallableUnit_versionRange_feature"),
         getString("_UI_PropertyDescriptor_description", "_UI_InstallableUnit_versionRange_feature",
             "_UI_InstallableUnit_type"), SetupPackage.Literals.INSTALLABLE_UNIT__VERSION_RANGE, true, false, false,
-            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.properties
index b53409082f..f4ee8cc0a1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.properties
@@ -7,7 +7,7 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-pluginName = Development Environment Setup Editor
+pluginName = Eclipse Oomph Editor
 providerName = Eclipse Modeling Project
 
 _UI_SetupEditor_menu = &Setup Editor
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.xml
index 07293a6bac..219d302ea3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.editor/plugin.xml
@@ -100,11 +100,11 @@
          point="org.eclipse.ui.actionSets">
       <actionSet
             id="org.eclipse.emf.cdo.releng.setup.editor.actionSet"
-            label="Setup Actions"
+            label="Oomph Actions"
             visible="true">
          <menu
                id="setupMenu"
-               label="Setup &amp;Menu">
+               label="&amp;Oomph">
             <separator
                   name="setupGroup">
             </separator>
@@ -124,28 +124,28 @@
                class="org.eclipse.emf.cdo.releng.setup.presentation.actions.OpenBranchAction"
                id="org.eclipse.emf.cdo.releng.setup.presentation.actions.OpenBranchAction"
                icon="icons/Branch.gif"
-               label="Setup &amp;Branch"
+               label="Oomph &amp;Branch"
                style="push"
                toolbarPath="setupGroup"
-               tooltip="Opens an editor on the current setup branch">
+               tooltip="Opens an editor on the current Oomph branch">
          </action>
          <action
                class="org.eclipse.emf.cdo.releng.setup.presentation.actions.OpenPreferencesAction"
                id="org.eclipse.emf.cdo.releng.setup.presentation.actions.OpenPreferencesAction"
                icon="icons/prefs.gif"
-               label="&amp;Setup Preferences"
+               label="&amp;Oomph Preferences"
                style="push"
                toolbarPath="setupGroup"
-               tooltip="Opens an editor on the setup preferences">
+               tooltip="Opens an editor on the Oomph user preferences">
          </action>
          <action
                class="org.eclipse.emf.cdo.releng.setup.presentation.actions.PerformSetupAction"
                id="org.eclipse.emf.cdo.releng.setup.presentation.actions.PerformSetupAction"
                icon="icons/update.gif"
-               label="&amp;Perform Setup"
+               label="&amp;Re-Oomph"
                style="push"
                toolbarPath="setupGroup"
-               tooltip="Perform setup tasks">
+               tooltip="Perform Oomph setup tasks">
          </action>
       </actionSet>
    </extension>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.properties
index bed153ba6f..13906619b5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.installer.editor/plugin.properties
@@ -53,7 +53,7 @@ _UI_Wizard_initial_object_description = Specify a file name and select a model o
 _UI_FileConflict_label = File Conflict
 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
 
-_UI_SetupEditorAdvisor_ActionSet_label = Development Environment Setup
+_UI_SetupEditorAdvisor_ActionSet_label = Eclipse Oomph
 _UI_Perspective_label = Setup
 
 _UI_Browse_label = &Browse...
@@ -74,8 +74,8 @@ _UI_Menu_Edit_label = &Edit
 _UI_Menu_Window_label = &Window
 _UI_Menu_Help_label = &Help
 _UI_Menu_About_label = &About...
-_UI_About_title = Development Environment Setup
-_UI_About_text = Development Environment Setup
+_UI_About_title = Eclipse Oomph
+_UI_About_text = Eclipse Oomph
 
-_UI_SetupModelWizard_ActionSet_label = Development Environment Setup
+_UI_SetupModelWizard_ActionSet_label = Eclipse Oomph
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/about.properties b/plugins/org.eclipse.emf.cdo.releng.setup/about.properties
index ce1d10ec0f..a753b20c16 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/about.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/about.properties
@@ -16,8 +16,8 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = Development Environment Setup
-featureText = Development Environment Setup\n\
+featureName = Eclipse Oomph
+featureText = Eclipse Oomph\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/plugin.properties b/plugins/org.eclipse.emf.cdo.releng.setup/plugin.properties
index f75b979c5c..627ce14d79 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/plugin.properties
@@ -7,5 +7,5 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-pluginName = Development Environment Setup
+pluginName = Eclipse Oomph
 providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.setup/plugin.xml
index 3fb6313858..daa16b81ce 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/plugin.xml
@@ -58,7 +58,7 @@
             category="org.eclipse.emf.cdo.releng.ui.preferences.RelengPreferencePage"
             id="org.eclipse.emf.cdo.releng.setup.SetupPreferencePage"
             class="org.eclipse.emf.cdo.releng.internal.setup.ui.SetupPreferencePage"
-            name="Setup Tool Configuration">
+            name="Oomph Configuration">
       </page>
    </extension>
 
@@ -104,7 +104,7 @@
       </locationProvider>
    </extension>
 
-  <!--
+<!--
    <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
@@ -113,7 +113,7 @@
             visible="true">
          <menu
                id="setupMenu"
-               label="Setup &amp;Menu">
+               label="&amp;Oomph">
             <separator
                   name="setupGroup">
             </separator>
@@ -134,6 +134,6 @@
          </action>
       </actionSet>
    </extension>
-  -->
+-->
 
 </plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/setups/releng.setup b/plugins/org.eclipse.emf.cdo.releng.setup/setups/releng.setup
index 7804c29636..08b152dde9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/setups/releng.setup
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/setups/releng.setup
@@ -55,7 +55,7 @@
       </repositoryLists>
     </setupTasks>
     <setupTasks xsi:type="setup:WorkingSetTask">
-      <workingSets name="Development Environment Setup">
+      <workingSets name="Eclipse Oomph">
         <predicates xsi:type="predicates:NamePredicate" pattern=".*\.setup.*"/>
       </workingSets>
       <workingSets name="Project Configuration">
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/targlets/TargletContainer.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/targlets/TargletContainer.java
index d2d3277a46..1d2c756237 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/targlets/TargletContainer.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/targlets/TargletContainer.java
@@ -972,7 +972,7 @@ public class TargletContainer extends AbstractBundleContainer
 
   private static Set<File> getProjectLocations(IProfile profile, Map<IInstallableUnit, File> sources,
       IProgressMonitor monitor)
-      {
+  {
     Set<File> projectLocations = new HashSet<File>();
     IQueryResult<IInstallableUnit> result = profile.query(QueryUtil.createIUAnyQuery(), monitor);
     for (IInstallableUnit iu : result.toUnmodifiableSet())
@@ -985,7 +985,7 @@ public class TargletContainer extends AbstractBundleContainer
     }
 
     return projectLocations;
-      }
+  }
 
   public static void updateWorkspace(IProgressMonitor monitor) throws CoreException
   {
@@ -1288,7 +1288,7 @@ public class TargletContainer extends AbstractBundleContainer
     }
 
     public static Writer toXML(String id, List<Targlet> targlets) throws ParserConfigurationException,
-    TransformerException
+        TransformerException
     {
       DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
       Document document = docBuilder.newDocument();
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/AbstractSetupDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/AbstractSetupDialog.java
index 4b4859d241..d6497e4220 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/AbstractSetupDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/ui/AbstractSetupDialog.java
@@ -51,8 +51,7 @@ import java.net.URL;
  */
 public abstract class AbstractSetupDialog extends TitleAreaDialog
 {
-  public static final String SHELL_TEXT = "Development Environment "
-      + (SetupConstants.SETUP_IDE ? "Setup" : "Installer");
+  public static final String SHELL_TEXT = "Eclipse Oomph" + (SetupConstants.SETUP_IDE ? "" : " Installer");
 
   private String title;
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TargletTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TargletTaskImpl.java
index 73d22b8a0d..9af6e3f49c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TargletTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/TargletTaskImpl.java
@@ -178,7 +178,7 @@ public class TargletTaskImpl extends SetupTaskImpl implements TargletTask
 
   private static final String TARGET_NAME = "Modular Target";
 
-  private static final String CONTAINER_ID = "Setup";
+  private static final String CONTAINER_ID = "Oomph";
 
   private transient Targlet targlet;
 
@@ -531,7 +531,7 @@ public class TargletTaskImpl extends SetupTaskImpl implements TargletTask
       return repositoryLists != null && !repositoryLists.isEmpty();
     case SetupPackage.TARGLET_TASK__ACTIVE_REPOSITORY_LIST:
       return ACTIVE_REPOSITORY_LIST_EDEFAULT == null ? activeRepositoryList != null : !ACTIVE_REPOSITORY_LIST_EDEFAULT
-      .equals(activeRepositoryList);
+          .equals(activeRepositoryList);
     case SetupPackage.TARGLET_TASK__ACTIVE_P2_REPOSITORIES:
       return !getActiveP2Repositories().isEmpty();
     case SetupPackage.TARGLET_TASK__INCLUDE_SOURCES: