class: ProjectDefinition
authorStefan Vogel <sv@exept.de>
Fri, 01 Mar 2013 22:29:31 +0100
changeset 14816 545edcfa21e0
parent 14815 2e7e4a079e9f
child 14817 c166d17242cc
class: ProjectDefinition changed: #effectivePreRequisites #preRequisites_code
ProjectDefinition.st
--- a/ProjectDefinition.st	Fri Mar 01 21:24:38 2013 +0100
+++ b/ProjectDefinition.st	Fri Mar 01 22:29:31 2013 +0100
@@ -1474,8 +1474,10 @@
     |preRequisites|
 
     preRequisites := self preRequisites asOrderedSet.    "prerequisite order matters"
-    preRequisites removeAllFoundIn:self excludedFromPreRequisites.
-    preRequisites remove:self package ifAbsent:[].
+    preRequisites 
+        addAll:self includedInPreRequisites;
+        removeAllFoundIn:self excludedFromPreRequisites;
+        remove:self package ifAbsent:[].
 
     ^ preRequisites
 !
@@ -1665,14 +1667,11 @@
 
     |preRequisites searchedPreRequisites importantReason|
 
-    preRequisites := Set new.
-
     searchedPreRequisites := self searchForPreRequisites.
-    preRequisites addAll: (searchedPreRequisites keys).
-    preRequisites addAll: (self includedInPreRequisites).
-
-    preRequisites removeAllFoundIn:self excludedFromPreRequisites.
-    preRequisites remove:self package ifAbsent:[].
+    preRequisites := Set new
+        addAll: searchedPreRequisites keys;
+        removeAllFoundIn:self excludedFromPreRequisites;
+        remove:self package ifAbsent:[].
 
     ^ String streamContents:[:s |
         s nextPutLine:'preRequisites'.
@@ -2339,6 +2338,7 @@
     "Created: / 18-08-2006 / 12:51:38 / cg"
 ! !
 
+
 !ProjectDefinition class methodsFor:'description - project information'!
 
 applicationAdditionalIconFileNames
@@ -6733,11 +6733,11 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.418 2013-03-01 20:24:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.419 2013-03-01 21:29:31 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.418 2013-03-01 20:24:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.419 2013-03-01 21:29:31 stefan Exp $'
 !
 
 version_SVN