hg/stx-libtool2: comparison ProjectBrowser.st

equal deleted inserted replaced

-:e88edf4a8cbe
+:df7d7c6611b6
 	poolDictionaries:''
 	category:'Interface-Smalltalk'
 !
 TreeItemWithImage subclass:#ProjectTreeItem
-	instanceVariableNames:'action spec'
+	instanceVariableNames:'action spec info'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:ProjectBrowser
 !
 ifAbsentPut:[(Depth4Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@DH@@@@@@@@4QA@@@@@@@TQDPP@@@@@@MDQDH@@@@@@PQDQA@@@@@@LTQA@@@@@@M@I@L@@@@@EDPQD@@@@@@CQDIB@@@@@@DDQDPP@@@@@CEDPP@@@@@@@BPC@@@@@@@@DQ@@@@@@@@@B@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 0 0 132 132 0 0 132 0 132 255 0 255]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'B@@\@C8@_0A? C?@G<@? G<@_8@?0A?@C8@G@@H@@@@b') ; yourself); yourself]
 !
+prerequisiteClassesIcon
+<resource: #programImage>
+^ self classesIcon
+!
+prerequisiteProjectsIcon
+<resource: #programImage>
+^ self projectsIcon
+!
 prerequisitesIcon
 "This resource specification was automatically generated
 by the ImageEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 ^Icon
 constantNamed:#'ProjectBrowser prerequisitesIcon'
 ifAbsentPut:[(Depth4Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@A8@D(@RPA80@C@^@=HRT/)^D$@C7#@RLAI@G(@@@@b') ; yourself); yourself]
 "Modified: / 23.3.1999 / 14:28:11 / cg"
-! !
+!
+projectsIcon
+"This resource specification was automatically generated
+by the ImageEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the ImageEditor may not be able to read the specification."
+"
+self projectsIcon inspect
+ImageEditor openOnClass:self andSelector:#projectsIcon
+"
+<resource: #image>
+^Icon
+constantNamed:#'ProjectBrowser projectsIcon'
+ifAbsentPut:[(Depth4Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@@@@@@@@@"H"H"@@@@@"H"H"@ @@@"H"H"@"@@@@@@@@@"H@@BH"H"HBH @@H"H"H H"@@@"H"H"@"H@@BH"H"HBH @@H"H"H H @@@"H"H"@ @@@BH"H"H@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 0 0 132 255 128 128]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@G? ?>G?8??''?>_?9??''?>_?9??G?8_?A?8@@@@@@b') ; yourself); yourself]! !
 !ProjectBrowser class methodsFor:'interface specs'!
 emptyRightCanvasSpec
 "This resource specification was automatically generated
 )
 )
 )
 !
-rightCanvasSpecForPrerequisites
+rightCanvasSpecForPrerequisiteClasses
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the UIPainter may not be able to read the specification."
 "
-UIPainter new openOnClass:ProjectBrowser andSelector:#rightCanvasSpecForPrerequisites
+UIPainter new openOnClass:ProjectBrowser andSelector:#rightCanvasSpecForPrerequisiteClasses
-ProjectBrowser new openInterface:#rightCanvasSpecForPrerequisites
+ProjectBrowser new openInterface:#rightCanvasSpecForPrerequisiteClasses
 "
 <resource: #canvas>
 ^
 #(#FullSpec
-#name: #rightCanvasSpecForPrerequisites
+#name: #rightCanvasSpecForPrerequisiteClasses
 #window:
 #(#WindowSpec
 #label: 'NewApplication'
 #name: 'NewApplication'
-#layout: #(#LayoutFrame 208 0 222 0 507 0 521 0)
+#layout: #(#LayoutFrame 216 0 173 0 515 0 472 0)
 #level: 0
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 208 222 508 522)
+#bounds: #(#Rectangle 216 173 516 473)
 #usePreferredExtent: false
 #returnIsOKInDialog: true
 #escapeIsCancelInDialog: true
 )
 #component:
 #(#SpecCollection
 #collection: #(
 #(#LabelSpec
-#label: 'Known Projects'
+#label: 'Known Classes'
 #name: 'Label1'
 #layout: #(#LayoutFrame 0 0 0 0 0 0.5 30 0)
 #translateLabel: true
 )
 #(#SequenceViewSpec
 #name: 'List1'
 #layout: #(#LayoutFrame 0 0 30 0 0 0.5 -62 1)
 #tabable: true
