reverted to the state before 25.3.
authorplickm1
Sun, 29 Mar 2009 19:26:37 +0000
changeset 76 f04099416924
parent 75 97ac71062964
child 77 d17c7dfb3d53
reverted to the state before 25.3.
xmlreaderimpl/trunk/XMLv2__ExpatXMLReader.so
xmlreaderimpl/trunk/XMLv2__VWXMLReader.st
xmlreaderimpl/trunk/stx_goodies_xmlsuite_xmlreaderimpl.st
Binary file xmlreaderimpl/trunk/XMLv2__ExpatXMLReader.so has changed
--- a/xmlreaderimpl/trunk/XMLv2__VWXMLReader.st	Sun Mar 29 19:07:53 2009 +0000
+++ b/xmlreaderimpl/trunk/XMLv2__VWXMLReader.st	Sun Mar 29 19:26:37 2009 +0000
@@ -81,12 +81,6 @@
     "Modified: / 06-06-2006 / 09:23:21 / janfrog"
 ! !
 
-!VWXMLReader::StreamWrapper class methodsFor:'documentation'!
-
-version
-    ^'$Id$'
-! !
-
 !VWXMLReader::StreamWrapper methodsFor:'accessing'!
 
 col
@@ -210,12 +204,6 @@
     "Modified: / 04-08-2005 / 14:54:25 / janfrog"
 ! !
 
-!VWXMLReader::XMLParser class methodsFor:'documentation'!
-
-version
-    ^'$Id$'
-! !
-
 !VWXMLReader::XMLParser class methodsFor:'utilities'!
 
 mapEncoding: anEncoding
--- a/xmlreaderimpl/trunk/stx_goodies_xmlsuite_xmlreaderimpl.st	Sun Mar 29 19:07:53 2009 +0000
+++ b/xmlreaderimpl/trunk/stx_goodies_xmlsuite_xmlreaderimpl.st	Sun Mar 29 19:26:37 2009 +0000
@@ -7,33 +7,8 @@
 	category:'* Projects & Packages *'
 !
 
-
 !stx_goodies_xmlsuite_xmlreaderimpl class methodsFor:'description'!
 
-postLoadAction
-
-    | packageDir expatXMLReaderLib |
-    packageDir := Smalltalk getPackageDirectoryForPackage: self package. 
-
-    expatXMLReaderLib := packageDir construct: 
-                                    ('XMLv2__ExpatXMLReader' , 
-                                    ObjectFileLoader sharedLibraryExtension , 
-                                    '.' , Smalltalk versionString).
-    expatXMLReaderLib exists ifFalse:
-        [expatXMLReaderLib := packageDir construct: 
-                                        ('XMLv2__ExpatXMLReader' , 
-                                        ObjectFileLoader sharedLibraryExtension)].
-    expatXMLReaderLib exists ifTrue:
-        [Transcript showCR:'Loading precompiled ExpatXMLReader class from: ' , expatXMLReaderLib nameString.
-        ObjectFileLoader loadObjectFile: expatXMLReaderLib nameString].
-
-    "
-        self postLoadAction   
-    "
-
-    "Modified: / 25-03-2009 / 13:46:27 / Martin Plicka <plickm1@fel.cvut.cz>"
-!
-
 preLoadAction
 	ObjectFileLoader searchedLibraries:
 	        (ObjectFileLoader searchedLibraries asOrderedCollection
@@ -41,14 +16,28 @@
 			yourself) asArray
 
 !
+postLoadAction
+
+    | expatXMLReaderLibName expatXMLReaderLib |
+    expatXMLReaderLibName := 'XMLv2__ExpatXMLReader' , 
+                                ObjectFileLoader sharedLibraryExtension.
+    expatXMLReaderLib :=
+        (Smalltalk getPackageDirectoryForPackage: self package) 
+            construct: expatXMLReaderLibName.
+    expatXMLReaderLib exists 
+        ifTrue:[ObjectFileLoader loadObjectFile: expatXMLReaderLib nameString].
+
+!
 
 preRequisites
     ^ #(
         #'stx:goodies/xml/vw'    "XML::XMLParser - superclass of XMLv2::VWXMLReader::XMLParser "
-        #'stx:goodies/xmlsuite/core'    "XMLv2::XMLReader - superclass of XMLv2::VWXMLReader "
+        #'stx:goodies/xmlsuite/core'    "XMLv2::XMLReader - superclass of XMLv2::ExpatXMLReader "
         #'stx:libbasic'    "Object - superclass of XMLv2::VWXMLReader "
         #'stx:libcomp'    "ObjectFileLoader - referenced by stx_goodies_xmlsuite_xmlreaderimpl class>>preLoadAction "
     )
+
+    "Modified: / 02-06-2008 / 22:37:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !stx_goodies_xmlsuite_xmlreaderimpl class methodsFor:'description - contents'!
@@ -56,7 +45,7 @@
 classNamesAndAttributes
     ^ #(
         "<className> or (<className> attributes...) in load order"
-        #'XMLv2::ExpatXMLReader'
+        (#'XMLv2::ExpatXMLReader' autoload)
         #'XMLv2::VWSAXBuilder'
         #'XMLv2::VWXMLReader'
         #'stx_goodies_xmlsuite_xmlreaderimpl'
@@ -94,8 +83,3 @@
     ^ 'Smalltalk/X'
 ! !
 
-!stx_goodies_xmlsuite_xmlreaderimpl class methodsFor:'documentation'!
-
-version
-    ^'$Id$'
-! !