Update SensinactProposalProvider
diff --git a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/.classpath b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/.classpath
index d1b97f7..635506c 100644
--- a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/.classpath
+++ b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/META-INF/MANIFEST.MF b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/META-INF/MANIFEST.MF
index 632395b..3e4efed 100644
--- a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/META-INF/MANIFEST.MF
+++ b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@
Bundle-SymbolicName: org.eclipse.sensinact.studio.language.sensinact.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.sensinact.studio.language.sensinact,
- org.eclipse.sensinact.studio.language.sensinact.ide,
org.eclipse.xtext.ui,
org.eclipse.xtext.ui.shared,
org.eclipse.xtext.ui.codetemplates.ui,
@@ -15,13 +14,15 @@
org.eclipse.ui,
org.eclipse.compare,
org.eclipse.xtext.builder,
- org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.apache.log4j,
- org.eclipse.sensinact.studio.model.manager
+ org.eclipse.sensinact.studio.model.manager,
+ org.eclipse.sensinact.studio.language.sensinact.ide
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.sensinact.studio.language.ui.quickfix,
- org.eclipse.sensinact.studio.language.sensinact.ui.internal,
- org.eclipse.sensinact.studio.language.ui.contentassist
+ org.eclipse.sensinact.studio.language.ui.contentassist,
+ org.eclipse.sensinact.studio.language.sensinact.ui.internal
Bundle-Activator: org.eclipse.sensinact.studio.language.sensinact.ui.internal.SensinactActivator
-Import-Package: org.apache.log4j
+Import-Package: org.apache.log4j,
+ org.eclipse.sensinact.studio.language.parser.antlr.internal
diff --git a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/plugin.xml_gen b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/plugin.xml_gen
index 705ed4f..c228b80 100644
--- a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/plugin.xml_gen
+++ b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/plugin.xml_gen
@@ -26,11 +26,11 @@
<handler
class="org.eclipse.sensinact.studio.language.ui.SensinactExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
commandId="org.eclipse.sensinact.studio.language.Sensinact.validate">
- <activeWhen>
- <reference
+ <activeWhen>
+ <reference
definitionId="org.eclipse.sensinact.studio.language.Sensinact.Editor.opened">
- </reference>
- </activeWhen>
+ </reference>
+ </activeWhen>
</handler>
<!-- copy qualified name -->
<handler
@@ -119,38 +119,38 @@
</extension>
<extension
point="org.eclipse.ui.commands">
- <command
+ <command
description="Trigger expensive validation"
id="org.eclipse.sensinact.studio.language.Sensinact.validate"
name="Validate">
- </command>
- <!-- copy qualified name -->
- <command
+ </command>
+ <!-- copy qualified name -->
+ <command
id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
categoryId="org.eclipse.ui.category.edit"
description="Copy the qualified name for the selected element"
name="Copy Qualified Name">
- </command>
- <command
+ </command>
+ <command
id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
categoryId="org.eclipse.ui.category.edit"
description="Copy the qualified name for the selected element"
name="Copy Qualified Name">
- </command>
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
locationURI="popup:#TextEditorContext?after=group.edit">
- <command
- commandId="org.eclipse.sensinact.studio.language.Sensinact.validate"
- style="push"
- tooltip="Trigger expensive validation">
- <visibleWhen checkEnabled="false">
- <reference
- definitionId="org.eclipse.sensinact.studio.language.Sensinact.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
+ <command
+ commandId="org.eclipse.sensinact.studio.language.Sensinact.validate"
+ style="push"
+ tooltip="Trigger expensive validation">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.sensinact.studio.language.Sensinact.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
</menuContribution>
<!-- copy qualified name -->
<menuContribution locationURI="popup:#TextEditorContext?after=copy">
@@ -204,6 +204,15 @@
</activeWhen>
</handler>
</extension>
+ <extension point="org.eclipse.core.contenttype.contentTypes">
+ <content-type
+ base-type="org.eclipse.core.runtime.text"
+ file-extensions="sna"
+ id="org.eclipse.sensinact.studio.language.Sensinact.contenttype"
+ name="Sensinact File"
+ priority="normal">
+ </content-type>
+ </extension>
<!-- adding resource factories -->
<extension
point="org.eclipse.emf.ecore.extension_parser">
@@ -291,7 +300,7 @@
<!-- Quick Outline -->
<extension
point="org.eclipse.ui.handlers">
- <handler
+ <handler
class="org.eclipse.sensinact.studio.language.ui.SensinactExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
<activeWhen>
@@ -351,7 +360,7 @@
</extension>
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
- <handler
+ <handler
class="org.eclipse.sensinact.studio.language.ui.SensinactExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
<activeWhen>
@@ -388,12 +397,18 @@
class="org.eclipse.sensinact.studio.language.ui.SensinactExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
extensions="sna">
</viewer>
+ <contentTypeBinding
+ contentTypeId="org.eclipse.sensinact.studio.language.Sensinact.contenttype"
+ contentViewerId="org.eclipse.sensinact.studio.language.Sensinact.compare.contentViewers" />
</extension>
<extension point="org.eclipse.compare.contentMergeViewers">
<viewer id="org.eclipse.sensinact.studio.language.Sensinact.compare.contentMergeViewers"
class="org.eclipse.sensinact.studio.language.ui.SensinactExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
extensions="sna" label="Sensinact Compare">
</viewer>
+ <contentTypeBinding
+ contentTypeId="org.eclipse.sensinact.studio.language.Sensinact.contenttype"
+ contentMergeViewerId="org.eclipse.sensinact.studio.language.Sensinact.compare.contentMergeViewers" />
</extension>
<extension point="org.eclipse.ui.editors.documentProviders">
<provider id="org.eclipse.sensinact.studio.language.Sensinact.editors.documentProviders"
diff --git a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/src/org/eclipse/sensinact/studio/language/ui/contentassist/SensinactProposalProvider.xtend b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/src/org/eclipse/sensinact/studio/language/ui/contentassist/SensinactProposalProvider.xtend
index 2085110..296a68c 100644
--- a/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/src/org/eclipse/sensinact/studio/language/ui/contentassist/SensinactProposalProvider.xtend
+++ b/xtext/org.eclipse.sensinact.studio.language.sensinact.ui/src/org/eclipse/sensinact/studio/language/ui/contentassist/SensinactProposalProvider.xtend
@@ -10,7 +10,7 @@
*/
package org.eclipse.sensinact.studio.language.ui.contentassist
-import org.eclipse.sensinact.studio.language.sensinact.DSL_Resource
+import org.eclipse.sensinact.studio.language.sensinact.DSL_Resource;
import org.eclipse.sensinact.studio.model.manager.modelupdater.ModelEditor
import org.eclipse.emf.ecore.EObject
import org.eclipse.xtext.Assignment
@@ -52,7 +52,7 @@
} // service completion
else if ("serviceID".equals(feature)) {
// Ensure to fetch the info during the code completion
- ModelUpdater.getInstance().updateServices(gatewayID, deviceID, false);
+ ModelUpdater.getInstance().updateServices(gatewayID, deviceID);
var candidates = ModelEditor.getInstance().getServicesId(gatewayID, deviceID);
for (candidate : candidates) {
