Browse Source

Use the HLManager instance environment by default

Nicolas Petton 12 years ago
parent
commit
2f77965e17
9 changed files with 1959 additions and 1989 deletions
  1. 328 319
      js/Helios-Core.deploy.js
  2. 328 319
      js/Helios-Core.js
  3. 318 337
      js/Helios-Inspector.deploy.js
  4. 314 349
      js/Helios-Inspector.js
  5. 326 313
      js/Helios-Workspace.deploy.js
  6. 326 313
      js/Helios-Workspace.js
  7. 17 1
      st/Helios-Core.st
  8. 1 19
      st/Helios-Inspector.st
  9. 1 19
      st/Helios-Workspace.st

File diff suppressed because it is too large
+ 328 - 319
js/Helios-Core.deploy.js


File diff suppressed because it is too large
+ 328 - 319
js/Helios-Core.js


File diff suppressed because it is too large
+ 318 - 337
js/Helios-Inspector.deploy.js


File diff suppressed because it is too large
+ 314 - 349
js/Helios-Inspector.js


File diff suppressed because it is too large
+ 326 - 313
js/Helios-Workspace.deploy.js


File diff suppressed because it is too large
+ 326 - 313
js/Helios-Workspace.js


+ 17 - 1
st/Helios-Core.st

@@ -596,7 +596,7 @@ setupKeyBindings
 ! !
 
 HLWidget subclass: #HLManager
-	instanceVariableNames: 'tabs activeTab keyBinder'
+	instanceVariableNames: 'tabs activeTab keyBinder environment'
 	package: 'Helios-Core'!
 
 !HLManager methodsFor: 'accessing'!
@@ -605,6 +605,16 @@ activeTab
 	^ activeTab
 !
 
+environment
+	"The default environment used by all Helios objects"
+    
+	^ environment ifNil: [ environment := self defaultEnvironment ]
+!
+
+environment: anEnvironment
+	environment := anEnvironment
+!
+
 keyBinder
 	^ keyBinder ifNil: [ keyBinder := HLKeyBinder new ]
 !
@@ -638,6 +648,12 @@ removeTab: aTab
 	self refresh
 ! !
 
+!HLManager methodsFor: 'defaults'!
+
+defaultEnvironment
+	^ HLLocalEnvironment new
+! !
+
 !HLManager methodsFor: 'initialization'!
 
 initialize

+ 1 - 19
st/Helios-Inspector.st

@@ -276,7 +276,7 @@ code
 !
 
 environment
-	^ environment ifNil: [ self initializeEnvironment]
+	^ environment ifNil: [ HLManager current environment ]
 !
 
 environment: anEnvironment
@@ -322,20 +322,6 @@ variables: aCollection
 
 !HLInspectorModel methodsFor: 'actions'!
 
-beLocal
-
-	self initializeEnvironment
-!
-
-beRemoteOn: anIPAddress port: aPort
-
-	"to-do"
-    
-    "environment := HLRemoteEnvironment on: anIPAddress port: aPort
-    
-    ...kind of stuff"
-!
-
 inspect: anObject on: anInspector
 
 	inspectee := anObject.
@@ -368,10 +354,6 @@ initializeCode
 	^ code := HLCodeModel on: self environment
 !
 
-initializeEnvironment
-	^ environment := HLLocalEnvironment new
-!
-
 initializeSelection
 
 	^ selection := ''

+ 1 - 19
st/Helios-Workspace.st

@@ -366,7 +366,7 @@ code
 !
 
 environment
-	^ environment ifNil: [ self initializeEnvironment]
+	^ environment ifNil: [ HLManager current environment ]
 !
 
 environment: anEnvironment
@@ -375,20 +375,6 @@ environment: anEnvironment
 
 !HLWorkspaceModel methodsFor: 'actions'!
 
-beLocal
-
-	self initializeEnvironment
-!
-
-beRemoteOn: anIPAddress port: aPort
-
-	"to-do"
-    
-    "environment := HLRemoteEnvironment on: anIPAddress port: aPort
-    
-    ...kind of stuff"
-!
-
 subscribe: aWidget
 	aWidget subscribeTo: self announcer
 ! !
@@ -402,10 +388,6 @@ initializeAnnouncer
 initializeCode
 
 	^ code := HLCodeModel on: self environment
-!
-
-initializeEnvironment
-	^ environment := HLLocalEnvironment new
 ! !
 
 !HLWorkspaceModel methodsFor: 'reactions'!

Some files were not shown because too many files changed in this diff