[Fix] Fix contents

DONGChuan · DONGChuan · commit 2c3d6c817d33 · 2014-10-08T17:34:23.000+02:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # 介绍
 
-这本书其实是我的一本笔记
+这本书其实是我的一本笔记 (还在整理中)
 
 记录了我面试遇到的问题以及我在网上整理的一些资料 主要是面向 junior 级别的 就是我们这些小菜鸟啦 ~
 
diff --git a/SUMMARY.md b/SUMMARY.md
@@ -28,9 +28,6 @@
    * [Singleton 单例模式](java/what_is_singleton_class.md)
    * [hashcode 和 equal](java/hashcode__equal.md)
        * [== 和 equal 的区别](java/==_equal.md)
-   * [StringBuffer 和 StringBuilder ](java/stringbuffer__stringbuilder.md)
-       * [StringBuilder 是什么？](java/stringbuilder.md)
-       * [是否可以继承 String 类?](java/inherit_string_class.md)
    * [所有类的基类是哪个类?](java/what_is_the_base_class_of_all_classes.md)
    * [Java 支持多继承吗?](java/does_java_support_multiple_inheritance.md)
    * [Path 与 Classpath?](java/what_is_difference_between_path_and_classpath.md)
@@ -55,7 +52,7 @@
    * [sleep() and wait()](java/sleep_and_wait.md)
    * [Gabage Collection](java/gabage_collection.md)
        * [heap 和 stack](java/heap_stack.md)
-       * [Does garbage collection guarantee that a program will not run out of memory?](java/does_garbage_collection_guarantee_that_a_program_will_not_run_out_of_memory.md)
+       * [GC 就一定能保证内存不溢出吗?](java/does_garbage_collection_guarantee_that_a_program_will_not_run_out_of_memory.md)
    * [字节流与字符流](java/stream_writer.md)
    * [Connection](java/connection.md)
        * [ArrayList 和 Vector](java/arraylist_vector.md)
@@ -66,17 +63,17 @@
        * [同步 synchronized](java/synchronized.md)
        * [如何实现 muliti-thread?](java/how_to_set_muliti-thread.md)
        * [transient](java/transient.md)
-       * [What is the difference between preemptive scheduling and time slicing?](java/what_is_the_difference_between_preemptive_scheduling_and_time_slicing.md)
-       * [When a thread is created and started, what is its initial state?](java/when_a_thread_is_created_and_started,_what_is_its_initial_state.md)
+       * [preemptive scheduling 和 time slicing?](java/what_is_the_difference_between_preemptive_scheduling_and_time_slicing.md)
+       * [一个线程的初始状态是什么?](java/when_a_thread_is_created_and_started,_what_is_its_initial_state.md)
        * [What are synchronized methods and synchronized statements?](java/what_are_synchronized_methods_and_synchronized_statements.md)
-       * [What is daemon thread and which method is used to create the daemon thread?](java/what_is_daemon_thread_and_which_method_is_used_to_create_the_daemon_thread.md)
-       * [What method must be implemented by all threads?](java/what_method_must_be_implemented_by_all_threads.md)
+       * [守护线程 daemon thread?](java/what_is_daemon_thread_and_which_method_is_used_to_create_the_daemon_thread.md)
+       * [所有的线程都必须实现哪个方法?](java/what_method_must_be_implemented_by_all_threads.md)
    * [Visitor Pattern](java/visitor_pattern.md)
    * [Problème sur chaîne](java/probleme_sur_chaine.md)
        * [字符串基础问题](java/string_questions.md)
        * [StringBuffer 相关问题](java/stringbuffer_questions.md)
        * [数组相关问题](java/array.md)
-   * [serialization](java/serialization.md)
+   * [序列化 serialization](java/serialization.md)
        * [How do I serialize an object to a file?](java/how_do_i_serialize_an_object_to_a_file.md)
        * [Which methods of Serializable interface should I implement?](java/which_methods_of_serializable_interface_should_i_implement.md)
        * [如何控制 serialization 的过程?](java/how_can_i_customize_the_seralization_process_ie_how_can_one_have_a_control_over_the_serialization_process.md)
diff --git a/java/arraylist_vector.md b/java/arraylist_vector.md
@@ -9,14 +9,8 @@
 ArrayList与Vector的区别
 
 * Vector是线程安全的,
-也就是说是它的方法之间是线程同步的,
-而ArrayList是线程序不安全的,
-它的方法之间是线程不同步的.
-如果只有一个线程会访问到集合,那最好是使用ArrayList,
-因为它不考虑线程安全,
-效率会高些;如果有多个线程会访问到集合,
-那最好是使用Vector,
-因为不需要我们自己再去考虑和编写线程安全的代码.
+也就是线程同步的,
+而ArrayList是线程序不安全的.
 对于Vector&ArrayList,
 Hashtable&HashMap,
 要记住线程安全的问题,
@@ -34,5 +28,5 @@ Vector默认增长为原来两倍,而ArrayList的增长策略在文档中没有
 Vector还可以设置增长的空间大小,
 而ArrayList没有提供设置增长空间的方法.
 
-总结：即Vector增长原来的一倍,ArrayList增加原来的0.5倍. Vector 线程安全, ArrayList 不是.
+**总结：即Vector增长原来的一倍,ArrayList增加原来的0.5倍. Vector 线程安全, ArrayList 不是.**
 
diff --git a/java/does_garbage_collection_guarantee_that_a_program_will_not_run_out_of_memory.md b/java/does_garbage_collection_guarantee_that_a_program_will_not_run_out_of_memory.md
@@ -1,4 +1,4 @@
-# Does garbage collection guarantee that a program will not run out of memory?
+# GC 就一定能保证内存不溢出吗?
 
 Non.
 程序员可能创建了一个对象,