-#model: #selectedProjectInPrerequisites
+#model: #selectedClassInPrerequisites
 #hasHorizontalScrollBar: true
 #hasVerticalScrollBar: true
 #miniScrollerHorizontal: true
 #miniScrollerVertical: true
+#doubleClickSelector: #addClassToPrerequisites
+#valueChangeSelector: #showInfoForRequiredClass:
 #useIndex: false
-#sequenceList: #listOfAllProjectsInPrerequisites
+#sequenceList: #listOfAllClassesInPrerequisites
 )
 #(#LabelSpec
-#label: 'Prerequisites'
+#label: 'Required Classes'
 #name: 'Label2'
 #layout: #(#LayoutFrame 0 0.5 0 0 0 1 30 0)
 #translateLabel: true
 )
 #(#SequenceViewSpec
 #name: 'List2'
 #layout: #(#LayoutFrame 0 0.5 30 0 0 1 -62 1)
 #tabable: true
-#model: #selectedRequiredProjectInPrerequisites
+#model: #selectedRequiredClassInPrerequisites
 #hasHorizontalScrollBar: true
 #hasVerticalScrollBar: true
 #miniScrollerHorizontal: true
 #miniScrollerVertical: true
+#doubleClickSelector: #removeClassFromPrerequisites
+#valueChangeSelector: #showInfoForRequiredClass:
 #useIndex: false
-#sequenceList: #listOfRequiredProjectsInPrerequisites
+#sequenceList: #listOfRequiredClassesInPrerequisites
 )
 #(#HorizontalPanelViewSpec
 #name: 'HorizontalPanel2'
 #layout: #(#LayoutFrame 0 0 -62 1 0 1 -32 1)
 #horizontalLayout: #fitSpace
 #label: 'Add'
 #name: 'addButton'
 #translateLabel: true
 #resizeForLabel: false
 #tabable: true
-#model: #addToPrerequisites
+#model: #addClassToPrerequisites
+#enableChannel: #canAddSelectedClassToPrerequisites
+#actionValue: ''
+#useDefaultExtent: true
+)
+#(#ActionButtonSpec
+#label: 'Remove'
+#name: 'removeButton'
+#translateLabel: true
+#resizeForLabel: false
+#tabable: true
+#model: #removeClassFromPrerequisites
+#enableChannel: #canRemoveSelectedClassFromPrerequisites
+#actionValue: ''
+#useDefaultExtent: true
+)
+)
+)
+)
+#(#HorizontalPanelViewSpec
+#name: 'HorizontalPanel1'
+#layout: #(#LayoutFrame 0 0.0 -30 1 0 1.0 0 1.0)
+#initiallyInvisible: true
+#horizontalLayout: #fitSpace
+#verticalLayout: #center
+#horizontalSpace: 3
+#verticalSpace: 3
+#component:
+#(#SpecCollection
+#collection: #(
+#(#ActionButtonSpec
+#label: 'Cancel'
+#name: 'Button1'
+#translateLabel: true
+#tabable: true
+#model: #cancel
+#useDefaultExtent: true
+)
+#(#ActionButtonSpec
+#label: 'OK'
+#name: 'Button2'
+#translateLabel: true
+#tabable: true
+#model: #accept
+#useDefaultExtent: true
+)
+)
+)
+)
+)
+)
+)
+!
+rightCanvasSpecForPrerequisiteProjects
+"This resource specification was automatically generated
+by the UIPainter of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIPainter may not be able to read the specification."
+"
+UIPainter new openOnClass:ProjectBrowser andSelector:#rightCanvasSpecForPrerequisiteProjects
+ProjectBrowser new openInterface:#rightCanvasSpecForPrerequisiteProjects
+"
+<resource: #canvas>
+^
+#(#FullSpec
+#name: #rightCanvasSpecForPrerequisiteProjects
+#window:
+#(#WindowSpec
+#label: 'NewApplication'
+#name: 'NewApplication'
+#layout: #(#LayoutFrame 216 0 173 0 515 0 472 0)
+#level: 0
+#min: #(#Point 10 10)
+#max: #(#Point 1280 1024)
+#bounds: #(#Rectangle 216 173 516 473)
+#usePreferredExtent: false
+#returnIsOKInDialog: true
+#escapeIsCancelInDialog: true
+)
+#component:
+#(#SpecCollection
+#collection: #(
+#(#LabelSpec
+#label: 'Known Projects'
+#name: 'Label1'
+#layout: #(#LayoutFrame 0 0 0 0 0 0.5 30 0)
+#translateLabel: true
+)
+#(#SequenceViewSpec
+#name: 'List1'
+#layout: #(#LayoutFrame 0 0 30 0 0 0.5 -62 1)
+#tabable: true
+#model: #selectedProjectInPrerequisites
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
+#doubleClickSelector: #addProjectToPrerequisites
+#useIndex: false
+#sequenceList: #listOfAllProjectsInPrerequisites
+)
+#(#LabelSpec
+#label: 'Prerequisites'
+#name: 'Label2'
+#layout: #(#LayoutFrame 0 0.5 0 0 0 1 30 0)
+#translateLabel: true
+)
+#(#SequenceViewSpec
+#name: 'List2'
+#layout: #(#LayoutFrame 0 0.5 30 0 0 1 -62 1)
+#tabable: true
+#model: #selectedRequiredProjectInPrerequisites
+#hasHorizontalScrollBar: true
+#hasVerticalScrollBar: true
+#miniScrollerHorizontal: true
+#miniScrollerVertical: true
+#doubleClickSelector: #removeProjectFromPrerequisites
+#useIndex: false
+#sequenceList: #listOfRequiredProjectsInPrerequisites
+)
+#(#HorizontalPanelViewSpec
+#name: 'HorizontalPanel2'
+#layout: #(#LayoutFrame 0 0 -62 1 0 1 -32 1)
+#horizontalLayout: #fitSpace
+#verticalLayout: #center
+#horizontalSpace: 3
+#verticalSpace: 3
+#component:
+#(#SpecCollection
+#collection: #(
+#(#ActionButtonSpec
+#label: 'Add'
+#name: 'addButton'
+#translateLabel: true
+#resizeForLabel: false
+#tabable: true
+#model: #addProjectToPrerequisites
 #enableChannel: #canAddSelectedProjectToPrerequisites
 #actionValue: ''
 #useDefaultExtent: true
 )
 #(#ActionButtonSpec
 #label: 'Remove'
 #name: 'removeButton'
 #translateLabel: true
 #resizeForLabel: false
 #tabable: true
