diff -r 7debf39501f8 -r 7363807607d7 ProjectDefinition.st --- a/ProjectDefinition.st Wed Mar 27 13:18:12 2013 +0100 +++ b/ProjectDefinition.st Wed Mar 27 13:23:25 2013 +0100 @@ -12,11 +12,11 @@ "{ Package: 'stx:libbasic' }" Object subclass:#ProjectDefinition - instanceVariableNames:'' - classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType - PackagesBeingLoaded Verbose AbbrevDictionary AccessLock' - poolDictionaries:'' - category:'System-Support-Projects' + instanceVariableNames:'' + classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType + PackagesBeingLoaded Verbose AbbrevDictionary AccessLock' + poolDictionaries:'' + category:'System-Support-Projects' ! ProjectDefinition class instanceVariableNames:'safeForOverwrittenMethods extensionOverwriteInfo projectIsLoaded' @@ -27,10 +27,10 @@ ! Object subclass:#AbbrevEntry - instanceVariableNames:'className fileName category numClassInstVars' - classVariableNames:'' - poolDictionaries:'' - privateIn:ProjectDefinition + instanceVariableNames:'className fileName category numClassInstVars' + classVariableNames:'' + poolDictionaries:'' + privateIn:ProjectDefinition ! !ProjectDefinition class methodsFor:'documentation'! @@ -5540,7 +5540,8 @@ restoreOverwrittenExtensionMethods "after unloading, tell other packages to restore any safed reference to any method - which got overloaded by me." + which got overloaded by me. + Unfinished!!" self extensionMethodNames pairWiseDo:[:className :selector | |class oldMethod oldPackage| @@ -5563,6 +5564,12 @@ safeForOverwrittenMethods isNil ifTrue:[^ nil]. ^ safeForOverwrittenMethods at:(aClass name,'>>',aSelector) ifAbsent:nil +! + +savedOverwrittenMethods + "return my saved original methods" + + ^ safeForOverwrittenMethods ? #() ! ! !ProjectDefinition class methodsFor:'private-loading'! @@ -6896,7 +6903,8 @@ validateDescription "perform some consistency checks (set of classes in project same as those listed in description); - called before checking in build support files" + called before checking in build support files. + Somewhat obsolete: use the ProjectChecker, which does more checks" |emptyProjects nonProjects emptyOrNonProjects classesInImage classesInDescription onlyInImage onlyInDescription missingPools myPackage| @@ -6969,6 +6977,7 @@ ]. ]. ]. + missingPools notEmpty ifTrue:[ (Dialog confirm:('The following sharedpools are non-existent, or not pools:\\ ' @@ -6983,6 +6992,7 @@ ]. ]. +"/ also found by ProjectChecker... classesInImage ~= classesInDescription ifTrue:[ onlyInImage := (classesInImage reject:[:cls | classesInDescription includes:cls]). onlyInImage notEmpty ifTrue:[ @@ -6996,6 +7006,7 @@ AbortSignal raiseRequest ] ]. + "/ self validateOrderOfClasses " @@ -7118,11 +7129,11 @@ !ProjectDefinition class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.440 2013-03-27 12:17:50 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.441 2013-03-27 12:23:25 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.440 2013-03-27 12:17:50 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.441 2013-03-27 12:23:25 cg Exp $' ! version_SVN