From c5c52684eb30d924cb75a632b526a0f879d5a33c Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Sun, 18 Sep 2016 17:38:12 +0300
Subject: Format Java files using Eclipse Neon and Vaadin settings

Using the same formatting in the 7.7 branch and the master branch
eases porting of fixes

Change-Id: I51b4693f2f120447702cf322ce4505608ad92987
---
 .../buildhelpers/FetchReleaseNotesAuthors.java     | 25 +++++++++++-----------
 .../buildhelpers/FetchReleaseNotesTickets.java     | 12 +++++------
 2 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'all')

diff --git a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
index cd85ca6a3f..85dc87e756 100644
--- a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
+++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -27,18 +27,17 @@ import java.util.Properties;
 public class FetchReleaseNotesAuthors {
     private static final String template = "<li class=\"author\">@author@</li>";
 
-    public static void main(String[] args) throws IOException,
-            InterruptedException {
+    public static void main(String[] args)
+            throws IOException, InterruptedException {
         Properties authorMap = new Properties();
 
         String authorsFilename = FetchReleaseNotesAuthors.class.getPackage()
-                .getName().replace(".", "/")
-                + "/authormap.properties";
+                .getName().replace(".", "/") + "/authormap.properties";
         InputStream s = FetchReleaseNotesAuthors.class.getClassLoader()
                 .getResourceAsStream(authorsFilename);
         if (s == null) {
-            System.err.println("Author mapping file " + authorsFilename
-                    + " not found!");
+            System.err.println(
+                    "Author mapping file " + authorsFilename + " not found!");
         }
         authorMap.load(s);
 
@@ -53,8 +52,8 @@ public class FetchReleaseNotesAuthors {
         if (p.exitValue() != 0) {
             System.err.println("Exit code: " + p.exitValue());
         }
-        BufferedReader b = new BufferedReader(new InputStreamReader(
-                p.getInputStream()));
+        BufferedReader b = new BufferedReader(
+                new InputStreamReader(p.getInputStream()));
         String line = "";
 
         List<String> authors = new ArrayList<String>();
@@ -77,8 +76,8 @@ public class FetchReleaseNotesAuthors {
     private static String getPreviousVersion(String version) {
         String[] versionNumbers = version.split("\\.");
         if (versionNumbers.length > 4 || versionNumbers.length < 3) {
-            throw new IllegalArgumentException("Cannot parse version: "
-                    + version);
+            throw new IllegalArgumentException(
+                    "Cannot parse version: " + version);
         }
         int major = Integer.parseInt(versionNumbers[0]);
         int minor = Integer.parseInt(versionNumbers[1]);
diff --git a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
index 0cd06890eb..a763934464 100644
--- a/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
+++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
@@ -27,8 +27,7 @@ import org.apache.commons.io.IOUtils;
 
 public class FetchReleaseNotesTickets {
     private static final String queryURL = "https://dev.vaadin.com/query?status=pending-release&amp;status=released&amp;@milestone@&amp;resolution=fixed&amp;col=id&amp;col=summary&amp;col=owner&amp;col=type&amp;col=priority&amp;col=component&amp;col=version&amp;col=bfptime&col=fv&amp;format=tab&amp;order=id";
-    private static final String ticketTemplate = "<tr>"
-            + "@badge@" //
+    private static final String ticketTemplate = "<tr>" + "@badge@" //
             + "<td class=\"ticket\"><a href=\"https://dev.vaadin.com/ticket/@ticket@\">#@ticket@</a></td>" //
             + "<td>@description@</td>" //
             + "</tr>"; //
@@ -105,7 +104,8 @@ public class FetchReleaseNotesTickets {
             String badge = "<td></td>";
             if (fields.length >= 8 && !fields[7].equals("")) {
                 badge = "<td class=\"bfp\"><span class=\"bfp\">Priority</span></td>";
-            } else if (fields.length >= 9 && fields[8].equalsIgnoreCase("true")) {
+            } else if (fields.length >= 9
+                    && fields[8].equalsIgnoreCase("true")) {
                 badge = "<td class=\"fv\"><span class=\"fv\">Vote</span></td>";
             }
 
@@ -163,9 +163,9 @@ public class FetchReleaseNotesTickets {
     }
 
     private static void usage() {
-        System.err.println("Usage: "
-                + FetchReleaseNotesTickets.class.getSimpleName()
-                + " -Dvaadin.version=<version>");
+        System.err.println(
+                "Usage: " + FetchReleaseNotesTickets.class.getSimpleName()
+                        + " -Dvaadin.version=<version>");
         System.exit(1);
     }
 }
-- 
cgit v1.2.3