MCVersionReader.st
changeset 198 ea2870255a06
parent 139 7c60597c94cb
child 285 7ea5fed29116
--- a/MCVersionReader.st	Sat Aug 20 13:42:04 2011 +0200
+++ b/MCVersionReader.st	Sat Aug 20 13:42:10 2011 +0200
@@ -12,11 +12,12 @@
 
 loadVersionStream: stream fromDirectory: directory
 	| version |
-	version _ self versionFromStream: stream.
+	version := self versionFromStream: stream.
 	directory isRemoteDirectory ifFalse: [
 	version workingCopy repositoryGroup addRepository:
 		(MCDirectoryRepository new directory: directory). ].
 	version load.
+
 !
 
 mergeVersionStream: stream
@@ -71,27 +72,28 @@
 
 initialize
         "MCVersionReader initialize"
-
-        Smalltalk isSmalltalkX ifTrue:[
-        ] ifFalse:[
-            Smalltalk 
+        "
+        Smalltalk 
                 at: #MczInstaller
                 ifPresent: [:installer | FileList unregisterFileReader: installer].
-            self concreteSubclasses do: [:aClass | FileList registerFileReader: aClass].
+        self concreteSubclasses do: [:aClass | FileList registerFileReader: aClass].
+        "
+        "get rid of AnObsoleteMCMcReader and AnObsoleteMCMcvReader"
+        "(FileList registeredFileReaderClasses  select: [ :ea | ea isObsolete ]) do: 
+                [ :ea | FileList unregisterFileReader: ea ]
+        "
 
-            "get rid of AnObsoleteMCMcReader and AnObsoleteMCMcvReader"
-            (FileList registeredFileReaderClasses  select: [ :ea | ea isObsolete ]) do: 
-                [ :ea | FileList unregisterFileReader: ea ]
-        ].
+    "Modified: / 20-10-2010 / 12:02:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 loadVersionFile: fileName
 	| version |
-	version _ self versionFromFile: fileName.
+	version := self versionFromFile: fileName.
 	version workingCopy repositoryGroup addRepository:
 		(MCDirectoryRepository new directory:
 			(FileDirectory on: (FileDirectory dirPathFor: fileName))).
 	version load.
+
 !
 
 mergeVersionFile: fileName
@@ -117,7 +119,7 @@
 
 file: fileName streamDo: aBlock
 	| file |
-	^ 	[file _ FileStream readOnlyFileNamed: fileName.
+	^ 	[file := FileStream readOnlyFileNamed: fileName.
 		aBlock value: file]
 			ensure: [file close]
 !
@@ -138,12 +140,6 @@
 	^ (self on: aStream) info
 ! !
 
-!MCVersionReader class methodsFor:'testing'!
-
-canReadFileNamed: fileName
-	^ (fileName endsWith: self extension)
-! !
-
 !MCVersionReader methodsFor:'accessing'!
 
 basicVersion
@@ -182,11 +178,6 @@
 	^ self basicVersion
 ! !
 
-!MCVersionReader methodsFor:'lifecycle'!
-
-initialize
-! !
-
 !MCVersionReader methodsFor:'loading'!
 
 loadDefinitions
@@ -207,12 +198,12 @@
 
 !MCVersionReader class methodsFor:'documentation'!
 
-version
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCVersionReader.st,v 1.2 2009-10-26 15:25:04 cg Exp $'
+version_CVS
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCVersionReader.st,v 1.3 2011-08-20 11:42:10 cg Exp $'
 !
 
-version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCVersionReader.st,v 1.2 2009-10-26 15:25:04 cg Exp $'
+version_SVN
+    ^ '§Id: MCVersionReader.st 21 2010-10-20 10:02:41Z vranyj1 §'
 ! !
 
 MCVersionReader initialize!