包名更新

java_demo/src/main/java/application.xml

@@ -3,10 +3,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-  <bean id="laowang" class="com.cmower.java_demo.ioc.Laowang">
+  <bean id="laowang" class="com.cmower.java_demo.thinkingjava.ioc.Laowang">
     <constructor-arg ref="saodiseng" />
   </bean>
         
-  <bean id="saodiseng" class="com.cmower.java_demo.ioc.Xiaosan" />
+  <bean id="saodiseng" class="com.cmower.java_demo.thinkingjava.ioc.Xiaosan" />
 
 </beans>
\ No newline at end of file

java_demo/src/main/java/com/cmower/java_demo/effectiv/Writer.java → java_demo/src/main/java/com/cmower/java_demo/effective/effectiv/Writer.java

-package com.cmower.java_demo.effectiv;
+package com.cmower.java_demo.effective.effectiv;
 
 import java.util.ArrayList;
 import java.util.List;

java_demo/src/main/java/com/cmower/java_demo/App.java → java_demo/src/main/java/com/cmower/java_demo/orther/App.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

java_demo/src/main/java/com/cmower/java_demo/Candidate.java → java_demo/src/main/java/com/cmower/java_demo/orther/Candidate.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 class Candidate implements Cloneable {
 	private String name;

java_demo/src/main/java/com/cmower/java_demo/Fibonacci.java → java_demo/src/main/java/com/cmower/java_demo/orther/Fibonacci.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 public class Fibonacci {
 

java_demo/src/main/java/com/cmower/java_demo/Interviewer.java → java_demo/src/main/java/com/cmower/java_demo/orther/Interviewer.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 class Interviewer {
 	private Candidate candidate;

java_demo/src/main/java/com/cmower/java_demo/Locker.java → java_demo/src/main/java/com/cmower/java_demo/orther/Locker.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 
 import java.util.concurrent.locks.Lock;

java_demo/src/main/java/com/cmower/java_demo/NiubiUtil.java → java_demo/src/main/java/com/cmower/java_demo/orther/NiubiUtil.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 import java.util.Date;
 

java_demo/src/main/java/com/cmower/java_demo/OperationalCharacter.java → java_demo/src/main/java/com/cmower/java_demo/orther/OperationalCharacter.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 import java.math.BigDecimal;
 

java_demo/src/main/java/com/cmower/java_demo/Pachong.java → java_demo/src/main/java/com/cmower/java_demo/orther/Pachong.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 import java.io.BufferedReader;
 import java.io.IOException;

java_demo/src/main/java/com/cmower/java_demo/Test.java → java_demo/src/main/java/com/cmower/java_demo/orther/Test.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 
 public class Test {

java_demo/src/main/java/com/cmower/java_demo/Test1.java → java_demo/src/main/java/com/cmower/java_demo/orther/Test1.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
   abstract class Wangsan {
     void wirte() {};

java_demo/src/main/java/com/cmower/java_demo/Test12.java → java_demo/src/main/java/com/cmower/java_demo/orther/Test12.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 public class Test12 {
 

java_demo/src/main/java/com/cmower/java_demo/Test122.java → java_demo/src/main/java/com/cmower/java_demo/orther/Test122.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 public class Test122 {
 

java_demo/src/main/java/com/cmower/java_demo/orther/UnixTimeStamp.java

+package com.cmower.java_demo.orther;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class UnixTimeStamp {
+    public static void main(String[] args) throws ParseException {
+//        long timeStamp = System.currentTimeMillis();
+//        int timeStampUnix = (int) (timeStamp / 1000);
+
+//int timeStampUnix = 1578179845;
+//SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//String result = simpleDateFormat.format(new Date(timeStampUnix * 1000L));
+//        System.out.println(result); // 2020-01-05 07:17:25
+
+String str = "2020-01-05 07:17:25";
+SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+int timeStampUnix = (int) (simpleDateFormat.parse(str).getTime() / 1000);
+System.out.println(timeStampUnix); // 1578179845
+
+        System.out.println(DateUtils.parseDate("2020-01-05 07:17:25", "yyyy-MM-dd HH:mm:ss").getTime() / 1000);
+        System.out.println(DateFormatUtils.format(1578179845 * 1000L,"yyyy-MM-dd HH:mm:ss"));
+    }
+}

java_demo/src/main/java/com/cmower/java_demo/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/orther/Wanger.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 public class Wanger {
 

java_demo/src/main/java/com/cmower/java_demo/Wangxiaoer.java → java_demo/src/main/java/com/cmower/java_demo/orther/Wangxiaoer.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 public class Wangxiaoer extends Wanger{
 //	@Override

java_demo/src/main/java/com/cmower/java_demo/Writer.java → java_demo/src/main/java/com/cmower/java_demo/orther/Writer.java

-package com.cmower.java_demo;
+package com.cmower.java_demo.orther;
 
 class Writer {
 	public Writer sleep() {

java_demo/src/main/java/com/cmower/java_demo/stackoverflow/printObject/Test.java

@@ -9,23 +9,23 @@ import java.util.List;
 
 public class Test {
     public static void main(String[] args) {
-        Cmower cmower = new Cmower("沉默王二");
-        System.out.println(cmower);
-
-        Cmower[] cmowers = {new Cmower("沉默王二"), new Cmower("沉默王三")};
-        System.out.println(Arrays.toString(cmowers));
-
-        System.out.println(ToStringBuilder.reflectionToString(cmower));
-
-        System.out.println(MoreObjects.toStringHelper(cmower)
-                .add("name", cmower.getName())
-                .toString());
-
-        System.out.println(cmower);
-
-List<Cmower> list = new ArrayList<>();
-list.add(new Cmower("沉默王二"));
-list.add(new Cmower("沉默王三"));
-System.out.println(list);
+//        Cmower cmower = new Cmower("沉默王二");
+//        System.out.println(cmower);
+//
+//        Cmower[] cmowers = {new Cmower("沉默王二"), new Cmower("沉默王三")};
+//        System.out.println(Arrays.toString(cmowers));
+//
+//        System.out.println(ToStringBuilder.reflectionToString(cmower));
+//
+//        System.out.println(MoreObjects.toStringHelper(cmower)
+//                .add("name", cmower.getName())
+//                .toString());
+//
+//        System.out.println(cmower);
+//
+//List<Cmower> list = new ArrayList<>();
+//list.add(new Cmower("沉默王二"));
+//list.add(new Cmower("沉默王三"));
+//System.out.println(list);
     }
 }

java_demo/src/main/java/com/cmower/java_demo/str/Cmower2.java

 package com.cmower.java_demo.str;
 
-import com.cmower.java_demo.Wanger;
+import com.cmower.java_demo.orther.Wanger;
 
 public class Cmower2 {
 

java_demo/src/main/java/com/cmower/java_demo/bingfa/Counter.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/bingfa/Counter.java

-package com.cmower.java_demo.bingfa;
+package com.cmower.java_demo.thinkingjava.bingfa;
 
 public class Counter {
     private int value = 0;

java_demo/src/main/java/com/cmower/java_demo/chouxianglei/Test.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/chouxianglei/Test.java

-package com.cmower.java_demo.chouxianglei;
+package com.cmower.java_demo.thinkingjava.chouxianglei;
 
 abstract class Test {
 

java_demo/src/main/java/com/cmower/java_demo/dongtaidaili/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/dongtaidaili/Cmower.java

-package com.cmower.java_demo.dongtaidaili;
+package com.cmower.java_demo.thinkingjava.dongtaidaili;
 
 import java.lang.reflect.Proxy;
 

java_demo/src/main/java/com/cmower/java_demo/dongtaidaili/Writer.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/dongtaidaili/Writer.java

-package com.cmower.java_demo.dongtaidaili;
+package com.cmower.java_demo.thinkingjava.dongtaidaili;
 
 // 抽象类接口
 public interface Writer {

java_demo/src/main/java/com/cmower/java_demo/dongtaidaili/WriterHandler.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/dongtaidaili/WriterHandler.java

-package com.cmower.java_demo.dongtaidaili;
+package com.cmower.java_demo.thinkingjava.dongtaidaili;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

java_demo/src/main/java/com/cmower/java_demo/dongtaidaili/WriterImpl.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/dongtaidaili/WriterImpl.java

-package com.cmower.java_demo.dongtaidaili;
+package com.cmower.java_demo.thinkingjava.dongtaidaili;
 
 // 被代理类（具体实现抽象接口的类）
 public class WriterImpl implements Writer{

java_demo/src/main/java/com/cmower/java_demo/duoxiancheng/Chenmo.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/duoxiancheng/Chenmo.java

-package com.cmower.java_demo.duoxiancheng;
+package com.cmower.java_demo.thinkingjava.duoxiancheng;
 
 class Chenmo {
     private int lineCount = 0;

java_demo/src/main/java/com/cmower/java_demo/duoxiancheng/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/duoxiancheng/Cmower.java

-package com.cmower.java_demo.duoxiancheng;
+package com.cmower.java_demo.thinkingjava.duoxiancheng;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ExecutorService;

java_demo/src/main/java/com/cmower/java_demo/duoxiancheng/four/NewStringList.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/duoxiancheng/four/NewStringList.java

-package com.cmower.java_demo.duoxiancheng.four;
+package com.cmower.java_demo.thinkingjava.duoxiancheng.four;
 
 public class NewStringList extends StringList {
 	public synchronized void addIfNotExist(String s) {

java_demo/src/main/java/com/cmower/java_demo/duoxiancheng/four/StringList.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/duoxiancheng/four/StringList.java

-package com.cmower.java_demo.duoxiancheng.four;
+package com.cmower.java_demo.thinkingjava.duoxiancheng.four;
 
 import java.util.ArrayList;
 import java.util.List;

java_demo/src/main/java/com/cmower/java_demo/duoxiancheng/three/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/duoxiancheng/three/Wanger.java

-package com.cmower.java_demo.duoxiancheng.three;
+package com.cmower.java_demo.thinkingjava.duoxiancheng.three;
 
 public class Wanger {
 	private static volatile boolean chenmo = false;

java_demo/src/main/java/com/cmower/java_demo/eight/Wangxiaoer.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/eight/Wangxiaoer.java

-package com.cmower.java_demo.eight;
+package com.cmower.java_demo.thinkingjava.eight;
 
 //子类继承父类
 public class Wangxiaoer extends Wanger {

java_demo/src/main/java/com/cmower/java_demo/eight/Wangxiaosan.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/eight/Wangxiaosan.java

-package com.cmower.java_demo.eight;
+package com.cmower.java_demo.thinkingjava.eight;
 
 //子类继承父类
 public class Wangxiaosan extends Wangsan {

java_demo/src/main/java/com/cmower/java_demo/eight/Wangxiaosi.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/eight/Wangxiaosi.java

-package com.cmower.java_demo.eight;
+package com.cmower.java_demo.thinkingjava.eight;
 
 public class Wangxiaosi extends Wangsi {
 	public void write() {

java_demo/src/main/java/com/cmower/java_demo/eleven/WriterAndReader.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/eleven/WriterAndReader.java

-package com.cmower.java_demo.eleven;
+package com.cmower.java_demo.thinkingjava.eleven;
 
 import java.util.PriorityQueue;
 

java_demo/src/main/java/com/cmower/java_demo/fanxing/Arraylist.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fanxing/Arraylist.java

-package com.cmower.java_demo.fanxing;
+package com.cmower.java_demo.thinkingjava.fanxing;
 
 import java.util.Arrays;
 

java_demo/src/main/java/com/cmower/java_demo/fanxing/Arraylist2.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fanxing/Arraylist2.java

-package com.cmower.java_demo.fanxing;
+package com.cmower.java_demo.thinkingjava.fanxing;
 
 class Arraylist2<E extends Wanger> {
     private Object[] elementData;

java_demo/src/main/java/com/cmower/java_demo/fanxing/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fanxing/Cmower.java

-package com.cmower.java_demo.fanxing;
-
-import java.util.Collections;
+package com.cmower.java_demo.thinkingjava.fanxing;
 
 public class Cmower {
 

java_demo/src/main/java/com/cmower/java_demo/fanxing/Collections.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fanxing/Collections.java

-package com.cmower.java_demo.fanxing;
+package com.cmower.java_demo.thinkingjava.fanxing;
 
 public class Collections {
 	public static <T> void copy(Arraylist<? super T> dest, Arraylist<? extends T> src) {

java_demo/src/main/java/com/cmower/java_demo/fanxing/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fanxing/Wanger.java

-package com.cmower.java_demo.fanxing;
+package com.cmower.java_demo.thinkingjava.fanxing;
 
 /**
  * 王二

java_demo/src/main/java/com/cmower/java_demo/fanxing/Wanglaoer.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fanxing/Wanglaoer.java

-package com.cmower.java_demo.fanxing;
+package com.cmower.java_demo.thinkingjava.fanxing;
 
 /**
  * 王老二

java_demo/src/main/java/com/cmower/java_demo/fanxing/Wangxiaoer.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fanxing/Wangxiaoer.java

-package com.cmower.java_demo.fanxing;
+package com.cmower.java_demo.thinkingjava.fanxing;
 
 /**
  * 王小二

java_demo/src/main/java/com/cmower/java_demo/fifteen/Test.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/fifteen/Test.java

-package com.cmower.java_demo.fifteen;
+package com.cmower.java_demo.thinkingjava.fifteen;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

java_demo/src/main/java/com/cmower/java_demo/groovy/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/groovy/Wanger.java

-package com.cmower.java_demo.groovy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Wanger {
-
-	public static void main(String[] args) {
-		List<String> list = new ArrayList<>();
-		list.add("沉默");
-		list.add("王二");
-
-		for (String s : list) {
-		    System.out.println(s);
-		}
-		
-		
-	}
-
-}
+package com.cmower.java_demo.thinkingjava.groovy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Wanger {
+
+	public static void main(String[] args) {
+		List<String> list = new ArrayList<>();
+		list.add("沉默");
+		list.add("王二");
+
+		for (String s : list) {
+		    System.out.println(s);
+		}
+		
+		
+	}
+
+}

java_demo/src/main/java/com/cmower/java_demo/ioc/Heshang.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ioc/Heshang.java

-package com.cmower.java_demo.ioc;
+package com.cmower.java_demo.thinkingjava.ioc;
 
 public interface Heshang {
     void saodi();

java_demo/src/main/java/com/cmower/java_demo/ioc/Laofang.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ioc/Laofang.java

-package com.cmower.java_demo.ioc;
+package com.cmower.java_demo.thinkingjava.ioc;
 
 public class Laofang {
     public static Heshang getSaodiseng() {

java_demo/src/main/java/com/cmower/java_demo/ioc/Laowang.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ioc/Laowang.java

-package com.cmower.java_demo.ioc;
+package com.cmower.java_demo.thinkingjava.ioc;
 
 public class Laowang {
     private Heshang saodiseng;

java_demo/src/main/java/com/cmower/java_demo/ioc/Test.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ioc/Test.java

-package com.cmower.java_demo.ioc;
+package com.cmower.java_demo.thinkingjava.ioc;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;

java_demo/src/main/java/com/cmower/java_demo/ioc/Xiaoer.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ioc/Xiaoer.java

-package com.cmower.java_demo.ioc;
+package com.cmower.java_demo.thinkingjava.ioc;
 
 public class Xiaoer implements Heshang {
 

java_demo/src/main/java/com/cmower/java_demo/ioc/Xiaosan.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ioc/Xiaosan.java

-package com.cmower.java_demo.ioc;
+package com.cmower.java_demo.thinkingjava.ioc;
 
 public class Xiaosan implements Heshang {
 

java_demo/src/main/java/com/cmower/java_demo/java7new/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/java7new/Cmower.java

-package com.cmower.java_demo.java7new;
+package com.cmower.java_demo.thinkingjava.java7new;
 
 import java.util.ArrayList;
 import java.util.HashMap;

java_demo/src/main/java/com/cmower/java_demo/jianyi/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/jianyi/Wanger.java

-package com.cmower.java_demo.jianyi;
+package com.cmower.java_demo.thinkingjava.jianyi;
 
 public class Wanger {
 

java_demo/src/main/java/com/cmower/java_demo/jiekou/Author.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/jiekou/Author.java

-package com.cmower.java_demo.jiekou;
+package com.cmower.java_demo.thinkingjava.jiekou;
 
 abstract class Author {
 	abstract void write();

java_demo/src/main/java/com/cmower/java_demo/jiekou/Contract51.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/jiekou/Contract51.java

-package com.cmower.java_demo.jiekou;
+package com.cmower.java_demo.thinkingjava.jiekou;
 
 interface Contract51 {
 	void script51();

java_demo/src/main/java/com/cmower/java_demo/jiekou/ContractBeihang.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/jiekou/ContractBeihang.java

-package com.cmower.java_demo.jiekou;
+package com.cmower.java_demo.thinkingjava.jiekou;
 
 interface ContractBeihang {
 	void scriptBeihang();

java_demo/src/main/java/com/cmower/java_demo/jiekou/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/jiekou/Wanger.java

-package com.cmower.java_demo.jiekou;
+package com.cmower.java_demo.thinkingjava.jiekou;
 
 public class Wanger extends Author implements ContractBeihang, Contract51 {
 

java_demo/src/main/java/com/cmower/java_demo/jihe/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/jihe/Cmower.java

-package com.cmower.java_demo.jihe;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class Cmower {
-	public static void main(String[] args) {
-		
-List<String> list1 = new ArrayList<>();
-list1.add("沉");
-list1.add("默");
-list1.add("王");
-list1.add("二");
-
-//Collections.sort(list1); // 先要排序
-System.out.println(Collections.binarySearch(list1, "王")); // 2
-	}
-}
-
-
+package com.cmower.java_demo.thinkingjava.jihe;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Cmower {
+	public static void main(String[] args) {
+		
+List<String> list1 = new ArrayList<>();
+list1.add("沉");
+list1.add("默");
+list1.add("王");
+list1.add("二");
+
+//Collections.sort(list1); // 先要排序
+System.out.println(Collections.binarySearch(list1, "王")); // 2
+	}
+}
+
+

java_demo/src/main/java/com/cmower/java_demo/neicunyingshe/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/neicunyingshe/Cmower.java

-package com.cmower.java_demo.neicunyingshe;
+package com.cmower.java_demo.thinkingjava.neicunyingshe;
 
 import java.io.IOException;
 import java.nio.CharBuffer;

java_demo/src/main/java/com/cmower/java_demo/neicunyingshe/Cmower1.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/neicunyingshe/Cmower1.java

-package com.cmower.java_demo.neicunyingshe;
+package com.cmower.java_demo.thinkingjava.neicunyingshe;
 
 import java.io.IOException;
 import java.nio.CharBuffer;

java_demo/src/main/java/com/cmower/java_demo/neicunyingshe/Cmower2.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/neicunyingshe/Cmower2.java

-package com.cmower.java_demo.neicunyingshe;
+package com.cmower.java_demo.thinkingjava.neicunyingshe;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

java_demo/src/main/java/com/cmower/java_demo/nine/Demo.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/nine/Demo.java

-package com.cmower.java_demo.nine;
+package com.cmower.java_demo.thinkingjava.nine;
 
 abstract class Coach {
 	public abstract void defend();

java_demo/src/main/java/com/cmower/java_demo/nine/adapter/Demo.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/nine/adapter/Demo.java

-package com.cmower.java_demo.nine.adapter;
+package com.cmower.java_demo.thinkingjava.nine.adapter;
 
 interface Coach {
 	void defend();

java_demo/src/main/java/com/cmower/java_demo/nine/factory/Demo.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/nine/factory/Demo.java

-package com.cmower.java_demo.nine.factory;
+package com.cmower.java_demo.thinkingjava.nine.factory;
 
 interface Coach {
 	void command();

java_demo/src/main/java/com/cmower/java_demo/nine/inf/Demo2.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/nine/inf/Demo2.java

-package com.cmower.java_demo.nine.inf;
+package com.cmower.java_demo.thinkingjava.nine.inf;
 
 interface Coach {
 	// 隐式的public

java_demo/src/main/java/com/cmower/java_demo/nine/strategy/Demo.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/nine/strategy/Demo.java

-package com.cmower.java_demo.nine.strategy;
+package com.cmower.java_demo.thinkingjava.nine.strategy;
 
 interface Coach {
 	void defend();

java_demo/src/main/java/com/cmower/java_demo/nio/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/nio/Wanger.java

-package com.cmower.java_demo.nio;
+package com.cmower.java_demo.thinkingjava.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

java_demo/src/main/java/com/cmower/java_demo/seventeen/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/seventeen/Cmower.java

-package com.cmower.java_demo.seventeen;
+package com.cmower.java_demo.thinkingjava.seventeen;
 
 import java.util.ArrayList;
 import java.util.Arrays;

java_demo/src/main/java/com/cmower/java_demo/sixteen/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/sixteen/Cmower.java

-package com.cmower.java_demo.sixteen;
+package com.cmower.java_demo.thinkingjava.sixteen;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class Cmower {

java_demo/src/main/java/com/cmower/java_demo/tdd/Ticket.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/tdd/Ticket.java

-package com.cmower.java_demo.tdd;
-
-import java.math.BigDecimal;
-
-public class Ticket {
-	private final static int PRICE = 99;
-
-	public BigDecimal sale(int count) {
-		if (count < 0) {
-			throw new IllegalArgumentException("销量不能为负数");
-		}
-		
-		return new BigDecimal(PRICE * count);
-	}
-
-}
+package com.cmower.java_demo.thinkingjava.tdd;
+
+import java.math.BigDecimal;
+
+public class Ticket {
+	private final static int PRICE = 99;
+
+	public BigDecimal sale(int count) {
+		if (count < 0) {
+			throw new IllegalArgumentException("销量不能为负数");
+		}
+		
+		return new BigDecimal(PRICE * count);
+	}
+
+}

java_demo/src/main/java/com/cmower/java_demo/tdd/TicketTest.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/tdd/TicketTest.java

-package com.cmower.java_demo.tdd;
-
-import static org.junit.Assert.*;
-
-import java.math.BigDecimal;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class TicketTest {
-	
-	private Ticket ticket;
-
-	@Before
-	public void setUp() throws Exception {
-		ticket = new Ticket();
-	}
-
-	@Test
-	public void testOne() {
-		BigDecimal total = new BigDecimal("99");
-		
-		assertEquals(total, ticket.sale(1));
-	}
-	
-	@Test(expected=IllegalArgumentException.class)
-	public void testNegative() {
-		ticket.sale(-1);
-	}
-	
-	@Test
-	public void testZero() {
-		assertEquals(BigDecimal.ZERO, ticket.sale(0));
-	}
-	
-	@Test
-	public void test1000() {
-		assertEquals(new BigDecimal(99000), ticket.sale(1000));
-	}
-
-}
+package com.cmower.java_demo.thinkingjava.tdd;
+
+import static org.junit.Assert.*;
+
+import java.math.BigDecimal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class TicketTest {
+	
+	private Ticket ticket;
+
+	@Before
+	public void setUp() throws Exception {
+		ticket = new Ticket();
+	}
+
+	@Test
+	public void testOne() {
+		BigDecimal total = new BigDecimal("99");
+		
+		assertEquals(total, ticket.sale(1));
+	}
+	
+	@Test(expected=IllegalArgumentException.class)
+	public void testNegative() {
+		ticket.sale(-1);
+	}
+	
+	@Test
+	public void testZero() {
+		assertEquals(BigDecimal.ZERO, ticket.sale(0));
+	}
+	
+	@Test
+	public void test1000() {
+		assertEquals(new BigDecimal(99000), ticket.sale(1000));
+	}
+
+}

java_demo/src/main/java/com/cmower/java_demo/ten/Demo.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ten/Demo.java

-package com.cmower.java_demo.ten;
+package com.cmower.java_demo.thinkingjava.ten;
 
 public class Demo {
 

java_demo/src/main/java/com/cmower/java_demo/ten/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/ten/Wanger.java

-package com.cmower.java_demo.ten;
+package com.cmower.java_demo.thinkingjava.ten;
 
 public class Wanger {
 	private int age;

java_demo/src/main/java/com/cmower/java_demo/twelve/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/twelve/Cmower.java

-package com.cmower.java_demo.twelve;
+package com.cmower.java_demo.thinkingjava.twelve;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

java_demo/src/main/java/com/cmower/java_demo/twelve/OrderException.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/twelve/OrderException.java

-package com.cmower.java_demo.twelve;
+package com.cmower.java_demo.thinkingjava.twelve;
 public class OrderException extends RuntimeException {
 
 	public OrderException() {

java_demo/src/main/java/com/cmower/java_demo/url/Cmower.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/url/Cmower.java

-package com.cmower.java_demo.url;
+package com.cmower.java_demo.thinkingjava.url;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

java_demo/src/main/java/com/cmower/java_demo/url/Cmower2.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/url/Cmower2.java

-package com.cmower.java_demo.url;
+package com.cmower.java_demo.thinkingjava.url;
 
 import java.net.MalformedURLException;
 import java.net.URL;

java_demo/src/main/java/com/cmower/java_demo/url/Cmower3.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/url/Cmower3.java

-package com.cmower.java_demo.url;
+package com.cmower.java_demo.thinkingjava.url;
 
 import java.io.BufferedReader;
 import java.io.IOException;

java_demo/src/main/java/com/cmower/java_demo/xuliehua/Test.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/xuliehua/Test.java

-package com.cmower.java_demo.xuliehua;
+package com.cmower.java_demo.thinkingjava.xuliehua;
 
 import java.io.File;
 import java.io.FileInputStream;

java_demo/src/main/java/com/cmower/java_demo/xuliehua/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/xuliehua/Wanger.java

-package com.cmower.java_demo.xuliehua;
+package com.cmower.java_demo.thinkingjava.xuliehua;
 
 import java.io.Serializable;
 

java_demo/src/main/java/com/cmower/java_demo/xuliehua1/Test.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/xuliehua1/Test.java

-package com.cmower.java_demo.xuliehua1;
+package com.cmower.java_demo.thinkingjava.xuliehua1;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -6,10 +6,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.ObjectStreamField;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
 
 public class Test {
 	public static void main(String[] args) {

java_demo/src/main/java/com/cmower/java_demo/xuliehua1/Wanger.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/xuliehua1/Wanger.java

-package com.cmower.java_demo.xuliehua1;
+package com.cmower.java_demo.thinkingjava.xuliehua1;
 
 import java.io.Externalizable;
 import java.io.IOException;

java_demo/src/main/java/com/cmower/java_demo/xuliehua1/Wanger2.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/xuliehua1/Wanger2.java

-package com.cmower.java_demo.xuliehua1;
+package com.cmower.java_demo.thinkingjava.xuliehua1;
 
 import java.io.Serializable;
 

java_demo/src/main/java/com/cmower/java_demo/xuliehua1/Wanger3.java → java_demo/src/main/java/com/cmower/java_demo/thinkingjava/xuliehua1/Wanger3.java

-package com.cmower.java_demo.xuliehua1;
+package com.cmower.java_demo.thinkingjava.xuliehua1;
 
 import java.io.Serializable;