Fixing migration to use plugin version for new STEM projects
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/versioning/VersioningUtil.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/versioning/VersioningUtil.java index 0172d19..57b3e7d 100644 --- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/versioning/VersioningUtil.java +++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/versioning/VersioningUtil.java
@@ -103,14 +103,9 @@ Bundle thisBundle = CorePlugin.getDefault().getBundle(); - //String version = thisBundle.getBundleContext().getProperty("Bundle-Version"); + Version STEMVersion = thisBundle.getVersion(); - String version = thisBundle.getHeaders().get("Bundle-Version"); - //Version v = new Version(version); - - // ToDo before 2.0 release. uncomment line above and delete line below - Version v = STEM_VERSION_2; - return v; + return STEMVersion; } }
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/wizards/NewSTEMProjectWizard.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/wizards/NewSTEMProjectWizard.java index 4766e59..3cda63f 100644 --- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/wizards/NewSTEMProjectWizard.java +++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/wizards/NewSTEMProjectWizard.java
@@ -44,6 +44,7 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; import org.eclipse.ui.handlers.HandlerUtil; +import org.osgi.framework.Version; /** * This class is an Eclipse {@link Wizard} for creating new STEM projects. @@ -262,8 +263,8 @@ // Add version information to the new STEM project from the plugin version ID. - String uiPluginVersion = CorePlugin.getDefault().getBundle().getVersion().toString(); - VersioningUtil.setSTEMProjectVersion(project, uiPluginVersion); + Version v = VersioningUtil.getSTEMVersion(); + VersioningUtil.setSTEMProjectVersion(project, v.toString()); // Populate the new project with default files. // final IPath