Permalink
Browse files

Rename scalariform.core -> scalariform

  • Loading branch information...
1 parent 5160383 commit 88b2adee2952dfad0898fb30df5f3f6cab40b216 @mdr mdr committed Jul 17, 2010
Showing with 25 additions and 22 deletions.
  1. +1 −1 corpusscan/.classpath
  2. +1 −1 gui/.classpath
  3. +2 −3 pom.xml
  4. +2 −2 project/build.properties
  5. +1 −1 project/build/Project.scala
  6. +1 −1 scalariform.eclipse/META-INF/MANIFEST.MF
  7. +3 −3 scalariform.eclipse/pom.xml
  8. +1 −1 scalariform.feature/feature.xml
  9. +1 −1 scalariform.feature/pom.xml
  10. +1 −1 scalariform.update/pom.xml
  11. 0 {scalariform.core → scalariform}/.classpath
  12. +1 −1 {scalariform.core → scalariform}/.project
  13. +1 −1 {scalariform.core → scalariform}/META-INF/MANIFEST.MF
  14. 0 {scalariform.core → scalariform}/build.properties
  15. +3 −3 {scalariform.core → scalariform}/pom.xml
  16. +4 −0 scalariform/project/build.properties
  17. 0 ...lariform.core → scalariform}/src/main/scala/scalariform/commandline/CommandLineOptionParser.scala
  18. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/commandline/Main.scala
  19. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/AnnotationFormatter.scala
  20. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/ExprFormatter.scala
  21. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/FormatResult.scala
  22. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/FormatterDirectiveParser.scala
  23. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/FormatterState.scala
  24. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/ScalaFormatter.scala
  25. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/SpecificFormatter.scala
  26. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/TemplateFormatter.scala
  27. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/TypeFormatter.scala
  28. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/formatter/XmlFormatter.scala
  29. 0 ...core → scalariform}/src/main/scala/scalariform/formatter/preferences/IFormattingPreferences.scala
  30. 0 ...m.core → scalariform}/src/main/scala/scalariform/formatter/preferences/PreferenceDescriptor.scala
  31. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/HiddenTokens.scala
  32. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/Keywords.scala
  33. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/Lexer.scala
  34. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/NewlineInferencer.scala
  35. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/ScalaLexer.scala
  36. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/ScalaLexerException.scala
  37. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/ScalaLexerReader.scala
  38. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala
  39. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/Token.scala
  40. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/Tokens.scala
  41. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/UnicodeEscapeReader.scala
  42. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/WhitespaceAndCommentsGrouper.scala
  43. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/lexer/XmlLexer.scala
  44. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/parser/AstNodes.scala
  45. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/parser/ScalaCombinatorParser.scala
  46. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/parser/ScalaParserException.scala
  47. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/utils/BooleanLang.scala
  48. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/utils/CaseClassReflector.scala
  49. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/utils/TextEdits.scala
  50. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/utils/Trimmed.scala
  51. 0 {scalariform.core → scalariform}/src/main/scala/scalariform/utils/Utils.scala
  52. 0 ...rm.core → scalariform}/src/test/scala/scalariform/formatter/AbstractExpressionFormatterTest.scala
  53. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/AbstractFormatterTest.scala
  54. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/BlockExprFormatterTest.scala
  55. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/CaseClausesFormatterTest.scala
  56. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/DefOrDclFormatterTest.scala
  57. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/ForExprFormatterTest.scala
  58. 0 ...iform.core → scalariform}/src/test/scala/scalariform/formatter/FormatterDirectiveParserTest.scala
  59. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/IfExprFormatterTest.scala
  60. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/ImportFormatterTest.scala
  61. 0 ...riform.core → scalariform}/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala
  62. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/PackageFormatterTest.scala
  63. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/TemplateFormatterTest.scala
  64. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/TryExprFormatterTest.scala
  65. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/TypeFormatterTest.scala
  66. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/formatter/WhileExprFormatterTest.scala
  67. 0 ...ariform.core → scalariform}/src/test/scala/scalariform/formatter/XmlExpressionFormatterTest.scala
  68. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/lexer/ScalaLexerTest.scala
  69. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/utils/TextEditTest.scala
  70. 0 {scalariform.core → scalariform}/src/test/scala/scalariform/utils/TrimmedTest.scala
  71. +2 −2 scripts/version-list.txt
