misc fixes

Author: tomooda

repository/ViennaTalk-Application/ViennaCommandLineHandler.class.st

@@ -76,11 +76,19 @@ ViennaCommandLineHandler class >> generate [
 ViennaCommandLineHandler >> activate [
 
 	self
+		installLocalDirectory;
 		installMenu;
 		installQuitSession.
 	ViennaLauncher reopen
 ]
 
+{ #category : 'activation' }
+ViennaCommandLineHandler >> installLocalDirectory [
+
+	SystemResolver userLocalDirectory:
+		FileLocator viennaTalkDocumentDirectory
+]
+
 { #category : 'activation' }
 ViennaCommandLineHandler >> installMenu [
 

repository/ViennaTalk-Browser-Core/ViennaRefactoringBrowser.class.st

@@ -884,6 +884,50 @@ ViennaRefactoringBrowser >> cherrypick [
 		self updateModuleList ]
 ]
 
+{ #category : 'user interface' }
+ViennaRefactoringBrowser >> chooseDirectory: aString path: aFileReference [
+
+	| reference |
+	reference := nil.
+	StOpenDirectoryPresenter new
+		openFolder:
+			(aFileReference ifNil: [ FileLocator viennaTalkDocumentDirectory ]);
+		title: aString;
+		okAction: [ :directoryReference | reference := directoryReference ];
+		openModal.
+	^ reference
+]
+
+{ #category : 'user interface' }
+ViennaRefactoringBrowser >> chooseExistingFileReference: aString extensions: anArrayOfString path: aFileReference [
+
+	| reference |
+	reference := nil.
+	StOpenFilePresenter new
+		openFolder:
+			(aFileReference ifNil: [ FileLocator viennaTalkDocumentDirectory ]);
+		extensions: anArrayOfString;
+		title: aString;
+		okAction: [ :directoryReference | reference := directoryReference ];
+		openModal.
+	^ reference
+]
+
+{ #category : 'user interface' }
+ViennaRefactoringBrowser >> chooseForSaveFileReference: aString extensions: anArrayOfString path: aFileReference [
+
+	| reference |
+	reference := nil.
+	StSaveFilePresenter new
+		filter: (StCustomExtensionsFilter extensions: anArrayOfString);
+		defaultFolder:
+			(aFileReference ifNil: [ FileLocator viennaTalkDocumentDirectory ]);
+		title: aString;
+		okAction: [ :ref | reference := ref ];
+		openModal.
+	^ reference
+]
+
 { #category : 'private' }
 ViennaRefactoringBrowser >> clearDirty [
 
@@ -2377,7 +2421,7 @@ ViennaRefactoringBrowser >> load: aFileReference [
 { #category : 'operations' }
 ViennaRefactoringBrowser >> loadFromDirectory [
 
-	(UIManager default
+	(self
 		 chooseDirectory: 'Directory to open'
 		 path: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :dir |
 		self load: dir ]
@@ -2386,7 +2430,7 @@ ViennaRefactoringBrowser >> loadFromDirectory [
 { #category : 'operations' }
 ViennaRefactoringBrowser >> loadFromFile [
 
-	(UIManager default
+	(self
 		 chooseExistingFileReference: 'File to open'
 		 extensions: #( 'vdmsl' )
 		 path: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :file |
@@ -2481,43 +2525,43 @@ ViennaRefactoringBrowser >> menuBar [
 ViennaRefactoringBrowser >> mergeAnnotationsIntoFRAM [
 
 	| fram |
-	(UIManager default
+	(self
 		 chooseExistingFileReference: 'Import directory'
 		 extensions: #( 'xfmv' )
-		 path: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :ref | 
+		 path: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :ref |
 		fram := ViennaFRAMModel fromFile: ref ].
 	fram ifNil: [ ^ nil ].
 	fram loadSpec: self specification.
-	(UIManager default
+	(self
 		 chooseForSaveFileReference: 'Export file'
 		 extensions: #( 'xfmv' )
-		 path: FileLocator home asFileReference) ifNotNil: [ :ref | 
+		 path: FileLocator home asFileReference) ifNotNil: [ :ref |
 		fram writeXMLFile: ref ]
 ]
 
 { #category : 'operations' }
 ViennaRefactoringBrowser >> mergeOperationsFromFRAM [
 
 	| fram copyMap newAst |
-	(UIManager default
+	(self
 		 chooseExistingFileReference: 'Import directory'
 		 extensions: #( 'xfmv' )
 		 path: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :ref |
 		fram := ViennaFRAMModel fromFile: ref ].
 	^ fram ifNotNil: [
-		  | module category definition |
-		  module := self module.
-		  category := self category.
-		  definition := self definition.
-		  copyMap := IdentityDictionary new.
-		  newAst := self specification copyWhole: copyMap.
-		  fram appendToSpec: newAst.
-		  self epiLogMergeFRAM: newAst.
-		  moduleList selectItem: (copyMap at: module ifAbsent: [ nil ]).
-		  categoryList selectItem: (copyMap at: category ifAbsent: [ nil ]).
-		  definitionList selectItem:
-			  (copyMap at: definition ifAbsent: [ nil ]).
-		  newAst ]
+			  | module category definition |
+			  module := self module.
+			  category := self category.
+			  definition := self definition.
+			  copyMap := IdentityDictionary new.
+			  newAst := self specification copyWhole: copyMap.
+			  fram appendToSpec: newAst.
+			  self epiLogMergeFRAM: newAst.
+			  moduleList selectItem: (copyMap at: module ifAbsent: [ nil ]).
+			  categoryList selectItem: (copyMap at: category ifAbsent: [ nil ]).
+			  definitionList selectItem:
+				  (copyMap at: definition ifAbsent: [ nil ]).
+			  newAst ]
 ]
 
 { #category : 'accessing' }
@@ -2973,37 +3017,36 @@ ViennaRefactoringBrowser >> saveAs [
 { #category : 'operations' }
 ViennaRefactoringBrowser >> saveAsDirectory [
 
-	(UIManager default
+	(self
 		 chooseDirectory: 'Directory to save'
-		 from: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :dir |
-		(dir filesMatching: '*.vdmsl') do: [ :file | file ensureDeleteAll ].
-		self specification modulesDo: [ :moduleNode |
-			| file |
-			file := dir / moduleNode identifier withExtension: 'vdmsl'.
-			file
-				ensureDeleteAll;
-				writeStreamDo: [ :stream |
-					stream nextPutAll:
-							((ViennaVDMFormatter format: moduleNode) withLineEndings:
-									 OSPlatform current lineEnding) ] ].
-		UIManager default message: 'Save to ' , dir basename , '/.'.
-		self fileReference: dir.
-		self clearDirty ]
+		 path: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :dir |
+			(dir filesMatching: '*.vdmsl') do: [ :file | file ensureDeleteAll ].
+			self specification modulesDo: [ :moduleNode |
+					| file |
+					file := dir / moduleNode identifier withExtension: 'vdmsl'.
+					file
+						ensureDeleteAll;
+						writeStreamDo: [ :stream |
+								stream nextPutAll:
+										((ViennaVDMFormatter format: moduleNode) withLineEndings:
+												 OSPlatform current lineEnding) ] ].
+			UIManager default message: 'Save to ' , dir basename , '/.'.
+			self fileReference: dir.
+			self clearDirty ]
 ]
 
 { #category : 'operations' }
 ViennaRefactoringBrowser >> saveAsFile [
 
-	(UIManager default
+	(self
 		 chooseForSaveFileReference: 'File to save'
 		 extensions: #( 'vdmsl' )
-		 path: FileLocator viennaTalkDocumentDirectory asFileReference)
-		ifNotNil: [ :file |
+		 path: FileLocator viennaTalkDocumentDirectory) ifNotNil: [ :file |
 			file
 				ensureDeleteAll;
 				writeStreamDo: [ :stream |
-					stream nextPutAll:
-							(self source withLineEndings: OSPlatform current lineEnding) ].
+						stream nextPutAll:
+								(self source withLineEndings: OSPlatform current lineEnding) ].
 			UIManager default message: 'Save to ' , file basename , '.'.
 			self fileReference: file.
 			self clearDirty ]

repository/ViennaTalk-Engine-Core/ViennaVDMJ.class.st

@@ -142,8 +142,7 @@ ViennaVDMJ class >> globalLock: aBlock [
 ViennaVDMJ class >> initialize [
 
 	super initialize.
-	Smalltalk addToStartUpList: self.
-	Smalltalk isInteractiveGraphic ifTrue: [ self install ]
+	Smalltalk addToStartUpList: self
 ]
 
 { #category : 'class initialization' }