diff options
author | Tobias Schwarz | 2014-11-13 13:04:10 +0000 |
---|---|---|
committer | Tobias Schwarz | 2014-11-13 13:04:10 +0000 |
commit | 6466ab5bd573bd7bbac6fefd7f30e7440934e448 (patch) | |
tree | da40a65386a14fe82109be7e2f95354c1a6e305d | |
parent | 0f2b147550f9be59472e7eb6eb12de075f2c65be (diff) | |
download | org.eclipse.tcf-6466ab5bd573bd7bbac6fefd7f30e7440934e448.tar.gz org.eclipse.tcf-6466ab5bd573bd7bbac6fefd7f30e7440934e448.tar.xz org.eclipse.tcf-6466ab5bd573bd7bbac6fefd7f30e7440934e448.zip |
SM: make "connect on finish" configurable
5 files changed, 24 insertions, 20 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/interfaces/IPreferenceKeys.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/interfaces/IPreferenceKeys.java index e7f352075..115650816 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/interfaces/IPreferenceKeys.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/interfaces/IPreferenceKeys.java @@ -23,4 +23,10 @@ public interface IPreferenceKeys { * Defaults to 20. */ public final String PREF_MAX_RECENT_ACTION_ENTRIES = PREFIX + "maxRecentActions"; //$NON-NLS-1$ + + /** + * Key prefix for auto connect setting in new wizards. + * The key needs to be followed by the connection type id. + */ + public final String PREF_AUTO_CONNECT = "autoConnect."; //$NON-NLS-1$ } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/NewWizard.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/NewWizard.java index 8d1763e8d..34bc127d9 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/NewWizard.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/NewWizard.java @@ -39,6 +39,8 @@ import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode; import org.eclipse.tcf.te.tcf.locator.interfaces.services.IPeerModelLookupService; import org.eclipse.tcf.te.tcf.locator.interfaces.services.IPeerModelRefreshService; import org.eclipse.tcf.te.tcf.locator.model.ModelManager; +import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin; +import org.eclipse.tcf.te.tcf.ui.interfaces.IPreferenceKeys; import org.eclipse.tcf.te.tcf.ui.nls.Messages; import org.eclipse.tcf.te.tcf.ui.wizards.pages.NewTargetWizardPage; import org.eclipse.tcf.te.ui.interfaces.data.IDataExchangeNode; @@ -80,8 +82,7 @@ public class NewWizard extends AbstractNewConfigWizard { key.equals(IPeer.ATTR_TRANSPORT_NAME) || key.equals(IPeer.ATTR_IP_HOST) || key.equals(IPeer.ATTR_IP_PORT) || - key.equals(IPeerProperties.PROP_PROXIES) || - key.equals(IPeerProperties.PROP_AUTO_CONNECT); + key.equals(IPeerProperties.PROP_PROXIES); } /* (non-Javadoc) @@ -90,6 +91,8 @@ public class NewWizard extends AbstractNewConfigWizard { @Override protected IPropertiesContainer getInitialData() { IStructuredSelection selection = getSelection(); + final IPropertiesContainer data = new PropertiesContainer(); + if (selection != null) { final IPeer peer; boolean isPeerNode = false; @@ -111,7 +114,6 @@ public class NewWizard extends AbstractNewConfigWizard { String selPeerType = peer.getAttributes().get(IPeerProperties.PROP_TYPE); final boolean sameType = getPeerType() == null ? selPeerType == null : getPeerType().equals(selPeerType); final boolean finIsPeerNode = isPeerNode; - final IPropertiesContainer data = new PropertiesContainer(); Protocol.invokeAndWait(new Runnable() { @Override public void run() { @@ -122,11 +124,15 @@ public class NewWizard extends AbstractNewConfigWizard { } } }); - - return data; } } - return super.getInitialData(); + + String autoConnectValue = UIPlugin.getScopedPreferences().getString(IPreferenceKeys.PREF_AUTO_CONNECT+getPeerType()); + boolean autoConnect = autoConnectValue != null ? UIPlugin.getScopedPreferences().getBoolean(IPreferenceKeys.PREF_AUTO_CONNECT+getPeerType()) : true; + data.setProperty(IPeerProperties.PROP_AUTO_CONNECT, autoConnect); + data.setProperty(IPeerProperties.PROP_TYPE, getPeerType()); + + return data; } /** diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/src/org/eclipse/tcf/te/ui/forms/parts/AbstractSection.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/src/org/eclipse/tcf/te/ui/forms/parts/AbstractSection.java index e685d6cbc..75c629bab 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/src/org/eclipse/tcf/te/ui/forms/parts/AbstractSection.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/src/org/eclipse/tcf/te/ui/forms/parts/AbstractSection.java @@ -310,21 +310,13 @@ public abstract class AbstractSection extends SectionPart implements IAdaptable, */ @Override public void commit(boolean onSave) { - // commit is reseting the dirty state - boolean hasBeenDirty = isDirty(); - // Execute the commit - super.commit(onSave); - // signal the dirty state change to the manager form if - // it really has changed - if (hasBeenDirty) { + if (onSave) { if (UIPlugin.getTraceHandler().isSlotEnabled(0, ITraceIds.TRACE_SECTIONS_DIRTY_STATE)) { UIPlugin.getTraceHandler().trace("Commit(" + onSave + ") reseted the dirty state to false.", //$NON-NLS-1$ //$NON-NLS-2$ ITraceIds.TRACE_SECTIONS_DIRTY_STATE, this); } - if (onSave) - getManagedForm().dirtyStateChanged(); - else - markDirty(); + super.commit(onSave); + getManagedForm().dirtyStateChanged(); } } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractEditorPage.java index dcbfaf7b1..fde9f5bf4 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractEditorPage.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractEditorPage.java @@ -148,12 +148,12 @@ public abstract class AbstractEditorPage extends FormPage implements IEditorPage @Override public void setActive(boolean active) { super.setActive(active); - if (!active) { + if (active) { ISelection selection = getEditorInput() != null ? new StructuredSelection(getEditorInputNode()) : null; getSite().getSelectionProvider().setSelection(selection); if (getSite().getSelectionProvider() instanceof MultiPageSelectionProvider) { SelectionChangedEvent changedEvent = new SelectionChangedEvent(getSite().getSelectionProvider(), selection); - ((MultiPageSelectionProvider) getSite().getSelectionProvider()).firePostSelectionChanged(changedEvent); + ((MultiPageSelectionProvider) getSite().getSelectionProvider()).fireSelectionChanged(changedEvent); } } } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractTreeViewerExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractTreeViewerExplorerEditorPage.java index e983811de..cc859e0f8 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractTreeViewerExplorerEditorPage.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractTreeViewerExplorerEditorPage.java @@ -473,7 +473,7 @@ public abstract class AbstractTreeViewerExplorerEditorPage extends AbstractCusto selectionProvider.setSelection(selection.isEmpty() ? new StructuredSelection(getEditorInputNode()) : selection); if (selectionProvider instanceof MultiPageSelectionProvider) { SelectionChangedEvent changedEvent = new SelectionChangedEvent(selectionProvider, selection); - ((MultiPageSelectionProvider) selectionProvider).firePostSelectionChanged(changedEvent); + ((MultiPageSelectionProvider) selectionProvider).fireSelectionChanged(changedEvent); } } catch (SWTException e) { |