View
@@ -4,7 +4,7 @@
<classpathentry kind="con" path="sbt.eclipse.CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/scalariform.core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/scalariform"/>
<classpathentry kind="lib" path="lib_managed/scala_2.8.0.RC6/compile/commons-io-1.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -4,7 +4,7 @@
<classpathentry kind="con" path="sbt.eclipse.CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/scalariform.core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/scalariform"/>
<classpathentry kind="lib" path="lib_managed/scala_2.8.0.RC6/compile/miglayout-3.7.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.github.mdr</groupId>
+ <groupId>org.scalariform</groupId>
<artifactId>scalariform.parent</artifactId>
<version>0.0.5-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -13,8 +13,7 @@
<encoding>UTF-8</encoding>
</properties>
<modules>
- <module>scalariform.core</module>
-<!-- <module>scalariform.eclipse</module> -->
+ <module>scalariform</module>
<module>scalariform.feature</module>
<module>scalariform.update</module>
</modules>
View
@@ -1,9 +1,9 @@
#Project properties
-#Thu Jul 15 13:00:04 BST 2010
+#Sat Jul 17 12:34:01 BST 2010
project.organization=-
project.name=scalariform
sbt.version=0.7.4
-project.version=0.0.5
+project.version=0.0.5-SNAPSHOT
def.scala.version=2.7.7
build.scala.versions=2.8.0
project.initialize=false
@@ -2,7 +2,7 @@ import sbt._
class Project(info: ProjectInfo) extends ParentProject(info) {
- lazy val main = project("scalariform.core", "scalariform.core", new CoreProject(_))
+ lazy val main = project("scalariform", "scalariform", new CoreProject(_))
lazy val gui = project("gui", "gui", new GuiProject(_), main)
lazy val corpusScan = project("corpusscan", "corpusscan", new CorpusScanProject(_), main)
@@ -4,7 +4,7 @@ Bundle-Name: Scalariform for Eclipse
Bundle-SymbolicName: scalariform.eclipse;singleton:=true
Bundle-Version: 0.0.5.qualifier
Require-Bundle:
- scalariform.core,
+ scalariform,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.jdt.core,
@@ -4,16 +4,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>scalariform.parent</artifactId>
- <groupId>com.github.mdr</groupId>
+ <groupId>org.scalariform</groupId>
<version>0.0.5-SNAPSHOT</version>
</parent>
- <groupId>com.github.mdr</groupId>
+ <groupId>org.scalariform</groupId>
<artifactId>scalariform.eclipse</artifactId>
<version>0.0.5-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
<dependency>
- <groupId>com.github.mdr</groupId>
+ <groupId>org.scalariform</groupId>
<artifactId>core</artifactId>
<version>0.0.5-SNAPSHOT</version>
</dependency>
@@ -56,7 +56,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
unpack="false"/>
-->
<plugin
- id="scalariform.core"
+ id="scalariform"
download-size="0"
install-size="0"
version="0.0.0"
@@ -8,7 +8,7 @@
<version>0.0.5-SNAPSHOT</version>
<parent>
<artifactId>scalariform.parent</artifactId>
- <groupId>com.github.mdr</groupId>
+ <groupId>org.scalariform</groupId>
<version>0.0.5-SNAPSHOT</version>
</parent>
</project>
@@ -8,7 +8,7 @@
<version>0.0.5-SNAPSHOT</version>
<parent>
<artifactId>scalariform.parent</artifactId>
- <groupId>com.github.mdr</groupId>
+ <groupId>org.scalariform</groupId>
<version>0.0.5-SNAPSHOT</version>
</parent>
</project>
File renamed without changes.
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>scalariform.core</name>
+ <name>scalariform</name>
<comment>scalariform 0.1</comment>
<projects>
</projects>
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Scalariform
-Bundle-SymbolicName: scalariform.core
+Bundle-SymbolicName: scalariform
Bundle-Version: 0.0.5.qualifier
Require-Bundle:
org.scala-ide.scala.library
File renamed without changes.
@@ -2,13 +2,13 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.github.mdr</groupId>
- <artifactId>scalariform.core</artifactId>
+ <groupId>org.scalariform</groupId>
+ <artifactId>scalariform</artifactId>
<version>0.0.5-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
<artifactId>scalariform.parent</artifactId>
- <groupId>com.github.mdr</groupId>
+ <groupId>org.scalariform</groupId>
<version>0.0.5-SNAPSHOT</version>
</parent>
<dependencies>
@@ -0,0 +1,4 @@
+#Project properties
+#Sat Jul 17 12:32:14 BST 2010
+project.name=scalariform
+project.version=0.0.5.SNAPSHOT
View
@@ -1,11 +1,11 @@
project/build.properties
pom.xml
scalariform.eclipse/pom.xml
-scalariform.core/pom.xml
+scalariform/pom.xml
scalariform.feature/pom.xml
scalariform.update/pom.xml
docs/source/conf.py
-scalariform.core/META-INF/MANIFEST.MF
+scalariform/META-INF/MANIFEST.MF
scalariform.eclipse/META-INF/MANIFEST.MF
scalariform.feature/feature.xml
scalariform.update/site.xml

0 comments on commit 88b2ade

Please sign in to comment.