ソースを参照

renamed handle unexpected message to handle message type

Dave Schuyler 20 年 前
コミット
7dbad1b10c
1 ファイル変更7 行追加5 行削除
  1. 7 5
      direct/src/distributed/ClientRepository.py

+ 7 - 5
direct/src/distributed/ClientRepository.py

@@ -305,7 +305,8 @@ class ClientRepository(ConnectionRepository):
         # Construct a new one
         # Construct a new one
         classDef = dclass.getClassDef()
         classDef = dclass.getClassDef()
         if classDef == None:
         if classDef == None:
-             self.notify.error("Could not create an undefined %s object." % (dclass.getName()))
+             self.notify.error("Could not create an undefined %s object."%(
+                dclass.getName()))
         distObj = classDef(self)
         distObj = classDef(self)
         distObj.dclass = dclass
         distObj.dclass = dclass
         # Assign it an Id
         # Assign it an Id
@@ -323,7 +324,8 @@ class ClientRepository(ConnectionRepository):
         # updateRequiredFields calls announceGenerate
         # updateRequiredFields calls announceGenerate
         return  distObj
         return  distObj
 
 
-    def generateWithRequiredOtherFields(self, dclass, doId, di, parentId = None, zoneId = None):
+    def generateWithRequiredOtherFields(self, dclass, doId, di,
+            parentId = None, zoneId = None):
         if self.doId2do.has_key(doId):
         if self.doId2do.has_key(doId):
             # ...it is in our dictionary.
             # ...it is in our dictionary.
             # Just update it.
             # Just update it.
@@ -513,7 +515,7 @@ class ClientRepository(ConnectionRepository):
                 if (self.isLocalId(id)):
                 if (self.isLocalId(id)):
                     self.send(obj.dclass.clientFormatGenerate(obj, id, zone, []))
                     self.send(obj.dclass.clientFormatGenerate(obj, id, zone, []))
 
 
-    def handleUnexpectedMsgType(self, msgType, di):
+    def handleMessageType(self, msgType, di):
         if msgType == CLIENT_GO_GET_LOST:
         if msgType == CLIENT_GO_GET_LOST:
             self.handleGoGetLost(di)
             self.handleGoGetLost(di)
         elif msgType == CLIENT_HEARTBEAT:
         elif msgType == CLIENT_HEARTBEAT:
@@ -744,7 +746,7 @@ class ClientRepository(ConnectionRepository):
                 self.handleSetZoneDone()
                 self.handleSetZoneDone()
 
 
         if self.handler == None:
         if self.handler == None:
-            self.handleUnexpectedMsgType(msgType, di)
+            self.handleMessageType(msgType, di)
         else:
         else:
             self.handler(msgType, di)
             self.handler(msgType, di)
 
 
@@ -772,7 +774,7 @@ class ClientRepository(ConnectionRepository):
         elif msgType == CLIENT_REQUEST_GENERATES:
         elif msgType == CLIENT_REQUEST_GENERATES:
             self.handleRequestGenerates(di)
             self.handleRequestGenerates(di)
         else:
         else:
-            self.handleUnexpectedMsgType(msgType, di)
+            self.handleMessageType(msgType, di)
 
 
     def sendHeartbeat(self):
     def sendHeartbeat(self):
         datagram = PyDatagram()
         datagram = PyDatagram()