-#model: #removeFromPrerequisites
+#model: #removeProjectFromPrerequisites
 #enableChannel: #canRemoveSelectedProjectFromPrerequisites
 #actionValue: ''
 #useDefaultExtent: true
 )
 )
 )
 )
 #(#HorizontalPanelViewSpec
 #name: 'HorizontalPanel1'
 #layout: #(#LayoutFrame 0 0.0 -30 1 0 1.0 0 1.0)
+#initiallyInvisible: true
 #horizontalLayout: #fitSpace
 #verticalLayout: #center
 #horizontalSpace: 3
 #verticalSpace: 3
 #component:
 ) nil
 nil
 )
 !
+prerequisiteClassesItemMenu
+"This resource specification was automatically generated
+by the MenuEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the MenuEditor may not be able to read the specification."
+"
+MenuEditor new openOnClass:ProjectBrowser andSelector:#prerequisiteClassesItemMenu
+(Menu new fromLiteralArrayEncoding:(ProjectBrowser prerequisiteClassesItemMenu)) startUp
+"
+<resource: #menu>
+^
+#(#Menu
+#(
+#(#MenuItem
+#label: 'Update'
+#translateLabel: true
+#value: #updateListOfRequiredPrerequisiteClasses
+#enabled: #hasClassesSelectedHolder
+)
+)
+nil
+nil
+)
+!
 projectItemMenu
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 #(
 #(#MenuItem
 #label: 'Make Current'
 #translateLabel: true
 #value: #makeCurrentProject
+#enabled: #hasProjectSelectedHolder
+)
+#(#MenuItem
+#label: 'Inspect'
+#translateLabel: true
+#value: #inspectCurrentProject
 #enabled: #hasProjectSelectedHolder
 )
 #(#MenuItem
 #label: '-'
 )
 ].
 SystemBrowser openInClass:cls selector:nil.
 !
