Permalink
Browse files

rename codedb to model

  • Loading branch information...
1 parent 094b1eb commit 41f9c030e87233162d83362bdb566f02d8b70ab9 @vladdu vladdu committed Feb 6, 2013
Showing with 102 additions and 103 deletions.
  1. +1 −1 org.erlide.backend/META-INF/MANIFEST.MF
  2. +1 −1 org.erlide.core/META-INF/MANIFEST.MF
  3. +1 −1 org.erlide.core/src/org/erlide/core/ErlangCore.java
  4. +1 −1 org.erlide.cover.api/META-INF/MANIFEST.MF
  5. +1 −1 org.erlide.cover.core/META-INF/MANIFEST.MF
  6. +1 −1 org.erlide.cover.ui/META-INF/MANIFEST.MF
  7. +1 −1 org.erlide.headless/feature.xml
  8. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/.classpath
  9. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/.gitignore
  10. +2 −2 {org.erlide.codedb.tests → org.erlide.model.tests}/.project
  11. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/.settings/org.eclipse.jdt.core.prefs
  12. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/.settings/org.erlide.core.prefs
  13. +3 −3 {org.erlide.codedb.tests → org.erlide.model.tests}/META-INF/MANIFEST.MF
  14. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/build.properties
  15. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/data/test_chinese.erl
  16. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/src/log4j.xml
  17. 0 ...ide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/ErlModelTestBase.java
  18. 0 ...de.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/ErlModelTestBase2.java
  19. 0 ...e.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlAttributeTests.java
  20. 0 ...ide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlCommentTests.java
  21. 0 ...lide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlElementTest.java
  22. 0 ...lide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlExportTests.java
  23. 0 ...de.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlExternalTests.java
  24. 0 ...lide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlFolderTests.java
  25. 0 ...edb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlFunctionClauseTests.java
  26. 0 ...db.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlFunctionCommentTests.java
  27. 0 ...de.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlFunctionTests.java
  28. 0 ...odedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlImportExportTests.java
  29. 0 ...lide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlImportTests.java
  30. 0 ...lide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlMemberTests.java
  31. 0 ...erlide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlModelTest.java
  32. 0 ...lide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlModuleTests.java
  33. 0 ...ide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlProjectTests.java
  34. 0 ...de.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IErlTypespecTests.java
  35. 0 ....erlide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/IParentTests.java
  36. 0 ...de.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/ISourceRangeTests.java
  37. 0 ...odedb.tests → org.erlide.model.tests}/src/org/erlide/core/model/erlang/ISourceReferenceTests.java
  38. +4 −4 ...odedb.tests → org.erlide.model.tests}/src/org/erlide/core/services/codeassist/CodeAssistTest.java
  39. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/util/ModelUtilsTests.java
  40. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/src/org/erlide/core/util/ModuleLocatorTests.java
  41. +2 −2 {org.erlide.codedb.tests → org.erlide.model.tests}/src/org/erlide/test/support/ErlideTestUtils.java
  42. 0 {org.erlide.codedb.tests → org.erlide.model.tests}/src/org/erlide/test/support/ExceptionUtils.java
  43. 0 {org.erlide.codedb → org.erlide.model}/.classpath
  44. +1 −1 {org.erlide.codedb → org.erlide.model}/.project
  45. 0 {org.erlide.codedb → org.erlide.model}/.settings/org.eclipse.jdt.core.prefs
  46. +6 −6 {org.erlide.codedb → org.erlide.model}/META-INF/MANIFEST.MF
  47. 0 {org.erlide.codedb → org.erlide.model}/build.properties
  48. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlAttribute.java
  49. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlComment.java
  50. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlExport.java
  51. +2 −2 ...dedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlExternalReferenceEntry.java
  52. +2 −2 ... → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlExternalReferenceEntryList.java
  53. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlFunction.java
  54. 0 ...rlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlFunctionClause.java
  55. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlImport.java
  56. 0 ....erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlImportExport.java
  57. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlMacroDef.java
  58. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlModule.java
  59. +2 −2 ...org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlOtpExternalReferenceEntryList.java
  60. +4 −4 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlParser.java
  61. 0 ...erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlParserProblem.java
  62. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlRecordDef.java
  63. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlRecordField.java
  64. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlScanner.java
  65. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlTypespec.java
  66. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlideNoparse.java
  67. +12 −12 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ErlideScanner.java
  68. 0 ...lide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ModelInternalUtils.java
  69. 0 ...rlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/PreferencesHelper.java
  70. 0 ....erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/PropertiesUtils.java
  71. 0 ...erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/ScannerException.java
  72. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/SourceRange.java
  73. 0 ...erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/erlang/SourceRefElement.java
  74. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlElement.java
  75. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlElementDelta.java
  76. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlFolder.java
  77. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlMember.java
  78. +2 −2 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlModel.java
  79. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlModelCache.java
  80. 0 ...lide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlModelDeltaManager.java
  81. +4 −4 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlProject.java
  82. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlProjectInfo.java
  83. 0 ...ide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlProjectInfoBuilder.java
  84. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ErlProjectLayout.java
  85. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ModelConfig.java
  86. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/Openable.java
  87. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/PathEntry.java
  88. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/internal/model/root/PathSerializer.java
  89. 0 ...dedb → org.erlide.model}/src/org/erlide/core/internal/model/root/ProjectPreferencesConstants.java
  90. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/BeamLocator.java
  91. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/ErlModelException.java
  92. +8 −8 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/ErlModelStatus.java
  93. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/ErlModelStatusConstants.java
  94. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/IBeamLocator.java
  95. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/IOpenable.java
  96. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/IParent.java
  97. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/ErlToken.java
  98. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/ErlangBackendToolkit.java
  99. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/ErlangToolkit.java
  100. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/ErlangToolkitFactory.java
  101. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/FunctionRef.java
  102. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlAttribute.java
  103. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlComment.java
  104. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlExport.java
  105. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlFunction.java
  106. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlFunctionClause.java
  107. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlImport.java
  108. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlImportExport.java
  109. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlMacroDef.java
  110. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlMember.java
  111. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlModule.java
  112. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlParser.java
  113. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlParserProblem.java
  114. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlPreprocessorDef.java
  115. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlRecordDef.java
  116. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlRecordField.java
  117. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlScanner.java
  118. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlTypespec.java
  119. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlangFirstThat.java
  120. 0 ...rlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/IErlangReconcilingListener.java
  121. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/ISourceRange.java
  122. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/ISourceReference.java
  123. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/erlang/ModuleKind.java
  124. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/ErlModelManager.java
  125. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlElement.java
  126. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlElementDelta.java
  127. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlElementLocator.java
  128. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlElementVisitor.java
  129. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlExternal.java
  130. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlFolder.java
  131. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlModel.java
  132. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlModelChangeListener.java
  133. +6 −6 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlModelMarker.java
  134. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlModelStatus.java
  135. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IErlProject.java
  136. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/ISourceUnit.java
  137. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/IWorkingCopy.java
  138. 0 ....erlide.codedb → org.erlide.model}/src/org/erlide/core/model/root/OldErlangProjectProperties.java
  139. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/CommonUtils.java
  140. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ContainerFilter.java
  141. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ContainerFilterCreator.java
  142. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/CoreUtil.java
  143. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ElementAdapterFactory.java
  144. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ElementChangedEvent.java
  145. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ErlangFunction.java
  146. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ErlangIncludeFile.java
  147. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ErlideUtil.java
  148. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/IElementChangedListener.java
  149. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ModelUtils.java
  150. +2 −2 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/NatureUtil.java
  151. +2 −2 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/PluginUtils.java
  152. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ProjectAdapterFactory.java
  153. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/model/util/ResourceUtil.java
  154. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/cleanup/CleanUpProvider.java
  155. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/cleanup/CleanUpProviders.java
  156. +2 −2 ...rlide.codedb → org.erlide.model}/src/org/erlide/core/services/cleanup/ErlTidyCleanupProvider.java
  157. 0 ...rlide.codedb → org.erlide.model}/src/org/erlide/core/services/codeassist/ErlideContextAssist.java
  158. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/codeassist/ICodeAssist.java
  159. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlOpenContext.java
  160. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlSearchScope.java
  161. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlangSearchPattern.java
  162. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlangXref.java
  163. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlideDoc.java
  164. +1 −1 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlideOpen.java
  165. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlideSearchServer.java
  166. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/ErlideXref.java
  167. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/FunctionPattern.java
  168. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/IncludePattern.java
  169. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/LimitTo.java
  170. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/MacroPattern.java
  171. 0 ...de.codedb → org.erlide.model}/src/org/erlide/core/services/search/ModuleLineFunctionArityRef.java
  172. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/NamePattern.java
  173. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/OpenResult.java
  174. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/RecordFieldPattern.java
  175. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/RecordPattern.java
  176. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/SearchFor.java
  177. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/SearchPatternFactory.java
  178. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/TypeRefPattern.java
  179. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/search/VariablePattern.java
  180. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/text/ErlideIndent.java
  181. 0 {org.erlide.codedb → org.erlide.model}/src/org/erlide/core/services/text/IndentResult.java
  182. +9 −9 .../src/org/erlide/codedb/CodeDbPlugin.java → org.erlide.model/src/org/erlide/model/ModelPlugin.java
  183. +1 −1 ...ide.codedb/src/org/erlide/codedb → org.erlide.model/src/org/erlide/model}/SourcePathProvider.java
  184. +1 −1 ...erlide.codedb/src/org/erlide/codedb → org.erlide.model/src/org/erlide/model}/SourcePathUtils.java
  185. +1 −1 org.erlide.sdk/feature.xml
  186. +1 −1 org.erlide.site/bucky_test
  187. +1 −1 org.erlide.test_support/META-INF/MANIFEST.MF
  188. +1 −1 org.erlide.test_support/src/org/erlide/test_support/TestSourcePathProvider.java
  189. +7 −8 org.erlide.testing/{junit_codedb.launch → junit_model.launch}
  190. +1 −1 org.erlide.tracing.core/META-INF/MANIFEST.MF
  191. +1 −1 org.erlide.ui.tests/projects/Erlide_tests.launch
  192. +1 −1 org.erlide.ui.tests/projects/Erlide_tests_E.launch
  193. +1 −1 org.erlide.ui/META-INF/MANIFEST.MF
  194. +1 −1 org.erlide.ui/src/org/erlide/ui/dialogs/FilteredModulesSelectionDialog.java
  195. +1 −1 org.erlide.wrangler.refactoring/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
