--- a/common/SCMAbstractPackageWorkingCopy.st	Thu Dec 17 12:16:18 2020 +0000
+++ b/common/SCMAbstractPackageWorkingCopy.st	Fri Jan 29 08:49:31 2021 +0000
@@ -1,7 +1,7 @@
 "
 stx:libscm - a new source code management library for Smalltalk/X
 Copyright (C) 2012-2015 Jan Vrany
-Copyright (C) 2020 LabWare
+Copyright (C) 2020-2021 LabWare
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@
 "
 stx:libscm - a new source code management library for Smalltalk/X
 Copyright (C) 2012-2015 Jan Vrany
-Copyright (C) 2020 LabWare
+Copyright (C) 2020-2021 LabWare
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -493,13 +493,14 @@
      Takes care about Java extensions, as they are filed out separately
      in per-classe .st file in <package dir>/java/extensions/<package>/<java classname>.st"
 
-    | stream nonJavaExtensionsMethod javaExtensionsMethods |
+    | stream nonJavaExtensionsMethods javaExtensionsMethods |
 
+    extensionMethods do:[:each|each makeLocalStringSource].
 
     stream := self containerWriteStreamForExtensions: lang.
     [
-        nonJavaExtensionsMethod := extensionMethods reject:[:each|each mclass theNonMetaclass isJavaClass].
-        self fileOutExtensions: nonJavaExtensionsMethod on: stream language: lang.
+        nonJavaExtensionsMethods := extensionMethods reject:[:each|each mclass theNonMetaclass isJavaClass].
+        self fileOutExtensions: nonJavaExtensionsMethods on: stream language: lang.
     ] ensure:[
         stream close
     ].
@@ -526,16 +527,13 @@
 
 fileOutExtensions: extensionMethods on:stream language: language
 
-    extensionMethods do:[:each|each makeLocalStringSource].
-
-    "Special hack for Smalltalk - use SourceCodeManager routine"
+    "/ Special hack for Smalltalk - use SourceCodeManager routine
     (language isSmalltalk and:[extensionMethods allSatisfy:[:m|m mclass theNonMetaclass isJavaClass not]]) ifTrue:[
         self manager fileOutSourceCodeExtensions: extensionMethods package: self name on: stream.
         ^self.
     ].
 
     "/ Generic fileout "
-
     language sourceFileWriterClass new
         fileOutPackageDefinition: self name on: stream;
         fileOutMethods: extensionMethods on: stream
@@ -543,6 +541,7 @@
     "Modified: / 15-06-2009 / 11:55:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Created: / 30-12-2009 / 19:01:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 16-12-2012 / 13:08:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-01-2021 / 08:40:40 / Jan Vrany <jan.vrany@labware.com>"
 ! !
 
 !SCMAbstractPackageWorkingCopy methodsFor:'initialization'!