diff --git a/sources/JadeiteProjectBrowserTestCase.cls b/sources/JadeiteProjectBrowserTestCase.cls index 9783af39..c8e928ff 100644 --- a/sources/JadeiteProjectBrowserTestCase.cls +++ b/sources/JadeiteProjectBrowserTestCase.cls @@ -252,21 +252,49 @@ test_autoDirtyDisplayRemoveMethod self assert: self packageListPresenter selection name = 'RowanSample1-Core'. self assert: self packageListPresenter selection isDirty! +test_browseSameClassCategoriesCorrect + "related bug found while fixing issue #344" + + | methodInSameClass newBrowser | + self testsIssue: #issue344 + withTitle: 'Can''t use method menu in method list browser method list pane'. + self selectServiceNamed: 'Rowan' in: self projectListPresenter. + self selectServiceNamed: 'Rowan-Definitions' in: self packageListPresenter. + self selectServiceNamed: 'RwClassExtensionDefinition' in: self classListPresenter. + self selectCategoryNamed: 'comparing'. + self assert: self methodListPresenter list size equals: 1. + self selectMethodNamed: #compareDictionary:againstBaseDictionary:into:elementClass:isMeta:. + methodListBrowser := self projectsPresenter browseImplementors. + self assert: self methodListPresenter list size equals: 1. "original browser method list doesn't change" + methodInSameClass := methodListBrowser primaryPresenter methodListPresenter methodListPresenter + list detect: [:methodService | methodService className == #RwClassExtensionDefinition] ifNone: []. + self denyIsNil: methodInSameClass. + methodListBrowser primaryPresenter methodListPresenter methodListPresenter + selection: methodInSameClass. + newBrowser := methodListBrowser primaryPresenter methodListPresenter browseClass. + + [self assert: self methodListPresenter list size equals: 1. "original browser method list doesn't change" + self assert: newBrowser currentCard categoryListPresenter list notEmpty. + self assert: self projectsPresenter categoryListPresenter list notEmpty. + self assert: newBrowser currentCard categoryListPresenter list + equals: self projectsPresenter categoryListPresenter list] + ensure: [newBrowser destroy]! + test_categoryTextDisplay self testsIssue: #issue232 withTitle: 'cannot tell which `category` a method is in (Oscar-3.0.41)'. self selectServicesNamed: (Array with: 'Rowan') in: self projectListPresenter. self selectServicesNamed: #('Rowan-Services-Core') in: self packageListPresenter. self selectServicesNamed: (Array with: 'RowanClassService') in: self classListPresenter. self assert: self projectsPresenter methodCategoryText value equals: String new. - self selectCategoryNamed: 'commands'. + self selectCategoryNamed: 'client commands'. self assert: self projectsPresenter methodCategoryText value equals: String new. self selectMethodNamed: #removeMethods. - self assert: self projectsPresenter methodCategoryText value equals: 'Category: commands'. + self assert: self projectsPresenter methodCategoryText value equals: 'Category: client commands'. self selectMethodsNamed: (Array with: #removeMethods with: #renameCategoryFrom:to: with: #addCategory:). - self assert: self projectsPresenter methodCategoryText value equals: 'Category: commands'. "category is shown if all selected methods are in same category" + self assert: self projectsPresenter methodCategoryText value equals: 'Category: client commands'. "category is shown if all selected methods are in same category" self selectServicesNamed: (Array with: 'RowanService') in: self classListPresenter. self assert: self projectsPresenter methodListPresenter list notEmpty. self assert: self projectsPresenter methodCategoryText value equals: String new. @@ -1428,19 +1456,19 @@ test_refreshAfterAbortMethodListLeaveCommitted self selectServiceNamed: 'Rowan' in: self projectListPresenter. self selectServiceNamed: 'Rowan-Services-Core' in: self packageListPresenter. self selectServiceNamed: 'RowanMethodService' in: self classListPresenter. - self selectMethodNamed: #update. + self selectMethodNamed: #classFromName. methodListBrowser := self projectsPresenter browseImplementors. [list := methodListBrowser primaryPresenter methodListPresenter methodListPresenter list. beforeSize := list size. - self assert: beforeSize > 1. "lots of #update methods in base" + self assert: beforeSize > 1. self assertIsNil: (list detect: [:methodService | methodService className = #RowanService] ifNone: [])] ensure: [methodListBrowser destroy]. self selectServiceNamed: 'RowanService' in: self classListPresenter. - self methodSourcePresenter value: 'update "do nothing"'. + self methodSourcePresenter value: 'classFromName "do nothing"'. self projectsPresenter editSaveMethod: self classListPresenter selection. - self selectMethodNamed: #update. + self selectMethodNamed: #classFromName. methodListBrowser := self projectsPresenter browseImplementors. list := methodListBrowser primaryPresenter methodListPresenter methodListPresenter list. afterSize := list size. @@ -1520,11 +1548,11 @@ test_refreshFromServer self selectServicesNamed: (Array with: 'Rowan') in: self projectListPresenter. self selectServicesNamed: #('Rowan-Services-Core') in: self packageListPresenter. self selectServicesNamed: (Array with: 'RowanPackageService') in: self classListPresenter. - self selectCategoryNamed: 'commands'. + self selectCategoryNamed: 'client commands'. self selectServiceNamed: 'classHierarchy' in: self methodListPresenter. self projectsPresenter refreshFromServer. self assert: self projectsPresenter selectedMethodName equals: #classHierarchy. - self assert: self projectsPresenter categoryListPresenter selection equals: 'commands'. + self assert: self projectsPresenter categoryListPresenter selection equals: 'client commands'. self assert: self projectsPresenter selectedClass name equals: 'RowanPackageService'. self assert: self projectsPresenter packageListPresenter selection name equals: 'Rowan-Services-Core'. self assert: self projectsPresenter projectListPresenter selection name equals: 'Rowan'. @@ -1532,7 +1560,7 @@ test_refreshFromServer self selectHierarchyTab. "selections remain" self projectsPresenter refreshFromServer. self assert: self projectsPresenter selectedMethodName equals: #classHierarchy. - self assert: self projectsPresenter categoryListPresenter selection equals: 'commands'. + self assert: self projectsPresenter categoryListPresenter selection equals: 'client commands'. self assert: self projectsPresenter selectedClass name equals: 'RowanPackageService'. self assert: self projectsPresenter packageListPresenter selection name equals: 'Rowan-Services-Core'. self assert: self projectsPresenter projectListPresenter selection name equals: 'Rowan' @@ -1545,8 +1573,8 @@ test_removeAbortedClass self selectServicesNamed: #('Rowan-Services-Tests') in: self packageListPresenter. self selectServicesNamed: (Array with: 'RowanServicesTest') in: self classListPresenter. self saveTestClass. - self assert: self projectsPresenter selectedClass name = 'TestClass'. - self projectsPresenter topShell abortTransaction. + [self assert: self projectsPresenter selectedClass name = 'TestClass'] + ensure: [self projectsPresenter topShell abortTransaction]. [self assertIsNil: (self classListPresenter list detect: [:service | service name = 'TestClass'] ifNone: [])] @@ -1554,7 +1582,7 @@ test_removeAbortedClass [self cloneRowanSample1. self ensureRowanSample1Loaded]. self saveTestClass. - self assert: self projectsPresenter selectedClass name = 'TestClass'. "abort from a different browser" + self assert: self projectsPresenter selectedClass name = 'TestClass'. "abort from a different browser" transcript projectListPresenter abortTransaction. [self @@ -1970,6 +1998,7 @@ waitForPresenter: presenter !JadeiteProjectBrowserTestCase categoriesFor: #test_addRemoveHierarchyCategory!public!test class hierarchy! ! !JadeiteProjectBrowserTestCase categoriesFor: #test_autoDirtyDisplayMoveMethodsToCategory!public!test! ! !JadeiteProjectBrowserTestCase categoriesFor: #test_autoDirtyDisplayRemoveMethod!public!test! ! +!JadeiteProjectBrowserTestCase categoriesFor: #test_browseSameClassCategoriesCorrect!public!test! ! !JadeiteProjectBrowserTestCase categoriesFor: #test_categoryTextDisplay!public!test! ! !JadeiteProjectBrowserTestCase categoriesFor: #test_classListNotBlank!public!test class list! ! !JadeiteProjectBrowserTestCase categoriesFor: #test_classSideSelection!public!test!test class hierarchy!test class list! ! diff --git a/sources/JadeiteProjectListBrowser.cls b/sources/JadeiteProjectListBrowser.cls index bffc99e8..4bda81e9 100644 --- a/sources/JadeiteProjectListBrowser.cls +++ b/sources/JadeiteProjectListBrowser.cls @@ -49,6 +49,6 @@ resource_Default_view ViewComposer openOn: (ResourceIdentifier class: self selector: #resource_Default_view) " - ^#(#'!!STL' 4 788558 10 ##(Smalltalk.STBViewProxy) ##(Smalltalk.ShellView) 34 27 nil nil 8 #(13565952 65536) 416 nil 524550 ##(Smalltalk.ColorRef) 8 4278190080 328198 ##(Smalltalk.Point) 1201 801 551 265030 4 ##(Smalltalk.Menu) nil true 34 16 984134 2 ##(Smalltalk.CommandMenuItem) 1 1180998 4 ##(Smalltalk.CommandDescription) #makeDefault 8 'Make Default' 1 1 nil nil nil 983366 1 ##(Smalltalk.DividerMenuItem) 4097 594 1 626 #cloneProject 8 'Clone Git Project ...' 1 1 nil nil nil 594 1 626 #loadProjects 8 'Load ...' 1 1 nil nil nil 594 1 626 #unloadProjects 8 'Unload ...' 1 1 nil nil nil 674 4097 594 1 626 #pullFromGit 8 'Pull from Git ...' 1 1 nil nil nil 594 1 626 #commit 8 'Commit ...' 1 1 nil nil nil 594 1 626 #pushToGit 8 'Push to Git ...' 1 1 nil nil nil 674 4097 594 1 626 #projectChanges 8 'Changes' 1 1 nil nil nil 594 1 626 #writeProject 8 'Write ...' 1 1 nil nil nil 594 1 626 #checkout 8 'Checkout ...' 1 1 nil nil nil 674 4097 594 1 626 #projectLog 8 'Log' 1 1 nil nil nil 594 1 626 #refresh 8 'Refresh' 1 1 nil nil nil 8 '' nil 134217729 nil nil nil nil nil nil nil 416 1180166 ##(Smalltalk.ProportionalLayout) 170 176 8 #() false 170 192 34 2 410 ##(Smalltalk.ListView) 34 30 nil 416 34 2 8 1140920653 1025 1392 590662 2 ##(Smalltalk.ListModel) 138 144 1344 nil 1310726 ##(Smalltalk.IdentitySearchPolicy) 466 8 4278190080 nil 7 nil nil nil 1392 nil 8 4294906105 ##(Smalltalk.BasicListAbstract) ##(Smalltalk.IconicListAbstract) 1049926 1 ##(Smalltalk.IconImageManager) nil nil nil nil nil nil 138 144 34 3 1447750 15 ##(Smalltalk.EditableListViewColumn) 8 'Project Name' 387 #left 459270 ##(Smalltalk.Message) #displayString 8 #() ##(Smalltalk.SortedCollection) 787814 3 ##(Smalltalk.BlockClosure) 0 nil 1180966 ##(Smalltalk.CompiledExpression) 2 1 1744 8 'doIt' 8 '[:project | project displayName]' 8 #[30 105 226 0 106] #displayName 1760 7 257 nil nil 1392 nil 3 nil 1746 0 nil 1778 3 1 1744 8 'doIt' 8 '[:each | each item displayStringFor: each]' 8 #[31 105 226 0 17 177 106] #item #displayStringFor: 1856 7 257 nil false nil 1052998 20 ##(Smalltalk.EmbeddedTextEdit) nil nil 8 #(67174528 0) 1952 721990 2 ##(Smalltalk.ValueHolder) nil false 1310726 ##(Smalltalk.EqualitySearchPolicy) nil nil nil 5 nil nil nil 1952 nil nil 852486 ##(Smalltalk.NullConverter) nil 8 '' 3 nil nil nil nil nil nil nil nil nil 1650 8 'Loaded Sha' 389 #left 1698 #displayString 8 #() 1698 #<= 2144 1746 0 nil 1778 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project sha]' 8 #[30 105 226 0 106] #sha 2176 7 257 nil nil 1392 nil 3 nil nil false nil 1938 nil nil 8 #(67174528 0) 2256 1986 nil false 2032 nil 466 8 4278190080 nil 5 nil nil nil 2256 nil nil 2050 nil 8 '' 3 nil nil nil nil nil nil nil nil nil 1650 8 'Branch' 387 #left 1698 #displayString 2144 1698 #<= 2144 1746 0 nil 1778 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project branch]' 8 #[30 105 226 0 106] #branch 2432 7 257 nil nil 1392 nil 3 nil nil false nil 1938 nil nil 8 #(67174528 0) 2512 1986 nil false 2032 nil 466 2320 nil 5 nil nil nil 2512 nil nil 2050 nil 8 '' 3 nil nil nil nil nil nil nil nil nil #report 1344 nil 131171 514 129 129 34 4 nil nil 514 1 1 nil 983302 ##(Smalltalk.MessageSequence) 138 144 34 2 721670 ##(Smalltalk.MessageSend) #createAt:extent: 34 2 514 1 1 514 1169 723 1392 2722 #text: 34 1 8 'Project Name' 1392 983302 ##(Smalltalk.WINDOWPLACEMENT) 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 72 2 0 0 105 1 0 0] 8 #() 514 193 193 nil 27 8 'projectList' nil nil nil nil nil 1 nil nil nil nil 1 nil nil 2658 138 144 34 4 2722 #createAt:extent: 34 2 514 7679 21 514 1201 801 416 2722 #contextMenu: 34 1 560 416 2722 #text: 34 1 8 'Rowan Project List' 416 2722 #updateMenuBar 1344 416 2850 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 14 0 0 10 0 0 0 87 17 0 0 154 1 0 0] 34 1 1392 2912 nil 27 )! ! + ^#(#'!!STL' 4 788558 10 ##(Smalltalk.STBViewProxy) ##(Smalltalk.ShellView) 34 27 nil nil 8 #(13565952 65536) 416 nil 524550 ##(Smalltalk.ColorRef) 8 4278190080 328198 ##(Smalltalk.Point) 1201 801 551 265030 4 ##(Smalltalk.Menu) nil true 34 16 984134 2 ##(Smalltalk.CommandMenuItem) 1 1180998 4 ##(Smalltalk.CommandDescription) #makeDefault 8 'Make Default' 1 1 nil nil nil 983366 1 ##(Smalltalk.DividerMenuItem) 4097 594 1 626 #cloneProject 8 'Clone Git Project ...' 1 1 nil nil nil 594 1 626 #loadProjects 8 'Load ...' 1 1 nil nil nil 594 1 626 #unloadProjects 8 'Unload ...' 1 1 nil nil nil 674 4097 594 1 626 #pullFromGit 8 'Pull from Git ...' 1 1 nil nil nil 594 1 626 #commit 8 'Commit to Git ...' 1 1 nil nil nil 594 1 626 #pushToGit 8 'Push to Git ...' 1 1 nil nil nil 674 4097 594 1 626 #projectChanges 8 'Changes' 1 1 nil nil nil 594 1 626 #writeProject 8 'Write ...' 1 1 nil nil nil 594 1 626 #checkout 8 'Checkout Git Branch ...' 1 1 nil nil nil 674 4097 594 1 626 #projectLog 8 'Log' 1 1 nil nil nil 594 1 626 #refresh 8 'Refresh' 1 1 nil nil nil 8 '' nil 134217729 nil nil nil nil nil nil nil 416 1180166 ##(Smalltalk.ProportionalLayout) 170 176 8 #() false 170 192 34 2 410 ##(Smalltalk.ListView) 34 30 nil 416 34 2 8 1140920653 1025 1392 590662 2 ##(Smalltalk.ListModel) 138 144 1344 nil 1310726 ##(Smalltalk.IdentitySearchPolicy) 466 8 4278190080 nil 7 nil nil nil 1392 nil 8 4294906139 ##(Smalltalk.BasicListAbstract) ##(Smalltalk.IconicListAbstract) 1049926 1 ##(Smalltalk.IconImageManager) nil nil nil nil nil nil 138 144 34 3 1447750 15 ##(Smalltalk.EditableListViewColumn) 8 'Project Name' 387 #left 459270 ##(Smalltalk.Message) #displayString 8 #() ##(Smalltalk.SortedCollection) 787814 3 ##(Smalltalk.BlockClosure) 0 nil 1180966 ##(Smalltalk.CompiledExpression) 2 1 1744 8 'doIt' 8 '[:project | project displayName]' 8 #[30 105 226 0 106] #displayName 1760 7 257 nil nil 1392 nil 3 nil 1746 0 nil 1778 3 1 1744 8 'doIt' 8 '[:each | each item displayStringFor: each]' 8 #[31 105 226 0 17 177 106] #item #displayStringFor: 1856 7 257 nil false nil 1052998 20 ##(Smalltalk.EmbeddedTextEdit) nil nil 8 #(67174528 0) 1952 721990 2 ##(Smalltalk.ValueHolder) nil false 1310726 ##(Smalltalk.EqualitySearchPolicy) nil nil nil 5 nil nil nil 1952 nil nil 852486 ##(Smalltalk.NullConverter) nil 8 '' 3 nil nil nil nil nil nil nil nil nil 1650 8 'Loaded Sha' 389 #left 1698 #displayString 8 #() 1698 #<= 2144 1746 0 nil 1778 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project sha]' 8 #[30 105 226 0 106] #sha 2176 7 257 nil nil 1392 nil 3 nil nil false nil 1938 nil nil 8 #(67174528 0) 2256 1986 nil false 2032 nil 466 8 4278190080 nil 5 nil nil nil 2256 nil nil 2050 nil 8 '' 3 nil nil nil nil nil nil nil nil nil 1650 8 'Branch' 387 #left 1698 #displayString 2144 1698 #<= 2144 1746 0 nil 1778 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project branch]' 8 #[30 105 226 0 106] #branch 2432 7 257 nil nil 1392 nil 3 nil nil false nil 1938 nil nil 8 #(67174528 0) 2512 1986 nil false 2032 nil 466 2320 nil 5 nil nil nil 2512 nil nil 2050 nil 8 '' 3 nil nil nil nil nil nil nil nil nil #report 1344 nil 131171 514 129 129 34 4 nil nil 514 1 1 nil 983302 ##(Smalltalk.MessageSequence) 138 144 34 2 721670 ##(Smalltalk.MessageSend) #createAt:extent: 34 2 514 1 1 514 1169 723 1392 2722 #text: 34 1 8 'Project Name' 1392 983302 ##(Smalltalk.WINDOWPLACEMENT) 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 72 2 0 0 105 1 0 0] 8 #() 514 193 193 nil 27 8 'projectList' nil nil nil nil nil 1 nil nil nil nil 1 nil nil 2658 138 144 34 4 2722 #createAt:extent: 34 2 514 7679 21 514 1201 801 416 2722 #contextMenu: 34 1 560 416 2722 #text: 34 1 8 'Rowan Project List' 416 2722 #updateMenuBar 1344 416 2850 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 14 0 0 10 0 0 0 87 17 0 0 154 1 0 0] 34 1 1392 2912 nil 27 )! ! !JadeiteProjectListBrowser class categoriesFor: #resource_Default_view!public!resources-views! ! diff --git a/sources/JadeiteProjectsBrowserPresenter.cls b/sources/JadeiteProjectsBrowserPresenter.cls index c9a8624b..67a64908 100644 --- a/sources/JadeiteProjectsBrowserPresenter.cls +++ b/sources/JadeiteProjectsBrowserPresenter.cls @@ -477,7 +477,7 @@ editSaveClass backcolor: Color white. packageListPresenter selection selectedClass ifNotNil: [:classService | self selectClass: classService]. - self isHierarchyTabSelected ifTrue: [self updateHierarchy].! + self isHierarchyTabSelected ifTrue: [self updateHierarchy]! editSaveClassComment | classService | @@ -627,6 +627,8 @@ findMethod: selector | methodService | methodService := methodListPresenter list detect: [:service | service selector = selector] ifNone: [^self]. + self isCategoryTabSelected ifTrue:[ + categoryListPresenter selection: methodService category]. methodListPresenter selections: (Array with: methodService)! getViews @@ -1238,7 +1240,6 @@ refreshClass ^methodListPresenter clear]. selection meta: self isClassSideSelected. selection selectedPackageServices: packageListPresenter selections. - self setFilterType: selection. self updateServices: (Array with: selection). self updateClassInfo! @@ -1284,17 +1285,11 @@ refreshMethodsOn: presenter self isCategoryTabSelected ifTrue: [classService filters: categoryListPresenter selections] ifFalse: [classService filters: variableListPresenter selections]. - classService filters isEmpty - ifTrue: [classService filterType: nil] - ifFalse: - [self isCategoryTabSelected - ifTrue: [classService filterType: 'categories'] - ifFalse: [classService filterType: 'variables']]. classService methods isNil ifTrue: ["if we got an error recently, could be nil" self updateServices: (Array with: classService)]. - classService displayMethodsOn: presenter! + classService displayMethodsOn: presenter browser: self! registerClassData "temporarily disabled"! @@ -1453,6 +1448,11 @@ selectedClasses ifTrue: [classListPresenter selections] ifFalse: [classHierarchyPresenter selections]! +selectedFilters + ^self isCategoryTabSelected + ifTrue: [categoryListPresenter selections] + ifFalse: [variableListPresenter selections]! + selectedMethodCategory ^methodListPresenter selectionOrNil ifNotNil: [:methodService | methodService category]! @@ -1516,11 +1516,6 @@ setDefaultProjectTablLabel setDefaultProjectTablLabel: listModel projectLabel ifNil: [projectLabel := listModel detect: [:each | each text = 'Project']]! -setFilterType: selection - self isCategoryTabSelected - ifTrue: [selection filterType: 'categories'] - ifFalse: [selection filterType: 'variables']! - setMethodFilterFor: presenter | filters | self isCategoryTabSelected @@ -2037,6 +2032,7 @@ writeProject !JadeiteProjectsBrowserPresenter categoriesFor: #selectClassNamed:!private!selection! ! !JadeiteProjectsBrowserPresenter categoriesFor: #selectedClass!private!selection! ! !JadeiteProjectsBrowserPresenter categoriesFor: #selectedClasses!private!selection! ! +!JadeiteProjectsBrowserPresenter categoriesFor: #selectedFilters!accessing!public! ! !JadeiteProjectsBrowserPresenter categoriesFor: #selectedMethodCategory!menu handlers support!private! ! !JadeiteProjectsBrowserPresenter categoriesFor: #selectedMethodName!menu handlers!public! ! !JadeiteProjectsBrowserPresenter categoriesFor: #selectionMethod:!private!selection! ! @@ -2048,7 +2044,6 @@ writeProject !JadeiteProjectsBrowserPresenter categoriesFor: #selectVariableTab!public!selection! ! !JadeiteProjectsBrowserPresenter categoriesFor: #setDefaultProjectTablLabel!event handlers!public! ! !JadeiteProjectsBrowserPresenter categoriesFor: #setDefaultProjectTablLabel:!event handlers!public! ! -!JadeiteProjectsBrowserPresenter categoriesFor: #setFilterType:!event handlers support!private!services! ! !JadeiteProjectsBrowserPresenter categoriesFor: #setMethodFilterFor:!event handlers support!private!services!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #setTestClass:!event handlers support!private! ! !JadeiteProjectsBrowserPresenter categoriesFor: #showSuperClassComparison!private!text tabs! ! @@ -2061,7 +2056,7 @@ writeProject !JadeiteProjectsBrowserPresenter categoriesFor: #unloadPackage!menu handlers!public! ! !JadeiteProjectsBrowserPresenter categoriesFor: #unloadProjects!project menu handlers!public! ! !JadeiteProjectsBrowserPresenter categoriesFor: #update:afterStonReplication:!public!updating! ! -!JadeiteProjectsBrowserPresenter categoriesFor: #updateAfterFindClass:!menu handlers!public! ! +!JadeiteProjectsBrowserPresenter categoriesFor: #updateAfterFindClass:!menu handlers!public!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateAndSelectA:!public!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateClasses!event handlers!public!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateClassInfo!event handlers!public!updating! ! @@ -2069,7 +2064,7 @@ writeProject !JadeiteProjectsBrowserPresenter categoriesFor: #updateClassMenu:!event handlers!public!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateCommand:onSuccessDo:!public!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateHierarchy!event handlers!public!updating! ! -!JadeiteProjectsBrowserPresenter categoriesFor: #updateMenuBar!menus!public! ! +!JadeiteProjectsBrowserPresenter categoriesFor: #updateMenuBar!menus!public!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateMethodMenu:!event handlers!public!updating! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateMethodReferences:!private!services! ! !JadeiteProjectsBrowserPresenter categoriesFor: #updateMethodSource!event handlers!public!text tabs!updating! ! diff --git a/sources/JadeiteSUnitPresenter.cls b/sources/JadeiteSUnitPresenter.cls index 7367344c..b2d75c62 100644 --- a/sources/JadeiteSUnitPresenter.cls +++ b/sources/JadeiteSUnitPresenter.cls @@ -66,6 +66,10 @@ runAll runSelected self runTests: methodListPresenter selections! +selectedFilters + "no categories in sunit browser" + ^Array new ! + status ^status! @@ -86,6 +90,7 @@ testClassesSize !JadeiteSUnitPresenter categoriesFor: #packagesSize!public! ! !JadeiteSUnitPresenter categoriesFor: #runAll!public! ! !JadeiteSUnitPresenter categoriesFor: #runSelected!public! ! +!JadeiteSUnitPresenter categoriesFor: #selectedFilters!accessing!public! ! !JadeiteSUnitPresenter categoriesFor: #status!accessing!private! ! !JadeiteSUnitPresenter categoriesFor: #status:!accessing!private! ! !JadeiteSUnitPresenter categoriesFor: #testCasesSize!public! ! diff --git a/sources/JadeiteTranscript.cls b/sources/JadeiteTranscript.cls index 4b5e3386..c20aff1f 100644 --- a/sources/JadeiteTranscript.cls +++ b/sources/JadeiteTranscript.cls @@ -164,6 +164,6 @@ resource_Default_view ViewComposer openOn: (ResourceIdentifier class: self selector: #resource_Default_view) " - ^#(#'!!STL' 4 788558 10 ##(Smalltalk.STBViewProxy) ##(Smalltalk.ShellView) 34 27 nil nil 8 #(13565952 65536) 416 nil 524550 ##(Smalltalk.ColorRef) 8 4278190080 328198 ##(Smalltalk.Point) 1201 801 551 nil nil nil 416 852230 ##(Smalltalk.FramingLayout) 170 176 34 4 410 ##(Smalltalk.CardContainer) 34 16 nil 416 34 2 8 1140850688 131073 608 nil 466 496 nil 7 nil nil nil 608 655878 ##(Smalltalk.CardLayout) 138 144 34 7 721414 ##(Smalltalk.Association) 8 'Workspace' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 800 nil 466 8 4278190080 nil 5 nil nil nil 800 1180166 ##(Smalltalk.ResourceIdentifier) ##(Smalltalk.CodeSourcePresenter) #resource_Default_view nil 983302 ##(Smalltalk.MessageSequence) 138 144 34 1 721670 ##(Smalltalk.MessageSend) #createAt:extent: 34 2 514 9 55 514 1153 571 800 983302 ##(Smalltalk.WINDOWPLACEMENT) 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 8 #() 514 193 193 nil 27 754 8 'My Session' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 1184 nil nil nil 5 nil nil nil 1184 898 ##(Smalltalk.MySessionPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1184 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'All Sessions' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 1440 nil nil nil 5 nil nil nil 1440 898 ##(Smalltalk.AllSessionsPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1440 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'Transcript' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140916224 131073 1696 nil 466 8 4278190080 nil 5 nil nil nil 1696 898 ##(Smalltalk.TranscriptPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1696 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'History' 410 ##(Smalltalk.MultilineTextEdit) 34 16 nil 608 34 2 8 1143017796 1025 1984 nil 466 8 4278190080 nil 5 nil nil nil 1984 nil 8 4294911317 852486 ##(Smalltalk.NullConverter) nil nil 11 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1984 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 8 #() 1136 nil 27 754 ##(Smalltalk.Stone) 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 2304 nil nil nil 5 nil nil nil 2304 898 ##(Smalltalk.StoneInfoPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 2304 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'Projects' 410 ##(Smalltalk.ShellView) 34 27 nil 608 34 2 8 1078919168 131073 2560 nil 466 8 4278190080 514 1201 801 551 265030 4 ##(Smalltalk.Menu) nil true 34 17 984134 2 ##(Smalltalk.CommandMenuItem) 1 1180998 4 ##(Smalltalk.CommandDescription) #makeDefault 8 'Make Default' 1 1 nil nil nil 2722 1 2754 #browseProject 8 'Browse' 1 1 nil nil nil 983366 1 ##(Smalltalk.DividerMenuItem) 4097 2722 1 2754 #cloneProject 8 'Clone Git Project ...' 1 1 nil nil nil 2722 1 2754 #loadProjects 8 'Load' 1 1 nil nil nil 2722 1 2754 #unloadProjects 8 'Unload' 1 1 nil nil nil 2850 4097 2722 1 2754 #pullFromGit 8 'Pull from Git' 1 1 nil nil nil 2722 1 2754 #commit 8 'Commit ...' 1 1 nil nil nil 2722 1 2754 #pushToGit 8 'Push to Git' 1 1 nil nil nil 2850 4097 2722 1 2754 #projectChanges 8 'Changes' 1 1 nil nil nil 2722 1 2754 #writeProject 8 'Write' 1 1 nil nil nil 2722 1 2754 #checkout 8 'Checkout ...' 1 1 nil nil nil 2850 4097 2722 1 2754 #projectLog 8 'Log' 1 1 nil nil nil 2722 1 2754 #refresh 8 'Refresh' 1 1 nil nil nil 8 '' nil 134217729 nil nil nil nil nil nil nil 2560 1180166 ##(Smalltalk.ProportionalLayout) 170 176 1120 false 170 192 34 2 410 ##(Smalltalk.ListView) 34 30 nil 2560 34 2 8 1140920649 1025 3552 590662 2 ##(Smalltalk.ListModel) 138 144 1120 nil 1310726 ##(Smalltalk.IdentitySearchPolicy) 466 8 4278190080 nil 7 nil nil nil 3552 nil 8 4294906139 ##(Smalltalk.BasicListAbstract) ##(Smalltalk.IconicListAbstract) 1049926 1 ##(Smalltalk.IconImageManager) nil nil nil nil nil nil 138 144 34 3 1447750 15 ##(Smalltalk.EditableListViewColumn) 8 'Project Name' 371 #left 459270 ##(Smalltalk.Message) #displayString 8 #() ##(Smalltalk.SortedCollection) 787814 3 ##(Smalltalk.BlockClosure) 0 nil 1180966 ##(Smalltalk.CompiledExpression) 2 1 3904 8 'doIt' 8 '[:project | project displayName]' 8 #[30 105 226 0 106] #displayName 3920 7 257 nil nil 3552 nil 3 nil 3906 0 nil 3938 3 1 3904 8 'doIt' 8 '[:each | each item displayStringFor: each]' 8 #[31 105 226 0 17 177 106] #item #displayStringFor: 4016 7 257 nil false nil 1052998 20 ##(Smalltalk.EmbeddedTextEdit) nil nil 8 #(67174528 0) 4112 721990 2 ##(Smalltalk.ValueHolder) nil false 1310726 ##(Smalltalk.EqualitySearchPolicy) nil nil nil 5 nil nil nil 4112 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil 3810 8 'Loaded Sha' 373 #left 3858 #displayString 8 #() 3858 #<= 4288 3906 0 nil 3938 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project sha]' 8 #[30 105 226 0 106] #sha 4320 7 257 nil nil 3552 nil 3 nil nil false nil 4098 nil nil 8 #(67174528 0) 4400 4146 nil false 4192 nil 466 8 4278190080 nil 5 nil nil nil 4400 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil 3810 8 'Branch' 371 #left 3858 #displayString 4288 3858 #<= 4288 3906 0 nil 3938 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project branch]' 8 #[30 105 226 0 106] #branch 4576 7 257 nil nil 3552 nil 3 nil nil false nil 4098 nil nil 8 #(67174528 0) 4656 4146 nil false 4192 nil 466 4464 nil 5 nil nil nil 4656 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil #report 1120 nil 131171 514 129 129 34 4 nil nil 514 1 1 nil 930 138 144 34 2 994 #createAt:extent: 34 2 514 1 1 514 1121 539 3552 994 #text: 34 1 8 'Project Name' 3552 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 48 2 0 0 13 1 0 0] 8 #() 1136 nil 27 8 'projectList' nil nil nil nil nil 1 nil nil nil nil 1 nil nil 930 138 144 34 4 994 #createAt:extent: 34 2 514 9 55 514 1153 571 2560 994 #contextMenu: 34 1 2688 2560 994 #text: 34 1 8 'Rowan Project List' 2560 994 #updateMenuBar 1120 2560 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 34 1 3552 1136 nil 27 2560 170 192 34 14 800 8 'codePane' 1696 8 'Transcript' 2304 8 'Stone' 1184 8 'My Session' 1440 8 'All Sessions' 1984 8 'history' 2560 8 'projectsList' nil 410 ##(Smalltalk.TabView) 34 23 nil 608 34 2 8 1140916736 1 5424 3618 138 144 34 7 1680 1968 ##(Smalltalk.Stone) 1168 1424 784 2544 nil 3680 721158 ##(Smalltalk.SystemColor) 31 nil 1 nil nil nil 5424 nil 8 4294912095 ##(Smalltalk.BasicListAbstract) ##(Smalltalk.IconicListAbstract) 3760 nil nil nil nil nil #noIcons 930 138 144 34 3 994 #createAt:extent: 34 2 514 1 1 514 1169 633 5424 994 #basicSelectionsByIndex: 34 1 8 #(7) 5424 994 #tcmSetExtendedStyle:dwExStyle: 8 #(-1 0) 5424 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 72 2 0 0 60 1 0 0] 8 #() 1136 nil 27 930 138 144 34 1 994 #createAt:extent: 34 2 514 1 51 514 1169 633 608 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 25 0 0 0 72 2 0 0 85 1 0 0] 34 8 1696 1984 2304 1184 1440 800 2560 5424 1136 nil 27 1181766 2 ##(Smalltalk.FramingConstraints) 1180678 ##(Smalltalk.FramingCalculation) #fixedParentLeft 1 6018 #fixedParentRight 1 6018 #fixedParentTop 51 6018 #fixedParentBottom 1 410 ##(Smalltalk.ReferenceView) 34 14 nil 416 34 2 8 1140850688 131073 6096 nil nil nil 7 nil nil nil 6096 898 ##(Smalltalk.JadeToolsToolBarPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 1 1 514 1169 51 6096 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 72 2 0 0 25 0 0 0] 1120 1136 nil 27 5986 6032 1 6048 1 6064 1 6018 #fixedViewTop 51 170 192 34 4 608 8 'cardContainer' 6096 8 'Toolbar' nil 461638 4 ##(Smalltalk.MenuBar) nil true 34 5 2674 nil true 34 9 2722 1 2754 #fileNew 8 '&New Workspace' 9373 1 nil nil nil 2722 1 2754 #fileOpen 8 '&Open Workspace...' 9375 1 nil nil nil 2722 1 2754 #fileSave 8 '&Save' 9383 1 nil nil nil 2722 1 2754 #fileSaveAs 8 'Save &As...' 1 1 nil nil nil 2722 1 2754 #fileRevert 8 '&Revert' 1025 1 nil nil nil 2850 4097 2722 1 2754 #resetCursor 8 'Reset &Cursor' 1025 1 nil nil nil 2850 4097 2722 1 2754 #exit 8 'E&xit Jadeite' 17639 1 nil nil nil 8 '&File' nil 1 nil nil 40545 nil nil 2674 nil true 34 15 2722 1 2754 #undo 8 '&Undo' 9397 1 nil nil nil 2722 1 2754 #redo 8 'R&edo' 9395 1 nil nil nil 2850 4097 2722 1 2754 #editCut 8 'Cu&t' 9393 1 nil nil nil 2722 1 2754 #editCopy 8 '&Copy' 9351 1 nil nil nil 2722 1 2754 #editPaste 8 '&Paste' 9389 1 nil nil nil 2722 1 2754 #editSelectAll 8 'Select &All' 9347 1 nil nil nil 2722 1 2754 #editDelete 8 '&Delete' 1629 1 nil nil nil 2850 4097 2722 1 2754 #editFind 8 '&Find...' 9357 1 nil nil nil 2722 1 2754 #editFindNext 8 'Find &Next' 1253 1 nil nil nil 2722 1 2754 #editReplace 8 '&Replace...' 9361 1 nil nil nil 2850 4097 2722 1 2754 #addQuotesToSelection 8 'Add &Quotes' 1 1 nil nil nil 2722 1 2754 #removeQuotesFromSelection 8 'Re&move Quotes' 1 1 nil nil nil 8 '&Edit' nil 1 nil nil 40571 nil nil 2674 nil true 34 14 2722 1 2754 #sleepAndCommit 8 '&Sleep and Commit' 1 1 nil nil nil 2722 1 2754 #abortTransaction 8 '&Abort Transaction' 1 1 nil nil nil 2722 1 2754 #commitTransaction 8 '&Commit Transaction' 1 1 nil nil nil 2722 1 2754 #disableNativeCode 8 'Disable Native Code' 1 1 nil nil nil 2850 4097 2722 1 2754 #jadeInspect 8 '&Inspect' 9379 1 nil nil nil 2722 1 2754 #jadeDisplay 8 '&Display' 9353 1 nil nil nil 2722 1 2754 #jadeExecute 8 '&Execute' 9355 1 nil nil nil 2722 1 2754 #jadeDebug 8 'Debu&g' 9349 1 nil nil nil 2722 1 2754 #fileIn 8 'Fi&le In' 1 1 nil nil nil 2850 4097 2722 1 2754 #inspectOop 8 'Inspect Oop ...' 1 1 nil nil nil 2722 1 2754 #describeErrorNumber 8 'Description for Error Number ...' 1025 1 nil nil nil 2722 1025 2754 #flipTranscript 8 'Transcript writes enabled' 1025 1 nil nil nil 8 '&Jadeite' nil 1 nil nil 40597 nil nil 2674 nil true 34 10 2722 1 2754 #openJadeiteProjectsBrowser 8 'Browse &Projects' 9377 1 nil nil nil 2722 1 2754 #openDictionaryBrowser 8 '&Browse Dictionaries' 13449 1 nil nil nil 2722 1 2754 #browseProcesses 8 'Browse P&rocesses' 9381 1 nil nil nil 2722 1 2754 #jadeBrowseTests 8 'Browse SUnit &Tests' 1 1 nil nil nil 2850 4097 2722 1 2754 #browseClass 8 'Find Class ...' 13453 1 nil nil nil 2722 1 2754 #browseImplementorsOf 8 'Browse &Implementors of ...' 13459 1 nil nil nil 2722 1 2754 #browseSendersOf 8 'Browse &Senders of ...' 13479 1 nil nil nil 2722 1 2754 #browseMethodsContaining 8 'Browse &Methods Containing ...' 1 1 nil nil nil 2722 1 2754 #browseLiteralReferences 8 'Browse &Literal References ...' 1 1 nil nil nil 8 '&Browse' nil 134217729 nil nil 40617 nil nil 2674 nil true 34 4 2722 1 2754 #openGitHubJadeiteProject 8 '&Jadiete GitHub Project' 1025 1 nil nil nil 2722 1 2754 #openGitHubRowanProject 8 '&Rowan GitHub Project' 1025 1 nil nil nil 2850 4097 2722 1 2754 #aboutJadeite 8 '&About Jadeite' 1 1 nil nil nil 8 '&Help' nil 1 nil nil 40625 nil nil 8 '' nil 1 nil nil nil nil nil nil nil nil 1 263494 3 ##(Smalltalk.Icon) nil true 1572870 ##(Smalltalk.ImageRelativeFileLocator) 8 'icons\GS32.ico' nil 8930 nil true 8976 8 'icons\GS16.ico' nil nil nil 1 nil nil 930 138 144 34 3 994 #createAt:extent: 34 2 514 7679 21 514 1201 801 416 994 #text: 34 1 8 'Jadeite Session' 416 994 #updateMenuBar 1120 416 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 14 0 0 10 0 0 0 87 17 0 0 154 1 0 0] 34 2 6096 608 1136 nil 27 )! ! + ^#(#'!!STL' 4 788558 10 ##(Smalltalk.STBViewProxy) ##(Smalltalk.ShellView) 34 27 nil nil 8 #(13565952 65536) 416 nil 524550 ##(Smalltalk.ColorRef) 8 4278190080 328198 ##(Smalltalk.Point) 1201 801 551 nil nil nil 416 852230 ##(Smalltalk.FramingLayout) 170 176 34 4 410 ##(Smalltalk.CardContainer) 34 16 nil 416 34 2 8 1140850688 131073 608 nil 466 496 nil 7 nil nil nil 608 655878 ##(Smalltalk.CardLayout) 138 144 34 7 721414 ##(Smalltalk.Association) 8 'Workspace' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 800 nil 466 8 4278190080 nil 5 nil nil nil 800 1180166 ##(Smalltalk.ResourceIdentifier) ##(Smalltalk.CodeSourcePresenter) #resource_Default_view nil 983302 ##(Smalltalk.MessageSequence) 138 144 34 1 721670 ##(Smalltalk.MessageSend) #createAt:extent: 34 2 514 9 55 514 1153 571 800 983302 ##(Smalltalk.WINDOWPLACEMENT) 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 8 #() 514 193 193 nil 27 754 8 'My Session' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 1184 nil nil nil 5 nil nil nil 1184 898 ##(Smalltalk.MySessionPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1184 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'All Sessions' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 1440 nil nil nil 5 nil nil nil 1440 898 ##(Smalltalk.AllSessionsPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1440 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'Transcript' 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140916224 131073 1696 nil 466 8 4278190080 nil 5 nil nil nil 1696 898 ##(Smalltalk.TranscriptPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1696 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'History' 410 ##(Smalltalk.MultilineTextEdit) 34 16 nil 608 34 2 8 1143017796 1025 1984 nil 466 8 4278190080 nil 5 nil nil nil 1984 nil 8 4294907349 852486 ##(Smalltalk.NullConverter) nil nil 11 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 1984 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 8 #() 1136 nil 27 754 ##(Smalltalk.Stone) 410 ##(Smalltalk.ReferenceView) 34 14 nil 608 34 2 8 1140850688 131073 2304 nil nil nil 5 nil nil nil 2304 898 ##(Smalltalk.StoneInfoPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 9 55 514 1153 571 2304 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 1120 1136 nil 27 754 8 'Projects' 410 ##(Smalltalk.ShellView) 34 27 nil 608 34 2 8 1078919168 131073 2560 nil 466 8 4278190080 514 1201 801 551 265030 4 ##(Smalltalk.Menu) nil true 34 17 984134 2 ##(Smalltalk.CommandMenuItem) 1 1180998 4 ##(Smalltalk.CommandDescription) #makeDefault 8 'Make Default' 1 1 nil nil nil 2722 1 2754 #browseProject 8 'Browse' 1 1 nil nil nil 983366 1 ##(Smalltalk.DividerMenuItem) 4097 2722 1 2754 #cloneProject 8 'Clone Git Project ...' 1 1 nil nil nil 2722 1 2754 #loadProjects 8 'Load' 1 1 nil nil nil 2722 1 2754 #unloadProjects 8 'Unload' 1 1 nil nil nil 2850 4097 2722 1 2754 #pullFromGit 8 'Pull from Git' 1 1 nil nil nil 2722 1 2754 #commit 8 'Commit to Git ...' 1 1 nil nil nil 2722 1 2754 #pushToGit 8 'Push to Git' 1 1 nil nil nil 2850 4097 2722 1 2754 #projectChanges 8 'Changes' 1 1 nil nil nil 2722 1 2754 #writeProject 8 'Write' 1 1 nil nil nil 2722 1 2754 #checkout 8 'Checkout Git Branch ...' 1 1 nil nil nil 2850 4097 2722 1 2754 #projectLog 8 'Log' 1 1 nil nil nil 2722 1 2754 #refresh 8 'Refresh' 1 1 nil nil nil 8 '' nil 134217729 nil nil nil nil nil nil nil 2560 1180166 ##(Smalltalk.ProportionalLayout) 170 176 1120 false 170 192 34 2 410 ##(Smalltalk.ListView) 34 30 nil 2560 34 2 8 1140920649 1025 3552 590662 2 ##(Smalltalk.ListModel) 138 144 1120 nil 1310726 ##(Smalltalk.IdentitySearchPolicy) 466 8 4278190080 nil 7 nil nil nil 3552 nil 8 4294909455 ##(Smalltalk.BasicListAbstract) ##(Smalltalk.IconicListAbstract) 1049926 1 ##(Smalltalk.IconImageManager) nil nil nil nil nil nil 138 144 34 3 1447750 15 ##(Smalltalk.EditableListViewColumn) 8 'Project Name' 371 #left 459270 ##(Smalltalk.Message) #displayString 8 #() ##(Smalltalk.SortedCollection) 787814 3 ##(Smalltalk.BlockClosure) 0 nil 1180966 ##(Smalltalk.CompiledExpression) 2 1 3904 8 'doIt' 8 '[:project | project displayName]' 8 #[30 105 226 0 106] #displayName 3920 7 257 nil nil 3552 nil 3 nil 3906 0 nil 3938 3 1 3904 8 'doIt' 8 '[:each | each item displayStringFor: each]' 8 #[31 105 226 0 17 177 106] #item #displayStringFor: 4016 7 257 nil false nil 1052998 20 ##(Smalltalk.EmbeddedTextEdit) nil nil 8 #(67174528 0) 4112 721990 2 ##(Smalltalk.ValueHolder) nil false 1310726 ##(Smalltalk.EqualitySearchPolicy) nil nil nil 5 nil nil nil 4112 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil 3810 8 'Loaded Sha' 373 #left 3858 #displayString 8 #() 3858 #<= 4288 3906 0 nil 3938 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project sha]' 8 #[30 105 226 0 106] #sha 4320 7 257 nil nil 3552 nil 3 nil nil false nil 4098 nil nil 8 #(67174528 0) 4400 4146 nil false 4192 nil 466 8 4278190080 nil 5 nil nil nil 4400 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil 3810 8 'Branch' 371 #left 3858 #displayString 4288 3858 #<= 4288 3906 0 nil 3938 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project branch]' 8 #[30 105 226 0 106] #branch 4576 7 257 nil nil 3552 nil 3 nil nil false nil 4098 nil nil 8 #(67174528 0) 4656 4146 nil false 4192 nil 466 4464 nil 5 nil nil nil 4656 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil #report 1120 nil 131171 514 129 129 34 4 nil nil 514 1 1 nil 930 138 144 34 2 994 #createAt:extent: 34 2 514 1 1 514 1121 539 3552 994 #text: 34 1 8 'Project Name' 3552 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 48 2 0 0 13 1 0 0] 8 #() 1136 nil 27 8 'projectList' nil nil nil nil nil 1 nil nil nil nil 1 nil nil 930 138 144 34 4 994 #createAt:extent: 34 2 514 9 55 514 1153 571 2560 994 #contextMenu: 34 1 2688 2560 994 #text: 34 1 8 'Rowan Project List' 2560 994 #updateMenuBar 1120 2560 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 4 0 0 0 27 0 0 0 68 2 0 0 56 1 0 0] 34 1 3552 1136 nil 27 2560 170 192 34 14 1440 8 'All Sessions' 2560 8 'projectsList' 1696 8 'Transcript' 2304 8 'Stone' 1184 8 'My Session' 800 8 'codePane' 1984 8 'history' nil 410 ##(Smalltalk.TabView) 34 23 nil 608 34 2 8 1140916736 1 5424 3618 138 144 34 7 1680 1968 ##(Smalltalk.Stone) 1168 1424 784 2544 nil 3680 721158 ##(Smalltalk.SystemColor) 31 nil 1 nil nil nil 5424 nil 8 4294911817 ##(Smalltalk.BasicListAbstract) ##(Smalltalk.IconicListAbstract) 3760 nil nil nil nil nil #noIcons 930 138 144 34 3 994 #createAt:extent: 34 2 514 1 1 514 1169 633 5424 994 #basicSelectionsByIndex: 34 1 8 #(7) 5424 994 #tcmSetExtendedStyle:dwExStyle: 8 #(-1 0) 5424 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 72 2 0 0 60 1 0 0] 8 #() 1136 nil 27 930 138 144 34 1 994 #createAt:extent: 34 2 514 1 51 514 1169 633 608 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 25 0 0 0 72 2 0 0 85 1 0 0] 34 8 1696 1984 2304 1184 1440 800 2560 5424 1136 nil 27 1181766 2 ##(Smalltalk.FramingConstraints) 1180678 ##(Smalltalk.FramingCalculation) #fixedParentLeft 1 6018 #fixedParentRight 1 6018 #fixedParentTop 51 6018 #fixedParentBottom 1 410 ##(Smalltalk.ReferenceView) 34 14 nil 416 34 2 8 1140850688 131073 6096 nil nil nil 7 nil nil nil 6096 898 ##(Smalltalk.JadeToolsToolBarPresenter) #resource_Default_view nil 930 138 144 34 1 994 #createAt:extent: 34 2 514 1 1 514 1169 51 6096 1074 8 #[44 0 0 0 0 0 0 0 1 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 72 2 0 0 25 0 0 0] 1120 1136 nil 27 5986 6032 1 6048 1 6064 1 6018 #fixedViewTop 51 170 192 34 4 608 8 'cardContainer' 6096 8 'Toolbar' nil 461638 4 ##(Smalltalk.MenuBar) nil true 34 5 2674 nil true 34 9 2722 1 2754 #fileNew 8 '&New Workspace' 9373 1 nil nil nil 2722 1 2754 #fileOpen 8 '&Open Workspace...' 9375 1 nil nil nil 2722 1 2754 #fileSave 8 '&Save' 9383 1 nil nil nil 2722 1 2754 #fileSaveAs 8 'Save &As...' 1 1 nil nil nil 2722 1 2754 #fileRevert 8 '&Revert' 1025 1 nil nil nil 2850 4097 2722 1 2754 #resetCursor 8 'Reset &Cursor' 1025 1 nil nil nil 2850 4097 2722 1 2754 #exit 8 'E&xit Jadeite' 17639 1 nil nil nil 8 '&File' nil 1 nil nil 10193 nil nil 2674 nil true 34 15 2722 1 2754 #undo 8 '&Undo' 9397 1 nil nil nil 2722 1 2754 #redo 8 'R&edo' 9395 1 nil nil nil 2850 4097 2722 1 2754 #editCut 8 'Cu&t' 9393 1 nil nil nil 2722 1 2754 #editCopy 8 '&Copy' 9351 1 nil nil nil 2722 1 2754 #editPaste 8 '&Paste' 9389 1 nil nil nil 2722 1 2754 #editSelectAll 8 'Select &All' 9347 1 nil nil nil 2722 1 2754 #editDelete 8 '&Delete' 1629 1 nil nil nil 2850 4097 2722 1 2754 #editFind 8 '&Find...' 9357 1 nil nil nil 2722 1 2754 #editFindNext 8 'Find &Next' 1253 1 nil nil nil 2722 1 2754 #editReplace 8 '&Replace...' 9361 1 nil nil nil 2850 4097 2722 1 2754 #addQuotesToSelection 8 'Add &Quotes' 1 1 nil nil nil 2722 1 2754 #removeQuotesFromSelection 8 'Re&move Quotes' 1 1 nil nil nil 8 '&Edit' nil 1 nil nil 10219 nil nil 2674 nil true 34 14 2722 1 2754 #sleepAndCommit 8 '&Sleep and Commit' 1 1 nil nil nil 2722 1 2754 #abortTransaction 8 '&Abort Transaction' 1 1 nil nil nil 2722 1 2754 #commitTransaction 8 '&Commit Transaction' 1 1 nil nil nil 2722 1 2754 #disableNativeCode 8 'Disable Native Code' 1 1 nil nil nil 2850 4097 2722 1 2754 #jadeInspect 8 '&Inspect' 9379 1 nil nil nil 2722 1 2754 #jadeDisplay 8 '&Display' 9353 1 nil nil nil 2722 1 2754 #jadeExecute 8 '&Execute' 9355 1 nil nil nil 2722 1 2754 #jadeDebug 8 'Debu&g' 9349 1 nil nil nil 2722 1 2754 #fileIn 8 'Fi&le In' 1 1 nil nil nil 2850 4097 2722 1 2754 #inspectOop 8 'Inspect Oop ...' 1 1 nil nil nil 2722 1 2754 #describeErrorNumber 8 'Description for Error Number ...' 1025 1 nil nil nil 2722 1025 2754 #flipTranscript 8 'Transcript writes enabled' 1025 1 nil nil nil 8 '&Jadeite' nil 1 nil nil 10245 nil nil 2674 nil true 34 10 2722 1 2754 #openJadeiteProjectsBrowser 8 'Browse &Projects' 9377 1 nil nil nil 2722 1 2754 #openDictionaryBrowser 8 '&Browse Dictionaries' 13449 1 nil nil nil 2722 1 2754 #browseProcesses 8 'Browse P&rocesses' 9381 1 nil nil nil 2722 1 2754 #jadeBrowseTests 8 'Browse SUnit &Tests' 1 1 nil nil nil 2850 4097 2722 1 2754 #browseClass 8 'Find Class ...' 13453 1 nil nil nil 2722 1 2754 #browseImplementorsOf 8 'Browse &Implementors of ...' 13459 1 nil nil nil 2722 1 2754 #browseSendersOf 8 'Browse &Senders of ...' 13479 1 nil nil nil 2722 1 2754 #browseMethodsContaining 8 'Browse &Methods Containing ...' 1 1 nil nil nil 2722 1 2754 #browseLiteralReferences 8 'Browse &Literal References ...' 1 1 nil nil nil 8 '&Browse' nil 134217729 nil nil 10265 nil nil 2674 nil true 34 4 2722 1 2754 #openGitHubJadeiteProject 8 '&Jadiete GitHub Project' 1025 1 nil nil nil 2722 1 2754 #openGitHubRowanProject 8 '&Rowan GitHub Project' 1025 1 nil nil nil 2850 4097 2722 1 2754 #aboutJadeite 8 '&About Jadeite' 1 1 nil nil nil 8 '&Help' nil 1 nil nil 10273 nil nil 8 '' nil 1 nil nil nil nil nil nil nil nil 1 263494 3 ##(Smalltalk.Icon) nil true 1572870 ##(Smalltalk.ImageRelativeFileLocator) 8 'icons\GS32.ico' nil 8930 nil true 8976 8 'icons\GS16.ico' nil nil nil 1 nil nil 930 138 144 34 3 994 #createAt:extent: 34 2 514 7679 21 514 1201 801 416 994 #text: 34 1 8 'Jadeite Session' 416 994 #updateMenuBar 1120 416 1074 8 #[44 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 14 0 0 10 0 0 0 87 17 0 0 154 1 0 0] 34 2 6096 608 1136 nil 27 )! ! !JadeiteTranscript class categoriesFor: #resource_Default_view!public!resources-views! ! diff --git a/sources/JadeiteTranscriptTestCase.cls b/sources/JadeiteTranscriptTestCase.cls index f5e9f08f..6fae0a3d 100644 --- a/sources/JadeiteTranscriptTestCase.cls +++ b/sources/JadeiteTranscriptTestCase.cls @@ -119,6 +119,20 @@ test_browseSendersMenuItem self assert: browseSendersItem command equals: #browseSendersOf. self assert: (transcript class canUnderstand: #browseSendersOf)! +test_menuNames + | commitMenuItem checkoutMenuItem contextMenu | + self testsIssue: #issue342 withTitle: 'Console menu items not matching projects browser'. + contextMenu := transcript projectListPresenter projectListPresenter view queryContextMenu. + commitMenuItem := contextMenu items detect: [:menu | 'Commit to Git ...' = menu text] ifNone: []. + self denyIsNil: commitMenuItem. + self assert: commitMenuItem command equals: #commit. + self assert: (transcript projectListPresenter class canUnderstand: #commit). + checkoutMenuItem := contextMenu items detect: [:menu | 'Checkout Git Branch ...' = menu text] + ifNone: []. + self denyIsNil: checkoutMenuItem. + self assert: checkoutMenuItem command equals: #checkout. + self assert: (transcript projectListPresenter class canUnderstand: #checkout)! + test_multiSelectProject | projectServices projectCount | self testsIssue: #issue163 @@ -140,6 +154,7 @@ test_transcriptNamedConsole !JadeiteTranscriptTestCase categoriesFor: #test_browseProjectsMenuItem!public!test menus! ! !JadeiteTranscriptTestCase categoriesFor: #test_browseSenders!public!tests! ! !JadeiteTranscriptTestCase categoriesFor: #test_browseSendersMenuItem!public!test menus! ! +!JadeiteTranscriptTestCase categoriesFor: #test_menuNames!public!tests! ! !JadeiteTranscriptTestCase categoriesFor: #test_multiSelectProject!public!tests! ! !JadeiteTranscriptTestCase categoriesFor: #test_transcriptNamedConsole!public!tests! ! diff --git a/sources/MethodListPresenter.cls b/sources/MethodListPresenter.cls index 8c55ba86..7495ee06 100644 --- a/sources/MethodListPresenter.cls +++ b/sources/MethodListPresenter.cls @@ -76,14 +76,14 @@ primaryPresenter ! queryCommand: aCommandQuery - - (#(#browseClass #browseImplementors #browseSenders) includes: aCommandQuery commandSymbol) - ifTrue: - [aCommandQuery - isEnabled: methodListPresenter selections size = 1; - receiver: self; - yourself. - ^true]. + (#(#browseClass #browseImplementors #browseSenders #browseHierarchyImplementors #browseHierarchySenders) + includes: aCommandQuery commandSymbol) + ifTrue: + [aCommandQuery + isEnabled: methodListPresenter selections size = 1; + receiver: self; + yourself. + ^true]. (#(#runTests) includes: aCommandQuery commandSymbol) ifTrue: [aCommandQuery diff --git a/sources/Rowan UI Base.pax b/sources/Rowan UI Base.pax index 4519c826..aa311b27 100644 --- a/sources/Rowan UI Base.pax +++ b/sources/Rowan UI Base.pax @@ -1335,6 +1335,7 @@ methodListPresenter ^methodListPresenter! onViewOpened + testCounter := Array with: 0 with: OrderedCollection new. super onViewOpened. self registerPresentersForUpdates. diff --git a/sources/RowanClassService.cls b/sources/RowanClassService.cls index 678e4e33..6cd265c6 100644 --- a/sources/RowanClassService.cls +++ b/sources/RowanClassService.cls @@ -50,13 +50,12 @@ categories classesMethodsUpdate: presenter browser: browser | classNames | browser classListPresenter selections isEmpty ifTrue: [^self]. - browser classListPresenter selections size > 1 "sunit browser" - ifFalse: [browser classListPresenter selection name asString = name asString ifFalse: [^self]]. + browser classListPresenter selections size > 1 + ifFalse: [browser classListPresenter selection name asString = name asString ifFalse: [^self]]. "sunit browser" presenter list isEmpty ifTrue: [self initializePresenterList: presenter]. classNames := browser classListPresenter selections collect: [:classService | classService name]. (classNames includes: name) ifFalse: [^self]. - filters isEmpty ifTrue: [filterType := nil]. - methods ifNotNil: [self displayMethodsOn: presenter]! + methods ifNotNil: [self displayMethodsOn: presenter browser: browser]! classHierarchyUpdate: presenter browser: browser | treeModel subclasses parent | @@ -97,10 +96,9 @@ classHierarchyUpdate: presenter browser: browser presenter view expandAll! classMethodsUpdate: presenter browser: browser - browser selectedClass name asString = name asString ifFalse:[^self]. + browser selectedClass name asString = name asString ifFalse: [^self]. presenter list isEmpty ifTrue: [self initializePresenterList: presenter]. - filters isEmpty ifTrue:[filterType := nil]. - self displayMethodsOn: presenter! + self displayMethodsOn: presenter browser: browser! classOrHierarchyPresenter: browser ^browser isClassListTabSelected @@ -113,16 +111,10 @@ comment comment: anObject comment := anObject! -computeVisibleMethods +computeVisibleMethods: presenter browser: browser | visibleMethods | - filterType isNil ifTrue: [visibleMethods := methods]. - filterType = 'variables' - ifTrue: - [visibleMethods := methods - select: [:methodService | (filters intersection: methodService accessedInstVars) notEmpty]]. - filterType = 'categories' - ifTrue: [visibleMethods := methods select: [:methodService | filters includes: methodService category]]. - visibleMethods ifNil: [^visibleMethods]. + filters := browser selectedFilters. + visibleMethods := filters isEmpty ifTrue: [methods] ifFalse: [self filterMethods: browser]. visibleMethods do: [:svc | svc inSelectedPackage: (self selectedPackageServiceNames includes: svc packageName)]. ^visibleMethods! @@ -133,9 +125,9 @@ definedPackageName definedPackageName: anObject definedPackageName := anObject! -displayMethodsOn: presenter +displayMethodsOn: presenter browser: browser | visibleMethods | - visibleMethods := self computeVisibleMethods. + visibleMethods := self computeVisibleMethods: presenter browser: browser. self updateListIn: presenter from: visibleMethods! displayString @@ -160,20 +152,23 @@ expand expand: anObject expand := anObject! +filterMethods: browser + | visibleMethods | + browser isCategoryTabSelected + ifTrue: [visibleMethods := methods select: [:methodService | filters includes: methodService category]] + ifFalse: + [visibleMethods := methods + select: [:methodService | (filters intersection: methodService accessedInstVars) notEmpty]]. + ^visibleMethods! + filters ^filters! filters: anObject filters := anObject! -filterType - ^filterType! - -filterType: anObject - filterType := anObject! - filterUpdate: presenter browser: browser - browser selectedClass isNil ifTrue: [^self]. + browser selectedClass ifNil: [^self]. browser selectedClass name asString = name asString ifFalse: [^self]. presenter model isEmpty ifTrue: [presenter list: SortedCollection new]. browser isCategoryTabSelected @@ -330,11 +325,11 @@ toolTip ^'Defined package: ' , self definedPackageName! updateCategories: presenter - | selections availableSelections | - selections := presenter selections. - presenter list: (ListModel withAll: categories). - availableSelections := categories select: [:filter | selections includes: filter]. - presenter selections: availableSelections! + "update without losing selections if appropriate" + presenter list copy do:[:category | + (categories includes: category) ifFalse:[presenter model remove: category]]. + categories do:[:category | + (presenter list includes: category) ifFalse:[presenter model add: category]]. ! updatedClass: presenter | update | @@ -375,19 +370,18 @@ visibleTests !RowanClassService categoriesFor: #classOrHierarchyPresenter:!private!updating! ! !RowanClassService categoriesFor: #comment!accessing!public! ! !RowanClassService categoriesFor: #comment:!accessing!public! ! -!RowanClassService categoriesFor: #computeVisibleMethods!private!updating! ! +!RowanClassService categoriesFor: #computeVisibleMethods:browser:!private!updating! ! !RowanClassService categoriesFor: #definedPackageName!accessing!private! ! !RowanClassService categoriesFor: #definedPackageName:!accessing!private! ! -!RowanClassService categoriesFor: #displayMethodsOn:!public!updating! ! +!RowanClassService categoriesFor: #displayMethodsOn:browser:!public!updating! ! !RowanClassService categoriesFor: #displayString!displaying!public! ! !RowanClassService categoriesFor: #displayStringFor:!displaying!public! ! !RowanClassService categoriesFor: #excludedInstVars!public!ston! ! !RowanClassService categoriesFor: #expand!accessing!private! ! !RowanClassService categoriesFor: #expand:!accessing!private! ! +!RowanClassService categoriesFor: #filterMethods:!private!updating! ! !RowanClassService categoriesFor: #filters!accessing!public! ! !RowanClassService categoriesFor: #filters:!accessing!public! ! -!RowanClassService categoriesFor: #filterType!accessing!private! ! -!RowanClassService categoriesFor: #filterType:!accessing!private! ! !RowanClassService categoriesFor: #filterUpdate:browser:!public!updating! ! !RowanClassService categoriesFor: #hash!comparing!public! ! !RowanClassService categoriesFor: #hierarchyClassServiceNames!public! ! diff --git a/sources/RowanProjectService.cls b/sources/RowanProjectService.cls index 26e7bbb7..15992301 100644 --- a/sources/RowanProjectService.cls +++ b/sources/RowanProjectService.cls @@ -68,7 +68,7 @@ displayName | displayName | displayName := name. - existsOnDisk ifFalse:[displayName := '(', displayName, ')']. + existsOnDisk == false ifTrue:[displayName := '(', displayName, ')']. name = self class defaultProjectName ifTrue: [displayName := displayName , '*']. ^displayName!