+canAddSelectedClassToPrerequisites
+|holder|
+(holder := builder bindingAt:#canAddSelectedClassToPrerequisites) isNil ifTrue:[
+holder := BlockValue
+with:[:m | self canAddClassToPrerequisites:m]
+argument:(self selectedClassInPrerequisites).
+builder aspectAt:#canAddSelectedClassToPrerequisites put:holder.
+].
+^ holder.
+"Created: / 23.3.1999 / 14:18:05 / cg"
+!
 canAddSelectedProjectToPrerequisites
 |holder|
 (holder := builder bindingAt:#canAddSelectedProjectToPrerequisites) isNil ifTrue:[
 holder := BlockValue
-with:[:m | self canAddToPrerequisites:m]
+with:[:m | self canAddProjectToPrerequisites:m]
 argument:(self selectedProjectInPrerequisites).
 builder aspectAt:#canAddSelectedProjectToPrerequisites put:holder.
+].
+^ holder.
+"Created: / 23.3.1999 / 14:18:05 / cg"
+!
+canRemoveSelectedClassFromPrerequisites
+|holder|
+(holder := builder bindingAt:#canRemoveSelectedClassFromPrerequisites) isNil ifTrue:[
+holder := BlockValue with:[:m | m notNil] argument:(self selectedRequiredClassInPrerequisites).
+builder aspectAt:#canRemoveSelectedClassFromPrerequisites put:holder.
 ].
 ^ holder.
 "Created: / 23.3.1999 / 14:18:05 / cg"
 !
 ^ holder.
 "Created: / 23.3.1999 / 14:18:05 / cg"
 !
+listOfAllClassesInPrerequisites
+|holder classes|
+(holder := builder bindingAt:#listOfAllClassesInPrerequisites) isNil ifTrue:[
+builder aspectAt:#listOfAllClassesInPrerequisites put:(holder := SortedCollection new asValue).
+"/ all unloaded classes and classes which where
+"/ loaded are candidates.
+classes := Smalltalk allClasses
+select:[:cls |
+cls isMeta not
+and:[
+cls isLoaded not
+or:[cls wasAutoloaded]]
+].
+"/ mark currently loaded classes as bold;
+"/ LATER: those which are superclasses of any of my classes bold-red.
+classes := classes collect:[:cls | |nm|
+nm := cls name.
+cls isLoaded ifTrue:[
+nm := nm asText allBold.
+].
+nm
+].
+holder value addAll:classes.
+self currentProject wasLoadedFromFile ifFalse:[
+self updateListOfRequiredPrerequisiteClasses.
+]
+].
+^ holder.
+"Created: / 23.3.1999 / 14:18:05 / cg"
+!
 listOfAllProjectsInPrerequisites
 "automatically generated by UIPainter ..."
 |holder projects currentProject|
 (holder := builder bindingAt:#listOfAllProjectsInPrerequisites) isNil ifTrue:[
-builder aspectAt:#listOfAllProjectsInPrerequisites put:(holder := List new).
+builder aspectAt:#listOfAllProjectsInPrerequisites put:(holder := SortedCollection new asValue).
 currentProject := self currentProject.
 projects := Set new.
 Project allInstancesDo:[:p |
 (p ~~ currentProject
 and:[p ~~ Project defaultProject]) ifTrue:[
 projects add:p name.
 ]
 ].
-projects := projects asOrderedCollection sort.
+holder value addAll:projects.
-holder addAll:projects.
+].
+^ holder.
+"Created: / 23.3.1999 / 14:18:05 / cg"
+!
+listOfRequiredClassesInPrerequisites
+"automatically generated by UIPainter ..."
+|holder|
+(holder := builder bindingAt:#listOfRequiredClassesInPrerequisites) isNil ifTrue:[
+builder aspectAt:#listOfRequiredClassesInPrerequisites put:(holder := SortedCollection new asValue).
+self currentProject wasLoadedFromFile ifFalse:[
+self updateListOfRequiredPrerequisiteClasses.
+]
 ].
 ^ holder.
 "Created: / 23.3.1999 / 14:18:05 / cg"
 !
 "automatically generated by UIPainter ..."
 |holder|
 (holder := builder bindingAt:#listOfRequiredProjectsInPrerequisites) isNil ifTrue:[
-builder aspectAt:#listOfRequiredProjectsInPrerequisites put:(holder := List new).
+builder aspectAt:#listOfRequiredProjectsInPrerequisites put:(holder := SortedCollection new asValue).
 ].
 ^ holder.
 "Created: / 23.3.1999 / 14:18:05 / cg"
 !
 builder aspectAt:#rightCanvasTextHolder put:(holder :=  ValueHolder new).
 ].
 ^ holder.
 !
