--- a/BeeProjectSourceWriter.st	Wed Oct 17 19:47:05 2018 +0200
+++ b/BeeProjectSourceWriter.st	Wed Oct 24 11:59:44 2018 +0100
@@ -73,14 +73,7 @@
         ].
     ].  
 
-    AbstractSourceFileWriter methodSourceRewriteQuery handle:[:request |
-        | method source |
-
-        method := request method.
-        source := request source.
-        source := porter port: method.
-        request proceedWith: source.         
-    ] do:[
+    [
         classesToFileout do:[:class |
             self activityNotification:'exporting ', class name,'...'.
             writer fileOut:class on:stream withTimeStamp:false withInitialize:false withDefinition:true methodFilter:[:m | false]
@@ -95,10 +88,24 @@
                     and:[ (AbstractSourceCodeManager isVersionMethodSelector: who methodSelector) not ]
             ]
         ].
+    ] on: AbstractSourceFileWriter methodSourceRewriteQuery do:[:request |
+        | method source |
+
+        method := request method.
+        source := request source.
+        source := porter portMethod: method source: source.
+        request proceedWith: source.         
+    ] on: AbstractSourceFileWriter classSourceRewriteQuery do:[:request |
+        | klass source |
+
+        klass := request klass.
+        source := request source.
+        source := porter portClass: klass source: source.
+        request proceedWith: source.         
     ].
 
     "Created: / 14-04-2015 / 13:47:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (format): / 11-10-2018 / 20:02:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 24-10-2018 / 11:30:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fileOutExtensions: methods on:stream