Remove complex import order Google's style guide changed its complex rules to be much simpler: all static imports, then all non-static imports: https://google.github.io/styleguide/javaguide.html#s3.3.3-import-ordering-and-spacing google-java-format will also understand this order. Change the Eclipse project settings and .importorder file, and reorder everything. Change-Id: I0bd3a085ef00ceee88d06e2c4b4711f1f696e4ae
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java index 41e0701..c505ed4 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java
@@ -22,7 +22,9 @@ import com.google.common.collect.Maps; import com.google.template.soy.data.SoyListData; import com.google.template.soy.data.SoyMapData; - +import java.io.IOException; +import java.util.List; +import java.util.Map; import org.eclipse.jgit.diff.RawText; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.MissingObjectException; @@ -33,11 +35,6 @@ import org.eclipse.jgit.util.RawParseUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - import prettify.parser.Prettify; import syntaxhighlight.ParseResult;