+selectedClassInPrerequisites
+"automatically generated by UIPainter ..."
+|holder|
+(holder := builder bindingAt:#selectedClassInPrerequisites) isNil ifTrue:[
+builder aspectAt:#selectedClassInPrerequisites put:(holder := ValueHolder new).
+].
+^ holder.
+"Created: / 23.3.1999 / 14:18:05 / cg"
+!
 selectedProjectInPrerequisites
 "automatically generated by UIPainter ..."
 |holder|
 (holder := builder bindingAt:#selectedProjectInPrerequisites) isNil ifTrue:[
 builder aspectAt:#selectedProjectInPrerequisites put:(holder := ValueHolder new).
+].
+^ holder.
+"Created: / 23.3.1999 / 14:18:05 / cg"
+!
+selectedRequiredClassInPrerequisites
+"automatically generated by UIPainter ..."
+|holder|
+(holder := builder bindingAt:#selectedRequiredClassInPrerequisites) isNil ifTrue:[
+builder aspectAt:#selectedRequiredClassInPrerequisites put:(holder := ValueHolder new).
 ].
 ^ holder.
 "Created: / 23.3.1999 / 14:18:05 / cg"
 !
 ^ self class classesItemMenu
 ].
 self hasClassNodeSelected ifTrue:[
 ^ self class classItemMenu
 ].
+self hasPrerequisiteClassesNodeSelected ifTrue:[
+^ self class prerequisiteClassesItemMenu
+].
 ^ nil
 !
 itemMenuHolder
 ^ [ self itemMenu]
 ^ self
 ! !
 !ProjectBrowser methodsFor:'private'!
-canAddToPrerequisites:aProjectName
+canAddClassToPrerequisites:aClassName
+^ aClassName notNil
+!
+canAddProjectToPrerequisites:aProjectName
 ^ aProjectName notNil
 and:[aProjectName ~= self currentProject name]
 !
 canLoadClassesFromDirectory
 ].
 ^ nil
 !
+currentProjectsClassNames
+|p|
+p := self currentProject.
+^ (p classes ? #())
+collect:[:classOrSymbol |
+classOrSymbol isSymbol
+ifTrue:[classOrSymbol]
+ifFalse:[Smalltalk at:classOrSymbol asSymbol ifAbsent:[classOrSymbol]]
+]
+!
 hasClassNodeSelected
 |selectedNode|
 selectedNode := self selectedTreeNode.
 selectedNode isNil ifTrue:[^ false].
 !
 hasNodeSelected
 ^ self selectedTreeNode notNil
+!
+hasPrerequisiteClassesNodeSelected
+|selectedNode|
+selectedNode := self selectedTreeNode.
+selectedNode isNil ifTrue:[^ false].
+^ selectedNode contents == #prerequisiteClasses
 !
 hasProjectNodeSelected
 |selectedNode|
 |projectName pNode
 propertiesNode docNode classesNode patchesNode subprojectsNode filesNode
 commentNode prerequisitesNode analysisNode designNode codeNode
 userDocNode userOverViewNode userGuideNode userRefManNode
-deploymentNode classIcon|
+deploymentNode classIcon
+prerequisiteProjectsNode prerequisiteClassesNode|
 projectName := aProject name.
 pNode := ProjectNode name:projectName.
 pNode contents:aProject.
 ].
 ].
 commentNode icon:(self class commentIcon).
 commentNode action:[:item | self showCommentOf:item].
+commentNode info:'Some comment describing the project'.
 commentNode contents:#comment.
 docNode notNil ifTrue:[
 docNode contents:#documentation.
 docNode action:[:item | self showDocumentationFor:item].
 userDocNode add:(userRefManNode := ProjectTreeItem name:'Reference').
 docNode add:(userDocNode := ProjectTreeItem name:'Error Reports').
 docNode add:(userDocNode := ProjectTreeItem name:'Other').
 ].
-prerequisitesNode contents:#prerequisites.
 prerequisitesNode icon:(self class prerequisitesIcon).
