commit 2f7eadb54b816a6835a3d468b1028cd6160d599e
author MaoLu <Lu.Mao@molex.com> Tue May 02 15:38:43 2017 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Wed May 03 17:58:46 2017 +0000
tree 6d33c159bfaa92bea1552c43e1bb446064303932
parent f708910147670732802135a94e9abc314cab85ab

Change some code in roadm application.
1. Change inputPowerRange to powerRange in the port view page.
2. Replace the update Frequency methods in roadmUtil.

Change-Id: I19a840156d8cdcb9c142bd88a6b5a667bb135f77

apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java

diff --git a/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java b/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java
index d125c77..22e1791 100644
--- a/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java
+++ b/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java
@@ -30,12 +30,8 @@
     public static final String MESSAGE = "message";
     public static final String NA = "N/A";
     public static final String UNKNOWN = "Unknown";
-    public static final String NONE = "(none)";
     public static final String NO_ROWS_MESSAGE = "No items found";
 
-    public static final long GHZ = 1_000_000_000L;
-    public static final long THZ = 1_000_000_000_000L;
-
     private RoadmUtil() {
     }
 
@@ -46,7 +42,7 @@
      * @return GHz in string format
      */
     public static String asGHz(Frequency value) {
-        return value == null ? UNKNOWN : String.valueOf((double) value.asHz() / GHZ);
+        return value == null ? UNKNOWN : String.valueOf(value.asGHz());
     }
 
     /**
@@ -56,7 +52,7 @@
      * @return THz in string format
      */
     public static String asTHz(Frequency value) {
-        return value == null ? UNKNOWN : String.valueOf((double) value.asHz() / THZ);
+        return value == null ? UNKNOWN : String.valueOf(value.asTHz());
     }
 
     /**