diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-06 17:26:43 -0500 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2020-06-07 19:22:45 -0400 |
commit | 6cac004e4935f4cdbfaf1004c74ba7604f990ddc (patch) | |
tree | 8dff613a63e8f3125365c49d01b551f0b088fa3d /Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui | |
parent | Restructure Vampire Reasoner project (diff) | |
download | VIATRA-Generator-6cac004e4935f4cdbfaf1004c74ba7604f990ddc.tar.gz VIATRA-Generator-6cac004e4935f4cdbfaf1004c74ba7604f990ddc.tar.zst VIATRA-Generator-6cac004e4935f4cdbfaf1004c74ba7604f990ddc.zip |
Implement Enum handling and study hierarchy handling
Diffstat (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui')
9 files changed, 535 insertions, 26 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF index baaefd41..48ee7417 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF | |||
@@ -16,7 +16,7 @@ Require-Bundle: ca.mcgill.ecse.dslreasoner.vampire.language, | |||
16 | org.eclipse.compare, | 16 | org.eclipse.compare, |
17 | org.eclipse.xtext.builder, | 17 | org.eclipse.xtext.builder, |
18 | org.eclipse.xtend.lib;resolution:=optional, | 18 | org.eclipse.xtend.lib;resolution:=optional, |
19 | org.eclipse.xtext.xbase.lib | 19 | org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" |
20 | Import-Package: org.apache.log4j | 20 | Import-Package: org.apache.log4j |
21 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 21 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
22 | Export-Package: ca.mcgill.ecse.dslreasoner.ui.contentassist, | 22 | Export-Package: ca.mcgill.ecse.dslreasoner.ui.contentassist, |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen new file mode 100644 index 00000000..cbb504dd --- /dev/null +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen | |||
@@ -0,0 +1,434 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2 | <?eclipse version="3.0"?> | ||
3 | <plugin> | ||
4 | <extension | ||
5 | point="org.eclipse.ui.editors"> | ||
6 | <editor | ||
7 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor" | ||
8 | contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor" | ||
9 | default="true" | ||
10 | extensions="tptp" | ||
11 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
12 | name="VampireLanguage Editor"> | ||
13 | </editor> | ||
14 | </extension> | ||
15 | <extension | ||
16 | point="org.eclipse.ui.handlers"> | ||
17 | <handler | ||
18 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler" | ||
19 | commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration"> | ||
20 | <activeWhen> | ||
21 | <reference | ||
22 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
23 | </reference> | ||
24 | </activeWhen> | ||
25 | </handler> | ||
26 | <handler | ||
27 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler" | ||
28 | commandId="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate"> | ||
29 | <activeWhen> | ||
30 | <reference | ||
31 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
32 | </reference> | ||
33 | </activeWhen> | ||
34 | </handler> | ||
35 | <!-- copy qualified name --> | ||
36 | <handler | ||
37 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler" | ||
38 | commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"> | ||
39 | <activeWhen> | ||
40 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
41 | </activeWhen> | ||
42 | </handler> | ||
43 | <handler | ||
44 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler" | ||
45 | commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"> | ||
46 | <activeWhen> | ||
47 | <and> | ||
48 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened" /> | ||
49 | <iterate> | ||
50 | <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" /> | ||
51 | </iterate> | ||
52 | </and> | ||
53 | </activeWhen> | ||
54 | </handler> | ||
55 | </extension> | ||
56 | <extension point="org.eclipse.core.expressions.definitions"> | ||
57 | <definition id="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
58 | <and> | ||
59 | <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/> | ||
60 | <with variable="activeEditor"> | ||
61 | <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" | ||
62 | value="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
63 | forcePluginActivation="true"/> | ||
64 | </with> | ||
65 | </and> | ||
66 | </definition> | ||
67 | <definition id="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened"> | ||
68 | <and> | ||
69 | <reference definitionId="isXtextEditorActive"/> | ||
70 | <with variable="activeEditor"> | ||
71 | <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" | ||
72 | value="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
73 | forcePluginActivation="true"/> | ||
74 | </with> | ||
75 | </and> | ||
76 | </definition> | ||
77 | </extension> | ||
78 | <extension | ||
79 | point="org.eclipse.ui.preferencePages"> | ||
80 | <page | ||
81 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage" | ||
82 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
83 | name="VampireLanguage"> | ||
84 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
85 | </page> | ||
86 | <page | ||
87 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
88 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage" | ||
89 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.coloring" | ||
90 | name="Syntax Coloring"> | ||
91 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
92 | </page> | ||
93 | <page | ||
94 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
95 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage" | ||
96 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.templates" | ||
97 | name="Templates"> | ||
98 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
99 | </page> | ||
100 | </extension> | ||
101 | <extension | ||
102 | point="org.eclipse.ui.propertyPages"> | ||
103 | <page | ||
104 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage" | ||
105 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
106 | name="VampireLanguage"> | ||
107 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
108 | <enabledWhen> | ||
109 | <adapt type="org.eclipse.core.resources.IProject"/> | ||
110 | </enabledWhen> | ||
111 | <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/> | ||
112 | </page> | ||
113 | </extension> | ||
114 | <extension | ||
115 | point="org.eclipse.ui.keywords"> | ||
116 | <keyword | ||
117 | id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage" | ||
118 | label="VampireLanguage"/> | ||
119 | </extension> | ||
120 | <extension | ||
121 | point="org.eclipse.ui.commands"> | ||
122 | <command | ||
123 | description="Trigger expensive validation" | ||
124 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate" | ||
125 | name="Validate"> | ||
126 | </command> | ||
127 | <!-- copy qualified name --> | ||
128 | <command | ||
129 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" | ||
130 | categoryId="org.eclipse.ui.category.edit" | ||
131 | description="Copy the qualified name for the selected element" | ||
132 | name="Copy Qualified Name"> | ||
133 | </command> | ||
134 | <command | ||
135 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" | ||
136 | categoryId="org.eclipse.ui.category.edit" | ||
137 | description="Copy the qualified name for the selected element" | ||
138 | name="Copy Qualified Name"> | ||
139 | </command> | ||
140 | </extension> | ||
141 | <extension point="org.eclipse.ui.menus"> | ||
142 | <menuContribution | ||
143 | locationURI="popup:#TextEditorContext?after=group.edit"> | ||
144 | <command | ||
145 | commandId="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate" | ||
146 | style="push" | ||
147 | tooltip="Trigger expensive validation"> | ||
148 | <visibleWhen checkEnabled="false"> | ||
149 | <reference | ||
150 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
151 | </reference> | ||
152 | </visibleWhen> | ||
153 | </command> | ||
154 | </menuContribution> | ||
155 | <!-- copy qualified name --> | ||
156 | <menuContribution locationURI="popup:#TextEditorContext?after=copy"> | ||
157 | <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" | ||
158 | style="push" tooltip="Copy Qualified Name"> | ||
159 | <visibleWhen checkEnabled="false"> | ||
160 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
161 | </visibleWhen> | ||
162 | </command> | ||
163 | </menuContribution> | ||
164 | <menuContribution locationURI="menu:edit?after=copy"> | ||
165 | <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" | ||
166 | style="push" tooltip="Copy Qualified Name"> | ||
167 | <visibleWhen checkEnabled="false"> | ||
168 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
169 | </visibleWhen> | ||
170 | </command> | ||
171 | </menuContribution> | ||
172 | <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions"> | ||
173 | <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" | ||
174 | style="push" tooltip="Copy Qualified Name"> | ||
175 | <visibleWhen checkEnabled="false"> | ||
176 | <and> | ||
177 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened" /> | ||
178 | <iterate> | ||
179 | <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" /> | ||
180 | </iterate> | ||
181 | </and> | ||
182 | </visibleWhen> | ||
183 | </command> | ||
184 | </menuContribution> | ||
185 | </extension> | ||
186 | <extension point="org.eclipse.ui.menus"> | ||
187 | <menuContribution locationURI="popup:#TextEditorContext?endof=group.find"> | ||
188 | <command commandId="org.eclipse.xtext.ui.editor.FindReferences"> | ||
189 | <visibleWhen checkEnabled="false"> | ||
190 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
191 | </reference> | ||
192 | </visibleWhen> | ||
193 | </command> | ||
194 | </menuContribution> | ||
195 | </extension> | ||
196 | <extension point="org.eclipse.ui.handlers"> | ||
197 | <handler | ||
198 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler" | ||
199 | commandId="org.eclipse.xtext.ui.editor.FindReferences"> | ||
200 | <activeWhen> | ||
201 | <reference | ||
202 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
203 | </reference> | ||
204 | </activeWhen> | ||
205 | </handler> | ||
206 | </extension> | ||
207 | <extension point="org.eclipse.core.contenttype.contentTypes"> | ||
208 | <content-type | ||
209 | base-type="org.eclipse.core.runtime.text" | ||
210 | file-extensions="tptp" | ||
211 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype" | ||
212 | name="VampireLanguage File" | ||
213 | priority="normal"> | ||
214 | </content-type> | ||
215 | </extension> | ||
216 | <!-- adding resource factories --> | ||
217 | <extension | ||
218 | point="org.eclipse.emf.ecore.extension_parser"> | ||
219 | <parser | ||
220 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory" | ||
221 | type="tptp"> | ||
222 | </parser> | ||
223 | </extension> | ||
224 | <extension point="org.eclipse.xtext.extension_resourceServiceProvider"> | ||
225 | <resourceServiceProvider | ||
226 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider" | ||
227 | uriExtension="tptp"> | ||
228 | </resourceServiceProvider> | ||
229 | </extension> | ||
230 | <!-- marker definitions for ca.mcgill.ecse.dslreasoner.VampireLanguage --> | ||
231 | <extension | ||
232 | id="vampirelanguage.check.fast" | ||
233 | name="VampireLanguage Problem" | ||
234 | point="org.eclipse.core.resources.markers"> | ||
235 | <super type="org.eclipse.xtext.ui.check.fast"/> | ||
236 | <persistent value="true"/> | ||
237 | </extension> | ||
238 | <extension | ||
239 | id="vampirelanguage.check.normal" | ||
240 | name="VampireLanguage Problem" | ||
241 | point="org.eclipse.core.resources.markers"> | ||
242 | <super type="org.eclipse.xtext.ui.check.normal"/> | ||
243 | <persistent value="true"/> | ||
244 | </extension> | ||
245 | <extension | ||
246 | id="vampirelanguage.check.expensive" | ||
247 | name="VampireLanguage Problem" | ||
248 | point="org.eclipse.core.resources.markers"> | ||
249 | <super type="org.eclipse.xtext.ui.check.expensive"/> | ||
250 | <persistent value="true"/> | ||
251 | </extension> | ||
252 | <extension point="org.eclipse.ui.preferencePages"> | ||
253 | <page | ||
254 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
255 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage" | ||
256 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.validator.preferencePage" | ||
257 | name="Errors/Warnings"> | ||
258 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
259 | </page> | ||
260 | </extension> | ||
261 | <extension point="org.eclipse.xtext.builder.participant"> | ||
262 | <participant | ||
263 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant" | ||
264 | fileExtensions="tptp"/> | ||
265 | </extension> | ||
266 | <extension point="org.eclipse.ui.preferencePages"> | ||
267 | <page | ||
268 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
269 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage" | ||
270 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compiler.preferencePage" | ||
271 | name="Compiler"> | ||
272 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
273 | </page> | ||
274 | </extension> | ||
275 | <extension point="org.eclipse.ui.propertyPages"> | ||
276 | <page | ||
277 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
278 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage" | ||
279 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compiler.propertyPage" | ||
280 | name="Compiler"> | ||
281 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
282 | <enabledWhen> | ||
283 | <adapt type="org.eclipse.core.resources.IProject"/> | ||
284 | </enabledWhen> | ||
285 | <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/> | ||
286 | </page> | ||
287 | </extension> | ||
288 | <extension point="org.eclipse.ui.menus"> | ||
289 | <menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration"> | ||
290 | <command | ||
291 | commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand" | ||
292 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.OpenGeneratedCode" | ||
293 | style="push"> | ||
294 | <visibleWhen checkEnabled="false"> | ||
295 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
296 | </visibleWhen> | ||
297 | </command> | ||
298 | </menuContribution> | ||
299 | </extension> | ||
300 | <extension point="org.eclipse.ui.handlers"> | ||
301 | <handler | ||
302 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler" | ||
303 | commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"> | ||
304 | <activeWhen> | ||
305 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
306 | </activeWhen> | ||
307 | </handler> | ||
308 | </extension> | ||
309 | <!-- Quick Outline --> | ||
310 | <extension | ||
311 | point="org.eclipse.ui.handlers"> | ||
312 | <handler | ||
313 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler" | ||
314 | commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"> | ||
315 | <activeWhen> | ||
316 | <reference | ||
317 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
318 | </reference> | ||
319 | </activeWhen> | ||
320 | </handler> | ||
321 | </extension> | ||
322 | <extension | ||
323 | point="org.eclipse.ui.commands"> | ||
324 | <command | ||
325 | description="Open the quick outline." | ||
326 | id="org.eclipse.xtext.ui.editor.outline.QuickOutline" | ||
327 | name="Quick Outline"> | ||
328 | </command> | ||
329 | </extension> | ||
330 | <extension point="org.eclipse.ui.menus"> | ||
331 | <menuContribution | ||
332 | locationURI="popup:#TextEditorContext?after=group.open"> | ||
333 | <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline" | ||
334 | style="push" | ||
335 | tooltip="Open Quick Outline"> | ||
336 | <visibleWhen checkEnabled="false"> | ||
337 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"/> | ||
338 | </visibleWhen> | ||
339 | </command> | ||
340 | </menuContribution> | ||
341 | </extension> | ||
342 | <!-- quickfix marker resolution generator for ca.mcgill.ecse.dslreasoner.VampireLanguage --> | ||
343 | <extension | ||
344 | point="org.eclipse.ui.ide.markerResolution"> | ||
345 | <markerResolutionGenerator | ||
346 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" | ||
347 | markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.fast"> | ||
348 | <attribute | ||
349 | name="FIXABLE_KEY" | ||
350 | value="true"> | ||
351 | </attribute> | ||
352 | </markerResolutionGenerator> | ||
353 | <markerResolutionGenerator | ||
354 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" | ||
355 | markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.normal"> | ||
356 | <attribute | ||
357 | name="FIXABLE_KEY" | ||
358 | value="true"> | ||
359 | </attribute> | ||
360 | </markerResolutionGenerator> | ||
361 | <markerResolutionGenerator | ||
362 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" | ||
363 | markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.expensive"> | ||
364 | <attribute | ||
365 | name="FIXABLE_KEY" | ||
366 | value="true"> | ||
367 | </attribute> | ||
368 | </markerResolutionGenerator> | ||
369 | </extension> | ||
370 | <!-- Rename Refactoring --> | ||
371 | <extension point="org.eclipse.ui.handlers"> | ||
372 | <handler | ||
373 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler" | ||
374 | commandId="org.eclipse.xtext.ui.refactoring.RenameElement"> | ||
375 | <activeWhen> | ||
376 | <reference | ||
377 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
378 | </reference> | ||
379 | </activeWhen> | ||
380 | </handler> | ||
381 | </extension> | ||
382 | <extension point="org.eclipse.ui.menus"> | ||
383 | <menuContribution | ||
384 | locationURI="popup:#TextEditorContext?after=group.edit"> | ||
385 | <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement" | ||
386 | style="push"> | ||
387 | <visibleWhen checkEnabled="false"> | ||
388 | <reference | ||
389 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
390 | </reference> | ||
391 | </visibleWhen> | ||
392 | </command> | ||
393 | </menuContribution> | ||
394 | </extension> | ||
395 | <extension point="org.eclipse.ui.preferencePages"> | ||
396 | <page | ||
397 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
398 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage" | ||
399 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.refactoring" | ||
400 | name="Refactoring"> | ||
401 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
402 | </page> | ||
403 | </extension> | ||
404 | <extension point="org.eclipse.compare.contentViewers"> | ||
405 | <viewer id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentViewers" | ||
406 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" | ||
407 | extensions="tptp"> | ||
408 | </viewer> | ||
409 | <contentTypeBinding | ||
410 | contentTypeId="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype" | ||
411 | contentViewerId="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentViewers" /> | ||
412 | </extension> | ||
413 | <extension point="org.eclipse.compare.contentMergeViewers"> | ||
414 | <viewer id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentMergeViewers" | ||
415 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" | ||
416 | extensions="tptp" label="VampireLanguage Compare"> | ||
417 | </viewer> | ||
418 | <contentTypeBinding | ||
419 | contentTypeId="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype" | ||
420 | contentMergeViewerId="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentMergeViewers" /> | ||
421 | </extension> | ||
422 | <extension point="org.eclipse.ui.editors.documentProviders"> | ||
423 | <provider id="ca.mcgill.ecse.dslreasoner.VampireLanguage.editors.documentProviders" | ||
424 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider" | ||
425 | extensions="tptp"> | ||
426 | </provider> | ||
427 | </extension> | ||
428 | <extension point="org.eclipse.team.core.fileTypes"> | ||
429 | <fileTypes | ||
430 | extension="tptp" | ||
431 | type="text"> | ||
432 | </fileTypes> | ||
433 | </extension> | ||
434 | </plugin> | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java index 5ef7b226..726c20f5 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ui; | 4 | package ca.mcgill.ecse.dslreasoner.ui; |
5 | 5 | ||
@@ -11,6 +11,7 @@ import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageDescriptionLabelPro | |||
11 | import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageLabelProvider; | 11 | import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageLabelProvider; |
12 | import ca.mcgill.ecse.dslreasoner.ui.outline.VampireLanguageOutlineTreeProvider; | 12 | import ca.mcgill.ecse.dslreasoner.ui.outline.VampireLanguageOutlineTreeProvider; |
13 | import ca.mcgill.ecse.dslreasoner.ui.quickfix.VampireLanguageQuickfixProvider; | 13 | import ca.mcgill.ecse.dslreasoner.ui.quickfix.VampireLanguageQuickfixProvider; |
14 | import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageValidatorConfigurationBlock; | ||
14 | import com.google.inject.Binder; | 15 | import com.google.inject.Binder; |
15 | import com.google.inject.Provider; | 16 | import com.google.inject.Provider; |
16 | import com.google.inject.name.Names; | 17 | import com.google.inject.name.Names; |
@@ -78,6 +79,7 @@ import org.eclipse.xtext.ui.refactoring.ui.IRenameSupport; | |||
78 | import org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences; | 79 | import org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences; |
79 | import org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider; | 80 | import org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider; |
80 | import org.eclipse.xtext.ui.shared.Access; | 81 | import org.eclipse.xtext.ui.shared.Access; |
82 | import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock; | ||
81 | 83 | ||
82 | /** | 84 | /** |
83 | * Manual modifications go to {@link VampireLanguageUiModule}. | 85 | * Manual modifications go to {@link VampireLanguageUiModule}. |
@@ -135,6 +137,11 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule { | |||
135 | binder.bind(InternalVampireLanguageLexer.class).toProvider(LexerProvider.create(InternalVampireLanguageLexer.class)); | 137 | binder.bind(InternalVampireLanguageLexer.class).toProvider(LexerProvider.create(InternalVampireLanguageLexer.class)); |
136 | } | 138 | } |
137 | 139 | ||
140 | // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2 | ||
141 | public Class<? extends AbstractValidatorConfigurationBlock> bindAbstractValidatorConfigurationBlock() { | ||
142 | return VampireLanguageValidatorConfigurationBlock.class; | ||
143 | } | ||
144 | |||
138 | // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 | 145 | // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 |
139 | public Class<? extends PrefixMatcher> bindPrefixMatcher() { | 146 | public Class<? extends PrefixMatcher> bindPrefixMatcher() { |
140 | return FQNPrefixMatcher.class; | 147 | return FQNPrefixMatcher.class; |
@@ -223,6 +230,13 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule { | |||
223 | } | 230 | } |
224 | 231 | ||
225 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | 232 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 |
233 | public void configureIPreferenceStoreInitializer(Binder binder) { | ||
234 | binder.bind(IPreferenceStoreInitializer.class) | ||
235 | .annotatedWith(Names.named("RefactoringPreferences")) | ||
236 | .to(RefactoringPreferences.Initializer.class); | ||
237 | } | ||
238 | |||
239 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
226 | public Class<? extends IRenameStrategy> bindIRenameStrategy() { | 240 | public Class<? extends IRenameStrategy> bindIRenameStrategy() { |
227 | return DefaultRenameStrategy.class; | 241 | return DefaultRenameStrategy.class; |
228 | } | 242 | } |
@@ -233,13 +247,6 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule { | |||
233 | } | 247 | } |
234 | 248 | ||
235 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | 249 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 |
236 | public void configureIPreferenceStoreInitializer(Binder binder) { | ||
237 | binder.bind(IPreferenceStoreInitializer.class) | ||
238 | .annotatedWith(Names.named("RefactoringPreferences")) | ||
239 | .to(RefactoringPreferences.Initializer.class); | ||
240 | } | ||
241 | |||
242 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
243 | public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() { | 250 | public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() { |
244 | return DefaultRenameRefactoringProvider.class; | 251 | return DefaultRenameRefactoringProvider.class; |
245 | } | 252 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java index 18440e58..1dc2d4cb 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java | |||
@@ -1,10 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ui; | 4 | package ca.mcgill.ecse.dslreasoner.ui; |
5 | 5 | ||
6 | import ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal.LanguageActivator; | 6 | import ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal.LanguageActivator; |
7 | import com.google.inject.Injector; | 7 | import com.google.inject.Injector; |
8 | import org.eclipse.core.runtime.Platform; | ||
8 | import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; | 9 | import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; |
9 | import org.osgi.framework.Bundle; | 10 | import org.osgi.framework.Bundle; |
10 | 11 | ||
@@ -16,12 +17,13 @@ public class VampireLanguageExecutableExtensionFactory extends AbstractGuiceAwar | |||
16 | 17 | ||
17 | @Override | 18 | @Override |
18 | protected Bundle getBundle() { | 19 | protected Bundle getBundle() { |
19 | return LanguageActivator.getInstance().getBundle(); | 20 | return Platform.getBundle(LanguageActivator.PLUGIN_ID); |
20 | } | 21 | } |
21 | 22 | ||
22 | @Override | 23 | @Override |
23 | protected Injector getInjector() { | 24 | protected Injector getInjector() { |
24 | return LanguageActivator.getInstance().getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE); | 25 | LanguageActivator activator = LanguageActivator.getInstance(); |
26 | return activator != null ? activator.getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE) : null; | ||
25 | } | 27 | } |
26 | 28 | ||
27 | } | 29 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java index aead1baf..8e11f8c7 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ui.contentassist; | 4 | package ca.mcgill.ecse.dslreasoner.ui.contentassist; |
5 | 5 | ||
@@ -131,13 +131,13 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP | |||
131 | public void completeVLSVariable_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 131 | public void completeVLSVariable_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
132 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); | 132 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); |
133 | } | 133 | } |
134 | public void completeVLSFunctionFof_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 134 | public void completeVLSFunctionAsTerm_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
135 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor); | 135 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor); |
136 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor); | 136 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor); |
137 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(2)), context, acceptor); | 137 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(2)), context, acceptor); |
138 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(3)), context, acceptor); | 138 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(3)), context, acceptor); |
139 | } | 139 | } |
140 | public void completeVLSFunctionFof_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 140 | public void completeVLSFunctionAsTerm_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
141 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); | 141 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); |
142 | } | 142 | } |
143 | public void completeVLSDefinedTerm_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 143 | public void completeVLSDefinedTerm_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
@@ -267,7 +267,7 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP | |||
267 | public void complete_VLSFofTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 267 | public void complete_VLSFofTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
268 | // subclasses may override | 268 | // subclasses may override |
269 | } | 269 | } |
270 | public void complete_VLSFunctionFof(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 270 | public void complete_VLSFunctionAsTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
271 | // subclasses may override | 271 | // subclasses may override |
272 | } | 272 | } |
273 | public void complete_VLSDefinedTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 273 | public void complete_VLSDefinedTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java new file mode 100644 index 00000000..9faf6232 --- /dev/null +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java | |||
@@ -0,0 +1,65 @@ | |||
1 | /* | ||
2 | * generated by Xtext 2.14.0 | ||
3 | */ | ||
4 | package ca.mcgill.ecse.dslreasoner.validation; | ||
5 | |||
6 | import org.eclipse.core.resources.IProject; | ||
7 | import org.eclipse.core.resources.ResourcesPlugin; | ||
8 | import org.eclipse.core.runtime.jobs.Job; | ||
9 | import org.eclipse.jface.dialogs.IDialogSettings; | ||
10 | import org.eclipse.swt.widgets.Combo; | ||
11 | import org.eclipse.swt.widgets.Composite; | ||
12 | import org.eclipse.xtext.ui.preferences.OptionsConfigurationBlock; | ||
13 | import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock; | ||
14 | import org.eclipse.xtext.validation.SeverityConverter; | ||
15 | |||
16 | @SuppressWarnings("restriction") | ||
17 | public class VampireLanguageValidatorConfigurationBlock extends AbstractValidatorConfigurationBlock { | ||
18 | |||
19 | @Override | ||
20 | protected void fillSettingsPage(Composite composite, int nColumns, int defaultIndent) { | ||
21 | addComboBox(VampireLanguageConfigurableIssueCodesProvider.DEPRECATED_MODEL_PART, "Deprecated Model Part", composite, defaultIndent); | ||
22 | } | ||
23 | |||
24 | @Override | ||
25 | protected Job getBuildJob(IProject project) { | ||
26 | Job buildJob = new OptionsConfigurationBlock.BuildJob("Validation Settings Changed", project); | ||
27 | buildJob.setRule(ResourcesPlugin.getWorkspace().getRuleFactory().buildRule()); | ||
28 | buildJob.setUser(true); | ||
29 | return buildJob; | ||
30 | } | ||
31 | |||
32 | @Override | ||
33 | protected String[] getFullBuildDialogStrings(boolean workspaceSettings) { | ||
34 | return new String[] { "Validation Settings Changed", | ||
35 | "Validation settings have changed. A full rebuild is required for changes to take effect. Do the full build now?" }; | ||
36 | } | ||
37 | |||
38 | @Override | ||
39 | protected void validateSettings(String changedKey, String oldValue, String newValue) { | ||
40 | } | ||
41 | |||
42 | protected Combo addComboBox(String prefKey, String label, Composite parent, int indent) { | ||
43 | String[] values = new String[] { SeverityConverter.SEVERITY_ERROR, SeverityConverter.SEVERITY_WARNING, | ||
44 | SeverityConverter.SEVERITY_INFO, SeverityConverter.SEVERITY_IGNORE }; | ||
45 | String[] valueLabels = new String[] { "Error", "Warning", "Info", "Ignore" }; | ||
46 | Combo comboBox = addComboBox(parent, label, prefKey, indent, values, valueLabels); | ||
47 | return comboBox; | ||
48 | } | ||
49 | |||
50 | @Override | ||
51 | public void dispose() { | ||
52 | storeSectionExpansionStates(getDialogSettings()); | ||
53 | super.dispose(); | ||
54 | } | ||
55 | |||
56 | @Override | ||
57 | protected IDialogSettings getDialogSettings() { | ||
58 | IDialogSettings dialogSettings = super.getDialogSettings(); | ||
59 | IDialogSettings section = dialogSettings.getSection("VampireLanguage"); | ||
60 | if (section == null) { | ||
61 | return dialogSettings.addNewSection("VampireLanguage"); | ||
62 | } | ||
63 | return section; | ||
64 | } | ||
65 | } | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java index eca3aa7f..b25ea8a3 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal; | 4 | package ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal; |
5 | 5 | ||
@@ -8,7 +8,6 @@ import ca.mcgill.ecse.dslreasoner.ui.VampireLanguageUiModule; | |||
8 | import com.google.common.collect.Maps; | 8 | import com.google.common.collect.Maps; |
9 | import com.google.inject.Guice; | 9 | import com.google.inject.Guice; |
10 | import com.google.inject.Injector; | 10 | import com.google.inject.Injector; |
11 | import com.google.inject.Module; | ||
12 | import java.util.Collections; | 11 | import java.util.Collections; |
13 | import java.util.Map; | 12 | import java.util.Map; |
14 | import org.apache.log4j.Logger; | 13 | import org.apache.log4j.Logger; |
@@ -23,6 +22,7 @@ import org.osgi.framework.BundleContext; | |||
23 | */ | 22 | */ |
24 | public class LanguageActivator extends AbstractUIPlugin { | 23 | public class LanguageActivator extends AbstractUIPlugin { |
25 | 24 | ||
25 | public static final String PLUGIN_ID = "ca.mcgill.ecse.dslreasoner.vampire.language.ui"; | ||
26 | public static final String CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE = "ca.mcgill.ecse.dslreasoner.VampireLanguage"; | 26 | public static final String CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE = "ca.mcgill.ecse.dslreasoner.VampireLanguage"; |
27 | 27 | ||
28 | private static final Logger logger = Logger.getLogger(LanguageActivator.class); | 28 | private static final Logger logger = Logger.getLogger(LanguageActivator.class); |
@@ -60,10 +60,10 @@ public class LanguageActivator extends AbstractUIPlugin { | |||
60 | 60 | ||
61 | protected Injector createInjector(String language) { | 61 | protected Injector createInjector(String language) { |
62 | try { | 62 | try { |
63 | Module runtimeModule = getRuntimeModule(language); | 63 | com.google.inject.Module runtimeModule = getRuntimeModule(language); |
64 | Module sharedStateModule = getSharedStateModule(); | 64 | com.google.inject.Module sharedStateModule = getSharedStateModule(); |
65 | Module uiModule = getUiModule(language); | 65 | com.google.inject.Module uiModule = getUiModule(language); |
66 | Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); | 66 | com.google.inject.Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); |
67 | return Guice.createInjector(mergedModule); | 67 | return Guice.createInjector(mergedModule); |
68 | } catch (Exception e) { | 68 | } catch (Exception e) { |
69 | logger.error("Failed to create injector for " + language); | 69 | logger.error("Failed to create injector for " + language); |
@@ -72,22 +72,23 @@ public class LanguageActivator extends AbstractUIPlugin { | |||
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | protected Module getRuntimeModule(String grammar) { | 75 | protected com.google.inject.Module getRuntimeModule(String grammar) { |
76 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { | 76 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { |
77 | return new VampireLanguageRuntimeModule(); | 77 | return new VampireLanguageRuntimeModule(); |
78 | } | 78 | } |
79 | throw new IllegalArgumentException(grammar); | 79 | throw new IllegalArgumentException(grammar); |
80 | } | 80 | } |
81 | 81 | ||
82 | protected Module getUiModule(String grammar) { | 82 | protected com.google.inject.Module getUiModule(String grammar) { |
83 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { | 83 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { |
84 | return new VampireLanguageUiModule(this); | 84 | return new VampireLanguageUiModule(this); |
85 | } | 85 | } |
86 | throw new IllegalArgumentException(grammar); | 86 | throw new IllegalArgumentException(grammar); |
87 | } | 87 | } |
88 | 88 | ||
89 | protected Module getSharedStateModule() { | 89 | protected com.google.inject.Module getSharedStateModule() { |
90 | return new SharedStateModule(); | 90 | return new SharedStateModule(); |
91 | } | 91 | } |
92 | 92 | ||
93 | |||
93 | } | 94 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin index 67fbde4f..e00e853c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin index 2f2eaa65..6f5209e7 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin | |||
Binary files differ | |||