-prerequisitesNode spec:[self class rightCanvasSpecForPrerequisites].
+prerequisitesNode add:(prerequisiteProjectsNode := ProjectTreeItem name:'Projects').
+prerequisitesNode add:(prerequisiteClassesNode := ProjectTreeItem name:'Classes').
+prerequisitesNode info:'Other projects and classes required by the project'.
+prerequisiteProjectsNode contents:#prerequisiteProjects.
+prerequisiteProjectsNode icon:(self class prerequisiteProjectsIcon).
+prerequisiteProjectsNode spec:[self class rightCanvasSpecForPrerequisiteProjects].
+prerequisiteProjectsNode info:'Other projects required by the project'.
+prerequisiteClassesNode contents:#prerequisiteClasses.
+prerequisiteClassesNode icon:(self class prerequisiteClassesIcon).
+prerequisiteClassesNode spec:[self class rightCanvasSpecForPrerequisiteClasses].
+prerequisiteClassesNode info:'Other (autoloaded-) classes required by the project'.
 classIcon := self class classIcon.
 classesNode contents:#classes.
 classesNode icon:(self class classesIcon).
+classesNode info:'Classes contained in the project'.
 ((aProject classes ? #()) copy sort:[:a :b |
 |nmA nmB|
 nmA := a isSymbol ifTrue:[a] ifFalse:[a name].
 nmB := b isSymbol ifTrue:[b] ifFalse:[b name].
 cNode contents:(#class -> aClass).
 cNode icon:classIcon.
 classesNode add:cNode.
 ].
 propertiesNode contents:#properties.
 propertiesNode spec:[self class rightCanvasSpecForProperties].
+propertiesNode info:'Project propreties'.
 filesNode contents:#files.
 filesNode icon:(self class filesIcon).
+filesNode info:'Other files (bitmaps, data) contained in the project'.
 patchesNode contents:#patches.
 patchesNode icon:(self class methodsIcon).
+patchesNode info:'Patches (system-changes) contained in the project'.
 deploymentNode icon:(self class deploymentIcon).
 deploymentNode spec:[self class rightCanvasSpecForDeployment].
+deploymentNode info:'Deployment & packaging specification.'.
 ^ pNode
 "Modified: / 23.3.1999 / 14:27:30 / cg"
 !
 self deliverZipArchive value:(p propertyAt:#deliverZipArchive) ? false.
 self deliverSources value:(p propertyAt:#deliverSources) ? false.
 self deliverLoadAllFile value:(p propertyAt:#deliverLoadAllFile) ? false.
 self installDirectory value:(p propertyAt:#installDirectory) ? '/opt'.
+self listOfRequiredClassesInPrerequisites value:(p prerequisiteClasses copy sort).
 modifiedChannel value:false.
 p addDependent:self.
 ].
 p propertyAt:#deliverZipArchive put:self deliverZipArchive value.
 p propertyAt:#deliverGZipArchive put:self deliverGZipArchive value.
 p propertyAt:#deliverLoadAllFile put:self deliverLoadAllFile value.
 p propertyAt:#installDirectory put:self installDirectory value.
+p prerequisiteClasses:(self listOfRequiredClassesInPrerequisites value
+collect:[:entry | entry string asSymbol]).
 p addDependent:self.
 ].
 "Created: / 23.3.1999 / 14:16:12 / cg"
 selectorFromPatchesInfo:pInfo
 ^ pInfo methodSelector
 ! !
 !ProjectBrowser methodsFor:'user actions'!
-accept
-"save values from aspects into the project"
-self saveAspectsIntoProject.
-modifiedChannel value:false.
-!
 addClassesFromFilesInDirectory
 self addClassesFromFilesInDirectoryWithFilter:nil
 !
 "/ extract className from fileName ...
 cls := Smalltalk filenameAbbreviations keyAtValue:(f withoutSuffix baseName ).
 cls isNil ifTrue:[
 cls := f withoutSuffix baseName asSymbol.
 project defaultNameSpace notNil ifTrue:[
-cls := project defaultNameSpace name , '::' , cls
+cls := (project defaultNameSpace name , '::' , cls) asSymbol
 ]
 ].
 (aFilterBlockOrNil isNil
 or:[aFilterBlockOrNil value:cls]) ifTrue:[
 project addClass:cls classFileName:fn.
 ]
 ].
 anyChange ifTrue:[
 self updateClassListForProject:project
 ]
-!
-addToPrerequisites
-|sel|
-sel := self selectedProjectInPrerequisites value.
-self listOfRequiredProjectsInPrerequisites add:sel.
-self listOfAllProjectsInPrerequisites remove:sel.
-self selectedProjectInPrerequisites value:nil.
 !
 browseClasses
 |ns p classes nBad|
 p createLoadAllFile
 ].
 !
-cancel
+inspectCurrentProject
-"reload aspects from the project"
+"make the selected Project the current project"
-self readAspectsFromProject
+|project selectedNode|
+self hasProjectNodeSelected ifTrue:[
+selectedNode := self selectedTreeNode.
+project := selectedNode contents.
+project inspect.
+]
 !
 itemDoubleClicked:index
 |node className cls|
 item := self projectTreeHolder value at:index.
 action := item action.
 action notNil ifTrue:[
 action value:item.
 ].
+self valueOfInfoLabel value: item info
 !
 loadClassesFromDirectory
 "load all classes as contained in the project into the system"
 newNode := self nodeFor:newProject.
 projectTree add:newNode.
 self projectTreeHolder root:projectTree.
 "/    self projectTreeHolder selectNode:newNode.
 "/    self projectTreeHolder expand:newNode.
+self readAspectsFromProject.
+newProject wasLoadedFromFile ifFalse:[
+self updateListOfRequiredPrerequisiteClasses.
+]
 !
 newSubProject
 |selectedNode subProjectsNode newNode parentProject newProject|
 fn notNil ifTrue:[
 self loadFromProjectFile:fn.
 ]
 !
-removeFromPrerequisites
-|sel|
-sel := self selectedRequiredProjectInPrerequisites value.
-self listOfAllProjectsInPrerequisites add:sel.
-self listOfRequiredProjectsInPrerequisites remove:sel.
-self selectedRequiredProjectInPrerequisites value:nil.
-!
 removeProject
 |projectToRemove selectedNode subNode newNode parentNode parentProject newProject|
 self hasProjectNodeSelected ifTrue:[
 selectedNode := self selectedTreeNode.
 ]
 !
 saveProject
 |d p|
+self modifiedChannel value ifTrue:[
+(self confirm:'Changes not confirmed; save anyway ?') ifFalse:[^ self]
+].
 p := self currentProject.
 p directory isNil ifTrue:[
 d := (Dialog request:'Project Directory:').
 d size == 0 ifTrue:[
 l := self classList.
 l removeAll.
 l addAll:classInfo.
+!
+updateListOfRequiredPrerequisiteClasses
+"all autoloaded superclasses of my classes are definitely required"
+|p anyChange allInPre requiredInPre nMissing|
+p := self currentProject.
+p isNil ifTrue:[^ self].
+anyChange := false.
+nMissing := 0.
+allInPre := self listOfAllClassesInPrerequisites value.
+requiredInPre := self listOfRequiredClassesInPrerequisites value.
+self currentProjectsClassNames do:[:aClassName |
+|cls|
+cls := Smalltalk at:aClassName asSymbol.
+(cls notNil and:[cls isLoaded]) ifTrue:[
+cls allSuperclasses do:[:superClass |
+|sName idx|
+(superClass notNil
+and:[superClass isLoaded
+and:[superClass wasAutoloaded]]) ifTrue:[
+|sName entry|
+sName := superClass name.
+idx := allInPre findFirst:[:item | item string = sName].
+idx ~~ 0 ifTrue:[
+allInPre removeIndex:idx.
+requiredInPre add:sName asText allBold.
+anyChange := true.
+]
+]
+]
+] ifFalse:[
+nMissing := nMissing + 1.
+]
+].
+anyChange ifTrue:[
+self listOfRequiredClassesInPrerequisites changed.
+self listOfAllClassesInPrerequisites changed.
+].
+nMissing ~~ 0 ifTrue:[
+self information:'Update not complete - ' , nMissing printString
+, ' of the projects classes are not loaded'.
+].
+self accept.
+! !
+!ProjectBrowser methodsFor:'user actions - canvas'!
+accept
+"save values from aspects into the project"
+self saveAspectsIntoProject.
+modifiedChannel value:false.
+!
+addClassToPrerequisites
+|sel cls|
+sel := self selectedClassInPrerequisites value.
+self listOfRequiredClassesInPrerequisites value add:sel.
+self listOfAllClassesInPrerequisites value remove:sel.
+self selectedClassInPrerequisites value:nil.
+"/ also add any autoloaded superclass(es)
+cls := Smalltalk at:sel asSymbol.
+(cls notNil and:[cls isLoaded]) ifTrue:[
+cls allSuperclasses do:[:superClass |
+|sName|
+(superClass notNil
+and:[superClass isLoaded
+and:[superClass wasAutoloaded]]) ifTrue:[
+|sName idx|
+sName := superClass name.
+idx := self listOfAllClassesInPrerequisites value findFirst:[:s | s string = sName].
+idx ~~ 0 ifTrue:[
+self listOfAllClassesInPrerequisites value removeIndex:idx.
+self listOfRequiredClassesInPrerequisites value add:sName asString allBold.
+].
+]
+]
+].
+self listOfRequiredClassesInPrerequisites changed.
+self listOfAllClassesInPrerequisites changed.
+self accept
+!
+addProjectToPrerequisites
+|sel|
+sel := self selectedProjectInPrerequisites value.
+self listOfRequiredProjectsInPrerequisites value add:sel.
+self listOfAllProjectsInPrerequisites value remove:sel.
+self selectedProjectInPrerequisites value:nil.
+self listOfRequiredProjectsInPrerequisites changed.
+self listOfAllProjectsInPrerequisites changed.
+self accept
+!
+cancel
+"reload aspects from the project"
+self readAspectsFromProject
+!
+removeClassFromPrerequisites
+|sel cls myClasses|
+sel := self selectedRequiredClassInPrerequisites value.
+cls := Smalltalk at:sel asSymbol.
+"/ check if this affects my classes
+(cls notNil and:[cls isLoaded and:[cls wasAutoloaded]]) ifTrue:[
+myClasses := self currentProjectsClassNames.
+cls allSubclassesDo:[:cls |
+(myClasses includes:cls name) ifTrue:[
+self valueOfInfoLabel value:'Attention - this class is required by ' , cls name.
+(self confirm:'Attention - this class is required by ' , cls name asText allBold, '.\(The project could later fail to load correctly)\\Really remove ?' withCRs) ifFalse:[
+^ self
+].
+].
+]
+].
+self listOfAllClassesInPrerequisites value add:sel.
+self listOfRequiredClassesInPrerequisites value remove:sel.
+self selectedRequiredClassInPrerequisites value:nil.
+"/ also remove any autoloaded subclass(es)
+(cls notNil and:[cls isLoaded and:[cls wasAutoloaded]]) ifTrue:[
+cls allSubclassesDo:[:cls |
+|entry|
+entry := self listOfRequiredClassesInPrerequisites value remove:cls name ifAbsent:nil.
+entry notNil ifTrue:[
+self listOfAllClassesInPrerequisites value add:cls name.
+]
+]
+].
+self listOfRequiredClassesInPrerequisites changed.
+self listOfAllClassesInPrerequisites changed.
+self accept
+!
+removeProjectFromPrerequisites
+|sel|
+sel := self selectedRequiredProjectInPrerequisites value.
+self listOfAllProjectsInPrerequisites value add:sel.
+self listOfRequiredProjectsInPrerequisites value remove:sel.
+self selectedRequiredProjectInPrerequisites value:nil.
+self listOfRequiredProjectsInPrerequisites changed.
+self listOfAllProjectsInPrerequisites changed.
+self accept
+!
+showInfoForRequiredClass:entry
+"show why a class is required"
+|cls myClasses|
+entry notNil ifTrue:[
+myClasses := self currentProjectsClassNames asSet.
+cls := Smalltalk at:entry string asSymbol.
+cls allSubclasses do:[:subClass |
+(myClasses includes:subClass name) ifTrue:[
+self valueOfInfoLabel value:('Required by ' , subClass name).
+^ self.
+]
+].
+].
+self valueOfInfoLabel value:nil
 ! !
 !ProjectBrowser::ProjectTreeItem methodsFor:'accessing'!
 action
 action:something
 "set the value of the instance variable 'action' (automatically generated)"
 action := something.!
+info
+"return the value of the instance variable 'info' (automatically generated)"
+^ info!
+info:something
+"set the value of the instance variable 'info' (automatically generated)"
+info := something.!
 spec
 "return the value of the instance variable 'spec' (automatically generated)"
 ^ spec!

changeset 1109	df7d7c6611b6
parent 1108	e88edf4a8cbe
child 1114	7fd86e9a6a11