Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/infra')
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java26
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml2
4 files changed, 13 insertions, 19 deletions
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF
index e8c19ec5089..fecbb0e0435 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.papyrus.infra.textedit.xtext;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.papyrus.infra.textedit.xtext.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)",
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java
index 2775269b9b0..220c1299274 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java
@@ -11,6 +11,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation
* Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Bug 578648, 579033, 580115, 580042
+ * Jeremie Tatibouet (CEA LIST) <jeremie.tatibouet@cea.fr> - Bug 580336
*****************************************************************************/
package org.eclipse.papyrus.infra.textedit.xtext.nested.editor;
@@ -30,7 +31,6 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
@@ -53,11 +53,9 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.model.IXtextDocument;
import org.eclipse.xtext.ui.editor.model.XtextDocument;
-import org.eclipse.xtext.ui.editor.model.XtextDocumentProvider;
/**
@@ -334,19 +332,6 @@ public class PapyrusXTextEditor extends XtextEditor {
if (this.historyListener != null) {
this.historyListener.updateXTextDocument(getDocumentProvider().getDocument(this.input));
}
-
- final IDocumentProvider provider = getDocumentProvider();
- if (provider instanceof XtextDocumentProvider) {
- final XtextDocumentProvider xtextDocumentProvider = (XtextDocumentProvider) provider;
- final IDocument tmp = xtextDocumentProvider.getDocument(this.input);
-
- if (tmp instanceof XtextDocument) {
- final XtextDocument xtextDoc = (XtextDocument) tmp;
- // here to create and display validation marker just after the opening of the editor
- // bug 580042
- xtextDoc.checkAndUpdateAnnotations();
- }
- }
}
}
@@ -357,6 +342,15 @@ public class PapyrusXTextEditor extends XtextEditor {
*/
@Override
public void setFocus() {
+ final PapyrusXTextDocumentProvider provider = getDocumentProvider();
+ if (provider != null) {
+ final IXtextDocument document = provider.getDocument(getEditorInput());
+ if (document instanceof XtextDocument) {
+ // here to create and display validation markers after getting the focus
+ // bugs 580042 and 580336
+ ((XtextDocument) document).checkAndUpdateAnnotations();
+ }
+ }
registerSashWindowsContainerListener();
super.setFocus();
}
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml
index 49e3b773d1b..e825ece7693 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.textedit.xtext</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
index fa1d4c578bb..3008991046e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
@@ -20,7 +20,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+ locationURI="popup:org.eclipse.papyrus.dev.ui.framework">
<command
commandId="org.eclipse.papyrus.infra.types.ui.deploy"
icon="icons/configuration.gif"

Back to the top