diff --git a/java/gabage_collection.md b/java/gabage_collection.md
@@ -2,7 +2,7 @@
 
 **什么是GC**
 
-GC是垃圾收集的意思（Gabage Collection）,
+GC是垃圾收集的意思(Gabage Collection),
 内存处理是编程人员容易出现问题的地方,
 忘记或者错误的内存回收会导致程序或系统的不稳定甚至崩溃,
 Java提供的GC功能可以自动监测对象是否超过作用域从而达到自动回收内存的目的,
@@ -15,4 +15,4 @@ Java语言没有提供释放已分配内存的显示操作方法.
 
 **有什么办法主动通知虚拟机进行垃圾回收?**
 
-可以.程序员可以手动执行System.gc(),通知GC运行,但是Java语言规范并不保证GC一定会执行.
+可以.程序员可以手动执行System.gc(),通知GC运行,但是Java语言规范并不保证GC一定会执行. 这个选择题的时候有考.
diff --git a/java/serialization.md b/java/serialization.md
@@ -1,4 +1,4 @@
-# serialization
+# 序列化 serialization
 
 Serialization is a mechanism by which you can save the state of an object by converting it to a byte stream.
 
diff --git a/java/stringbuffer_questions.md b/java/stringbuffer_questions.md
@@ -8,4 +8,12 @@
 * 当需要保证线程安全的时候用 StringBuffer
 * StringBuffer 是 synchronized, StringBuilder 不是.
 
-**题目二**
+String 类一般被认为是不可改变的.
+如果需要对一个String做许多修改就需要使用StringBuffer或者StringBuilder.
+
+在Oracle里的定义就是
+"A mutable sequence of characters."
+
+另外需要注意 String 类是 final 类不可以被继承. 有时候会在考察 final 关键字的时候考这个.
+
+
diff --git a/java/transient.md b/java/transient.md
@@ -1 +1,7 @@
 # transient
+
+当持久化对象时,
+可能有一个特殊的对象数据成员,
+我们不想用 serialization 机制来保存它. 为了在一个特定对象的一个域上关闭serialization,
+可以在这个域前加上关键字transient.
+
diff --git a/java/what_is_daemon_thread_and_which_method_is_used_to_create_the_daemon_thread.md b/java/what_is_daemon_thread_and_which_method_is_used_to_create_the_daemon_thread.md
@@ -1,3 +1,21 @@
-# What is daemon thread and which method is used to create the daemon thread?
+# 守护线程 daemon thread?
 
-Daemon thread is a low priority thread which runs intermittently in the back ground doing the garbage collection operation for the java runtime system. 
+守护线程,
+是指在程序运行的时候在后台提供一种通用服务的线程,
+比如垃圾回收线程就是一个很称职的守护者,
+并且这种线程并不属于程序中不可或缺的部分.
+因此,
+当所有的非守护线程结束时,
+程序也就终止了,
+同时会杀死进程中的所有守护线程.
+反过来说,
+只要任何非守护线程还在运行,
+程序就不会终止.
+
+用户线程和守护线程两者几乎没有区别,
+唯一的不同之处就在于虚拟机的离开:
+如果用户线程已经全部退出运行了,
+只剩下守护线程存在了,
+虚拟机也就退出了.
+
+将线程转换为守护线程可以通过调用Thread对象的setDaemon(true)方法来实现.
diff --git a/java/what_is_the_difference_between_preemptive_scheduling_and_time_slicing.md b/java/what_is_the_difference_between_preemptive_scheduling_and_time_slicing.md
@@ -1,3 +1,8 @@
-# What is the difference between preemptive scheduling and time slicing?
+# preemptive scheduling 和 time slicing?
 
-Under preemptive scheduling, the highest priority task executes until it enters the waiting or dead states or a higher priority task comes into existence. Under time slicing, a task executes for a predefined slice of time and then reenters the pool of ready tasks. The scheduler then determines which task should execute next, based on priority and other factors.
+preemptive scheduling,
+优先级别最高的任务会被执行,
+除非它进入等待状态或者死了或者一个更高优先权的任务进来.
+
+time slicing,
+a task executes for a predefined slice of time and then reenters the pool of ready tasks. The scheduler then determines which task should execute next, based on priority and other factors.
diff --git a/java/what_method_must_be_implemented_by_all_threads.md b/java/what_method_must_be_implemented_by_all_threads.md
@@ -1,3 +1,3 @@
-# What method must be implemented by all threads?
+# 所有的线程都必须实现哪个方法?
 
-All tasks must implement the run() method, whether they are a subclass of Thread or implement the Runnable interface.
+run() 方法, 不管是继承 Thread 还是实现 Runnable 接口.
diff --git a/java/when_a_thread_is_created_and_started,_what_is_its_initial_state.md b/java/when_a_thread_is_created_and_started,_what_is_its_initial_state.md
@@ -1,6 +1,3 @@
-# When a thread is created and started, what is its initial state?
+# 一个线程的初始状态是什么?
 
-A thread is in “Ready” state after it has been created and started.
-This state signifies that the thread is ready for execution.
-From here,
-it can be in the running state.
+一个线程被创建和开始之后是 “Ready” 状态.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Does garbage collection guarantee that a program will not run out of memory?`
	`1`	`+# GC 就一定能保证内存不溢出吗?`
`2`	`2`
`3`	`3`	`Non.`
`4`	`4`	`程序员可能创建了一个对象,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# serialization`
	`1`	`+# 序列化 serialization`
`2`	`2`
`3`	`3`	`Serialization is a mechanism by which you can save the state of an object by converting it to a byte stream.`
`4`	`4`