summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSopot Çela2012-07-24 04:55:40 (EDT)
committerLars Vogel2012-07-24 04:55:40 (EDT)
commit2a5cd04b555229d63921b13ff9fa5eccd69adae1 (patch)
tree60cf951f80e197272308f6506d76c3ef6dbcbcb3
parentd13f7f0a39998cf0f534c93c6f8b0810e31e34af (diff)
downloadorg.eclipse.e4.tools-2a5cd04b555229d63921b13ff9fa5eccd69adae1.zip
org.eclipse.e4.tools-2a5cd04b555229d63921b13ff9fa5eccd69adae1.tar.gz
org.eclipse.e4.tools-2a5cd04b555229d63921b13ff9fa5eccd69adae1.tar.bz2
Bug 385685 - Model editor - Avoid repositioning the cursor and improved
warning message
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 8b813e4..35ba6c6 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -321,7 +321,7 @@ BindingContextEditor_Name=Name
BindingContextEditor_Description=Description
BindingContextEditor_Subcontexts=Subcontexts
BindingContextEditor_AddContext=Binding Context
-BindingContextEditor_NameWarning=Binding Context name should be left empty
+BindingContextEditor_NameWarning=Binding Context name should not be empty
CommandParameterEditor_TreeLabel=Command Parameter
CommandParameterEditor_TreeLabelDescritpion=Command Parameter Bla Bla Bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
index fd1788b..faaf89f 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ControlFactory.java
@@ -351,6 +351,7 @@ public class ControlFactory {
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
t.setLayoutData(gd);
+ TextPasteHandler.createFor(t);
if (warningText != null) {
final ControlDecoration controlDecoration = new ControlDecoration(t, SWT.LEFT | SWT.TOP);
controlDecoration.setDescriptionText(warningText);
@@ -376,9 +377,8 @@ public class ControlFactory {
};
UpdateValueStrategy acv = new UpdateValueStrategy().setAfterConvertValidator(iv);
context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master), acv, acv);
- }
- TextPasteHandler.createFor(t);
- context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
+ } else
+ context.bindValue(textProp.observeDelayed(200, t), modelProp.observeDetail(master));
}
public static void createTranslatedTextField(Composite parent, String label, IObservableValue master, EMFDataBindingContext context, IWidgetValueProperty textProp, IEMFEditValueProperty modelProp, IResourcePool resourcePool, IProject project) {