ONOS-3755: use thousand separator for packet and byte counts, etc. Fix alignment (numbers right justified).
Change-Id: Idb407fb16a82d5e3fb6fd10a6599b263a777deb2
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
index 44bd78d..e7a29dd 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/FlowViewMessageHandler.java
@@ -32,6 +32,7 @@
import org.onosproject.ui.table.cell.EnumFormatter;
import org.onosproject.ui.table.cell.HexFormatter;
import org.onosproject.ui.table.cell.HexLongFormatter;
+import org.onosproject.ui.table.cell.NumberFormatter;
import java.util.Collection;
import java.util.List;
@@ -88,9 +89,11 @@
TableModel tm = super.createTableModel();
tm.setFormatter(ID, HexLongFormatter.INSTANCE);
tm.setFormatter(GROUP_ID, HexFormatter.INSTANCE);
+ tm.setFormatter(STATE, EnumFormatter.INSTANCE);
+ tm.setFormatter(PACKETS, NumberFormatter.INTEGER);
+ tm.setFormatter(BYTES, NumberFormatter.INTEGER);
tm.setFormatter(SELECTOR, new SelectorFormatter());
tm.setFormatter(TREATMENT, new TreatmentFormatter());
- tm.setFormatter(STATE, EnumFormatter.INSTANCE);
return tm;
}
@@ -112,13 +115,13 @@
.cell(GROUP_ID, flow.groupId().id())
.cell(TABLE_ID, flow.tableId())
.cell(PRIORITY, flow.priority())
- .cell(SELECTOR, flow)
- .cell(TREATMENT, flow)
.cell(TIMEOUT, flow.timeout())
.cell(PERMANENT, flow.isPermanent())
.cell(STATE, flow.state())
.cell(PACKETS, flow.packets())
- .cell(BYTES, flow.bytes());
+ .cell(BYTES, flow.bytes())
+ .cell(SELECTOR, flow)
+ .cell(TREATMENT, flow);
}
private final class SelectorFormatter implements CellFormatter {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java
index c78d32f..5780e9f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/GroupViewMessageHandler.java
@@ -30,6 +30,7 @@
import org.onosproject.ui.table.TableRequestHandler;
import org.onosproject.ui.table.cell.EnumFormatter;
import org.onosproject.ui.table.cell.HexFormatter;
+import org.onosproject.ui.table.cell.NumberFormatter;
import java.util.Collection;
import java.util.List;
@@ -78,6 +79,8 @@
TableModel tm = super.createTableModel();
tm.setFormatter(ID, HexFormatter.INSTANCE);
tm.setFormatter(TYPE, EnumFormatter.INSTANCE);
+ tm.setFormatter(PACKETS, NumberFormatter.INTEGER);
+ tm.setFormatter(BYTES, NumberFormatter.INTEGER);
tm.setFormatter(BUCKETS, new BucketFormatter());
return tm;
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/MeterViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/MeterViewMessageHandler.java
index 204fe8f..f48fc81 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/MeterViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/MeterViewMessageHandler.java
@@ -28,6 +28,8 @@
import org.onosproject.ui.table.CellFormatter;
import org.onosproject.ui.table.TableModel;
import org.onosproject.ui.table.TableRequestHandler;
+import org.onosproject.ui.table.cell.HexLongFormatter;
+import org.onosproject.ui.table.cell.NumberFormatter;
import java.util.Collection;
@@ -71,6 +73,9 @@
@Override
protected TableModel createTableModel() {
TableModel tm = super.createTableModel();
+ tm.setFormatter(ID, HexLongFormatter.INSTANCE);
+ tm.setFormatter(PACKETS, NumberFormatter.INTEGER);
+ tm.setFormatter(BYTES, NumberFormatter.INTEGER);
tm.setFormatter(BANDS, new BandFormatter());
return tm;
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/PortViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/PortViewMessageHandler.java
index 92ebcf7..9c2f211 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/PortViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/PortViewMessageHandler.java
@@ -26,6 +26,7 @@
import org.onosproject.ui.UiMessageHandler;
import org.onosproject.ui.table.TableModel;
import org.onosproject.ui.table.TableRequestHandler;
+import org.onosproject.ui.table.cell.NumberFormatter;
import java.util.Collection;
@@ -71,6 +72,18 @@
}
@Override
+ protected TableModel createTableModel() {
+ TableModel tm = super.createTableModel();
+ tm.setFormatter(PKT_RX, NumberFormatter.INTEGER);
+ tm.setFormatter(PKT_TX, NumberFormatter.INTEGER);
+ tm.setFormatter(BYTES_RX, NumberFormatter.INTEGER);
+ tm.setFormatter(BYTES_TX, NumberFormatter.INTEGER);
+ tm.setFormatter(PKT_RX_DRP, NumberFormatter.INTEGER);
+ tm.setFormatter(PKT_TX_DRP, NumberFormatter.INTEGER);
+ return tm;
+ }
+
+ @Override
protected void populateTable(TableModel tm, ObjectNode payload) {
String uri = string(payload, "devId");
if (!Strings.isNullOrEmpty(uri)) {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/ProcessorViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/ProcessorViewMessageHandler.java
index 5d97504..00b221b 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/ProcessorViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/ProcessorViewMessageHandler.java
@@ -76,7 +76,7 @@
@Override
protected TableModel createTableModel() {
TableModel tm = super.createTableModel();
- tm.setFormatter(AVG_MS, new NumberFormatter());
+ tm.setFormatter(AVG_MS, NumberFormatter.TO_5DP);
return tm;
}