Browse Source

added Package >> loadFromNamespace:

... and Package class >> load:fromNamespace:
Herbert Vojčík 10 years ago
parent
commit
94332f4945
4 changed files with 69 additions and 22 deletions
  1. 53 0
      js/Kernel-ImportExport.js
  2. 0 16
      js/Kernel-Infrastructure.js
  3. 16 0
      st/Kernel-ImportExport.st
  4. 0 6
      st/Kernel-Infrastructure.st

+ 53 - 0
js/Kernel-ImportExport.js

@@ -2353,4 +2353,57 @@ referencedClasses: []
 }),
 smalltalk.Package);
 
+smalltalk.addMethod(
+smalltalk.method({
+selector: "loadFromNamespace:",
+category: '*Kernel-ImportExport',
+fn: function (aString){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
+var $2,$3,$1;
+$2=self._transport();
+_st($2)._namespace_(aString);
+$3=_st($2)._load();
+$1=$3;
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"loadFromNamespace:",{aString:aString},smalltalk.Package)})},
+args: ["aString"],
+source: "loadFromNamespace: aString\x0a\x09^ self transport\x0a\x09\x09namespace: aString;\x0a\x09\x09load",
+messageSends: ["namespace:", "transport", "load"],
+referencedClasses: []
+}),
+smalltalk.Package);
+
+smalltalk.addMethod(
+smalltalk.method({
+selector: "load:",
+category: '*Kernel-ImportExport',
+fn: function (aPackageName){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
+_st(self._named_(aPackageName))._load();
+return self}, function($ctx1) {$ctx1.fill(self,"load:",{aPackageName:aPackageName},smalltalk.Package.klass)})},
+args: ["aPackageName"],
+source: "load: aPackageName\x0a\x09(self named: aPackageName) load",
+messageSends: ["load", "named:"],
+referencedClasses: []
+}),
+smalltalk.Package.klass);
+
+smalltalk.addMethod(
+smalltalk.method({
+selector: "load:fromNamespace:",
+category: '*Kernel-ImportExport',
+fn: function (aPackageName,aString){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
+_st(self._named_(aPackageName))._loadFromNamespace_(aString);
+return self}, function($ctx1) {$ctx1.fill(self,"load:fromNamespace:",{aPackageName:aPackageName,aString:aString},smalltalk.Package.klass)})},
+args: ["aPackageName", "aString"],
+source: "load: aPackageName fromNamespace: aString\x0a\x09(self named: aPackageName) loadFromNamespace: aString",
+messageSends: ["loadFromNamespace:", "named:"],
+referencedClasses: []
+}),
+smalltalk.Package.klass);
+
 });

+ 0 - 16
js/Kernel-Infrastructure.js

@@ -1882,22 +1882,6 @@ smalltalk.Package);
 
 
 smalltalk.Package.klass.iVarNames = ['defaultCommitPathJs','defaultCommitPathSt'];
-smalltalk.addMethod(
-smalltalk.method({
-selector: "load:",
-category: 'loading',
-fn: function (aPackageName){
-var self=this;
-return smalltalk.withContext(function($ctx1) { 
-_st(self._named_(aPackageName))._load();
-return self}, function($ctx1) {$ctx1.fill(self,"load:",{aPackageName:aPackageName},smalltalk.Package.klass)})},
-args: ["aPackageName"],
-source: "load: aPackageName\x0a\x09(self named: aPackageName) load",
-messageSends: ["load", "named:"],
-referencedClasses: []
-}),
-smalltalk.Package.klass);
-
 smalltalk.addMethod(
 smalltalk.method({
 selector: "named:",

+ 16 - 0
st/Kernel-ImportExport.st

@@ -856,5 +856,21 @@ commit
 
 load
 	^ self transport load
+!
+
+loadFromNamespace: aString
+	^ self transport
+		namespace: aString;
+		load
+! !
+
+!Package class methodsFor: '*Kernel-ImportExport'!
+
+load: aPackageName
+	(self named: aPackageName) load
+!
+
+load: aPackageName fromNamespace: aString
+	(self named: aPackageName) loadFromNamespace: aString
 ! !
 

+ 0 - 6
st/Kernel-Infrastructure.st

@@ -708,12 +708,6 @@ named: aPackageName transport: aTransport
 	^ package
 ! !
 
-!Package class methodsFor: 'loading'!
-
-load: aPackageName
-	(self named: aPackageName) load
-! !
-
 !Package class methodsFor: 'sorting'!
 
 sortedClasses: classes