--- a/NewSystemBrowser.st	Fri Jul 12 12:12:36 2002 +0200
+++ b/NewSystemBrowser.st	Fri Jul 12 14:58:48 2002 +0200
@@ -27020,7 +27020,7 @@
 !
 
 canUseRefactoringSupport
-     ^ RefactoryChangeManager notNil and:[RefactoryChangeManager isLoaded]
+     ^ CodeGeneratorTool canUseRefactoringSupport
 !
 
 javaMode
@@ -51838,6 +51838,6 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.357 2002-07-11 20:12:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.358 2002-07-12 12:58:48 cg Exp $'
 ! !
 NewSystemBrowser initialize!

--- a/Tools__NewSystemBrowser.st	Fri Jul 12 12:12:36 2002 +0200
+++ b/Tools__NewSystemBrowser.st	Fri Jul 12 14:58:48 2002 +0200
@@ -27020,7 +27020,7 @@
 !
 
 canUseRefactoringSupport
-     ^ RefactoryChangeManager notNil and:[RefactoryChangeManager isLoaded]
+     ^ CodeGeneratorTool canUseRefactoringSupport
 !
 
 javaMode
@@ -51838,6 +51838,6 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.357 2002-07-11 20:12:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.358 2002-07-12 12:58:48 cg Exp $'
 ! !
 NewSystemBrowser initialize!

--- a/WorkspaceApplication.st	Fri Jul 12 12:12:36 2002 +0200
+++ b/WorkspaceApplication.st	Fri Jul 12 14:58:48 2002 +0200
@@ -135,23 +135,6 @@
             )
           )
          #(#MenuItem
-            #label: 'Settings'
-            #translateLabel: true
-            #isVisible: false
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #label: 'Autodefine Workspace Variables'
-                  #translateLabel: true
-                  #indication: #autoDefineWorkspaceVariables
-                )
-               )
-              nil
-              nil
-            )
-          )
-         #(#MenuItem
             #label: 'Buffer'
             #translateLabel: true
             #nameKey: #Buffer
@@ -211,6 +194,52 @@
             )
           )
          #(#MenuItem
+            #label: 'Workspace'
+            #translateLabel: true
+            #submenu: 
+           #(#Menu
+              #(
+               #(#MenuItem
+                  #label: 'Add Workspace Variable...'
+                  #translateLabel: true
+                  #value: #addWorkspaceVariable
+                )
+               #(#MenuItem
+                  #label: 'Remove Workspace Variable...'
+                  #translateLabel: true
+                  #value: #removeWorkspaceVariable
+                )
+               #(#MenuItem
+                  #label: '-'
+                )
+               #(#MenuItem
+                  #label: 'Remove all Workspace Variables...'
+                  #translateLabel: true
+                  #value: #removeAllWorkspaceVariables
+                )
+         #(#MenuItem
+            #label: 'Settings'
+            #translateLabel: true
+            #isVisible: false
+            #submenu: 
+           #(#Menu
+              #(
+               #(#MenuItem
+                  #label: 'Autodefine Workspace Variables'
+                  #translateLabel: true
+                  #indication: #autoDefineWorkspaceVariables
+                )
+               )
+              nil
+              nil
+            )
+          )
+               )
+              nil
+              nil
+            )
+          )
+         #(#MenuItem
             #label: 'Smalltalk'
             #translateLabel: true
             #submenu: 
@@ -548,6 +577,22 @@
     self addWindow:(HVScrollableView for:Workspace) named:'Workspace%1'
 !
 
+addWorkspaceVariable
+    |name selection|
+
+    selection := self selectedWorkspacesTextView selection ? ''.
+
+    name := Dialog 
+                request:'Name of new Workspace Variable:'
+                initialAnswer:(selection asString string)
+                okLabel:'Add'
+                title:'Enter Variable Name'.
+    name size == 0 ifTrue:[
+        ^ self
+    ].
+    Workspace addWorkspaceVariable:name.
+!
+
 autoDefineWorkspaceVariablesChanged
     "does not work yet - needs more interaction with parser"
 
@@ -691,6 +736,13 @@
     self selectedWorkspacesTextView printIt
 !
 
+removeAllWorkspaceVariables
+    (Dialog confirm:'Do you really want to remove all Workspace Variables ?')
+    ifTrue:[
+        Workspace removeAllWorkspaceVariables
+   ].
+!
+
 removeWorkspace
     self removeWorkspace:(self selectedWorkspaceIndexHolder value)
 !
@@ -727,6 +779,23 @@
     self selectedWorkspaceIndexHolder changed:#value.   
 !
 
+removeWorkspaceVariable
+    |name selection|
+
+    selection := self selectedWorkspacesTextView selection ? ''.
+
+    name := Dialog 
+                request:'Variable to remove:'
+                initialAnswer:(selection asString string)
+                okLabel:'Remove'
+                title:'Enter Variable Name'
+                list:(Workspace workspaceVariables keys asOrderedCollection sort).      
+    name size == 0 ifTrue:[
+        ^ self
+    ].
+    Workspace removeWorkspaceVariable:name.
+!
+
 renameWorkspace
     self renameWorkspace:(self selectedWorkspaceIndexHolder value)
 !
@@ -821,5 +890,5 @@
 !WorkspaceApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.31 2002-07-11 10:56:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.32 2002-07-12 12:58:23 cg Exp $'
 ! !