From db3adaf6eb1d5eb6d1400de308d44e06322818e1 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Tue, 30 May 2017 09:29:00 +0200 Subject: use standard formatting for Override annotation --- component/src/main/java/com/yahoo/component/ComponentId.java | 6 ++++-- .../src/main/java/com/yahoo/component/ComponentSpecification.java | 6 ++++-- component/src/main/java/com/yahoo/component/Spec.java | 3 ++- .../src/main/java/com/yahoo/component/provider/FreezableClass.java | 3 ++- .../main/java/com/yahoo/component/provider/FreezableComponent.java | 3 ++- .../java/com/yahoo/component/provider/ListenableFreezableClass.java | 3 ++- 6 files changed, 16 insertions(+), 8 deletions(-) (limited to 'component/src') diff --git a/component/src/main/java/com/yahoo/component/ComponentId.java b/component/src/main/java/com/yahoo/component/ComponentId.java index 50417c15b5e..687d0da617a 100644 --- a/component/src/main/java/com/yahoo/component/ComponentId.java +++ b/component/src/main/java/com/yahoo/component/ComponentId.java @@ -111,7 +111,8 @@ public final class ComponentId implements Comparable { */ public String stringValue() { return stringValue; } - public @Override String toString() { + @Override + public String toString() { return spec.toString(); } @@ -126,7 +127,8 @@ public final class ComponentId implements Comparable { return c.stringValue().equals(stringValue); } - public @Override int hashCode() { + @Override + public int hashCode() { return stringValue.hashCode(); } diff --git a/component/src/main/java/com/yahoo/component/ComponentSpecification.java b/component/src/main/java/com/yahoo/component/ComponentSpecification.java index 9662eee0f66..af8fbdcdbe1 100644 --- a/component/src/main/java/com/yahoo/component/ComponentSpecification.java +++ b/component/src/main/java/com/yahoo/component/ComponentSpecification.java @@ -91,7 +91,8 @@ public final class ComponentSpecification { */ public String stringValue() { return stringValue; } - public @Override String toString() { + @Override + public String toString() { return toId().toString(); } @@ -102,7 +103,8 @@ public final class ComponentSpecification { return c.stringValue.equals(this.stringValue()); } - public @Override int hashCode() { + @Override + public int hashCode() { return stringValue.hashCode(); } diff --git a/component/src/main/java/com/yahoo/component/Spec.java b/component/src/main/java/com/yahoo/component/Spec.java index a3259484b4a..54cf52a3887 100644 --- a/component/src/main/java/com/yahoo/component/Spec.java +++ b/component/src/main/java/com/yahoo/component/Spec.java @@ -51,7 +51,8 @@ final class Spec { } } - public @Override String toString() { + @Override + public String toString() { if (isNonEmpty(version) || (namespace != null)) { StringBuilder builder = new StringBuilder(name); if (isNonEmpty(version)) { diff --git a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java index c94c8a0bbac..895f642e315 100644 --- a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java +++ b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java @@ -30,7 +30,8 @@ public class FreezableClass implements Freezable { } /** Clones this. The clone is not frozen */ - public @Override FreezableClass clone() { + @Override + public FreezableClass clone() { try { FreezableClass clone=(FreezableClass)super.clone(); clone.frozen = false; diff --git a/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java b/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java index 9d51b0b5819..d2189c3a48b 100644 --- a/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java +++ b/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java @@ -38,7 +38,8 @@ public class FreezableComponent extends AbstractComponent implements Freezable { } /** Clones this. The clone will not be frozen */ - public @Override FreezableComponent clone() { + @Override + public FreezableComponent clone() { FreezableComponent clone=(FreezableComponent)super.clone(); clone.frozen = false; return clone; diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java index d1d82b2de79..7bb2eae10a5 100644 --- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java +++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java @@ -34,7 +34,8 @@ public class ListenableFreezableClass extends FreezableClass implements Listenab } /** Clones this. The clone is not frozen and has no listeners. */ - public @Override ListenableFreezableClass clone() { + @Override + public ListenableFreezableClass clone() { ListenableFreezableClass clone=(ListenableFreezableClass)super.clone(); clone.executionList = new ExecutionList(); return clone; -- cgit v1.2.3