org.erlide.libs;bundle-version="1.8.4",
org.erlide.runtime,
org.eclipse.debug.core;bundle-version="3.6.0",
- org.erlide.codedb;bundle-version="0.18.0",
+ org.erlide.model;bundle-version="0.18.0",
org.eclipse.equinox.event;bundle-version="1.2.0",
org.eclipse.osgi.services;bundle-version="3.2.100",
org.erlide.common;bundle-version="0.18.0"
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.filesystem,
org.erlide.backend,
org.erlide.libs;bundle-version="1.8.4",
org.erlide.runtime,
- org.erlide.codedb;bundle-version="0.18.0"
+ org.erlide.model;bundle-version="0.18.0"
Bundle-ActivationPolicy: lazy; exclude="org.erlide.core.content"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
@@ -26,9 +26,9 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.erlide.codedb.SourcePathUtils;
import org.erlide.core.services.builder.BuildQueueProcessor;
import org.erlide.launch.debug.ErlangDebugOptionsManager;
+import org.erlide.model.SourcePathUtils;
import org.erlide.runtime.rpc.RpcMonitor;
import org.erlide.utils.EncodingUtils;
import org.erlide.utils.ErlLogger;
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.erlide.core;bundle-version="0.11.0",
org.eclipse.core.resources;bundle-version="3.5.0",
org.erlide.backend;bundle-version="0.11.9",
- org.erlide.codedb;bundle-version="0.18.0"
+ org.erlide.model;bundle-version="0.18.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.erlide.cover.api
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.erlide.cover.api;bundle-version="0.2.0",
org.eclipse.osgi.services;bundle-version="3.2.100",
org.erlide.runtime,
- org.erlide.codedb;bundle-version="0.18.0"
+ org.erlide.model;bundle-version="0.18.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.erlide.cover.constants;x-friends:="org.erlide.cover.ui",
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.filesystem;bundle-version="1.2.1",
org.erlide.core;bundle-version="0.10.2",
org.erlide.runtime,
- org.erlide.codedb;bundle-version="0.18.0"
+ org.erlide.model;bundle-version="0.18.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: lib/commons-io-2.0.1.jar,
@@ -108,7 +108,7 @@ is available from http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
- id="org.erlide.codedb"
+ id="org.erlide.model"
download-size="0"
install-size="0"
version="0.0.0"
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.erlide.codedb.tests</name>
+ <name>org.erlide.model.tests</name>
<comment></comment>
<projects>
- <project>org.erlide.codedb</project>
+ <project>org.erlide.model</project>
</projects>
<buildSpec>
<buildCommand>
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: erlide codedb Tests Fragment
-Bundle-SymbolicName: org.erlide.codedb.tests;singleton:=true
+Bundle-Name: erlide model Tests Fragment
+Bundle-SymbolicName: org.erlide.model.tests;singleton:=true
Bundle-Version: 0.18.0.qualifier
Bundle-Vendor: erlide.org
-Fragment-Host: org.erlide.codedb;bundle-version="0.18.0"
+Fragment-Host: org.erlide.model;bundle-version="0.18.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.erlide.testing.libs,
org.eclipse.core.filesystem;bundle-version="1.3.1",
@@ -2,7 +2,7 @@
import java.util.Collection;
-import org.erlide.codedb.CodeDbPlugin;
+import org.erlide.model.ModelPlugin;
import org.erlide.runtime.IRpcSite;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
@@ -14,15 +14,15 @@
@Test
public void getVariablesShouldReturnNonNull() {
- final IRpcSite b = CodeDbPlugin.getDefault().getIdeBackend();
+ final IRpcSite b = ModelPlugin.getDefault().getIdeBackend();
final Collection<String> result = ErlideContextAssist.getVariables(b,
"src", "");
MatcherAssert.assertThat(result, Matchers.notNullValue());
}
@Test
public void getVariables_1() {
- final IRpcSite b = CodeDbPlugin.getDefault().getIdeBackend();
+ final IRpcSite b = ModelPlugin.getDefault().getIdeBackend();
final Collection<String> result = ErlideContextAssist.getVariables(b,
"a(X)-> XY=-X, {Z, W}=XY, X.", "");
final Collection<String> expected = Sets
@@ -32,7 +32,7 @@ public void getVariables_1() {
@Test
public void getVariables_2() {
- final IRpcSite b = CodeDbPlugin.getDefault().getIdeBackend();
+ final IRpcSite b = ModelPlugin.getDefault().getIdeBackend();
final Collection<String> result = ErlideContextAssist.getVariables(b,
"a(X)-> XY=-X, Z=XY, X.", "X");
final Collection<String> expected = Sets.newHashSet("X", "XY");
@@ -25,14 +25,14 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.erlide.codedb.CodeDbPlugin;
import org.erlide.core.model.erlang.IErlModule;
import org.erlide.core.model.root.ErlModelManager;
import org.erlide.core.model.root.IErlElement;
import org.erlide.core.model.root.IErlModel;
import org.erlide.core.model.root.IErlProject;
import org.erlide.core.model.root.OldErlangProjectProperties;
import org.erlide.core.model.util.ModelUtils;
+import org.erlide.model.ModelPlugin;
import com.google.common.collect.Lists;
@@ -195,7 +195,7 @@ public static void deleteModule(final IErlModule module)
if (file != null) {
file.delete(true, null);
}
- final IPath stateDir = CodeDbPlugin.getDefault().getStateLocation();
+ final IPath stateDir = ModelPlugin.getDefault().getStateLocation();
// FIXME this code should not know about caches!
final String cacheExts[] = { ".noparse", ".refs", ".scan" };
for (final String ext : cacheExts) {
File renamed without changes.
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.erlide.codedb</name>
+ <name>org.erlide.model</name>
<comment></comment>
<projects>
</projects>
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: erlide code database
-Bundle-SymbolicName: org.erlide.codedb;singleton:=true
+Bundle-Name: erlide model
+Bundle-SymbolicName: org.erlide.model;singleton:=true
Bundle-Version: 0.18.0.qualifier
-Bundle-Activator: org.erlide.codedb.CodeDbPlugin
+Bundle-Activator: org.erlide.model.ModelPlugin
Bundle-Vendor: erlide.org project
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="3.6.1",
@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.erlide.common;bundle-version="0.18.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Export-Package: org.erlide.codedb,
- org.erlide.core.internal.model.erlang,
+Export-Package: org.erlide.core.internal.model.erlang,
org.erlide.core.internal.model.root,
org.erlide.core.model,
org.erlide.core.model.erlang,
@@ -23,4 +22,5 @@ Export-Package: org.erlide.codedb,
org.erlide.core.services.cleanup,
org.erlide.core.services.codeassist,
org.erlide.core.services.search,
- org.erlide.core.services.text
+ org.erlide.core.services.text,
+ org.erlide.model
@@ -6,14 +6,14 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.erlide.codedb.CodeDbPlugin;
import org.erlide.core.internal.model.root.Openable;
import org.erlide.core.model.ErlModelException;
import org.erlide.core.model.IParent;
import org.erlide.core.model.erlang.IErlModule;
import org.erlide.core.model.root.IErlExternal;
import org.erlide.core.model.util.ModelUtils;
import org.erlide.core.services.search.ErlideOpen;
+import org.erlide.model.ModelPlugin;
import org.erlide.runtime.IRpcSite;
import com.google.common.collect.Lists;
@@ -45,7 +45,7 @@ protected boolean buildStructure(final IProgressMonitor pm)
// already done
return true;
}
- final IRpcSite backend = CodeDbPlugin.getDefault().getBackend(
+ final IRpcSite backend = ModelPlugin.getDefault().getBackend(
ModelUtils.getProject(this).getName());
if (backend != null) {
final List<String> files = ErlideOpen.getLibFiles(backend, entry);
@@ -7,7 +7,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.erlide.codedb.CodeDbPlugin;
import org.erlide.core.internal.model.root.ErlModel;
import org.erlide.core.internal.model.root.ErlModelCache;
import org.erlide.core.internal.model.root.Openable;
@@ -21,6 +20,7 @@
import org.erlide.core.model.util.ModelUtils;
import org.erlide.core.services.search.ErlideOpen;
import org.erlide.core.services.search.ErlideOpen.ExternalTreeEntry;
+import org.erlide.model.ModelPlugin;
import org.erlide.runtime.IRpcSite;
import com.ericsson.otp.erlang.OtpErlangList;
@@ -62,7 +62,7 @@ protected boolean buildStructure(final IProgressMonitor pm)
List<ExternalTreeEntry> externalIncludeTree = cache
.getExternalTree(externalIncludes);
if (externalModuleTree == null || externalIncludeTree == null) {
- final IRpcSite backend = CodeDbPlugin.getDefault().getBackend(
+ final IRpcSite backend = ModelPlugin.getDefault().getBackend(
project.getName());
System.out.println("aBACKEND FOR " + project.getName() + " IS "
+ backend);
@@ -6,13 +6,13 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.erlide.codedb.CodeDbPlugin;
import org.erlide.core.internal.model.root.Openable;
import org.erlide.core.model.ErlModelException;
import org.erlide.core.model.IParent;
import org.erlide.core.model.root.IErlExternal;
import org.erlide.core.model.util.ModelUtils;
import org.erlide.core.services.search.ErlideOpen;
+import org.erlide.model.ModelPlugin;
import org.erlide.runtime.IRpcSite;
public class ErlOtpExternalReferenceEntryList extends Openable implements
@@ -31,7 +31,7 @@ public Kind getKind() {
@Override
protected boolean buildStructure(final IProgressMonitor pm)
throws ErlModelException {
- final IRpcSite backend = CodeDbPlugin.getDefault().getBackend(
+ final IRpcSite backend = ModelPlugin.getDefault().getBackend(
ModelUtils.getProject(this).getName());
if (backend != null) {
final List<String> libList = ErlideOpen.getLibDirs(backend);
@@ -17,7 +17,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.erlide.codedb.CodeDbPlugin;
import org.erlide.core.internal.model.root.ErlMember;
import org.erlide.core.model.ErlModelException;
import org.erlide.core.model.erlang.IErlAttribute;
@@ -31,6 +30,7 @@
import org.erlide.core.model.erlang.IErlTypespec;
import org.erlide.core.model.erlang.ISourceReference;
import org.erlide.core.model.root.IErlElement;
+import org.erlide.model.ModelPlugin;
import org.erlide.runtime.IRpcSite;
import org.erlide.runtime.RuntimeHelper;
import org.erlide.utils.ErlLogger;
@@ -71,7 +71,7 @@ public int compare(final ISourceReference o1, final ISourceReference o2) {
private final RuntimeHelper helper;
public ErlParser() {
- helper = new RuntimeHelper(CodeDbPlugin.getDefault().getIdeBackend());
+ helper = new RuntimeHelper(ModelPlugin.getDefault().getIdeBackend());
}
@Override
@@ -84,9 +84,9 @@ public boolean parse(final IErlModule module, final String scannerName,
OtpErlangList forms = null;
OtpErlangList comments = null;
OtpErlangTuple res = null;
- final IRpcSite backend = CodeDbPlugin.getDefault().getIdeBackend();
+ final IRpcSite backend = ModelPlugin.getDefault().getIdeBackend();
if (initialParse) {
- final String stateDir = CodeDbPlugin.getDefault()
+ final String stateDir = ModelPlugin.getDefault()
.getStateLocation().toString();
res = ErlideNoparse.initialParse(backend, scannerName, path,
stateDir, updateSearchServer);
Oops, something went wrong. Retry.

0 comments on commit 41f9c03

Please sign in to comment.