Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2014-08-08 06:09:52 -0400
committerTobias Schwarz2014-08-08 06:09:52 -0400
commit5e1d3b0cde9541f70234b1858e5265fa914fb1cc (patch)
tree4eda5bfc0f67aff3d8a30d6948152931d3ce2dca
parent7c3967a98093b5ddca5225b3fbff005720d31ad8 (diff)
downloadorg.eclipse.tcf-5e1d3b0cde9541f70234b1858e5265fa914fb1cc.tar.gz
org.eclipse.tcf-5e1d3b0cde9541f70234b1858e5265fa914fb1cc.tar.xz
org.eclipse.tcf-5e1d3b0cde9541f70234b1858e5265fa914fb1cc.zip
Target Explorer: fix content assist
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/AbstractConfigWizardPage.java14
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.properties2
4 files changed, 20 insertions, 0 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/AbstractConfigWizardPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/AbstractConfigWizardPage.java
index e689dbf36..b808f6a1a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/AbstractConfigWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/pages/AbstractConfigWizardPage.java
@@ -55,6 +55,7 @@ public abstract class AbstractConfigWizardPage extends AbstractFormsWizardPage i
protected boolean autoConnect = false;
protected boolean autoLaunchDbg = false;
+ protected boolean isAutoLaunchDbgEnabled = true;
// The list of existing configuration names. Used to generate a unique name
// and validate the wizard
@@ -421,6 +422,13 @@ public abstract class AbstractConfigWizardPage extends AbstractFormsWizardPage i
return autoLaunchDbg;
}
+ protected final void setIsAutoStartDebugger(boolean autoLaunchDbg) {
+ this.autoLaunchDbg = autoLaunchDbg;
+ if (launchDbg != null) {
+ launchDbg.setSelection(autoLaunchDbg);
+ }
+ }
+
/* (non-Javadoc)
* @see org.eclipse.tcf.te.ui.wizards.pages.AbstractValidatingWizardPage#doValidate()
*/
@@ -590,4 +598,10 @@ public abstract class AbstractConfigWizardPage extends AbstractFormsWizardPage i
}
}
}
+
+ protected void updateEnablement() {
+ if (launchDbg != null) {
+ launchDbg.setEnabled(isAutoLaunchDbgEnabled);
+ }
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java
index aa0c2c3f2..87d60e1b9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/AbstractDecoratedDialogPageControl.java
@@ -17,6 +17,7 @@ import org.eclipse.jface.fieldassist.FieldDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.tcf.te.ui.controls.nls.Messages;
/**
* AbstractDecoratedDialogPageControl
@@ -119,6 +120,7 @@ public abstract class AbstractDecoratedDialogPageControl extends BaseDialogPageC
else {
fieldDeco = registry.getFieldDecoration(FieldDecorationRegistry.DEC_CONTENT_PROPOSAL);
if (fieldDeco != null) {
+ getControlDecoration().setDescriptionText(Messages.AbstractDecoratedDialogPageControl_contentAssist_message);
getControlDecoration().setImage(fieldDeco.getImage());
getControlDecoration().show();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.java
index f25b96817..1f28b8a64 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.java
@@ -70,6 +70,8 @@ public class Messages extends NLS {
public static String BaseEditBrowseTextControl_button_label;
public static String BaseEditBrowseTextControl_validationJob_name;
+ public static String AbstractDecoratedDialogPageControl_contentAssist_message;
+
public static String DirectorySelectionControl_title;
public static String DirectorySelectionControl_group_label;
public static String DirectorySelectionControl_editfield_label;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.properties
index f8ec0eb6b..da4ff547e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/nls/Messages.properties
@@ -11,6 +11,8 @@
BaseEditBrowseTextControl_button_label=Browse...
BaseEditBrowseTextControl_validationJob_name={0} validation job
+AbstractDecoratedDialogPageControl_contentAssist_message=Press ''Ctrl+Space'' for content assist.
+
DirectorySelectionControl_title=Browse for Folder
DirectorySelectionControl_group_label=Select directory
DirectorySelectionControl_editfield_label=Directory:

Back to the top