Author: koen.aers(a)jboss.com Date: 2010-10-20 14:57:35 -0400 (Wed, 20 Oct 2010) New Revision: 25953 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/Plugin.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/JbpmClasspathContainerInitializer.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectDetailsWizardPage.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java Log: JBIDE-7336 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/Plugin.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/Plugin.java 2010-10-20 18:19:15 UTC (rev 25952) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/Plugin.java 2010-10-20 18:57:35 UTC (rev 25953) @@ -25,7 +25,6 @@ import java.util.ResourceBundle; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.jbpm.gd.jpdl.prefs.Jbpm3PreferencesManager; import org.osgi.framework.BundleContext; public class Plugin extends AbstractUIPlugin implements Constants { @@ -46,7 +45,6 @@ public void start(BundleContext context) throws Exception { super.start(context); - Jbpm3PreferencesManager.INSTANCE.getPreferredJbpmName(); } public void stop(BundleContext context) throws Exception { Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/JbpmClasspathContainerInitializer.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/JbpmClasspathContainerInitializer.java 2010-10-20 18:19:15 UTC (rev 25952) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/util/JbpmClasspathContainerInitializer.java 2010-10-20 18:57:35 UTC (rev 25953) @@ -28,15 +28,15 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.jboss.tools.jbpm.preferences.JbpmInstallation; +import org.jboss.tools.jbpm.preferences.PreferencesManager; import org.jbpm.gd.jpdl.Logger; -import org.jbpm.gd.jpdl.prefs.Jbpm3PreferencesManager; public class JbpmClasspathContainerInitializer extends ClasspathContainerInitializer { private JbpmInstallation getJbpmInstallation(IPath containerPath) { String jbpmInstallationName = containerPath.lastSegment(); - return Jbpm3PreferencesManager.INSTANCE.getJbpmInstallation(jbpmInstallationName); + return PreferencesManager.getInstance().getJbpmInstallation(jbpmInstallationName); } public void initialize(IPath containerPath, IJavaProject project) throws CoreException { Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java 2010-10-20 18:19:15 UTC (rev 25952) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java 2010-10-20 18:57:35 UTC (rev 25953) @@ -30,7 +30,6 @@ import org.dom4j.DocumentException; import org.dom4j.io.SAXReader; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; @@ -48,9 +47,9 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; import org.jboss.tools.jbpm.preferences.JbpmInstallation; +import org.jboss.tools.jbpm.preferences.PreferencesManager; import org.jbpm.gd.jpdl.Logger; import org.jbpm.gd.jpdl.Plugin; -import org.jbpm.gd.jpdl.prefs.Jbpm3PreferencesManager; public class NewProcessDefinitionWizard extends Wizard implements INewWizard { @@ -137,7 +136,7 @@ IProject project = page.getProcessDefinitionFile().getProject(); String jbpmName = project.getPersistentProperty(new QualifiedName("", "jbpmName")); if (jbpmName == null) return ""; - JbpmInstallation jbpmInstallation = Jbpm3PreferencesManager.INSTANCE.getJbpmInstallation(jbpmName); + JbpmInstallation jbpmInstallation = PreferencesManager.getInstance().getJbpmInstallation(jbpmName); if (jbpmInstallation == null) return ""; String location = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(jbpmInstallation.location); if (location == null) return ""; Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectDetailsWizardPage.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectDetailsWizardPage.java 2010-10-20 18:19:15 UTC (rev 25952) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectDetailsWizardPage.java 2010-10-20 18:57:35 UTC (rev 25953) @@ -35,6 +35,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.jboss.tools.jbpm.preferences.JbpmInstallation; +import org.jboss.tools.jbpm.preferences.PreferencesManager; import org.jbpm.gd.jpdl.prefs.Jbpm3PreferencesManager; public class NewProcessProjectDetailsWizardPage extends WizardPage { @@ -91,7 +92,7 @@ } private void fillComboWithPreferenceRuntimes() { - Map<String, JbpmInstallation> installations = Jbpm3PreferencesManager.INSTANCE.getJbpmInstallationMap(); + Map<String, JbpmInstallation> installations = PreferencesManager.getInstance().getJbpmInstallationMap(); Iterator<String> iterator = installations.keySet().iterator(); int counter = 0; while (iterator.hasNext()) { @@ -100,7 +101,7 @@ if ("jBPM3".equals(installation.version)) { counter++; combo.add(next); - if (Jbpm3PreferencesManager.INSTANCE.getPreferredJbpmName().equals(next)) { + if (PreferencesManager.getInstance().getPreferredJbpmName().equals(next)) { combo.select(counter - 1); } } Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java 2010-10-20 18:19:15 UTC (rev 25952) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessProjectWizard.java 2010-10-20 18:57:35 UTC (rev 25953) @@ -84,8 +84,8 @@ import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; import org.eclipse.ui.part.ISetSelectionTarget; import org.jboss.tools.jbpm.preferences.JbpmInstallation; +import org.jboss.tools.jbpm.preferences.PreferencesManager; import org.jbpm.gd.jpdl.Logger; -import org.jbpm.gd.jpdl.prefs.Jbpm3PreferencesManager; import org.jbpm.gd.jpdl.util.JbpmClasspathContainer; public class NewProcessProjectWizard extends Wizard implements INewWizard { @@ -115,7 +115,7 @@ } private boolean isJbpm3RuntimeAvailable() { - Map<String, JbpmInstallation> installations = Jbpm3PreferencesManager.INSTANCE.getJbpmInstallationMap(); + Map<String, JbpmInstallation> installations = PreferencesManager.getInstance().getJbpmInstallationMap(); Iterator<String> iterator = installations.keySet().iterator(); while (iterator.hasNext()) { JbpmInstallation installation = installations.get(iterator.next()); @@ -193,7 +193,7 @@ } private JbpmInstallation getJbpmInstallation() { - return Jbpm3PreferencesManager.INSTANCE.getJbpmInstallation(getCoreJbpmName()); + return PreferencesManager.getInstance().getJbpmInstallation(getCoreJbpmName()); } private void createJbpmLibraryContainer(IJavaProject javaProject) throws JavaModelException { @@ -260,7 +260,7 @@ } private void createSimpleProcessDefinition(IJavaProject javaProject) throws CoreException, JavaModelException, IOException { - JbpmInstallation jbpmInstallation = Jbpm3PreferencesManager.INSTANCE.getJbpmInstallation(getCoreJbpmName()); + JbpmInstallation jbpmInstallation = PreferencesManager.getInstance().getJbpmInstallation(getCoreJbpmName()); if (jbpmInstallation == null) return; // IFolder processesFolder = javaProject.getProject().getFolder("processes"); // if (!processesFolder.exists()) { @@ -317,7 +317,7 @@ } private void copyJbpmResources(IJavaProject javaProject) throws CoreException { - JbpmInstallation jbpmInstallation = Jbpm3PreferencesManager.INSTANCE.getJbpmInstallation(getCoreJbpmName()); + JbpmInstallation jbpmInstallation = PreferencesManager.getInstance().getJbpmInstallation(getCoreJbpmName()); if (jbpmInstallation == null) return; String location = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(jbpmInstallation.location); IFolder folder = javaProject.getProject().getFolder("src/main/config"); @@ -452,7 +452,7 @@ String name = configureRuntimePage.nameText.getText(); String location = configureRuntimePage.locationText.getText(); String version = "jBPM3"; - Jbpm3PreferencesManager.INSTANCE.initializeDefaultJbpmInstallation(name, location, version); + PreferencesManager.getInstance().initializeDefaultJbpmInstallation(name, location, version); } getContainer().updateButtons(); createJavaProject();