Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Sources formatted #359

  • Loading branch information...
commit d5a48424e49a837c0b2ccdfe25232ac6368fa0b7 1 parent f3c4383
@ujhelyiz authored
Showing with 13,640 additions and 13,399 deletions.
  1. +23 −23 ...tabinding.runtime/src/org/eclipse/incquery/databinding/runtime/adapter/BaseGeneratedDatabindingAdapter.java
  2. +32 −29 ...e.incquery.databinding.runtime/src/org/eclipse/incquery/databinding/runtime/adapter/DatabindingAdapter.java
  3. +102 −96 ...cquery.databinding.runtime/src/org/eclipse/incquery/databinding/runtime/adapter/DatabindingAdapterUtil.java
  4. +27 −27 ...ery.databinding.runtime/src/org/eclipse/incquery/databinding/runtime/adapter/GenericDatabindingAdapter.java
  5. +96 −82 ...ipse.incquery.databinding.runtime/src/org/eclipse/incquery/databinding/runtime/api/IncQueryObservables.java
  6. +10 −8 ...ding.runtime/src/org/eclipse/incquery/databinding/runtime/collection/IObservablePatternMatchCollection.java
  7. +18 −11 ...databinding.runtime/src/org/eclipse/incquery/databinding/runtime/collection/ObservableCollectionHelper.java
  8. +4 −2 ...abinding.runtime/src/org/eclipse/incquery/databinding/runtime/collection/ObservableCollectionProcessor.java
  9. +65 −37 ...databinding.runtime/src/org/eclipse/incquery/databinding/runtime/collection/ObservablePatternMatchList.java
  10. +59 −34 ....databinding.runtime/src/org/eclipse/incquery/databinding/runtime/collection/ObservablePatternMatchSet.java
  11. +11 −7 ....incquery.databinding.runtime/src/org/eclipse/incquery/databinding/runtime/util/PatternToMatchMultimap.java
  12. +5 −5 ...g.runtime/src/org/eclipse/incquery/databinding/runtime/util/validation/ObservableValuePatternValidator.java
  13. +8 −8 ...y.patternlanguage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/EMFPatternLanguageUIActivator.java
  14. +79 −81 ...uery.patternlanguage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/EMFPatternLanguageUiModule.java
  15. +79 −78 ...pse.incquery.patternlanguage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/EclipseLogAppender.java
  16. +5 −4 ...cquery.patternlanguage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/UiPluginInjectorProvider.java
  17. +187 −185 ...mf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/contentassist/EMFPatternLanguageProposalProvider.java
  18. +66 −67 ...atternlanguage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/feedback/GeneratorMarkerFeedback.java
  19. +48 −58 ....ui/src/org/eclipse/incquery/patternlanguage/emf/ui/highlight/EMFPatternLanguageHighlightingCalculator.java
  20. +15 −16 .../src/org/eclipse/incquery/patternlanguage/emf/ui/highlight/EMFPatternLanguageHighlightingConfiguration.java
  21. +7 −11 ...ui/src/org/eclipse/incquery/patternlanguage/emf/ui/labeling/EMFPatternLanguageDescriptionLabelProvider.java
  22. +59 −67 .../src/org/eclipse/incquery/patternlanguage/emf/ui/labeling/EMFPatternLanguageHoverDocumentationProvider.java
  23. +127 −133 ...nguage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/labeling/EMFPatternLanguageLabelProvider.java
  24. +63 −65 ...e.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/outline/EMFPatternLanguageOutlineTreeProvider.java
  25. +33 −42 ...age.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/quickfix/EMFPatternLanguageQuickfixProvider.java
  26. +9 −9 ...ge.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/refactoring/EMFPatternLanguageRenameStrategy.java
  27. +35 −42 ...rc/org/eclipse/incquery/patternlanguage/emf/ui/validation/GenmodelBasedEMFPatternLanguageJavaValidator.java
  28. +32 −35 ...tternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/EMFPatternLanguageQualifiedNameProvider.java
  29. +56 −54 ...query.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/EMFPatternLanguageRuntimeModule.java
  30. +41 −41 ...ncquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/EMFPatternLanguageScopeHelper.java
  31. +20 −22 ...ery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/EMFPatternLanguageServiceProvider.java
  32. +5 −8 ...ery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/EMFPatternLanguageStandaloneSetup.java
  33. +67 −71 ...clipse.incquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/EcoreGenmodelRegistry.java
  34. +1 −1  ...eclipse.incquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/IResourceSetPreparer.java
  35. +13 −14 ....eclipse.incquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/ResolutionException.java
  36. +70 −70 ...atternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/formatting/EMFPatternLanguageFormatter.java
  37. +4 −3 ...s/org.eclipse.incquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/jvmmodel/Empty.java
  38. +155 −153 ...ge.emf/src/org/eclipse/incquery/patternlanguage/emf/scoping/EMFPatternLanguageDeclarativeScopeProvider.java
  39. +73 −79 ...ternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/scoping/EMFPatternLanguageLinkingService.java
  40. +2 −3 ...tternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/scoping/EMFPatternLanguageScopeProvider.java
  41. +16 −17 ...e.incquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/scoping/IMetamodelProvider.java
  42. +70 −73 ...uery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/scoping/MetamodelProviderService.java
  43. +10 −11 ...guage.emf/src/org/eclipse/incquery/patternlanguage/emf/serializer/EMFPatternLanguageCrossRefSerializer.java
  44. +0 −1  ...nguage.emf/src/org/eclipse/incquery/patternlanguage/emf/serializer/EMFPatternLanguageSemanticSequencer.java
  45. +0 −1  ...guage.emf/src/org/eclipse/incquery/patternlanguage/emf/serializer/EMFPatternLanguageSyntacticSequencer.java
  46. +0 −1  ...lipse.incquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/types/IEMFTypeProvider.java
  47. +37 −27 ...pse.incquery.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/validation/EMFIssueCodes.java
  48. +20 −25 ...f/src/org/eclipse/incquery/patternlanguage/emf/validation/EMFPatternLanguageSyntaxErrorMessageProvider.java
  49. +31 −31 ...rnlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/validation/PatternSetValidationDiagnostics.java
  50. +2 −4 ...ry.patternlanguage.emf/src/org/eclipse/incquery/patternlanguage/emf/validation/PatternValidationStatus.java
  51. +34 −35 .../org.eclipse.incquery.patternlanguage.emf/src/org/eclipse/incquery/runtime/exception/IncQueryException.java
  52. +13 −13 ...language.generator/src/org/eclipse/incquery/patternlanguage/generator/ExtendedPatternLanguageGenerator.java
  53. +11 −8 ...ternlanguage.generator/src/org/eclipse/incquery/patternlanguage/generator/PatternLanguageClassResolver.java
  54. +3 −3 ...clipse.incquery.patternlanguage.ui/src/org/eclipse/incquery/patternlanguage/ui/PatternLanguageUiModule.java
  55. +61 −72 ...nlanguage.ui/src/org/eclipse/incquery/patternlanguage/ui/contentassist/PatternLanguageProposalProvider.java
  56. +7 −11 ...nguage.ui/src/org/eclipse/incquery/patternlanguage/ui/labeling/PatternLanguageDescriptionLabelProvider.java
  57. +11 −15 ...y.patternlanguage.ui/src/org/eclipse/incquery/patternlanguage/ui/labeling/PatternLanguageLabelProvider.java
  58. +1 −1  ...ternlanguage.ui/src/org/eclipse/incquery/patternlanguage/ui/outline/PatternLanguageOutlineTreeProvider.java
  59. +10 −10 ...atternlanguage.ui/src/org/eclipse/incquery/patternlanguage/ui/quickfix/PatternLanguageQuickfixProvider.java
  60. +7 −7 ...tternlanguage.ui/src/org/eclipse/incquery/patternlanguage/ui/refactoring/PatternLanguageRenameStrategy.java
  61. +8 −8 ...eclipse.incquery.patternlanguage/src/org/eclipse/incquery/patternlanguage/PatternLanguageRuntimeModule.java
  62. +5 −8 ...lipse.incquery.patternlanguage/src/org/eclipse/incquery/patternlanguage/PatternLanguageStandaloneSetup.java
  63. +29 −27 ...query.patternlanguage/src/org/eclipse/incquery/patternlanguage/annotations/IPatternAnnotationValidator.java
  64. +1 −1  ...ncquery.patternlanguage/src/org/eclipse/incquery/patternlanguage/annotations/PatternAnnotationProvider.java
  65. +47 −42 ...age/src/org/eclipse/incquery/patternlanguage/annotations/impl/ExtensionBasedPatternAnnotationParameter.java
  66. +10 −11 ....incquery.patternlanguage/src/org/eclipse/incquery/patternlanguage/formatting/PatternLanguageFormatter.java
  67. +18 −19 ...g.eclipse.incquery.patternlanguage/src/org/eclipse/incquery/patternlanguage/naming/PatternNameProvider.java
  68. +113 −115 ...ry.patternlanguage/src/org/eclipse/incquery/patternlanguage/scoping/MyAbstractDeclarativeScopeProvider.java
  69. +49 −55 ...tternlanguage/src/org/eclipse/incquery/patternlanguage/scoping/PatternLanguageDeclarativeScopeProvider.java
  70. +27 −27 ...rnlanguage/src/org/eclipse/incquery/patternlanguage/scoping/PatternLanguageResourceDescriptionStrategy.java
  71. +0 −1  ...y.patternlanguage/src/org/eclipse/incquery/patternlanguage/serializer/PatternLanguageSemanticSequencer.java
  72. +0 −1  ....patternlanguage/src/org/eclipse/incquery/patternlanguage/serializer/PatternLanguageSyntacticSequencer.java
  73. +1 −1  ...rg.eclipse.incquery.patternlanguage/src/org/eclipse/incquery/patternlanguage/validation/IIssueCallback.java
  74. +32 −27 ...ns/org.eclipse.incquery.patternlanguage/src/org/eclipse/incquery/patternlanguage/validation/IssueCodes.java
  75. +12 −12 ...query.patternlanguage/src/org/eclipse/incquery/patternlanguage/validation/PatternLanguageJavaValidator.java
  76. +338 −344 ...y.querybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime/DerivedFeatureAdapter.java
  77. +1 −1  ...erybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime/IQueryBasedFeatureHandler.java
  78. +185 −169 ...erybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime/InvertableQueryBasedEList.java
  79. +104 −55 ...querybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime/QueryBasedFeatureHelper.java
  80. +1 −0  ...erybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime/QueryBasedFeatureInverter.java
  81. +2 −2 ...y.querybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime/QueryBasedFeatureKind.java
  82. +21 −21 ...incquery.querybasedfeatures.tooling/src/org/eclipse/incquery/querybasedfeatures/tooling/ProjectLocator.java
  83. +209 −212 ...g.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/counting/CountingAlg.java
  84. +282 −279 ...se.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/counting/CountingTcRelation.java
  85. +341 −329 plugins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/dred/DRedAlg.java
  86. +211 −203 ...rg.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/dred/DRedTcRelation.java
  87. +98 −99 ...rg.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/fw/FloydWarshallAlg.java
  88. +39 −35 ...clipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/CollectionHelper.java
  89. +15 −15 ...clipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/CountingListener.java
  90. +2 −3 ...s/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/Direction.java
  91. +106 −105 ...org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/GraphHelper.java
  92. +479 −472 ...s/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/IncSCCAlg.java
  93. +35 −36 ....eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/NotifierThread.java
  94. +154 −152 ...s/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/UnionFind.java
  95. +23 −23 ...e.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/incscc/UnionFindNodeProperty.java
  96. +29 −29 plugins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/Edge.java
  97. +22 −21 ...s/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/ITcRelation.java
  98. +51 −51 plugins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/Tuple.java
  99. +143 −133 plugins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/bfs/BFS.java
  100. +86 −87 ...ns/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/dfs/DFSAlg.java
  101. +173 −177 ...ins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/scc/PKAlg.java
  102. +276 −273 plugins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/scc/SCC.java
  103. +28 −28 ...g.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/scc/SCCProperty.java
  104. +69 −70 ...org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/scc/SCCResult.java
  105. +87 −87 ...g.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/alg/misc/topsort/TopSort.java
  106. +157 −159 plugins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/graphimpl/Graph.java
  107. +26 −24 ...cquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/igraph/IBiDirectionalGraphDataSource.java
  108. +95 −96 ...lipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/igraph/IBiDirectionalWrapper.java
  109. +52 −48 ...rg.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/igraph/IGraphDataSource.java
  110. +48 −42 .../org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/igraph/IGraphObserver.java
  111. +64 −57 ...s/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/igraph/ITcDataSource.java
  112. +30 −26 ...ins/org.eclipse.incquery.runtime.base.itc/src/org/eclipse/incquery/runtime/base/itc/igraph/ITcObserver.java
  113. +37 −35 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/IncQueryBasePlugin.java
  114. +20 −16 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/DataTypeListener.java
  115. +25 −19 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/FeatureListener.java
  116. +32 −24 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/IQueryResultSetter.java
  117. +16 −10 ...org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/IQueryResultUpdateListener.java
  118. +77 −68 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/IncQueryBaseFactory.java
  119. +20 −17 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/InstanceListener.java
  120. +374 −313 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/NavigationHelper.java
  121. +196 −139 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/QueryResultMultimap.java
  122. +15 −15 ...ns/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/api/TransitiveClosureHelper.java
  123. +196 −195 ...clipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/comprehension/EMFModelComprehension.java
  124. +86 −68 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/comprehension/EMFVisitor.java
  125. +115 −112 ...ry.runtime.base/src/org/eclipse/incquery/runtime/base/comprehension/WellbehavingDerivedFeatureRegistry.java
  126. +147 −150 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/core/EMFDataSource.java
  127. +646 −662 ...clipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/core/NavigationHelperContentAdapter.java
  128. +664 −651 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/core/NavigationHelperImpl.java
  129. +63 −63 ...s/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/core/NavigationHelperSetting.java
  130. +5 −6 plugins/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/core/NavigationHelperType.java
  131. +297 −283 ...s/org.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/core/NavigationHelperVisitor.java
  132. +194 −203 ...g.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/core/TransitiveClosureHelperImpl.java
  133. +14 −16 ...rg.eclipse.incquery.runtime.base/src/org/eclipse/incquery/runtime/base/exception/IncQueryBaseException.java
  134. +40 −38 plugins/org.eclipse.incquery.runtime.gmf/src/org/eclipse/incquery/runtime/gmf/Activator.java
  135. +1 −1  ...s/org.eclipse.incquery.runtime.gmf/src/org/eclipse/incquery/runtime/gmf/handlers/InitValidatorsHandler.java
  136. +33 −33 plugins/org.eclipse.incquery.runtime.gmf/src/org/eclipse/incquery/runtime/gmf/util/GMFModelConnector.java
  137. +16 −16 ...ery.runtime.graphiti/src/org/eclipse/incquery/runtime/graphiti/handlers/GraphitiEditorLoadModelHandler.java
  138. +21 −20 ....runtime.graphiti/src/org/eclipse/incquery/runtime/graphiti/handlers/GraphitiEditorLoadResourceHandler.java
  139. +41 −41 ...se.incquery.runtime.graphiti/src/org/eclipse/incquery/runtime/graphiti/util/GraphitiEditorPartListener.java
  140. +64 −64 ...clipse.incquery.runtime.graphiti/src/org/eclipse/incquery/runtime/graphiti/util/GraphitiModelConnector.java
  141. +42 −40 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/Activator.java
  142. +17 −17 ...ins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/AbstractEvaluator.java
  143. +16 −19 ...ins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/ContainmentFeeder.java
  144. +1 −1  plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/Disconnectable.java
  145. +25 −27 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/EntityFeeder.java
  146. +50 −54 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/Feeder.java
  147. +15 −17 .../org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/GeneralizationFeeder.java
  148. +12 −14 ...org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/IManipulationListener.java
  149. +6 −4 ...g.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/IPredicateTraceListener.java
  150. +16 −18 ...s/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/InstantiationFeeder.java
  151. +291 −297 ...rg.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/PredicateEvaluatorNode.java
  152. +25 −27 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/ReferenceFeeder.java
  153. +26 −32 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/RelationFeeder.java
  154. +601 −645 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/boundary/ReteBoundary.java
  155. +74 −49 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/Buildable.java
  156. +367 −400 ...ipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/CodegenRecorderBuildable.java
  157. +99 −98 ...e.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/CodegenRecordingCoordinator.java
  158. +5 −4 ...g.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/IReteLayoutStrategy.java
  159. +52 −58 ...g.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/IRetePatternBuilder.java
  160. +231 −246 ...clipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/ReteContainerBuildable.java
  161. +81 −71 ...pse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/RetePatternBuildException.java
  162. +128 −108 plugins/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/Stub.java
  163. +89 −94 ...incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/basiclinear/BasicLinearLayout.java
  164. +62 −62 ...ncquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/basiclinear/OrderingHeuristics.java
  165. +123 −132 ...g.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/helpers/BuildHelper.java
  166. +112 −116 ....eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/helpers/LayoutHelper.java
  167. +66 −58 ...rg.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/helpers/TypeHelper.java
  168. +53 −49 ...lipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/BasePConstraint.java
  169. +30 −26 ...e.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/DeferredPConstraint.java
  170. +49 −48 ...incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/EnumerablePConstraint.java
  171. +35 −31 ...ry.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/ITypeInfoProviderConstraint.java
  172. +34 −35 ...ery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/KeyedEnumerablePConstraint.java
  173. +10 −9 ...g.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/PConstraint.java
  174. +146 −139 ...s/org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/PSystem.java
  175. +203 −200 ...org.eclipse.incquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/PVariable.java
  176. +31 −27 ...ry.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/VariableDeferredPConstraint.java
  177. +69 −74 ...te/src/org/eclipse/incquery/runtime/rete/construction/psystem/basicdeferred/BaseTypeSafePredicateCheck.java
  178. +92 −92 ...ncquery.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/basicdeferred/Equality.java
  179. +83 −89 ...untime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/basicdeferred/ExportedParameter.java
  180. +129 −129 ...query.runtime.rete/src/org/eclipse/incquery/runtime/rete/construction/psystem/basicdeferred/Inequality.java
