AbstractSourceCodeManager.st
changeset 2975 90f3c278d6d8
parent 2937 227e7043831a
child 2979 ca2676ba02a1
--- a/AbstractSourceCodeManager.st	Tue Nov 06 18:48:56 2012 +0100
+++ b/AbstractSourceCodeManager.st	Wed Nov 07 17:30:33 2012 +0100
@@ -846,7 +846,7 @@
      methodCategoriesInOtherPackages methodCategoryInOtherPackages
      msg answer isDefaultAnswer labels actions hasUnassignedExtensions
      unassignedMethods methodCategoriesWithUnassignedMethods methodCategoryWithUnassignedMethods 
-     args|
+     args anyPackageChange|
 
     checkInClassPackageOnly := false.
 
@@ -977,21 +977,28 @@
     "/ ok, move them over
     answer == true ifTrue:[
         "/ change all method's packageID to the classes packageId
+        anyPackageChange := false.
         aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
             mthd package == PackageId noProjectID ifTrue:[
                 mthd makeLocalStringSource.
-                mthd setPackage:clsPackage
+                mthd setPackage:clsPackage.
+                anyPackageChange := true.
             ]
         ].
         aClass allPrivateClassesDo:[:eachPrivateClass |
             aClass setPackage:clsPackage.
             eachPrivateClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
-                mthd makeLocalStringSource.
-                mthd setPackage:clsPackage
+                mthd package ~= clsPackage ifTrue:[
+                    mthd makeLocalStringSource.
+                    mthd setPackage:clsPackage.
+                    anyPackageChange := true.
+                ]
             ]
         ].
-        aClass changed:#projectOrganization.
-        Smalltalk changed:#projectOrganization with:(Array with:aClass). 
+        anyPackageChange ifTrue:[
+            aClass changed:#projectOrganization.
+            Smalltalk changed:#projectOrganization with:(Array with:aClass). 
+        ].
     ].
     ^ #base
 
@@ -3801,11 +3808,11 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.302 2012-10-29 14:28:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.303 2012-11-07 16:30:33 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.302 2012-10-29 14:28:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.303 2012-11-07 16:30:33 cg Exp $'
 !
 
 version_SVN