--- a/MCRepositoryBrowser.st Sun Oct 05 02:24:12 2014 +0200
+++ b/MCRepositoryBrowser.st Tue Oct 07 00:57:57 2014 +0200
@@ -1110,19 +1110,21 @@
setTargetPackage
"specify an st/x package identifier to be used as default"
-
+
| package |
package := Dialog
- requestProject:'Default Smalltalk/X package to load code into:'
- initialAnswer:targetPackage
- suggestions:#().
- package ifNil:[^self].
-
+ requestProject:'Default Smalltalk/X package to load code into:'
+ initialAnswer:targetPackage
+ suggestions:#().
+ package isNil ifTrue:[
+ ^ self
+ ].
targetPackage := lastPackage := package.
- self targetPackageHolder value:('Target-Package: ',targetPackage).
+ self targetPackageHolder value:('Target-Package: ' , targetPackage).
"Created: / 07-09-2011 / 12:47:15 / cg"
+ "Modified: / 06-10-2014 / 23:38:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
showPackageInFileBrowser
@@ -1205,15 +1207,31 @@
entry := self selectedVersionHolder value.
entry notNil ifTrue:[
self withWaitCursorDo:[
- |version|
+ | version package |
version := entry asMCVersion.
- self versionLoad: version into:(targetPackage ? version package name ? PackageId noProjectID)
+ package := targetPackage.
+ package isNil ifTrue:[
+ version package name notNil ifTrue:[
+ "/ Just a guess...
+ package := 'stx:goodies/', (version package name asLowercase replaceAll: $- with: $_)
+ ] ifFalse:[
+ package := PackageId noProjectID.
+ ].
+ package := Dialog
+ requestProject:'Smalltalk/X package to load code into:'
+ initialAnswer:package
+ suggestions:#().
+ package isNil ifTrue:[
+ ^ self
+ ].
+ ].
+ self versionLoad: version into:package
]
].
- "Modified: / 09-11-2010 / 13:26:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 07-09-2011 / 14:51:57 / cg"
+ "Modified: / 06-10-2014 / 23:39:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
versionLoad: version into: package
@@ -1301,15 +1319,15 @@
!MCRepositoryBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.35 2014-05-18 09:14:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.36 2014-10-06 22:57:57 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.35 2014-05-18 09:14:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.36 2014-10-06 22:57:57 vrany Exp $'
!
version_SVN
- ^ '$Id: MCRepositoryBrowser.st,v 1.35 2014-05-18 09:14:56 cg Exp $'
+ ^ '$Id: MCRepositoryBrowser.st,v 1.36 2014-10-06 22:57:57 vrany Exp $'
! !