修正！~~

Author: lijunhuayc

command/lijunhuayc/readme.md

@@ -33,7 +33,8 @@ Android设计模式源码解析之命令模式
 ## 3. 模式的简单实现
 ###  简单实现的介绍
 命令模式其实就是对命令进行封装，将命令请求者和命令执行者的责任分离开来实现松耦合。
-`阐述一下你的示例要实现的功能`    
+这里我们通过一个简单的实例来剖析一下命令模式：命令接收者ReceiverRole拥有一个PeopleBean类型成员，通过Invoker发出不同的命令来修改PeopleBean的相对应的属性，具体命令实现类ConcreteCommandImpl1执行修改年龄命令，ConcreteCommandImpl2执行修改姓名的命令等等，ClientRole负责组装各个部分。
+例子代码如下（resource目录下也可以查看）。
 
 ### 实现源码
 
@@ -337,13 +338,6 @@ public class Thread implements Runnable {
     Runnable target;
     private static int count = 0;
     
-        /**
-     * Starts the new Thread of execution. The <code>run()</code> method of
-     * the receiver will be called by the receiver Thread itself (and not the
-     * Thread calling <code>start()</code>).
-     * @throws IllegalThreadStateException if the Thread has been started before
-     * @see Thread#run
-     */
     public synchronized void start() {
         if (hasBeenStarted) {
             throw new IllegalThreadStateException("Thread already started."); // TODO Externalize?
@@ -397,10 +391,6 @@ bool dvmCreateInterpThread(Object* threadObj, int reqStackSize){
     
 }
 
-/*
- * Alloc and initialize a Thread struct.
- * Does not create any objects, just stuff on the system (malloc) heap.
- */
 static Thread* allocThread(int interpStackSize)
 {
     Thread* thread;
@@ -416,17 +406,13 @@ static Thread* allocThread(int interpStackSize)
 接下来在12行通过pthread_create创建pthread线程，并让这个线程start，这样就会进入该线程的thread entry运行，下来我们来看新线程的thread entry方法 interpThreadStart，同样只列出关键的地方：
 
 ```
-/*
- * pthread entry function for threads started from interpreted code.
- */
+//pthread entry function for threads started from interpreted code.
 static void* interpThreadStart(void* arg){
     Thread* self = (Thread*) arg;
     std::string threadName(dvmGetThreadName(self));
     setThreadName(threadName.c_str());
 
-    /*
-     * Finish initializing the Thread struct.
-     */
+    //Finish initializing the Thread struct.
     dvmLockThreadList(self);
     prepareThread(self);
 
@@ -440,48 +426,33 @@ static void* interpThreadStart(void* arg){
      */
     self->jniEnv = dvmCreateJNIEnv(self);
 
-    /*
-     * Change our state so the GC will wait for us from now on.  If a GC is
-     * in progress this call will suspend us.
-     */
+    //修改状态为THREAD_RUNNING
     dvmChangeStatus(self, THREAD_RUNNING);
     
-    /*
-     * Execute the "run" method.
-     * At this point our stack is empty, so somebody who comes looking for
-     * stack traces right now won't have much to look at.  This is normal.
-     */
+    //执行run方法
     Method* run = self->threadObj->clazz->vtable[gDvm.voffJavaLangThread_run];
+
     JValue unused;
     ALOGV("threadid=%d: calling run()", self->threadId);
     assert(strcmp(run->name, "run") == 0);
     dvmCallMethod(self, run, self->threadObj, &unused);
     ALOGV("threadid=%d: exiting", self->threadId);
-    /*
-     * Remove the thread from various lists, report its death, and free
-     * its resources.
-     */
+    
+    //移出线程并释放资源
     dvmDetachCurrentThread();
     return NULL;
 }
 
-/*
- * Finish initialization of a Thread struct.
- * This must be called while executing in the new thread, but before the
- * thread is added to the thread list.
- * NOTE: The threadListLock must be held by the caller (needed for
- * assignThreadId()).
- */
+//Finish initialization of a Thread struct.
 static bool prepareThread(Thread* thread){
     assignThreadId(thread);
     thread->handle = pthread_self();
     thread->systemTid = dvmGetSysThreadId();
     setThreadSelf(thread);
     return true;
 }
-/*
- * Explore our sense of self.  Stuffs the thread pointer into TLS.
- */
+
+//Explore our sense of self.  Stuffs the thread pointer into TLS.
 static void setThreadSelf(Thread* thread){
     int cc;
     cc = pthread_setspecific(gDvm.pthreadKeySelf, thread);

command/lijunhuayc/resource/command/ClientRole.java

@@ -9,28 +9,24 @@
 public class ClientRole {
 
 	/**
-	 * @Description: 组装操作
+	 * @Description:
 	 * @author (ljh) @date 2015-3-16 上午11:13:06  
 	 * @return void
 	 */
 	public void assembleAction() {
 		ReceiverRole receiverRole1 = new ReceiverRole();//创建一个命令接收者
 		Command command1 = new ConcreteCommandImpl1(receiverRole1);//创建一个命令的具体实现对象，并指定命令接收者
+		Command command2 = new ConcreteCommandImpl2(receiverRole1);
 
-		ReceiverRole receiverRole2 = new ReceiverRole(new PeopleBean(9999, "神仙"));
-		Command command2 = new ConcreteCommandImpl2(receiverRole2);
-		
-		//PS：command1 修改people为(18, "西北狼")
-		//PS：command2 修改people为(35, "lijunhuayc")
-		
+		//PS：command1 修改people 年龄
+		//PS：command2 修改people 姓名
+		//PS：command23修改people 年龄和姓名
+
 		InvokerRole invokerRole = new InvokerRole();//创建一个命令调用者
 		invokerRole.setCommand1(command1);//为调用者指定命令对象1
 		invokerRole.setCommand2(command2);//为调用者指定命令对象2
-		invokerRole.invoke(null);//发起调用命令请求
-		
-		ReceiverRole receiverRole3 = new ReceiverRole(new PeopleBean(9999, "神仙"));
-		Command command3 = new ConcreteCommandImpl3(receiverRole2);
-		invokerRole.invoke(command3);//发起调用命令请求
+		invokerRole.invoke(0);//发起调用命令请求
+		invokerRole.invoke(1);//发起调用命令请求
 
 	}
 

command/lijunhuayc/resource/command/ConcreteCommandImpl1.java

@@ -1,7 +1,7 @@
 package com.command;
 
 /**
- * @Desc: 命令接口的实现类[具体命令角色]
+ * @Desc: 更新年龄的命令类[具体命令角色]
  * @author ljh
  * @date 2015-3-16 上午11:04:51
  */
@@ -17,19 +17,17 @@ public void execute() {
 		/*
 		 * 可以加入命令排队等等，未执行的命令支持redo操作
 		 */
-		receiverRole1.opAction(18, "西北狼");//执行具体的命令操作
+		receiverRole1.opActionUpdateAge(1001);//执行具体的命令操作
 	}
 
 	@Override
 	public void undo() {
-		receiverRole1.rollBack();//执行具体的撤销回滚操作
+		receiverRole1.rollBackAge();//执行具体的撤销回滚操作
 	}
 
 	@Override
 	public void redo() {
 		//在命令执行前可以修改命令的执行
 	}
 
-	
-	
 }

command/lijunhuayc/resource/command/ConcreteCommandImpl2.java

@@ -1,7 +1,7 @@
 package com.command;
 
 /**
- * @Desc: 命令接口的实现类[具体命令角色]
+ * @Desc: 更新姓名的命令类[具体命令角色]
  * @author ljh
  * @date 2015-3-16 上午11:04:51
  */
@@ -17,19 +17,17 @@ public void execute() {
 		/*
 		 * 可以加入命令排队等等，未执行的命令支持redo操作
 		 */
-		receiverRole1.opAction(35, "lijunhuayc");//执行具体的命令操作
+		receiverRole1.opActionUpdateName("lijunhuayc");//执行具体的命令操作
 	}
 
 	@Override
 	public void undo() {
-		receiverRole1.rollBack();//执行具体的撤销回滚操作
+		receiverRole1.rollBackName();//执行具体的撤销回滚操作
 	}
 
 	@Override
 	public void redo() {
 		//在命令执行前可以修改命令的执行
 	}
 
-	
-	
 }

command/lijunhuayc/resource/command/InvokerRole.java

@@ -18,16 +18,21 @@ public void setCommand2(Command command2) {
 		this.command2 = command2;
 	}
 
-	public void invoke(Command command) {
-		//根据具体情况选择执行某些命令
-		if(null != command){
-			command.execute();
-			return;
+	/**
+	 * @Description: 
+	 * @author (ljh) @date 2015-3-16 下午1:40:54 
+	 * @param args 0执行正常命令，1执行回滚命令
+	 * @return void
+	 */
+	public void invoke(int args) {
+		//可以根据具体情况选择执行某些命令
+		if(args == 0){
+			command1.execute();
+			command2.execute();
+		}else if(args == 1){
+			command1.undo();
+			command2.undo();
 		}
-		command1.execute();
-		command2.execute();
 	}
 
-	
-	
 }

command/lijunhuayc/resource/command/MainTest.java

@@ -1,12 +1,8 @@
 package com.command;
 
-
 public class MainTest {
-	
 	public static void main(String[] args) {
 		ClientRole client = new ClientRole();
 		client.assembleAction();
-		
 	}
-	
 }

command/lijunhuayc/resource/command/PeopleBean.java

@@ -8,40 +8,47 @@
 public class PeopleBean {
 	private int age = -1;	//年龄
 	private String name = "NULL";	//姓名
-	
 	public PeopleBean() {
 	}
 	public PeopleBean(int age, String name) {
 		this.age = age;
 		this.name = name;
 	}
-	
 	public void update(int age, String name) {
 		this.age = age;
 		this.name = name;
 	}
-	
+	public void update(int age) {
+		this.age = age;
+	}
+	public void update(String name) {
+		this.name = name;
+	}
 	/**
 	 * @return 返回一个PeopleBean的克隆对象
 	 */
 	protected PeopleBean clone(){
 		return new PeopleBean(age, name);
 	}
+	@Override
+	public String toString() {
+		return " 【年龄：" + age + "\t姓名：" + name + "】";
+	}
 
-	/**
-	 * @Description: 还原操作
-	 * @author (ljh) @date 2015-3-16 上午11:45:23 
-	 * @param cache 
-	 * @return void
-	 */
-	protected void undo(PeopleBean cache) {
-		this.age = cache.age;
-		this.name = cache.name;
+	public int getAge() {
+		return age;
 	}
 
-	@Override
-	public String toString() {
-		return " 【姓名：" + name + "\t年龄：" + age + "】\n";
+	public void setAge(int age) {
+		this.age = age;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public void setName(String name) {
+		this.name = name;
 	}
 
 }

command/lijunhuayc/resource/command/ReceiverRole.java

@@ -23,20 +23,31 @@ public ReceiverRole(PeopleBean people) {
 	 * @author (ljh) @date 2015-3-16 上午11:07:32  
 	 * @return void
 	 */
-	public void opAction(int age, String name) {
-		peopleCache = people.clone();//缓存people
-		people.update(age, name);
-		System.out.println("执行命令后："+people.toString());
+	//修改年龄
+	public void opActionUpdateAge(int age) {
+		System.out.println("执行命令前："+people.toString());
+		this.people.update(age);
+		System.out.println("执行命令后："+people.toString()+"\n");
+	}
+	//修改姓名
+	public void opActionUpdateName(String name) {
+		System.out.println("执行命令前："+people.toString());
+		this.people.update(name);
+		System.out.println("执行命令后："+people.toString()+"\n");
 	}
 
 	/**
 	 * @Description: 回滚操作，用于撤销opAction执行的改变
 	 * @author (ljh) @date 2015-3-16 上午11:34:41  
 	 * @return void
 	 */
-	public void rollBack() {
-		people.undo(peopleCache);
-		System.out.println("命令回滚后："+people.toString());
+	public void rollBackAge() {
+		people.setAge(peopleCache.getAge());
+		System.out.println("命令回滚后："+people.toString()+"\n");
+	}
+	public void rollBackName() {
+		people.setName(peopleCache.getName());
+		System.out.println("命令回滚后："+people.toString()+"\n");
 	}
 
 }