2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Made protected member variable private. Added accessor funcs.
	* src/AbstractBtMessage.cc
	* src/AbstractBtMessage.h
	* src/BtAllowedFastMessage.cc
	* src/BtAllowedFastMessage.h
	* src/BtBitfieldMessage.cc
	* src/BtBitfieldMessage.h
	* src/BtCancelMessage.cc
	* src/BtCancelMessage.h
	* src/BtChokeMessage.cc
	* src/BtChokeMessage.h
	* src/BtExtendedMessage.cc
	* src/BtHaveAllMessage.cc
	* src/BtHaveAllMessage.h
	* src/BtHaveMessage.cc
	* src/BtHaveMessage.h
	* src/BtHaveNoneMessage.cc
	* src/BtHaveNoneMessage.h
	* src/BtInterestedMessage.cc
	* src/BtInterestedMessage.h
	* src/BtNotInterestedMessage.cc
	* src/BtNotInterestedMessage.h
	* src/BtPieceMessage.cc
	* src/BtPieceMessage.h
	* src/BtPortMessage.cc
	* src/BtPortMessage.h
	* src/BtRejectMessage.cc
	* src/BtRejectMessage.h
	* src/BtRequestMessage.cc
	* src/BtRequestMessage.h
	* src/BtUnchokeMessage.cc
	* src/BtUnchokeMessage.h
	* src/SimpleBtMessage.cc
	* src/SimpleBtMessage.h

1 files changed, 23 insertions, 17 deletions

diff --git a/src/BtRequestMessage.cc b/src/BtRequestMessage.cc
index 3a6b98f7..fc4e0df3 100644
--- a/src/BtRequestMessage.cc
+++ b/src/BtRequestMessage.cc
@@ -43,6 +43,11 @@ namespace aria2 {
 
 const std::string BtRequestMessage::NAME("request");
 
+BtRequestMessage::BtRequestMessage
+(size_t index, uint32_t begin, uint32_t length, size_t blockIndex):
+  RangeBtMessage(ID, NAME, index, begin, length),
+  _blockIndex(blockIndex) {}
+
 SharedHandle<BtRequestMessage> BtRequestMessage::create
 (const unsigned char* data, size_t dataLength)
 {
@@ -51,22 +56,23 @@ SharedHandle<BtRequestMessage> BtRequestMessage::create
 
 void BtRequestMessage::doReceivedAction()
 {
-  if(_metadataGetMode) {
+  if(isMetadataGetMode()) {
     return;
   }
-  if(pieceStorage->hasPiece(getIndex()) &&
-     (!peer->amChoking() ||
-      (peer->amChoking() && peer->isInAmAllowedIndexSet(getIndex())))) {
-    BtMessageHandle msg = messageFactory->createPieceMessage(getIndex(),
-                                                             getBegin(),
-                                                             getLength());
-    dispatcher->addMessageToQueue(msg);
+  if(getPieceStorage()->hasPiece(getIndex()) &&
+     (!getPeer()->amChoking() ||
+      (getPeer()->amChoking() &&
+       getPeer()->isInAmAllowedIndexSet(getIndex())))) {
+    BtMessageHandle msg =
+      getBtMessageFactory()->createPieceMessage
+      (getIndex(), getBegin(), getLength());
+    getBtMessageDispatcher()->addMessageToQueue(msg);
   } else {
-    if(peer->isFastExtensionEnabled()) {
-      BtMessageHandle msg = messageFactory->createRejectMessage(getIndex(),
-                                                                getBegin(),
-                                                                getLength());
-      dispatcher->addMessageToQueue(msg);
+    if(getPeer()->isFastExtensionEnabled()) {
+      BtMessageHandle msg =
+        getBtMessageFactory()->createRejectMessage
+        (getIndex(), getBegin(), getLength());
+      getBtMessageDispatcher()->addMessageToQueue(msg);
     }
   }
 }
@@ -74,16 +80,16 @@ void BtRequestMessage::doReceivedAction()
 void BtRequestMessage::onQueued()
 {
   RequestSlot requestSlot(getIndex(), getBegin(), getLength(), _blockIndex,
-                          pieceStorage->getPiece(getIndex()));
-  dispatcher->addOutstandingRequest(requestSlot);
+                          getPieceStorage()->getPiece(getIndex()));
+  getBtMessageDispatcher()->addOutstandingRequest(requestSlot);
 }
 
 void BtRequestMessage::onAbortOutstandingRequestEvent
 (const BtAbortOutstandingRequestEvent& event)
 {
   if(getIndex() == event.getPiece()->getIndex() &&
-     !invalidate && !sendingInProgress) {
-    invalidate = true;
+     !isInvalidate() && !isSendingInProgress()) {
+    setInvalidate(true);
   }
 }