2
0
Selaa lähdekoodia

server: rename class side #port to #defaultPort

additionally initialize instances with defaultPort
Manfred Kroehnert 12 vuotta sitten
vanhempi
commit
c7a0e7f01a
2 muutettua tiedostoa jossa 29 lisäystä ja 27 poistoa
  1. 6 5
      server/FileServer.st
  2. 23 22
      server/server.js

+ 6 - 5
server/FileServer.st

@@ -33,7 +33,8 @@ initialize
 	http := self require: 'http'.
 	fs := self require: 'fs'.
 	util := self require: 'util'.
-	url := self require: 'url'
+	url := self require: 'url'.
+	port := self class defaultPort.
 !
 
 checkDirectoryLayout
@@ -183,7 +184,7 @@ respondOKTo: aResponse
 !FileServer methodsFor: 'starting'!
 
 startOn: aPort
-	port := aPort.
+	self port: aPort.
 	self start
 !
 
@@ -195,12 +196,12 @@ start
 	      listen: self port.
 ! !
 
-FileServer class instanceVariableNames: 'port mimeTypes'!
+FileServer class instanceVariableNames: 'mimeTypes'!
 
 !FileServer class methodsFor: 'accessing'!
 
-port
-	^port ifNil: [4000]
+defaultPort
+	^4000
 !
 
 defaultMimeTypes

+ 23 - 22
server/server.js

@@ -14322,10 +14322,11 @@ smalltalk.send(self, "_initialize", [], smalltalk.FileServer.superclass || nil);
 (self['@fs']=smalltalk.send(self, "_require_", ["fs"]));
 (self['@util']=smalltalk.send(self, "_require_", ["util"]));
 (self['@url']=smalltalk.send(self, "_require_", ["url"]));
+(self['@port']=smalltalk.send(smalltalk.send(self, "_class", []), "_defaultPort", []));
 return self;},
 args: [],
-source: "initialize\x0a\x09super initialize.\x0a\x09path := self require: 'path'.\x0a\x09http := self require: 'http'.\x0a\x09fs := self require: 'fs'.\x0a\x09util := self require: 'util'.\x0a\x09url := self require: 'url'",
-messageSends: ["initialize", "require:"],
+source: "initialize\x0a\x09super initialize.\x0a\x09path := self require: 'path'.\x0a\x09http := self require: 'http'.\x0a\x09fs := self require: 'fs'.\x0a\x09util := self require: 'util'.\x0a\x09url := self require: 'url'.\x0a\x09port := self class defaultPort.",
+messageSends: ["initialize", "require:", "defaultPort", "class"],
 referencedClasses: []
 }),
 smalltalk.FileServer);
@@ -14510,12 +14511,12 @@ selector: "startOn:",
 category: 'starting',
 fn: function (aPort){
 var self=this;
-(self['@port']=aPort);
+smalltalk.send(self, "_port_", [aPort]);
 smalltalk.send(self, "_start", []);
 return self;},
 args: ["aPort"],
-source: "startOn: aPort\x0a\x09port := aPort.\x0a\x09self start",
-messageSends: ["start"],
+source: "startOn: aPort\x0a\x09self port: aPort.\x0a\x09self start",
+messageSends: ["port:", "start"],
 referencedClasses: []
 }),
 smalltalk.FileServer);
@@ -14554,7 +14555,7 @@ referencedClasses: []
 smalltalk.FileServer);
 
 
-smalltalk.FileServer.klass.iVarNames = ['port','mimeTypes'];
+smalltalk.FileServer.klass.iVarNames = ['mimeTypes'];
 smalltalk.addMethod(
 "_defaultMimeTypes",
 smalltalk.method({
@@ -14571,6 +14572,22 @@ referencedClasses: []
 }),
 smalltalk.FileServer.klass);
 
+smalltalk.addMethod(
+"_defaultPort",
+smalltalk.method({
+selector: "defaultPort",
+category: 'accessing',
+fn: function (){
+var self=this;
+return (4000);
+return self;},
+args: [],
+source: "defaultPort\x0a\x09^4000",
+messageSends: [],
+referencedClasses: []
+}),
+smalltalk.FileServer.klass);
+
 smalltalk.addMethod(
 "_main",
 smalltalk.method({
@@ -14630,22 +14647,6 @@ referencedClasses: []
 }),
 smalltalk.FileServer.klass);
 
-smalltalk.addMethod(
-"_port",
-smalltalk.method({
-selector: "port",
-category: 'accessing',
-fn: function (){
-var self=this;
-return (($receiver = self['@port']) == nil || $receiver == undefined) ? (function(){return (4000);})() : $receiver;
-return self;},
-args: [],
-source: "port\x0a\x09^port ifNil: [4000]",
-messageSends: ["ifNil:"],
-referencedClasses: []
-}),
-smalltalk.FileServer.klass);
-
 
 smalltalk.init(smalltalk.Object); //metaclasses are in through Class
 smalltalk.classes()._do_(function(each) {