Sorry, we could not display the entire diff because too many files (470) changed.
View
46 ...src/org/eclipse/incquery/databinding/runtime/adapter/BaseGeneratedDatabindingAdapter.java
@@ -9,8 +9,8 @@
* Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
*******************************************************************************/
-package org.eclipse.incquery.databinding.runtime.adapter;
-
+package org.eclipse.incquery.databinding.runtime.adapter;
+
import java.util.Map;
import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -19,28 +19,28 @@
import org.eclipse.incquery.runtime.api.IPatternMatch;
import com.google.common.base.Preconditions;
-
-public class BaseGeneratedDatabindingAdapter<T extends IPatternMatch> extends DatabindingAdapter<T> {
-
- protected Map<String, String> parameterMap;
-
- @Override
- public String[] getParameterNames() {
- return parameterMap.keySet().toArray(new String[parameterMap.keySet().size()]);
- }
-
- @Override
- public IObservableValue getObservableParameter(T match, String parameterName) {
- if (parameterMap.size() > 0) {
- String expression = parameterMap.get(parameterName);
- return IncQueryObservables.getObservableValue(match, expression);
- }
- return null;
- }
+
+public class BaseGeneratedDatabindingAdapter<T extends IPatternMatch> extends DatabindingAdapter<T> {
+
+ protected Map<String, String> parameterMap;
+
+ @Override
+ public String[] getParameterNames() {
+ return parameterMap.keySet().toArray(new String[parameterMap.keySet().size()]);
+ }
+
+ @Override
+ public IObservableValue getObservableParameter(T match, String parameterName) {
+ if (parameterMap.size() > 0) {
+ String expression = parameterMap.get(parameterName);
+ return IncQueryObservables.getObservableValue(match, expression);
+ }
+ return null;
+ }
public IValueProperty getProperty(String parameterName) {
Preconditions.checkArgument(parameterMap.containsKey(parameterName), "Invalid parameter name");
return new MatcherProperty(parameterMap.get(parameterName));
- }
-
-}
+ }
+
+}
View
61 ...ding.runtime/src/org/eclipse/incquery/databinding/runtime/adapter/DatabindingAdapter.java
@@ -9,8 +9,8 @@
* Tamas Szabo - initial API and implementation
*******************************************************************************/
-package org.eclipse.incquery.databinding.runtime.adapter;
-
+package org.eclipse.incquery.databinding.runtime.adapter;
+
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.ValueProperty;
@@ -18,16 +18,17 @@
import org.eclipse.incquery.runtime.api.IPatternMatch;
import com.google.common.base.Preconditions;
-
-/**
- * The class is used to observe given parameters of a pattern.
- *
- * @author Tamas Szabo
- *
- * @param <T> the type parameter of the match
- */
-public abstract class DatabindingAdapter<T extends IPatternMatch> {
-
+
+/**
+ * The class is used to observe given parameters of a pattern.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <T>
+ * the type parameter of the match
+ */
+public abstract class DatabindingAdapter<T extends IPatternMatch> {
+
protected class MatcherProperty extends ValueProperty {
private String expression;
@@ -60,20 +61,22 @@ public IObservableValue observe(Realm realm, Object source) {
}
}
-
- /**
- * Returns the array of observable values.
- *
- * @return the array of values
- */
- public abstract String[] getParameterNames();
-
- /**
- * Returns an observable value for the given match and parameterName.
- *
- * @param match the match object
- * @param parameterName the parameter name
- * @return an observable value
- */
- public abstract IObservableValue getObservableParameter(T match, String parameterName);
-}
+
+ /**
+ * Returns the array of observable values.
+ *
+ * @return the array of values
+ */
+ public abstract String[] getParameterNames();
+
+ /**
+ * Returns an observable value for the given match and parameterName.
+ *
+ * @param match
+ * the match object
+ * @param parameterName
+ * the parameter name
+ * @return an observable value
+ */
+ public abstract IObservableValue getObservableParameter(T match, String parameterName);
+}
View
198 ....runtime/src/org/eclipse/incquery/databinding/runtime/adapter/DatabindingAdapterUtil.java
@@ -9,8 +9,8 @@
* Tamas Szabo - initial API and implementation
*******************************************************************************/
-package org.eclipse.incquery.databinding.runtime.adapter;
-
+package org.eclipse.incquery.databinding.runtime.adapter;
+
import java.util.List;
import java.util.Map;
@@ -30,116 +30,122 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Maps;
-
+
public class DatabindingAdapterUtil {
-
- public static final String OBSERVABLEVALUE_ANNOTATION = "ObservableValue";
-
- private DatabindingAdapterUtil() {}
-
- /**
- * Returns an IObservableValue for the given match based on the given expression.
- * If an attribute is not present in the expression than it tries with the 'name' attribute.
- * If it is not present the returned value will be null.
+
+ public static final String OBSERVABLEVALUE_ANNOTATION = "ObservableValue";
+
+ private DatabindingAdapterUtil() {
+ }
+
+ /**
+ * Returns an IObservableValue for the given match based on the given expression. If an attribute is not present in
+ * the expression than it tries with the 'name' attribute. If it is not present the returned value will be null.
*
- * @param match the match object
- * @param expression the expression
- * @return IObservableValue instance or null
+ * @param match
+ * the match object
+ * @param expression
+ * the expression
+ * @return IObservableValue instance or null
* @deprecated Use {@link IncQueryObservables#getObservableValue(IPatternMatch,String)} instead
*/
@Deprecated
public static IObservableValue getObservableValue(IPatternMatch match, String expression) {
return IncQueryObservables.getObservableValue(match, expression);
- }
-
- /**
- * Registers the given changeListener for the appropriate features of the given signature.
- * The features will be computed based on the message parameter.
+ }
+
+ /**
+ * Registers the given changeListener for the appropriate features of the given signature. The features will be
+ * computed based on the message parameter.
*
- * @param signature the signature instance
- * @param changeListener the changle listener
- * @param message the message which can be found in the appropriate PatternUI annotation
+ * @param signature
+ * the signature instance
+ * @param changeListener
+ * the changle listener
+ * @param message
+ * the message which can be found in the appropriate PatternUI annotation
* @return the list of IObservableValue instances for which the IValueChangeListener was registered
* @deprecated Use {@link IncQueryObservables#observeFeatures(IPatternMatch,IValueChangeListener,String)} instead
*/
@Deprecated
- public static List<IObservableValue> observeFeatures(IPatternMatch match, IValueChangeListener changeListener, String message) {
+ public static List<IObservableValue> observeFeatures(IPatternMatch match, IValueChangeListener changeListener,
+ String message) {
return IncQueryObservables.observeFeatures(match, changeListener, message);
- }
-
- /**
- * Registers the given change listener on the given object's all accessible fields.
- * This function uses Java Reflection.
+ }
+
+ /**
+ * Registers the given change listener on the given object's all accessible fields. This function uses Java
+ * Reflection.
*
- * @param changeListener the changle listener
- * @param object the observed object
+ * @param changeListener
+ * the changle listener
+ * @param object
+ * the observed object
* @return the list of IObservableValue instances for which the IValueChangeListener was registered
* @deprecated Use {@link IncQueryObservables#observeAllAttributes(IValueChangeListener,Object)} instead
*/
@Deprecated
public static List<IObservableValue> observeAllAttributes(IValueChangeListener changeListener, Object object) {
return IncQueryObservables.observeAllAttributes(changeListener, object);
- }
-
- /**
- * Get the structural feature with the given name of the given object.
- *
- * @param o the object (must be an EObject)
- * @param featureName the name of the feature
- * @return the EStructuralFeature of the object or null if it can not be found
- */
- public static EStructuralFeature getFeature(Object o, String featureName) {
- if (o instanceof EObject) {
- EStructuralFeature feature = ((EObject) o).eClass().getEStructuralFeature(featureName);
- return feature;
- }
- return null;
- }
-
- public static String getMessage(IPatternMatch match, String message) {
- String[] tokens = message.split("\\$");
- StringBuilder newText = new StringBuilder();
-
- for (int i = 0;i<tokens.length;i++) {
- if (i % 2 == 0) {
- newText.append(tokens[i]);
- }
- else {
- String[] objectTokens = tokens[i].split("\\.");
- if (objectTokens.length > 0) {
- Object o = null;
- EStructuralFeature feature = null;
-
- if (objectTokens.length == 1) {
- o = match.get(objectTokens[0]);
- feature = DatabindingAdapterUtil.getFeature(o, "name");
- }
- if (objectTokens.length == 2) {
- o = match.get(objectTokens[0]);
- feature = DatabindingAdapterUtil.getFeature(o, objectTokens[1]);
- }
-
- if (o != null && feature != null) {
- Object value = ((EObject) o).eGet(feature);
- if (value != null) {
- newText.append(value.toString());
- }
- else {
- newText.append("null");
- }
- }
- else if (o != null) {
- newText.append(o.toString());
- }
- }
- else {
- newText.append("[no such parameter]");
- }
- }
- }
-
- return newText.toString();
- }
+ }
+
+ /**
+ * Get the structural feature with the given name of the given object.
+ *
+ * @param o
+ * the object (must be an EObject)
+ * @param featureName
+ * the name of the feature
+ * @return the EStructuralFeature of the object or null if it can not be found
+ */
+ public static EStructuralFeature getFeature(Object o, String featureName) {
+ if (o instanceof EObject) {
+ EStructuralFeature feature = ((EObject) o).eClass().getEStructuralFeature(featureName);
+ return feature;
+ }
+ return null;
+ }
+
+ public static String getMessage(IPatternMatch match, String message) {
+ String[] tokens = message.split("\\$");
+ StringBuilder newText = new StringBuilder();
+
+ for (int i = 0; i < tokens.length; i++) {
+ if (i % 2 == 0) {
+ newText.append(tokens[i]);
+ } else {
+ String[] objectTokens = tokens[i].split("\\.");
+ if (objectTokens.length > 0) {
+ Object o = null;
+ EStructuralFeature feature = null;
+
+ if (objectTokens.length == 1) {
+ o = match.get(objectTokens[0]);
+ feature = DatabindingAdapterUtil.getFeature(o, "name");
+ }
+ if (objectTokens.length == 2) {
+ o = match.get(objectTokens[0]);
+ feature = DatabindingAdapterUtil.getFeature(o, objectTokens[1]);
+ }
+
+ if (o != null && feature != null) {
+ Object value = ((EObject) o).eGet(feature);
+ if (value != null) {
+ newText.append(value.toString());
+ } else {
+ newText.append("null");
+ }
+ } else if (o != null) {
+ newText.append(o.toString());
+ }
+ } else {
+ newText.append("[no such parameter]");
+ }
+ }
+ }
+
+ return newText.toString();
+ }
/**
* @param pattern
@@ -152,7 +158,7 @@ else if (o != null) {
}
for (Annotation annotation : CorePatternLanguageHelper
.getAnnotationsByName(pattern, OBSERVABLEVALUE_ANNOTATION)) {
-
+
ListMultimap<String, ValueReference> parameterMap = CorePatternLanguageHelper
.getAnnotationParameters(annotation);
List<ValueReference> nameAttributes = parameterMap.get("name");
@@ -170,7 +176,7 @@ else if (o != null) {
propertyMap.put(key, value);
}
}
- }
+ }
return propertyMap;
- }
-}
+ }
+}
View
54 ...ntime/src/org/eclipse/incquery/databinding/runtime/adapter/GenericDatabindingAdapter.java
@@ -9,8 +9,8 @@
* Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
*******************************************************************************/
-package org.eclipse.incquery.databinding.runtime.adapter;
-
+package org.eclipse.incquery.databinding.runtime.adapter;
+
import java.util.Map;
import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -20,36 +20,36 @@
import org.eclipse.incquery.runtime.api.IPatternMatch;
import com.google.common.base.Preconditions;
-
-public class GenericDatabindingAdapter extends DatabindingAdapter<IPatternMatch> {
-
- private final Map<String, String> parameterMap;
-
+
+public class GenericDatabindingAdapter extends DatabindingAdapter<IPatternMatch> {
+
+ private final Map<String, String> parameterMap;
+
public GenericDatabindingAdapter(Map<String, String> parameterMap) {
- this.parameterMap = parameterMap;
- }
+ this.parameterMap = parameterMap;
+ }
public GenericDatabindingAdapter(Pattern pattern) {
this.parameterMap = DatabindingAdapterUtil.calculateObservableValues(pattern);
- }
-
- @Override
- public String[] getParameterNames() {
- return parameterMap.keySet().toArray(new String[parameterMap.keySet().size()]);
- }
-
- @Override
- public IObservableValue getObservableParameter(IPatternMatch match, String parameterName) {
- if (parameterMap.size() > 0) {
- String expression = parameterMap.get(parameterName);
- return IncQueryObservables.getObservableValue(match, expression);
- }
- return null;
- }
+ }
+
+ @Override
+ public String[] getParameterNames() {
+ return parameterMap.keySet().toArray(new String[parameterMap.keySet().size()]);
+ }
+
+ @Override
+ public IObservableValue getObservableParameter(IPatternMatch match, String parameterName) {
+ if (parameterMap.size() > 0) {
+ String expression = parameterMap.get(parameterName);
+ return IncQueryObservables.getObservableValue(match, expression);
+ }
+ return null;
+ }
public IValueProperty getProperty(String parameterName) {
Preconditions.checkArgument(parameterMap.containsKey(parameterName), "Invalid parameter name");
return new MatcherProperty(parameterMap.get(parameterName));
- }
-
-}
+ }
+
+}
View
178 ...binding.runtime/src/org/eclipse/incquery/databinding/runtime/api/IncQueryObservables.java
@@ -29,11 +29,10 @@
import org.eclipse.incquery.runtime.api.IncQueryMatcher;
/**
- * Utility class for observing EMF-IncQuery related objects, such as match sets,
- * match parameters.
+ * Utility class for observing EMF-IncQuery related objects, such as match sets, match parameters.
*
* @author Abel Hegedus
- *
+ *
*/
public class IncQueryObservables {
@@ -41,120 +40,135 @@
* Hidden constructor for utility class
*/
private IncQueryObservables() {
-
+
}
-
+
/**
* Create an observable list of the match set of the given query on the selected notifier.
*
- * <p>The matches are ordered by appearance, so a new match is always put on the end of the list.
+ * <p>
+ * The matches are ordered by appearance, so a new match is always put on the end of the list.
*
- * <p>Use the generated matcher factories for initialization, in the generic case, you may have to
- * accept an unchecked invocation (or use the Generic classes if you are sure).
+ * <p>
+ * Use the generated matcher factories for initialization, in the generic case, you may have to accept an unchecked
+ * invocation (or use the Generic classes if you are sure).
*
- * @param factory the matcher factory for the query to observe
- * @param notifier the notifier to use for the matcher
+ * @param factory
+ * the matcher factory for the query to observe
+ * @param notifier
+ * the notifier to use for the matcher
* @return an observable list of matches
*/
- public static <Match extends IPatternMatch, Matcher extends IncQueryMatcher<Match>> IObservableList observeMatchesAsList(IMatcherFactory<Matcher> factory, Notifier notifier) {
+ public static <Match extends IPatternMatch, Matcher extends IncQueryMatcher<Match>> IObservableList observeMatchesAsList(
+ IMatcherFactory<Matcher> factory, Notifier notifier) {
return new ObservablePatternMatchList<Match>(factory, notifier);
}
-
+
/**
* Create an observable set of the match set of the given query on the selected notifier.
*
- * <p>Use the generated matcher factories for initialization, in the generic case, you may have to
- * accept an unchecked invocation (or use the Generic classes if you are sure).
+ * <p>
+ * Use the generated matcher factories for initialization, in the generic case, you may have to accept an unchecked
+ * invocation (or use the Generic classes if you are sure).
*
- * @param factory the matcher factory for the query to observe
- * @param notifier the notifier to use for the matcher
+ * @param factory
+ * the matcher factory for the query to observe
+ * @param notifier
+ * the notifier to use for the matcher
* @return an observable set of matches
*/
- public static <Match extends IPatternMatch, Matcher extends IncQueryMatcher<Match>> IObservableSet observeMatchesAsSet(IMatcherFactory<Matcher> factory, Notifier notifier) {
+ public static <Match extends IPatternMatch, Matcher extends IncQueryMatcher<Match>> IObservableSet observeMatchesAsSet(
+ IMatcherFactory<Matcher> factory, Notifier notifier) {
return new ObservablePatternMatchSet<Match>(factory, notifier);
}
/**
- * Registers the given changeListener for the appropriate features of the given signature.
- * The features will be computed based on the message parameter.
+ * Registers the given changeListener for the appropriate features of the given signature. The features will be
+ * computed based on the message parameter.
*
- * @param signature the signature instance
- * @param changeListener the changle listener
- * @param message the message which can be found in the appropriate PatternUI annotation
+ * @param signature
+ * the signature instance
+ * @param changeListener
+ * the changle listener
+ * @param message
+ * the message which can be found in the appropriate PatternUI annotation
* @return the list of IObservableValue instances for which the IValueChangeListener was registered
*/
- public static List<IObservableValue> observeFeatures(IPatternMatch match, IValueChangeListener changeListener, String message) {
- List<IObservableValue> affectedValues = new ArrayList<IObservableValue>();
- if (message != null) {
- String[] tokens = message.split("\\$");
-
- for (int i = 0; i < tokens.length; i++) {
-
- //odd tokens
- if (i % 2 != 0) {
- IObservableValue value = IncQueryObservables.getObservableValue(match, tokens[i]);
- if (value != null) {
- value.addValueChangeListener(changeListener);
- affectedValues.add(value);
- }
- }
- }
- }
- return affectedValues;
+ public static List<IObservableValue> observeFeatures(IPatternMatch match, IValueChangeListener changeListener,
+ String message) {
+ List<IObservableValue> affectedValues = new ArrayList<IObservableValue>();
+ if (message != null) {
+ String[] tokens = message.split("\\$");
+
+ for (int i = 0; i < tokens.length; i++) {
+
+ // odd tokens
+ if (i % 2 != 0) {
+ IObservableValue value = IncQueryObservables.getObservableValue(match, tokens[i]);
+ if (value != null) {
+ value.addValueChangeListener(changeListener);
+ affectedValues.add(value);
+ }
+ }
+ }
+ }
+ return affectedValues;
}
/**
- * Registers the given change listener on the given object's all accessible fields.
- * This function uses Java Reflection.
+ * Registers the given change listener on the given object's all accessible fields. This function uses Java
+ * Reflection.
*
- * @param changeListener the changle listener
- * @param object the observed object
+ * @param changeListener
+ * the changle listener
+ * @param object
+ * the observed object
* @return the list of IObservableValue instances for which the IValueChangeListener was registered
*/
public static List<IObservableValue> observeAllAttributes(IValueChangeListener changeListener, Object object) {
- List<IObservableValue> affectedValues = new ArrayList<IObservableValue>();
- if (object instanceof EObject) {
- for (EStructuralFeature feature : ((EObject) object).eClass().getEAllStructuralFeatures()) {
- IObservableValue val = EMFProperties.value(feature).observe(object);
- affectedValues.add(val);
- val.addValueChangeListener(changeListener);
- }
- }
- return affectedValues;
+ List<IObservableValue> affectedValues = new ArrayList<IObservableValue>();
+ if (object instanceof EObject) {
+ for (EStructuralFeature feature : ((EObject) object).eClass().getEAllStructuralFeatures()) {
+ IObservableValue val = EMFProperties.value(feature).observe(object);
+ affectedValues.add(val);
+ val.addValueChangeListener(changeListener);
+ }
+ }
+ return affectedValues;
}
/**
- * Returns an IObservableValue for the given match based on the given expression.
- * If an attribute is not present in the expression than it tries with the 'name' attribute.
- * If it is not present the returned value will be null.
+ * Returns an IObservableValue for the given match based on the given expression. If an attribute is not present in
+ * the expression than it tries with the 'name' attribute. If it is not present the returned value will be null.
*
- * @param match the match object
- * @param expression the expression
- * @return IObservableValue instance or null
+ * @param match
+ * the match object
+ * @param expression
+ * the expression
+ * @return IObservableValue instance or null
*/
public static IObservableValue getObservableValue(IPatternMatch match, String expression) {
- IObservableValue val = null;
- String[] objectTokens = expression.split("\\.");
-
- if (objectTokens.length > 0) {
- Object o = null;
- EStructuralFeature feature = null;
-
- if (objectTokens.length == 2) {
- o = match.get(objectTokens[0]);
- feature = DatabindingAdapterUtil.getFeature(o, objectTokens[1]);
- }
- if (objectTokens.length == 1) {
- o = match.get(objectTokens[0]);
- feature = DatabindingAdapterUtil.getFeature(o, "name");
- }
- if (o != null && feature != null) {
- val = EMFProperties.value(feature).observe(o);
- }
- }
-
- return val;
+ IObservableValue val = null;
+ String[] objectTokens = expression.split("\\.");
+
+ if (objectTokens.length > 0) {
+ Object o = null;
+ EStructuralFeature feature = null;
+
+ if (objectTokens.length == 2) {
+ o = match.get(objectTokens[0]);
+ feature = DatabindingAdapterUtil.getFeature(o, objectTokens[1]);
+ }
+ if (objectTokens.length == 1) {
+ o = match.get(objectTokens[0]);
+ feature = DatabindingAdapterUtil.getFeature(o, "name");
+ }
+ if (o != null && feature != null) {
+ val = EMFProperties.value(feature).observe(o);
+ }
+ }
+
+ return val;
}
-
-
+
}
View
18 ...rg/eclipse/incquery/databinding/runtime/collection/IObservablePatternMatchCollection.java
@@ -13,26 +13,28 @@
import org.eclipse.incquery.runtime.api.IPatternMatch;
/**
- * Common interface for observable pattern match collections (e.g.
- * {@link ObservablePatternMatchList} and {@link ObservablePatternMatchSet}).
+ * Common interface for observable pattern match collections (e.g. {@link ObservablePatternMatchList} and
+ * {@link ObservablePatternMatchSet}).
*
* @author Abel Hegedus
- *
+ *
*/
-public interface IObservablePatternMatchCollection<Match extends IPatternMatch>{
+public interface IObservablePatternMatchCollection<Match extends IPatternMatch> {
/**
* Can be called to indicate that a match appeared and should be added to the collection.
*
- * @param match the new match
+ * @param match
+ * the new match
*/
void addMatch(Match match);
/**
* Can be called to indicate that a match disappeared and should be removed from the collection.
- *
- * @param match the disappered match
+ *
+ * @param match
+ * the disappered match
*/
void removeMatch(Match match);
-
+
}
View
29 ...e/src/org/eclipse/incquery/databinding/runtime/collection/ObservableCollectionHelper.java
@@ -21,11 +21,11 @@
import org.eclipse.incquery.runtime.triggerengine.firing.AutomaticFiringStrategy;
/**
- * Utility class to prepare a rule in an agenda for an observable collection.
- * For use cases, see {@link ObservablePatternMatchSet} and {@link ObservablePatternMatchList}.
+ * Utility class to prepare a rule in an agenda for an observable collection. For use cases, see
+ * {@link ObservablePatternMatchSet} and {@link ObservablePatternMatchList}.
*
* @author Abel Hegedus
- *
+ *
*/
public class ObservableCollectionHelper {
@@ -35,18 +35,25 @@
private ObservableCollectionHelper() {
// TODO Auto-generated constructor stub
}
-
+
/**
- * Creates the rule used for updating the results in the given agenda.
+ * Creates the rule used for updating the results in the given agenda.
*
- * @param observableCollection the observable collection to handle
- * @param factory the {@link IMatcherFactory} used to create the rule
- * @param agenda an existing {@link Agenda} where the rule is created
+ * @param observableCollection
+ * the observable collection to handle
+ * @param factory
+ * the {@link IMatcherFactory} used to create the rule
+ * @param agenda
+ * an existing {@link Agenda} where the rule is created
*/
- public static <Match extends IPatternMatch, Matcher extends IncQueryMatcher<Match>> void createRuleInAgenda(IObservablePatternMatchCollection<Match> observableCollection, IMatcherFactory<Matcher> factory, IAgenda agenda) {
+ public static <Match extends IPatternMatch, Matcher extends IncQueryMatcher<Match>> void createRuleInAgenda(
+ IObservablePatternMatchCollection<Match> observableCollection, IMatcherFactory<Matcher> factory,
+ IAgenda agenda) {
IRule<Match> rule = agenda.createRule(factory, false, true);
- ObservableCollectionProcessor<Match> insertProc = new ObservableCollectionProcessor<Match>(Direction.INSERT, observableCollection);
- ObservableCollectionProcessor<Match> deleteProc = new ObservableCollectionProcessor<Match>(Direction.DELETE, observableCollection);
+ ObservableCollectionProcessor<Match> insertProc = new ObservableCollectionProcessor<Match>(Direction.INSERT,
+ observableCollection);
+ ObservableCollectionProcessor<Match> deleteProc = new ObservableCollectionProcessor<Match>(Direction.DELETE,
+ observableCollection);
rule.setStateChangeProcessor(ActivationState.APPEARED, insertProc);
rule.setStateChangeProcessor(ActivationState.DISAPPEARED, deleteProc);
AutomaticFiringStrategy firingStrategy = new AutomaticFiringStrategy(agenda.newActivationMonitor(true));
View
6 ...rc/org/eclipse/incquery/databinding/runtime/collection/ObservableCollectionProcessor.java
@@ -31,8 +31,10 @@
/**
* Creates a processor with the given direction and observable collection.
*
- * @param direction the {@link Direction} of updates that are handled
- * @param collection the {@link IObservablePatternMatchCollection} to manage
+ * @param direction
+ * the {@link Direction} of updates that are handled
+ * @param collection
+ * the {@link IObservablePatternMatchCollection} to manage
*/
public ObservableCollectionProcessor(Direction direction, IObservablePatternMatchCollection<Match> collection) {
this.direction = direction;
View
102 ...e/src/org/eclipse/incquery/databinding/runtime/collection/ObservablePatternMatchList.java
@@ -30,75 +30,99 @@
import org.eclipse.incquery.runtime.triggerengine.api.RuleEngine;
/**
- * Observable view of a match set for a given {@link IncQueryMatcher} on a model
- * (match sets of an {@link IncQueryMatcher} are ordered by the order of their appearance).
- *
- * <p>This implementation uses the {@link RuleEngine} to get notifications for match set changes,
- * and can be instantiated using either an existing {@link IncQueryMatcher}, or an {@link IMatcherFactory} and
- * either a {@link Notifier}, {@link IncQueryEngine} or {@link Agenda}.
+ * Observable view of a match set for a given {@link IncQueryMatcher} on a model (match sets of an
+ * {@link IncQueryMatcher} are ordered by the order of their appearance).
+ *
+ * <p>
+ * This implementation uses the {@link RuleEngine} to get notifications for match set changes, and can be instantiated
+ * using either an existing {@link IncQueryMatcher}, or an {@link IMatcherFactory} and either a {@link Notifier},
+ * {@link IncQueryEngine} or {@link Agenda}.
*
* @author Abel Hegedus
- *
+ *
*/
-public class ObservablePatternMatchList<Match extends IPatternMatch> extends AbstractObservableList implements IObservablePatternMatchCollection<Match> {
+public class ObservablePatternMatchList<Match extends IPatternMatch> extends AbstractObservableList implements
+ IObservablePatternMatchCollection<Match> {
private final List<Match> cache = Collections.synchronizedList(new ArrayList<Match>());
-
+
/**
* Creates an observable view of the match set of the given {@link IncQueryMatcher}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
*
- * @param matcher the {@link IncQueryMatcher} to use as the source of the observable list
+ * @param matcher
+ * the {@link IncQueryMatcher} to use as the source of the observable list
*/
@SuppressWarnings("unchecked")
public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchList(Matcher matcher) {
super();
- IMatcherFactory<Matcher> matcherFactory = (IMatcherFactory<Matcher>) MatcherFactoryRegistry.getOrCreateMatcherFactory(matcher.getPattern());
- ObservableCollectionHelper.createRuleInAgenda(this, matcherFactory, RuleEngine.getInstance().getOrCreateAgenda(matcher.getEngine()));
+ IMatcherFactory<Matcher> matcherFactory = (IMatcherFactory<Matcher>) MatcherFactoryRegistry
+ .getOrCreateMatcherFactory(matcher.getPattern());
+ ObservableCollectionHelper.createRuleInAgenda(this, matcherFactory,
+ RuleEngine.getInstance().getOrCreateAgenda(matcher.getEngine()));
}
-
+
/**
- * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given {@link Notifier}.
+ * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given
+ * {@link Notifier}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
*
- * @param factory the {@link IMatcherFactory} used to create a matcher
- * @param notifier the {@link Notifier} on which the matcher is created
+ * @param factory
+ * the {@link IMatcherFactory} used to create a matcher
+ * @param notifier
+ * the {@link Notifier} on which the matcher is created
*/
- public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchList(IMatcherFactory<Matcher> factory, Notifier notifier) {
+ public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchList(IMatcherFactory<Matcher> factory,
+ Notifier notifier) {
this(factory, RuleEngine.getInstance().getOrCreateAgenda(notifier));
}
-
+
/**
- * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given {@link IncQueryEngine}.
+ * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given
+ * {@link IncQueryEngine}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
*
- * @param factory the {@link IMatcherFactory} used to create a matcher
- * @param engine the {@link IncQueryEngine} on which the matcher is created
+ * @param factory
+ * the {@link IMatcherFactory} used to create a matcher
+ * @param engine
+ * the {@link IncQueryEngine} on which the matcher is created
*/
- public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchList(IMatcherFactory<Matcher> factory, IncQueryEngine engine) {
+ public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchList(IMatcherFactory<Matcher> factory,
+ IncQueryEngine engine) {
this(factory, RuleEngine.getInstance().getOrCreateAgenda(engine));
}
-
+
/**
- * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given {@link Agenda}.
+ * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given
+ * {@link Agenda}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsList} instead!
*
- * <p> Note, that no firing strategy will be added to the {@link Agenda}!
+ * <p>
+ * Note, that no firing strategy will be added to the {@link Agenda}!
*
- * @param factory the {@link IMatcherFactory} used to create a matcher
- * @param agenda an existing {@link Agenda} that specifies the used model
+ * @param factory
+ * the {@link IMatcherFactory} used to create a matcher
+ * @param agenda
+ * an existing {@link Agenda} that specifies the used model
*/
- public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchList(IMatcherFactory<Matcher> factory, IAgenda agenda) {
+ public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchList(IMatcherFactory<Matcher> factory,
+ IAgenda agenda) {
super();
ObservableCollectionHelper.createRuleInAgenda(this, factory, agenda);
-
+
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.core.databinding.observable.list.IObservableList#getElementType()
*/
@Override
@@ -106,7 +130,9 @@ public Object getElementType() {
return IPatternMatch.class;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.core.databinding.observable.list.AbstractObservableList#doGetSize()
*/
@Override
@@ -114,7 +140,9 @@ protected int doGetSize() {
return cache.size();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.util.AbstractList#get(int)
*/
@Override
View
93 ...me/src/org/eclipse/incquery/databinding/runtime/collection/ObservablePatternMatchSet.java
@@ -31,71 +31,94 @@
import com.google.common.collect.Sets;
/**
- * Observable view of a match set for a given {@link IncQueryMatcher} on a model
- * (match sets of an {@link IncQueryMatcher} are not ordered by default).
- *
- * <p>This implementation uses the {@link RuleEngine} to get notifications for match set changes,
- * and can be instantiated using either an existing {@link IncQueryMatcher}, or an {@link IMatcherFactory} and
- * either a {@link Notifier}, {@link IncQueryEngine} or {@link Agenda}.
+ * Observable view of a match set for a given {@link IncQueryMatcher} on a model (match sets of an
+ * {@link IncQueryMatcher} are not ordered by default).
+ *
+ * <p>
+ * This implementation uses the {@link RuleEngine} to get notifications for match set changes, and can be instantiated
+ * using either an existing {@link IncQueryMatcher}, or an {@link IMatcherFactory} and either a {@link Notifier},
+ * {@link IncQueryEngine} or {@link Agenda}.
*
* @author Abel Hegedus
- *
+ *
*/
-public class ObservablePatternMatchSet<Match extends IPatternMatch> extends AbstractObservableSet implements IObservablePatternMatchCollection<Match> {
+public class ObservablePatternMatchSet<Match extends IPatternMatch> extends AbstractObservableSet implements
+ IObservablePatternMatchCollection<Match> {
private final Set<Match> cache = Collections.synchronizedSet(new HashSet<Match>());
-
+
/**
* Creates an observable view of the match set of the given {@link IncQueryMatcher}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
*
- * @param matcher the {@link IncQueryMatcher} to use as the source of the observable set
+ * @param matcher
+ * the {@link IncQueryMatcher} to use as the source of the observable set
*/
@SuppressWarnings("unchecked")
public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchSet(Matcher matcher) {
- IMatcherFactory<Matcher> matcherFactory = (IMatcherFactory<Matcher>) MatcherFactoryRegistry.getOrCreateMatcherFactory(matcher.getPattern());
- ObservableCollectionHelper.createRuleInAgenda(this, matcherFactory, RuleEngine.getInstance().getOrCreateAgenda(matcher.getEngine()));
+ IMatcherFactory<Matcher> matcherFactory = (IMatcherFactory<Matcher>) MatcherFactoryRegistry
+ .getOrCreateMatcherFactory(matcher.getPattern());
+ ObservableCollectionHelper.createRuleInAgenda(this, matcherFactory,
+ RuleEngine.getInstance().getOrCreateAgenda(matcher.getEngine()));
}
-
+
/**
- * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given {@link Notifier}.
+ * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given
+ * {@link Notifier}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
*
- * @param factory the {@link IMatcherFactory} used to create a matcher
- * @param notifier the {@link Notifier} on which the matcher is created
+ * @param factory
+ * the {@link IMatcherFactory} used to create a matcher
+ * @param notifier
+ * the {@link Notifier} on which the matcher is created
*/
- public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchSet(IMatcherFactory<Matcher> factory, Notifier notifier) {
+ public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchSet(IMatcherFactory<Matcher> factory,
+ Notifier notifier) {
this(factory, RuleEngine.getInstance().getOrCreateAgenda(notifier));
}
-
+
/**
- * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given {@link IncQueryEngine}.
+ * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given
+ * {@link IncQueryEngine}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
*
- * @param factory the {@link IMatcherFactory} used to create a matcher
- * @param engine the {@link IncQueryEngine} on which the matcher is created
+ * @param factory
+ * the {@link IMatcherFactory} used to create a matcher
+ * @param engine
+ * the {@link IncQueryEngine} on which the matcher is created
*/
- public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchSet(IMatcherFactory<Matcher> factory, IncQueryEngine engine) {
+ public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchSet(IMatcherFactory<Matcher> factory,
+ IncQueryEngine engine) {
this(factory, RuleEngine.getInstance().getOrCreateAgenda(engine));
}
-
+
/**
- * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given {@link IncQueryEngine}.
+ * Creates an observable view of the match set of the given {@link IMatcherFactory} initialized on the given
+ * {@link IncQueryEngine}.
*
- * <p>Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
+ * <p>
+ * Consider using {@link IncQueryObservables#observeMatchesAsSet} instead!
*
- * @param factory the {@link IMatcherFactory} used to create a matcher
- * @param agenda an existing {@link Agenda} that specifies the used model
+ * @param factory
+ * the {@link IMatcherFactory} used to create a matcher
+ * @param agenda
+ * an existing {@link Agenda} that specifies the used model
*/
- public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchSet(IMatcherFactory<Matcher> factory, IAgenda agenda) {
+ public <Matcher extends IncQueryMatcher<Match>> ObservablePatternMatchSet(IMatcherFactory<Matcher> factory,
+ IAgenda agenda) {
super();
ObservableCollectionHelper.createRuleInAgenda(this, factory, agenda);
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.core.databinding.observable.list.IObservableList#getElementType()
*/
@Override
@@ -103,7 +126,9 @@ public Object getElementType() {
return IPatternMatch.class;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.core.databinding.observable.set.AbstractObservableSet#getWrappedSet()
*/
@Override
View
18 ...ing.runtime/src/org/eclipse/incquery/databinding/runtime/util/PatternToMatchMultimap.java
@@ -21,32 +21,36 @@
* Multimap for managing multiple patterns and related matches for a given notifier.
*
* @author Abel Hegedus
- *
+ *
*/
-public class PatternToMatchMultimap<MatchType extends IPatternMatch> extends TriggeredQueryResultMultimap<MatchType, Pattern, MatchType> {
+public class PatternToMatchMultimap<MatchType extends IPatternMatch> extends
+ TriggeredQueryResultMultimap<MatchType, Pattern, MatchType> {
/**
* Creates a new multimap for the given agenda.
*
- * @param agenda the agenda to use
+ * @param agenda
+ * the agenda to use
*/
public PatternToMatchMultimap(Agenda agenda) {
super(agenda);
}
-
+
/**
* Creates a new multimap for the given engine.
*
- * @param engine the engine to use
+ * @param engine
+ * the engine to use
*/
public PatternToMatchMultimap(IncQueryEngine engine) {
super(engine);
}
-
+
/**
* Creates a new multimap for the given notifier
*
- * @param notifier the notifier to use
+ * @param notifier
+ * the notifier to use
*/
public PatternToMatchMultimap(Notifier notifier) {
super(notifier);
View
10 ...eclipse/incquery/databinding/runtime/util/validation/ObservableValuePatternValidator.java
@@ -57,6 +57,7 @@ public void executeAdditionalValidation(Annotation annotation, IIssueCallback va
validateParameterExpression(pattern, ref, value, validator);
}
}
+
/**
* @param pattern
* @param ref
@@ -68,8 +69,8 @@ private void validateParameterExpression(Pattern pattern, ValueReference ref, St
String[] tokens = expression.split("\\.");
String featureName = "";
if (expression.isEmpty() || tokens.length == 0) {
- validator.error("Expression must not be empty.", ref,
- PatternLanguagePackage.Literals.STRING_VALUE__VALUE, GENERAL_ISSUE_CODE);
+ validator.error("Expression must not be empty.", ref, PatternLanguagePackage.Literals.STRING_VALUE__VALUE,
+ GENERAL_ISSUE_CODE);
return;
} else if (tokens.length == 1) {
featureName = "name";
@@ -95,9 +96,8 @@ private void validateParameterExpression(Pattern pattern, ValueReference ref, St
}
EClass classDef = (EClass) classifier;
if (classDef.getEStructuralFeature(featureName) == null) {
- validator.error(
- String.format("Invalid feature type %s in EClass %s", featureName, classifier.getName()), ref,
- PatternLanguagePackage.Literals.STRING_VALUE__VALUE, UNKNOWN_ATTRIBUTE_CODE);
+ validator.error(String.format("Invalid feature type %s in EClass %s", featureName, classifier.getName()),
+ ref, PatternLanguagePackage.Literals.STRING_VALUE__VALUE, UNKNOWN_ATTRIBUTE_CODE);
}
}
View
16 ...emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/EMFPatternLanguageUIActivator.java
@@ -18,13 +18,13 @@
public class EMFPatternLanguageUIActivator extends EMFPatternLanguageActivator {
- @Override
- protected Module getRuntimeModule(String grammar) {
- if (ORG_ECLIPSE_INCQUERY_PATTERNLANGUAGE_EMF_EMFPATTERNLANGUAGE.equals(grammar)) {
- return IncQueryGeneratorPlugin.INSTANCE.getRuntimeModule();
- }
-
- throw new IllegalArgumentException(grammar);
- }
+ @Override
+ protected Module getRuntimeModule(String grammar) {
+ if (ORG_ECLIPSE_INCQUERY_PATTERNLANGUAGE_EMF_EMFPATTERNLANGUAGE.equals(grammar)) {
+ return IncQueryGeneratorPlugin.INSTANCE.getRuntimeModule();
+ }
+
+ throw new IllegalArgumentException(grammar);
+ }
}
View
160 ...ge.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/EMFPatternLanguageUiModule.java
@@ -47,85 +47,83 @@
* Use this class to register components to be used within the IDE.
*/
public class EMFPatternLanguageUiModule extends AbstractEMFPatternLanguageUiModule {
- private static final String loggerRoot = "org.eclipse.incquery";
-
- public EMFPatternLanguageUiModule(AbstractUIPlugin plugin) {
- super(plugin);
- }
-
- @Provides
- @Singleton
- Logger provideLoggerImplementation() {
- Logger logger = Logger.getLogger(loggerRoot);
- logger.setAdditivity(false);
- logger.addAppender(new ConsoleAppender());
- logger.addAppender(new EclipseLogAppender());
- return logger;
- }
-
- @Override
- public void configure(Binder binder) {
- super.configure(binder);
- binder.bind(String.class)
- .annotatedWith(
- Names.named(XtextContentAssistProcessor.COMPLETION_AUTO_ACTIVATION_CHARS))
- .toInstance(".,");
- }
-
- /*
- * Registering model inferrer from the tooling.generator project
- */
- public Class<? extends IJvmModelInferrer> bindIJvmModelInferrer() {
- return EMFPatternLanguageJvmModelInferrer.class;
- }
-
- @Override
- public Class<? extends IXtextBuilderParticipant> bindIXtextBuilderParticipant() {
- return EMFPatternLanguageBuilderParticipant.class;
- }
-
- @Override
- public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
- return EMFPatternLanguageHighlightingCalculator.class;
- }
-
- @Override
- public Class<? extends IHighlightingConfiguration> bindIHighlightingConfiguration() {
- return EMFPatternLanguageHighlightingConfiguration.class;
- }
-
- public Class<? extends IMetamodelProvider> bindIMetamodelProvider() {
- return GenModelMetamodelProviderService.class;
- }
-
- public Class<? extends IEiqGenmodelProvider> bindIEiqGenmodelProvider() {
- return GenModelMetamodelProviderService.class;
- }
-
- public Class<? extends ITypeProvider> bindITypeProvider() {
- return GenModelBasedTypeProvider.class;
- }
-
- @Override
- public Class<? extends IEObjectHoverDocumentationProvider> bindIEObjectHoverDocumentationProvider() {
- return EMFPatternLanguageHoverDocumentationProvider.class;
- }
-
- public Class<? extends IErrorFeedback> bindIErrorFeedback(){
- return GeneratorMarkerFeedback.class;
- }
-
-
- public Class<? extends ILogicalContainerProvider> bindILogicalContainerProvider() {
- return EMFPatternJvmModelAssociator.class;
- }
-
- public Class<? extends JvmModelAssociator> bindJvmModelAssociator() {
- return EMFPatternJvmModelAssociator.class;
- }
-
- @SingletonBinding(eager = true)
- public Class<? extends EMFPatternLanguageJavaValidator> bindEMFPatternLanguageJavaValidator() {
- return GenmodelBasedEMFPatternLanguageJavaValidator.class;
- }
+ private static final String loggerRoot = "org.eclipse.incquery";
+
+ public EMFPatternLanguageUiModule(AbstractUIPlugin plugin) {
+ super(plugin);
+ }
+
+ @Provides
+ @Singleton
+ Logger provideLoggerImplementation() {
+ Logger logger = Logger.getLogger(loggerRoot);
+ logger.setAdditivity(false);
+ logger.addAppender(new ConsoleAppender());
+ logger.addAppender(new EclipseLogAppender());
+ return logger;
+ }
+
+ @Override
+ public void configure(Binder binder) {
+ super.configure(binder);
+ binder.bind(String.class)
+ .annotatedWith(Names.named(XtextContentAssistProcessor.COMPLETION_AUTO_ACTIVATION_CHARS))
+ .toInstance(".,");
+ }
+
+ /*
+ * Registering model inferrer from the tooling.generator project
+ */
+ public Class<? extends IJvmModelInferrer> bindIJvmModelInferrer() {
+ return EMFPatternLanguageJvmModelInferrer.class;
+ }
+
+ @Override
+ public Class<? extends IXtextBuilderParticipant> bindIXtextBuilderParticipant() {
+ return EMFPatternLanguageBuilderParticipant.class;
+ }
+
+ @Override
+ public Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {
+ return EMFPatternLanguageHighlightingCalculator.class;
+ }
+
+ @Override
+ public Class<? extends IHighlightingConfiguration> bindIHighlightingConfiguration() {
+ return EMFPatternLanguageHighlightingConfiguration.class;
+ }
+
+ public Class<? extends IMetamodelProvider> bindIMetamodelProvider() {
+ return GenModelMetamodelProviderService.class;
+ }
+
+ public Class<? extends IEiqGenmodelProvider> bindIEiqGenmodelProvider() {
+ return GenModelMetamodelProviderService.class;
+ }
+
+ public Class<? extends ITypeProvider> bindITypeProvider() {
+ return GenModelBasedTypeProvider.class;
+ }
+
+ @Override
+ public Class<? extends IEObjectHoverDocumentationProvider> bindIEObjectHoverDocumentationProvider() {
+ return EMFPatternLanguageHoverDocumentationProvider.class;
+ }
+
+ public Class<? extends IErrorFeedback> bindIErrorFeedback() {
+ return GeneratorMarkerFeedback.class;
+ }
+
+ public Class<? extends ILogicalContainerProvider> bindILogicalContainerProvider() {
+ return EMFPatternJvmModelAssociator.class;
+ }
+
+ public Class<? extends JvmModelAssociator> bindJvmModelAssociator() {
+ return EMFPatternJvmModelAssociator.class;
+ }
+
+ @SingletonBinding(eager = true)
+ public Class<? extends EMFPatternLanguageJavaValidator> bindEMFPatternLanguageJavaValidator() {
+ return GenmodelBasedEMFPatternLanguageJavaValidator.class;
+ }
}
View
157 ...rnlanguage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/EclipseLogAppender.java
@@ -20,6 +20,7 @@
/**
* Updated Eclipse LogAppender based on the implementation in org.eclipse.xtext.logger bundle.
+ *
* @author Peter Friese - Initial contribution and API
* @author Sven Efftinge
* @author Knut Wannheden - Refactored handling when used in non OSGi environment
@@ -27,83 +28,83 @@
*/
public class EclipseLogAppender extends AppenderSkeleton {
- private static final String LOG_PATTERN = "%m%n";
-
- private static final String BUNDLE_NAME = EMFPatternLanguageUIActivator.getInstance().getBundle().getSymbolicName();
-
- private boolean initialized;
- private ILog log;
-
- public EclipseLogAppender() {
- super();
- layout = new PatternLayout(LOG_PATTERN);
- }
-
- public EclipseLogAppender(boolean isActive) {
- super(isActive);
- layout = new PatternLayout(LOG_PATTERN);
- }
-
- private synchronized void ensureInitialized() {
- if (!initialized) {
- log = Platform.getLog(Platform.getBundle(BUNDLE_NAME));
- initialized = true;
- }
- }
-
- private ILog getLog() {
- ensureInitialized();
- return log;
- }
-
- @Override
- protected void append(LoggingEvent event) {
- if (isDoLog(event.getLevel())) {
- String logString = layout.format(event);
-
- ILog myLog = getLog();
- if (myLog != null) {
- String loggerName = event.getLoggerName();
- int severity = mapLevel(event.getLevel());
- final Throwable throwable = event.getThrowableInformation() != null ? event.getThrowableInformation()
- .getThrowable() : null;
- IStatus status = createStatus(severity, loggerName, logString, throwable);
- getLog().log(status);
- }
- }
- }
-
- private boolean isDoLog(Level level) {
- return level.toInt() >= Priority.WARN_INT;
- }
-
- private int mapLevel(Level level) {
- switch (level.toInt()) {
- case Priority.DEBUG_INT:
- case Priority.INFO_INT:
- return IStatus.INFO;
-
- case Priority.WARN_INT:
- return IStatus.WARNING;
-
- case Priority.ERROR_INT:
- case Priority.FATAL_INT:
- return IStatus.ERROR;
-
- default:
- return IStatus.INFO;
- }
- }
-
- private IStatus createStatus(int severity, String loggerName, String message, Throwable throwable) {
- return new Status(severity, BUNDLE_NAME, message, throwable);
- }
-
- public void close() {
- }
-
- public boolean requiresLayout() {
- return true;
- }
+ private static final String LOG_PATTERN = "%m%n";
+
+ private static final String BUNDLE_NAME = EMFPatternLanguageUIActivator.getInstance().getBundle().getSymbolicName();
+
+ private boolean initialized;
+ private ILog log;
+
+ public EclipseLogAppender() {
+ super();
+ layout = new PatternLayout(LOG_PATTERN);
+ }
+
+ public EclipseLogAppender(boolean isActive) {
+ super(isActive);
+ layout = new PatternLayout(LOG_PATTERN);
+ }
+
+ private synchronized void ensureInitialized() {
+ if (!initialized) {
+ log = Platform.getLog(Platform.getBundle(BUNDLE_NAME));
+ initialized = true;
+ }
+ }
+
+ private ILog getLog() {
+ ensureInitialized();
+ return log;
+ }
+
+ @Override
+ protected void append(LoggingEvent event) {
+ if (isDoLog(event.getLevel())) {
+ String logString = layout.format(event);
+
+ ILog myLog = getLog();
+ if (myLog != null) {
+ String loggerName = event.getLoggerName();
+ int severity = mapLevel(event.getLevel());
+ final Throwable throwable = event.getThrowableInformation() != null ? event.getThrowableInformation()
+ .getThrowable() : null;
+ IStatus status = createStatus(severity, loggerName, logString, throwable);
+ getLog().log(status);
+ }
+ }
+ }
+
+ private boolean isDoLog(Level level) {
+ return level.toInt() >= Priority.WARN_INT;
+ }
+
+ private int mapLevel(Level level) {
+ switch (level.toInt()) {
+ case Priority.DEBUG_INT:
+ case Priority.INFO_INT:
+ return IStatus.INFO;
+
+ case Priority.WARN_INT:
+ return IStatus.WARNING;
+
+ case Priority.ERROR_INT:
+ case Priority.FATAL_INT:
+ return IStatus.ERROR;
+
+ default:
+ return IStatus.INFO;
+ }
+ }
+
+ private IStatus createStatus(int severity, String loggerName, String message, Throwable throwable) {
+ return new Status(severity, BUNDLE_NAME, message, throwable);
+ }
+
+ public void close() {
+ }
+
+ public boolean requiresLayout() {
+ return true;
+ }
}
View
9 ...uage.emf.ui/src/org/eclipse/incquery/patternlanguage/emf/ui/UiPluginInjectorProvider.java
@@ -17,9 +17,10 @@
public class UiPluginInjectorProvider implements IInjectorProvider {
- @Override
- public Injector getInjector() {
- return EMFPatternLanguageUIActivator.getInstance().getInjector(EMFPatternLanguageUIActivator.ORG_ECLIPSE_INCQUERY_PATTERNLANGUAGE_EMF_EMFPATTERNLANGUAGE);
- }
+ @Override
+ public Injector getInjector() {
+ return EMFPatternLanguageUIActivator.getInstance().getInjector(
+ EMFPatternLanguageUIActivator.ORG_ECLIPSE_INCQUERY_PATTERNLANGUAGE_EMF_EMFPATTERNLANGUAGE);
+ }
}
View
372 ...pse/incquery/patternlanguage/emf/ui/contentassist/EMFPatternLanguageProposalProvider.java
@@ -56,193 +56,195 @@
import com.google.common.base.Predicates;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
+
/**
* see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#contentAssist on how to customize content assistant
*/
public class EMFPatternLanguageProposalProvider extends AbstractEMFPatternLanguageProposalProvider {
-
- private static final Set<String> FILTERED_KEYWORDS = Sets.newHashSet("pattern");
-
- @Inject
- IScopeProvider scopeProvider;
- @Inject
- ReferenceProposalCreator crossReferenceProposalCreator;
-
- public static class ClassifierPrefixMatcher extends PrefixMatcher {
- private final PrefixMatcher delegate;
-
- private final IQualifiedNameConverter qualifiedNameConverter;
-
-
- public ClassifierPrefixMatcher(PrefixMatcher delegate, IQualifiedNameConverter qualifiedNameConverter) {
- this.delegate = delegate;
- this.qualifiedNameConverter = qualifiedNameConverter;
- }
-
- @Override
- public boolean isCandidateMatchingPrefix(String name, String prefix) {
- if (delegate.isCandidateMatchingPrefix(name, prefix))
- return true;
- QualifiedName qualifiedName = qualifiedNameConverter.toQualifiedName(name);
- QualifiedName qualifiedPrefix = qualifiedNameConverter.toQualifiedName(prefix);
- if (qualifiedName.getSegmentCount() > 1) {
- if (qualifiedPrefix.getSegmentCount() == 1)
- return delegate.isCandidateMatchingPrefix(qualifiedName.getSegment(1),
- qualifiedPrefix.getFirstSegment());
- if (!delegate.isCandidateMatchingPrefix(qualifiedName.getFirstSegment(),
- qualifiedPrefix.getFirstSegment()))
- return false;
- return delegate.isCandidateMatchingPrefix(qualifiedName.getSegment(1), qualifiedPrefix.getSegment(1));
- }
- return false;
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.xtext.xbase.ui.contentassist.XbaseProposalProvider#completeKeyword(org.eclipse.xtext.Keyword, org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext, org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
- */
- @Override
- public void completeKeyword(Keyword keyword,
- ContentAssistContext contentAssistContext,
- ICompletionProposalAcceptor acceptor) {
- // ignore keywords in FILTERED set
- if (FILTERED_KEYWORDS.contains(keyword.getValue())) {
- return;
- }
- super.completeKeyword(keyword, contentAssistContext, acceptor);
- }
-
- @Override
- public void complete_ValueReference(EObject model, RuleCall ruleCall,
- ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- super.complete_ValueReference(model, ruleCall, context, acceptor);
- if (model instanceof PathExpressionHead) {
- PathExpressionHead head = (PathExpressionHead) model;
- try {
- //XXX The following code re-specifies scoping instead of reusing the scope provider
- EClassifier typeClassifier = EMFPatternLanguageScopeHelper.calculateExpressionType(head);
- if (typeClassifier instanceof EEnum) {
- //In case of EEnums add Enum Literal constants
- EEnum type = (EEnum) typeClassifier;
- for (EEnumLiteral literal : type.getELiterals()) {
- acceptor.accept(createCompletionProposal(
- "::" + literal.getName(), type.getName() + "::" + literal.getName(),
- null, context));
- }
- }
- //XXX The following code re-specifies scoping instead of reusing the scope provider
- // Always refer to existing variables
- PatternBody body = (PatternBody) head.eContainer()/*PathExpression*/.eContainer()/*PatternBody*/;
- for (Variable var : body.getVariables()) {
- acceptor.accept(createCompletionProposal(var.getName(), context));
- }
- Pattern pattern = (Pattern) body.eContainer();
- for (Variable var : pattern.getParameters()) {
- acceptor.accept(createCompletionProposal(var.getName(), context));
- }
- } catch (ResolutionException e) {
- //If resolution fails, simply don't return anything
- }
- }
- }
-
- @Override
- public void completeType_Typename(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- PatternModel pModel = null;
- EObject root = getRootContainer(model);
- if (root instanceof PatternModel){
- pModel = (PatternModel) root;
- }
- ContentAssistContext.Builder myContextBuilder = context.copy();
- myContextBuilder.setMatcher(new ClassifierPrefixMatcher(context.getMatcher(), getQualifiedNameConverter()));
- ClassType type = null;
- if (model instanceof Variable) {
- type = (ClassType) ((Variable) model).getType();
- } else {
- return;
- }
-
- ICompositeNode node = NodeModelUtils.getNode(type);
- int offset = node.getOffset();
- Region replaceRegion = new Region(offset, context.getReplaceRegion()
- .getLength() + context.getReplaceRegion().getOffset() - offset);
- myContextBuilder.setReplaceRegion(replaceRegion);
- myContextBuilder.setLastCompleteNode(node);
- StringBuilder availablePrefix = new StringBuilder(4);
- for (ILeafNode leaf : node.getLeafNodes()) {
- if (leaf.getGrammarElement() != null && !leaf.isHidden()) {
- if ((leaf.getTotalLength() + leaf.getTotalOffset()) < context
- .getOffset())
- availablePrefix.append(leaf.getText());
- else
- availablePrefix.append(leaf.getText().substring(0,
- context.getOffset() - leaf.getTotalOffset()));
- }
- if (leaf.getTotalOffset() >= context.getOffset())
- break;
- }
- myContextBuilder.setPrefix(availablePrefix.toString());
-
- ContentAssistContext myContext = myContextBuilder.toContext();
- for (PackageImport declaration : pModel.getImportPackages()) {
- if (declaration.getEPackage() != null) {
- createClassifierProposals(declaration, model, myContext, acceptor);
- }
- }
- }
-
- private void createClassifierProposals(PackageImport declaration, EObject model,
- ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- //String alias = declaration.getAlias();
- //QualifiedName prefix = (!Strings.isEmpty(alias))
- // ? QualifiedName.create(getValueConverter().toString(alias,"ID"))
- // : null;
- boolean createDatatypeProposals = modelOrContainerIs(model, Variable.class);
- boolean createEnumProposals = modelOrContainerIs(model, EnumRule.class);
- boolean createClassProposals = modelOrContainerIs(model, Variable.class);
- Function<IEObjectDescription, ICompletionProposal> factory = getProposalFactory(null, context);
- for (EClassifier classifier : declaration.getEPackage().getEClassifiers()) {
- if (classifier instanceof EDataType && createDatatypeProposals || classifier instanceof EEnum
- && createEnumProposals || classifier instanceof EClass && createClassProposals) {
- String classifierName = getValueConverter().toString(classifier.getName(), "ID");
- QualifiedName proposalQualifiedName = /*(prefix != null) ? prefix.append(classifierName) :*/ QualifiedName
- .create(classifierName);
- IEObjectDescription description = EObjectDescription.create(proposalQualifiedName, classifier);
- ConfigurableCompletionProposal proposal = (ConfigurableCompletionProposal) factory.apply(description);
- if (proposal != null) {
- /*if (prefix != null)
- proposal.setDisplayString(classifier.getName() + " - " + alias);*/
- proposal.setPriority(proposal.getPriority() * 2);
- }
- acceptor.accept(proposal);
- }
- }
- }
-
- private boolean modelOrContainerIs(EObject model, Class<?>... types) {
- for (Class<?> type : types) {
- if (type.isInstance(model) || type.isInstance(model.eContainer()))
- return true;
- }
- return false;
- }
-
- public void complete_RefType(PathExpressionElement model, RuleCall ruleCall,
- ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- IScope scope = scopeProvider.getScope(model.getTail(),
- EMFPatternLanguagePackage.Literals.REFERENCE_TYPE__REFNAME);
- crossReferenceProposalCreator.lookupCrossReference(scope, model,
- EMFPatternLanguagePackage.Literals.REFERENCE_TYPE__REFNAME,
- acceptor, Predicates.<IEObjectDescription> alwaysTrue(),
- getProposalFactory(ruleCall.getRule().getName(), context));
- }
-
- @Override
- public void completeRefType_Refname(EObject model, Assignment assignment,
- ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- // This method is deliberately empty.
- // This override prohibits the content assist to suggest incorrect parameters.
- }
-
+
+ private static final Set<String> FILTERED_KEYWORDS = Sets.newHashSet("pattern");
+
+ @Inject
+ IScopeProvider scopeProvider;
+ @Inject
+ ReferenceProposalCreator crossReferenceProposalCreator;
+
+ public static class ClassifierPrefixMatcher extends PrefixMatcher {
+ private final PrefixMatcher delegate;
+
+ private final IQualifiedNameConverter qualifiedNameConverter;
+
+ public ClassifierPrefixMatcher(PrefixMatcher delegate, IQualifiedNameConverter qualifiedNameConverter) {
+ this.delegate = delegate;
+ this.qualifiedNameConverter = qualifiedNameConverter;
+ }
+
+ @Override
+ public boolean isCandidateMatchingPrefix(String name, String prefix) {
+ if (delegate.isCandidateMatchingPrefix(name, prefix))
+ return true;
+ QualifiedName qualifiedName = qualifiedNameConverter.toQualifiedName(name);
+ QualifiedName qualifiedPrefix = qualifiedNameConverter.toQualifiedName(prefix);
+ if (qualifiedName.getSegmentCount() > 1) {
+ if (qualifiedPrefix.getSegmentCount() == 1)
+ return delegate.isCandidateMatchingPrefix(qualifiedName.getSegment(1),
+ qualifiedPrefix.getFirstSegment());
+ if (!delegate.isCandidateMatchingPrefix(qualifiedName.getFirstSegment(),
+ qualifiedPrefix.getFirstSegment()))
+ return false;
+ return delegate.isCandidateMatchingPrefix(qualifiedName.getSegment(1), qualifiedPrefix.getSegment(1));
+ }
+ return false;
+ }
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.xtext.xbase.ui.contentassist.XbaseProposalProvider#completeKeyword(org.eclipse.xtext.Keyword,
+ * org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext,
+ * org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor)
+ */
+ @Override
+ public void completeKeyword(Keyword keyword, ContentAssistContext contentAssistContext,
+ ICompletionProposalAcceptor acceptor) {
+ // ignore keywords in FILTERED set
+ if (FILTERED_KEYWORDS.contains(keyword.getValue())) {
+ return;
+ }
+ super.completeKeyword(keyword, contentAssistContext, acceptor);
+ }
+
+ @Override
+ public void complete_ValueReference(EObject model, RuleCall ruleCall, ContentAssistContext context,
+ ICompletionProposalAcceptor acceptor) {
+ super.complete_ValueReference(model, ruleCall, context, acceptor);
+ if (model instanceof PathExpressionHead) {
+ PathExpressionHead head = (PathExpressionHead) model;
+ try {
+ // XXX The following code re-specifies scoping instead of reusing the scope provider
+ EClassifier typeClassifier = EMFPatternLanguageScopeHelper.calculateExpressionType(head);
+ if (typeClassifier instanceof EEnum) {
+ // In case of EEnums add Enum Literal constants
+ EEnum type = (EEnum) typeClassifier;
+ for (EEnumLiteral literal : type.getELiterals()) {
+ acceptor.accept(createCompletionProposal("::" + literal.getName(), type.getName() + "::"
+ + literal.getName(), null, context));
+ }
+ }
+ // XXX The following code re-specifies scoping instead of reusing the scope provider
+ // Always refer to existing variables
+ PatternBody body = (PatternBody) head.eContainer()/* PathExpression */.eContainer()/* PatternBody */;
+ for (Variable var : body.getVariables()) {
+ acceptor.accept(createCompletionProposal(var.getName(), context));
+ }
+ Pattern pattern = (Pattern) body.eContainer();
+ for (Variable var : pattern.getParameters()) {
+ acceptor.accept(createCompletionProposal(var.getName(), context));
+ }
+ } catch (ResolutionException e) {
+ // If resolution fails, simply don't return anything
+ }
+ }
+ }
+
+ @Override
+ public void completeType_Typename(EObject model, Assignment assignment, ContentAssistContext context,
+ ICompletionProposalAcceptor acceptor) {
+ PatternModel pModel = null;
+ EObject root = getRootContainer(model);
+ if (root instanceof PatternModel) {
+ pModel = (PatternModel) root;
+ }
+ ContentAssistContext.Builder myContextBuilder = context.copy();
+ myContextBuilder.setMatcher(new ClassifierPrefixMatcher(context.getMatcher(), getQualifiedNameConverter()));
+ ClassType type = null;
+ if (model instanceof Variable) {
+ type = (ClassType) ((Variable) model).getType();
+ } else {
+ return;
+ }
+
+ ICompositeNode node = NodeModelUtils.getNode(type);
+ int offset = node.getOffset();
+ Region replaceRegion = new Region(offset, context.getReplaceRegion().getLength()
+ + context.getReplaceRegion().getOffset() - offset);
+ myContextBuilder.setReplaceRegion(replaceRegion);
+ myContextBuilder.setLastCompleteNode(node);
+ StringBuilder availablePrefix = new StringBuilder(4);
+ for (ILeafNode leaf : node.getLeafNodes()) {
+ if (leaf.getGrammarElement() != null && !leaf.isHidden()) {
+ if ((leaf.getTotalLength() + leaf.getTotalOffset()) < context.getOffset())
+ availablePrefix.append(leaf.getText());
+ else
+ availablePrefix.append(leaf.getText().substring(0, context.getOffset() - leaf.getTotalOffset()));
+ }
+ if (leaf.getTotalOffset() >= context.getOffset())
+ break;
+ }
+ myContextBuilder.setPrefix(availablePrefix.toString());
+
+ ContentAssistContext myContext = myContextBuilder.toContext();
+ for (PackageImport declaration : pModel.getImportPackages()) {
+ if (declaration.getEPackage() != null) {
+ createClassifierProposals(declaration, model, myContext, acceptor);
+ }
+ }
+ }
+
+ private void createClassifierProposals(PackageImport declaration, EObject model, ContentAssistContext context,
+ ICompletionProposalAcceptor acceptor) {