diff options
author | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:39:26 -0600 |
---|---|---|
committer | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:39:26 -0600 |
commit | 8d1e2e31ef9c62e2833ccb83cde78caef668f044 (patch) | |
tree | 1cca5af13a146c0a36ef760b6264d18875290ec0 /zh-cn/java-cn.html.markdown | |
parent | 51c2f7ce28caf1cc654bcafc4063f3012cc2f0c3 (diff) | |
parent | 6e38442b857a9d8178b6ce6713b96c52bf4426eb (diff) |
Merge conflict r-spanish
Diffstat (limited to 'zh-cn/java-cn.html.markdown')
-rw-r--r-- | zh-cn/java-cn.html.markdown | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zh-cn/java-cn.html.markdown b/zh-cn/java-cn.html.markdown index 12afa59a..1e9c38f6 100644 --- a/zh-cn/java-cn.html.markdown +++ b/zh-cn/java-cn.html.markdown @@ -302,7 +302,7 @@ class Bicycle { // 构造函数是初始化一个对象的方式 // 以下是一个默认构造函数 - public Bi450635425cycle() { + public Bicycle() { gear = 1; cadence = 50; speed = 5; @@ -328,7 +328,7 @@ class Bicycle { return cadence; } - // void返450635425回值函数没有返回值 + // void返回值函数没有返回值 public void setCadence(int newValue) { cadence = newValue; } @@ -405,4 +405,4 @@ class PennyFarthing extends Bicycle { * [泛型](http://docs.oracle.com/javase/tutorial/java/generics/index.html) -* [Java代码规范](http://www.oracle.com/technetwork/java/codeconv-138413.html) +* [Java代码规范](http://www.oracle.com/technetwork/java/codeconvtoc-136057.html) |