commit 0b5ccd2bb57296988affb91bc612d8473f7dfb98
author Naoki Shiota <n-shiota@onlab.us> Fri Dec 11 15:47:01 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 17 18:35:38 2015 +0000
tree 32dfc92618c33ff71f5967ac9fad0bbd7c5337ac
parent 78acc4460f31b8e24369849997b3ac2c8c63de96

[Falcon] Pretty print OchSignal

Change-Id: Ic0ecc88c95faf91397e132087a1ea0b1fa7295d5

core/api/src/main/java/org/onosproject/net/OchSignal.java

diff --git a/core/api/src/main/java/org/onosproject/net/OchSignal.java b/core/api/src/main/java/org/onosproject/net/OchSignal.java
index fc60aaa..65f430c 100644
--- a/core/api/src/main/java/org/onosproject/net/OchSignal.java
+++ b/core/api/src/main/java/org/onosproject/net/OchSignal.java
@@ -15,7 +15,6 @@
  */
 package org.onosproject.net;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 import org.onlab.util.Frequency;
 import org.onlab.util.Spectrum;
@@ -251,11 +250,12 @@
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("gridType", gridType)
-                .add("channelSpacing", channelSpacing)
-                .add("spacingMultiplier", spacingMultiplier)
-                .add("slotGranularity", slotGranularity)
-                .toString();
+        return String.format("%s{%+d×%.2fGHz ± %.2fGHz}",
+                this.getClass().getSimpleName(),
+                spacingMultiplier,
+                (double) slotGranularity * channelSpacing.frequency().asHz()
+                        / Frequency.ofGHz(1).asHz(),
+                (double) slotGranularity * ChannelSpacing.CHL_12P5GHZ.frequency().asHz()
+                        / Frequency.ofGHz(1).asHz() / 2.0);
     }
 }