checkstyle

Author: tulinkry

opengrok-indexer/src/main/java/org/opengrok/indexer/history/Annotation.java

@@ -24,18 +24,26 @@
 
 package org.opengrok.indexer.history;
 
+import org.opengrok.indexer.logger.LoggerFactory;
+import org.opengrok.indexer.util.Color;
+import org.opengrok.indexer.util.LazilyInstantiate;
+import org.opengrok.indexer.util.RainbowColorGenerator;
+import org.opengrok.indexer.web.Util;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import org.opengrok.indexer.logger.LoggerFactory;
-import org.opengrok.indexer.util.Color;
-import org.opengrok.indexer.util.LazilyInstantiate;
-import org.opengrok.indexer.util.RainbowColorGenerator;
-import org.opengrok.indexer.web.Util;
 
 /**
  * Class representing file annotation, i.e., revision and author for the last

opengrok-indexer/src/main/java/org/opengrok/indexer/util/ColorUtil.java

@@ -1,3 +1,22 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
 /*
  * Copyright 2000-2016 JetBrains s.r.o.
  *
@@ -45,9 +64,15 @@ private static int parseHexNumber(String str, int pos) {
 
  private static int convertToDecimal(String str, int pos) {
  char ch = str.charAt(pos);
- if (ch >= '0' && ch <= '9') return ch - '0';
- if (ch >= 'A' && ch <= 'F') return ch - 'A' + 10;
- if (ch >= 'a' && ch <= 'f') return ch - 'a' + 10;
+ if (ch >= '0' && ch <= '9') {
+ return ch - '0';
+ }
+ if (ch >= 'A' && ch <= 'F') {
+ return ch - 'A' + 10;
+ }
+ if (ch >= 'a' && ch <= 'f') {
+ return ch - 'a' + 10;
+ }
  throw new IllegalArgumentException("unsupported char at " + pos + ":" + str);
  }
 }

opengrok-indexer/src/main/java/org/opengrok/indexer/util/RainbowColorGenerator.java

@@ -1,3 +1,22 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
 /*
  * Copyright 2000-2016 JetBrains s.r.o.
  *
@@ -31,7 +50,7 @@
 public class RainbowColorGenerator {
 
  private static final int COLORS_BETWEEN_ANCHORS = 4;
- private final static Color[] STOP_COLORS = new Color[]{
+ private static final Color[] STOP_COLORS = new Color[]{
  fromHex("eaffe2"),
  fromHex("d9e4f9"),
  fromHex("d1d1d1"),

opengrok-indexer/src/test/java/org/opengrok/indexer/history/AnnotationTest.java

@@ -162,7 +162,7 @@ public void testColorPalette() {
  annotation.addLine("1.0", "Me", true);
  annotation.addLine("1.1", "Me", true);
  annotation.addLine("1.2", "Me", true);
- Assert.assertEquals(21, annotation.getColors().size());
+ Assert.assertEquals(3, annotation.getColors().size());
  }
 
  @Test
@@ -173,11 +173,11 @@ public void testSortedColorPalette() {
  annotation.addLine("1.2", "Me", true);
  annotation.addFileVersion("1.0", 3);
  annotation.addFileVersion("1.2", 2);
- Assert.assertEquals(21, annotation.getColors().size());
+ Assert.assertEquals(3, annotation.getColors().size());
  // tracked by history entries
- Assert.assertEquals("hsl(60, 90%, 80%)", annotation.getColors().get("1.0"));
- Assert.assertEquals("hsl(180, 80%, 70%)", annotation.getColors().get("1.2"));
+ Assert.assertEquals("rgb(234, 255, 226)", annotation.getColors().get("1.0"));
+ Assert.assertEquals("rgb(213, 220, 233)", annotation.getColors().get("1.2"));
  // 1.1 us untracked by history entries (no addFileVersion called)
- Assert.assertEquals("hsl(300, 90%, 80%)", annotation.getColors().get("1.1"));
+ Assert.assertEquals("rgb(255, 191, 195)", annotation.getColors().get("1.1"));
  }
 }