Merge branch 'master' into squeak4.3

(Issue #11, #92, #93, #101) Conflicts: repository/MonticelloFileTree-Core.package/MCFileTreeStSnapshotWriter.class/instance/writeDefinitions..st repository/MonticelloFileTree-Core.package/MCFileTreeStSnapshotWriter.class/methodProperties.json
dalehenrich · Aug 9, 2013 · e863ad7 · e863ad7
2 parents de0f62c + d1d5930
commit e863ad7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/...ory/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json b/...ory/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"specials" : "dkh 4/4/2012 11:27" },
 	"instance" : {
 		"fileNameForSelector:" : "dkh 02/13/2013 17:04",
-		"fileNameMapFor:" : "dkh 07/18/2013 17:11",
+		"fileNameMapFor:" : "dkh 08/08/2013 18:37",
 		"propertyFileExtension" : "dkh 07/07/2013 22:15",
 		"setFileStream:" : "dkh 4/4/2012 14:01",
 		"writeClassComment:" : "dkh 03/22/2013 11:30",

diff --git a/...celloFileTree-Core.package/MCFileTreeStSnapshotWriter.class/instance/writeDefinitions..st b/...celloFileTree-Core.package/MCFileTreeStSnapshotWriter.class/instance/writeDefinitions..st
@@ -3,7 +3,7 @@ writeDefinitions: aCollection
   | basePath extensionClasses extensionMethodDefinitions methodHolders |
   self writeBasicDefinitions: aCollection.
   basePath := 'snapshot' , self fileUtils pathNameDelimiter asString , 'classes'
-        , self fileUtils pathNameDelimiter asString.
+    , self fileUtils pathNameDelimiter asString.
   extensionClasses := OrderedCollection new.
   extensionMethodDefinitions := OrderedCollection new.
   methodHolders := self classDefinitions, self traitDefinitions..
@@ -25,8 +25,8 @@ writeDefinitions: aCollection
     extension: '.class'
     to: basePath
     do: [ :definition :classPath | self writeClassDefinition: definition to: classPath ].
-  basePath := 'snapshot' , self fileUtils pathNameDelimiter asString , 'extensions'
-    , self fileUtils pathNameDelimiter asString.
+  basePath := 'snapshot' , self fileUtils pathNameDelimiter asString
+    , 'extensions' , self fileUtils pathNameDelimiter asString.
   extensionMethodDefinitions
     do: [ :methodDefinition | 
       | methodPath |

diff --git a/...ry/MonticelloFileTree-Core.package/MCFileTreeStSnapshotWriter.class/methodProperties.json b/...ry/MonticelloFileTree-Core.package/MCFileTreeStSnapshotWriter.class/methodProperties.json
@@ -2,17 +2,11 @@
 	"class" : {
 		 },
 	"instance" : {
-		"classDefinitions" : "dkh 2/29/2012 14:36",
-		"classTraitDefinitions" : "topa 7/22/2013 13:50",
-		"methodDefinitions" : "dkh 2/29/2012 14:37",
-		"traitDefinitions" : "topa 7/22/2013 00:12",
-		"visitClassDefinition:" : "dkh 3/1/2012 14:52",
-		"visitClassTraitDefinition:" : "topa 7/22/2013 13:50",
-		"visitMethodDefinition:" : "dkh 3/1/2012 14:53",
-		"visitTraitDefinition:" : "topa 7/22/2013 00:18",
-		"writeClassDefinition:to:" : "dkh 2/29/2012 16:51",
-		"writeClassTraitDefinition:to:" : "topa 7/22/2013 13:38",
-		"writeDefinitions:" : " 08/08/2013 16:07",
-		"writeMethodDefinition:to:" : "dkh 2/29/2012 16:48",
-		"writeMethodHolderDefinitions:extension:to:do:" : "topa 7/22/2013 13:54",
-		"writeTraitDefinition:to:" : "topa 7/22/2013 00:19" } }
+		"classDefinitions" : "dkh 4/5/2012 11:15:15",
+		"methodDefinitions" : "dkh 4/5/2012 11:15:15",
+		"visitClassDefinition:" : "dkh 4/5/2012 11:15:15",
+		"visitMethodDefinition:" : "dkh 4/5/2012 11:15:15",
+		"writeClassDefinition:to:" : "dkh 4/5/2012 11:15:15",
+		"writeDefinitions:" : "dkh 08/08/2013 18:34",
+		"writeMethodDefinition:to:" : "dkh 4/5/2012 11:15:15",
+		"writeMethodHolderDefinitions:extension:to:do:" : " 08/08/2013 15:40" } }