diff --git a/.gitignore b/.gitignore index d568f958..1b329cd5 100755 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ Rowan System Browser Layout.stb runtime/Jade.* tempBkp/* runtime/Jadeite.exe +runtime/Jadeite.xml diff --git a/sources/JadeiteProjectsBrowserPresenter.cls b/sources/JadeiteProjectsBrowserPresenter.cls index d9b043ad..e9fc0ea6 100644 --- a/sources/JadeiteProjectsBrowserPresenter.cls +++ b/sources/JadeiteProjectsBrowserPresenter.cls @@ -436,9 +436,6 @@ initialize super initialize. stonCritical := Semaphore forMutualExclusion.! -inspectProject - projectListPresenter selection inspect! - isDictionariesTabSelected ^projectDictionaryTabs currentCard name = 'dictionaryList'. @@ -635,7 +632,6 @@ projectMenuStrings writeProject; checkout; projectLog; - inspectProject; refresh ]. ^#( 'Projects' @@ -655,7 +651,6 @@ projectMenuStrings 'Checkout ...//checkout' '-' 'Log//projectLog' - '&Inspect//inspectProject' '&Refresh ...//refresh' )! @@ -1342,7 +1337,6 @@ writeProject !JadeiteProjectsBrowserPresenter categoriesFor: #gotoClassPackage!menu handlers!private! ! !JadeiteProjectsBrowserPresenter categoriesFor: #gotoMethodPackage!menu handlers!private! ! !JadeiteProjectsBrowserPresenter categoriesFor: #initialize!initialization!public! ! -!JadeiteProjectsBrowserPresenter categoriesFor: #inspectProject!project menu handlers!public! ! !JadeiteProjectsBrowserPresenter categoriesFor: #isDictionariesTabSelected!public!testing! ! !JadeiteProjectsBrowserPresenter categoriesFor: #issueCommand:!private!services! ! !JadeiteProjectsBrowserPresenter categoriesFor: #jadeMenuStrings!menus!public! ! diff --git a/sources/Rowan UI Base.pax b/sources/Rowan UI Base.pax index e7dbea7b..0e84fbcc 100644 --- a/sources/Rowan UI Base.pax +++ b/sources/Rowan UI Base.pax @@ -191,6 +191,8 @@ package methodNames add: #RowanCommandResult -> #updateType; add: #RowanGsMethod -> #printOn:; add: #RowanMethodDefinition -> #methodDefinitionService; + add: #RowanPatch -> #operations:; + add: #RowanPatch -> #session:; add: 'JadeServer class' -> #gsString; add: 'JadeServer64bit32 class' -> #gsClassDefinitionStringFor:; add: 'JadeSessionManager class' -> #getUrl; @@ -608,7 +610,8 @@ postLoginAs: aString useSocket: aBoolean self verifyRowanLoaded ifFalse: [^MessageBox notify: 'Rowan not loaded or $ROWAN_PROJECTS_HOME not set. Logging out.' "log out in RowinLoginShell>>postLogin:"]. "self initializeServer." server := self executeString: '| server | - server := (Rowan jadeServerClassNamed: #JadeServer64bit32) new initialize; yourself. + "server := (Rowan jadeServerClassNamed: #JadeServer64bit32) new initialize; yourself." "restore for non-SystemUser support" + server := JadeServer64bit32 new initialize; yourself. System _sessionStateAt: 3 put: server. ^server'. aBoolean ifTrue: [self attemptSocket]. @@ -2297,5 +2300,17 @@ methodDefinitionService ^methodDefinitionService ifNil: [methodDefinitionService := RowanMethodService on: gciSession]! ! !RowanMethodDefinition categoriesFor: #methodDefinitionService!public!services! ! +!RowanPatch methodsFor! + +operations: aCollection + + operations := aCollection! + +session: aCollection + + gciSession := aCollection! ! +!RowanPatch categoriesFor: #operations:!public! ! +!RowanPatch categoriesFor: #session:!public! ! + "End of package definition"! diff --git a/sources/RowanProjectListPresenter.cls b/sources/RowanProjectListPresenter.cls index 98c81ea8..bb7da9d1 100644 --- a/sources/RowanProjectListPresenter.cls +++ b/sources/RowanProjectListPresenter.cls @@ -54,10 +54,6 @@ createComponents super createComponents. projectListPresenter := self add: ListPresenter new name: 'projectList'! -inspectProject - - projectListPresenter selectionOrNil inspect! - list: aList projectListPresenter list: aList! @@ -173,7 +169,6 @@ writeProject !RowanProjectListPresenter categoriesFor: #cloneProject!project menu handlers!public! ! !RowanProjectListPresenter categoriesFor: #commit!project menu handlers!public! ! !RowanProjectListPresenter categoriesFor: #createComponents!public! ! -!RowanProjectListPresenter categoriesFor: #inspectProject!project menu handlers!public! ! !RowanProjectListPresenter categoriesFor: #list:!public! ! !RowanProjectListPresenter categoriesFor: #loadProject!project menu handlers!public! ! !RowanProjectListPresenter categoriesFor: #makeDefault!project menu handlers!public! ! diff --git a/sources/RowanProjectListShell.cls b/sources/RowanProjectListShell.cls index d5c4a280..bef019ca 100644 --- a/sources/RowanProjectListShell.cls +++ b/sources/RowanProjectListShell.cls @@ -59,6 +59,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 17 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 #loadProject 8 'Load ...' 1 1 nil nil nil 594 1 626 #unloadProject 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 #inspectProject 8 'Inspect' 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 1440 590662 2 ##(Smalltalk.ListModel) 138 144 1392 nil 1310726 ##(Smalltalk.IdentitySearchPolicy) 466 8 4278190080 nil 7 nil nil nil 1440 nil 8 4294908001 ##(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 1792 8 'doIt' 8 '[:project | project displayName]' 8 #[30 105 226 0 106] #displayName 1808 7 257 nil nil 1440 nil 3 nil 1794 0 nil 1826 3 1 1792 8 'doIt' 8 '[:each | each item displayStringFor: each]' 8 #[31 105 226 0 17 177 106] #item #displayStringFor: 1904 7 257 nil false nil 1052998 20 ##(Smalltalk.EmbeddedTextEdit) nil nil 8 #(67174528 0) 2000 721990 2 ##(Smalltalk.ValueHolder) nil false 1310726 ##(Smalltalk.EqualitySearchPolicy) nil nil nil 5 nil nil nil 2000 nil nil 852486 ##(Smalltalk.NullConverter) nil 8 '' 3 nil nil nil nil nil nil nil nil nil 1698 8 'Loaded Sha' 389 #left 1746 #displayString 8 #() 1746 #<= 2192 1794 0 nil 1826 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project sha]' 8 #[30 105 226 0 106] #sha 2224 7 257 nil nil 1440 nil 3 nil nil false nil 1986 nil nil 8 #(67174528 0) 2304 2034 nil false 2080 nil 466 8 4278190080 nil 5 nil nil nil 2304 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil 1698 8 'Branch' 387 #left 1746 #displayString 2192 1746 #<= 2192 1794 0 nil 1826 2 1 ##(Smalltalk.UndefinedObject) 8 'doIt' 8 '[:project | project branch]' 8 #[30 105 226 0 106] #branch 2480 7 257 nil nil 1440 nil 3 nil nil false nil 1986 nil nil 8 #(67174528 0) 2560 2034 nil false 2080 nil 466 2368 nil 5 nil nil nil 2560 nil nil 2098 nil 8 '' 3 nil nil nil nil nil nil nil nil nil #report 1392 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 1440 2770 #text: 34 1 8 'Project Name' 1440 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 2706 138 144 34 4 2770 #createAt:extent: 34 2 514 7679 21 514 1201 801 416 2770 #contextMenu: 34 1 560 416 2770 #text: 34 1 8 'Rowan Project List' 416 2770 #updateMenuBar 1392 416 2898 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 1440 2960 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 #loadProject 8 'Load ...' 1 1 nil nil nil 594 1 626 #unloadProject 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 4294902557 ##(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 )! ! !RowanProjectListShell class categoriesFor: #resource_Default_view!public!resources-views! ! diff --git a/sources/RowanProjectService.cls b/sources/RowanProjectService.cls index 3e0d7cd4..d48c342e 100644 --- a/sources/RowanProjectService.cls +++ b/sources/RowanProjectService.cls @@ -39,7 +39,7 @@ changesUsing: presenter operations := OrderedCollection new. changes do: [:changeString | operations addAll: (RowanPatch fromString: changeString session: session) operations]. - RowanPatchBrowser showOn: (RowanPatch operations: operations session: session) name: name! + RowanPatchBrowser showOn: (RowanPatch new operations: operations; session: session) name: name! checkout: branchName transport