Author: adietish Date: 2010-12-03 04:58:24 -0500 (Fri, 03 Dec 2010) New Revision: 27135 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java Log: [JBIDE-7790] corrected storage & retrieval of selected cloud in the preferences Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-03 08:52:24 UTC (rev 27134) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-03 09:58:24 UTC (rev 27135) @@ -1,3 +1,8 @@ +2010-12-03 André Dietisheim <adietish(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java: + [JBIDE-7790] corrected storage & retrieval of selected cloud in the preferences + 2010-12-02 André Dietisheim <adietish(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java 2010-12-03 08:52:24 UTC (rev 27134) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java 2010-12-03 09:58:24 UTC (rev 27135) @@ -10,7 +10,6 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; -import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; @@ -43,9 +42,8 @@ import org.jboss.tools.deltacloud.core.IInstanceFilter; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.ErrorUtils; -import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; +import org.jboss.tools.internal.deltacloud.ui.preferences.TextPreferenceValue; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; -import org.osgi.service.prefs.Preferences; /** * @author Jeff Johnston @@ -64,6 +62,12 @@ private DeltaCloud currCloud; + TextPreferenceValue lastSelectedCloudPref; + + public AbstractCloudChildrenTableView() { + lastSelectedCloudPref = new TextPreferenceValue(getSelectedCloudPrefsKey(), Activator.getDefault()); + } + private ModifyListener cloudModifyListener = new ModifyListener() { @Override @@ -77,7 +81,7 @@ final DeltaCloud currentCloud = setCurrentCloud(index); if (currentCloud != null) { - storeSelectedCloud(currentCloud); + lastSelectedCloudPref.store(currentCloud.getName()); Display.getCurrent().asyncExec(new Runnable() { @Override @@ -88,15 +92,6 @@ }); } } - - private void storeSelectedCloud(DeltaCloud cloud) { - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - try { - prefs.put(getSelectedCloudPrefsKey(), cloud.getName()); - } catch (Exception exc) { - // do nothing - } - } }; private class ColumnListener extends SelectionAdapter { @@ -148,8 +143,9 @@ DeltaCloud[] clouds = getClouds(); createCloudSelector(container); - initCloudSelector(getLastSelectedCloud(), cloudSelector, clouds); + initCloudSelector(lastSelectedCloudPref.get(null), cloudSelector, clouds); + Label filterLabel = new Label(container, SWT.NULL); filterLabel.setText(CVMessages.getString(FILTERED_LABEL)); filterLabel.setToolTipText(CVMessages.getString(FILTERED_TOOLTIP)); @@ -271,12 +267,6 @@ return clouds[selectedCloudIndex]; } - private String getLastSelectedCloud() { - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - String lastSelectedCloud = prefs.get(IDeltaCloudPreferenceConstants.LAST_CLOUD_INSTANCE_VIEW, ""); - return lastSelectedCloud; - } - private void createColumns(TableColumnLayout tableLayout, Table table) { for (int i = 0; i < InstanceViewLabelAndContentProvider.Column.getSize(); ++i) { InstanceViewLabelAndContentProvider.Column c =