From b075cb7cad464b224103fb2ec8fdb8521ec08e7f Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Tue, 12 Jul 2016 12:08:12 -0700 Subject: [PATCH] Update to current. This includes changes for Java 8, and simplified import order rules. --- javaguide.html | 66 ++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/javaguide.html b/javaguide.html index 3ce36e556..5ef0dc8dc 100644 --- a/javaguide.html +++ b/javaguide.html @@ -186,37 +186,21 @@

3.3.2 No line-wrapping

3.3.3 Ordering and spacing

- - -

Import statements are divided into the following groups, in this order, with each group -separated by a single blank line:

+

Imports are ordered as follows:

    -
  1. All static imports in a single group -
      -
    • Static import is not used for static nested classes; these are imported with normal imports - in the appropriate group below.
      • -
    -
    2. - -
  2. com.google imports - (only if this source file is in the com.google package - space)
    3. +
  3. All static imports in a single block.
    4. +
  4. All non-static imports in a single block.
    5. +
-
  • Third-party imports, one group per top-level package, in ASCII sort order - -
    • +

    If there are both static and non-static imports, a single blank line separates the two +blocks. There are no other blank lines between import statements.

    -
  • java imports
    • +

    Within each block the imported names appear in ASCII sort order. (Note: +this is not the same as the import statements being in ASCII sort order, since '.' +sorts before ';'.)

    -
  • javax imports
    • - -

    Within a group there are no blank lines, and the imported names appear in ASCII sort -order. (Note: this is not the same as the import statements being in -ASCII sort order; the presence of semicolons warps the result.)

    3.4 Class declaration

    @@ -284,9 +268,15 @@

    4.1.2 Nonempty blocks: K & R style

    else or a comma. -

    Example:

    +

    Examples:

    + +
    return () -> {
+  while (condition()) {
+    method();
+  }
+};
 
-
    return new MyClass() {
+return new MyClass() {
   @Override public void method() {
     if (condition()) {
       try {
@@ -381,7 +371,8 @@ 
    4.5.1 Where to break
    
   such as C++ and JavaScript.)
     
      
       
    • This also applies to the following "operator-like" symbols: the dot separator
-      (.), the ampersand in type bounds
+      (.), the two colons of a method reference
+      (::), the ampersand in type bounds
       (<T extends Foo & Bar>), and the pipe in
       catch blocks
       (catch (FooException | BarException e)).
      • 
@@ -443,7 +434,8 @@ 
      4.6.1 Vertical Whitespace
      
   
    • Optionally before the first member or after the last member of the class (neither
   encouraged nor discouraged).
      • 
 
-  
    • As required by other sections of this document (such as Section 3.3,
+  
    • As required by other sections of this document (such as Section 3,
+  Source file structure, and Section 3.3,
   Import statements).
      • 
 
 
@@ -488,6 +480,17 @@ 
      4.6.2 Horizontal whitespace
      
 
     
    • the colon (:) in an enhanced
     for ("foreach") statement
      • 
+
+    
    • the arrow in a lambda expression:
+    (String str) -> str.length()
      • 
+  
    
+    but not
+
+  
      
+    
    • the two colons (::) of a method reference, which
+    is written like Object::toString
      • 
+    
    • the dot separator (.), which is written like
+      object.toString()
      • 
   
    
   
 
@@ -690,7 +693,8 @@ 
    4.8.5 Annotations
    
 
    @Partial @Mock DataLoader loader;
 
    
 
-
    There are no specific rules for formatting parameter and local variable annotations.
    
+
    There are no specific rules for formatting annotations on parameters, local variables, or types.
+
    
 
 
 
    4.8.6 Comments
    
@@ -729,7 +733,7 @@ 
    4.8.7 Modifiers
    
 recommended by the Java Language Specification:
 
    
 
-
    public protected private abstract static final transient volatile synchronized native strictfp
+
    public protected private abstract default static final transient volatile synchronized native strictfp
 
    
 
 
    4.8.8 Numeric Literals