Author: koen.aers(a)jboss.com Date: 2010-12-17 07:44:31 -0500 (Fri, 17 Dec 2010) New Revision: 27586 Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/PreferencesManager.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Initializer.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java Log: JBDS-1442 Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java 2010-12-17 12:08:06 UTC (rev 27585) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java 2010-12-17 12:44:31 UTC (rev 27586) @@ -183,7 +183,10 @@ } private void checkItemToCheck(TableViewer viewer) { - String name = Activator.getDefault().getPreferenceStore().getString(Constants.JBPM_NAME); +// String name = Activator.getDefault().getPreferenceStore().getString(Constants.JBPM_NAME); + PreferencesManager inputManager = + (PreferencesManager)tableViewer.getInput(); + String name = inputManager.getPreferredJbpmName(); if (name != null) { TableItem tableItem = getItemToCheck(viewer, name); if (tableItem != null) { @@ -296,7 +299,8 @@ if (item != null) { name = item.getText(0); } - Activator.getDefault().getPreferenceStore().setValue(Constants.JBPM_NAME, name); +// Activator.getDefault().getPreferenceStore().setValue(Constants.JBPM_NAME, name); + inputManager.setPreferredJbpmName(name); return true; } @@ -309,9 +313,10 @@ } public void performDefaults() { - Activator.getDefault().getPreferenceStore().setToDefault(Constants.JBPM_NAME); +// Activator.getDefault().getPreferenceStore().setToDefault(Constants.JBPM_NAME); PreferencesManager inputManager = (PreferencesManager)tableViewer.getInput(); + inputManager.setPreferredJbpmName(null); inputManager.getJbpmInstallationMap().clear(); tableViewer.setInput(inputManager); checkItemToCheck(tableViewer); Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/PreferencesManager.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/PreferencesManager.java 2010-12-17 12:08:06 UTC (rev 27585) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/PreferencesManager.java 2010-12-17 12:44:31 UTC (rev 27586) @@ -53,6 +53,10 @@ } protected PreferencesManager() { + initialize(); + } + + protected void initialize() { initializeInstallations(); } Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Initializer.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Initializer.java 2010-12-17 12:08:06 UTC (rev 27585) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Initializer.java 2010-12-17 12:44:31 UTC (rev 27586) @@ -1,8 +1,8 @@ package org.jbpm.gd.jpdl.prefs; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.jface.preference.IPreferenceStore; import org.jbpm.gd.jpdl.Plugin; -import org.eclipse.jface.preference.IPreferenceStore; public class Initializer extends AbstractPreferenceInitializer implements PreferencesConstants { Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java 2010-12-17 12:08:06 UTC (rev 27585) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/prefs/Jbpm3PreferencesManager.java 2010-12-17 12:44:31 UTC (rev 27586) @@ -31,20 +31,11 @@ public static final Jbpm3PreferencesManager INSTANCE = new Jbpm3PreferencesManager(); - protected Jbpm3PreferencesManager() { - super(); - initialize(); - } - - void initialize() { - initializeInstallations(); - initializePreferredJbpmName(); - } - - private void initializeInstallations() { + protected void initialize() { File installationsFile = Plugin.getDefault().getStateLocation().append("jbpm-installations.xml").toFile(); if (installationsFile.exists()) { + initializePreferredJbpmName(); loadInstallations(installationsFile); saveInstallations(); loadInstallations();