Removal of deprecated UI methods
- removed deprecated addProp() methods from property panel
- removed deprecated DateTimeZone based withZone() method
Change-Id: I251ca70e49f37714e60cb5312a444baa0ef88bd8
diff --git a/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java b/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java
index 7568fbd..7396bb8 100644
--- a/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java
+++ b/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java
@@ -33,6 +33,13 @@
private static final String OVERLAY_ID = "alarmsTopo-overlay";
private static final ButtonId ALARM1_BUTTON = new ButtonId("alarm1button");
+ public static final String CRITICAL_LABEL = "Critical";
+ public static final String MAJOR_LABEL = "Major";
+ public static final String MINOR_LABEL = "Minor";
+ public static final String WARNING_LABEL = "Warning";
+ public static final String INDETER_LABEL = "Indeter.";
+ public static final String CLEARED_LABEL = "Cleared";
+ public static final String TOTAL_LABEL = "Total";
public AlarmTopovOverlay() {
super(OVERLAY_ID);
@@ -75,16 +82,16 @@
long in = countsForDevice.getOrDefault(Alarm.SeverityLevel.INDETERMINATE, 0L);
long cl = countsForDevice.getOrDefault(Alarm.SeverityLevel.CLEARED, 0L);
- // Unfortunately the PropertyPanel does not righ justify numbers even when using longs,
+ // Unfortunately the PropertyPanel does not right justify numbers even when using longs,
// but that not in scope of fault management work
- pp.addProp("Critical", cr);
- pp.addProp("Major", ma);
- pp.addProp("Minor", mi);
- pp.addProp("Warning", wa);
- pp.addProp("Indeter.", in);
- pp.addProp("Cleared", cl);
+ pp.addProp(CRITICAL_LABEL, CRITICAL_LABEL, cr);
+ pp.addProp(MAJOR_LABEL, MAJOR_LABEL, ma);
+ pp.addProp(MINOR_LABEL, MINOR_LABEL, mi);
+ pp.addProp(WARNING_LABEL, WARNING_LABEL, wa);
+ pp.addProp(INDETER_LABEL, INDETER_LABEL, in);
+ pp.addProp(CLEARED_LABEL, CLEARED_LABEL, cl);
pp.addSeparator();
- pp.addProp("Total", cr + ma + mi + wa + in + cl);
+ pp.addProp(TOTAL_LABEL, TOTAL_LABEL, cr + ma + mi + wa + in + cl);
}
diff --git a/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovOverlay.java b/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovOverlay.java
index 63f51d7..f555050 100644
--- a/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovOverlay.java
+++ b/apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovOverlay.java
@@ -53,7 +53,7 @@
FLOWS,
VERSION
)
- .addProp(VERSION, MY_VERSION);
+ .addProp(VERSION, VERSION, MY_VERSION);
}
}
diff --git a/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovOverlay.java b/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovOverlay.java
index 38cfead..1a32815 100644
--- a/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovOverlay.java
+++ b/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovOverlay.java
@@ -44,7 +44,7 @@
*/
public class PceWebTopovOverlay extends UiTopoOverlay {
- // NOTE: this must match the ID defined in pcewebTopovOverlay.js
+ // NOTE: this must match the ID defined in pcewebTopovOverlay.js
private static final String OVERLAY_ID = "PCE-web-overlay";
private static final String MY_TITLE = "Device details";
@@ -59,6 +59,11 @@
public static final String INNER = "Inner";
public static final long IDENTIFIER_SET = 0x100000000L;
public static final long SET = 0xFFFFFFFFL;
+ public static final String TYPE_LABEL = "Type";
+ public static final String AS_NUMBER_LABEL = "AS Number";
+ public static final String LSR_ID_LABEL = "LSR ID";
+ public static final String POSITION_LABEL = "Position";
+
/**
* Initialize the overlay ID.
*/
@@ -94,25 +99,25 @@
String asbrStatus = annots.value(ASBR_BIT);
if (type != null) {
- pp.addProp("Type", type);
+ pp.addProp(TYPE_LABEL, TYPE_LABEL, type);
}
if (asNumber != null) {
- pp.addProp("AS Number", asNumber);
+ pp.addProp(AS_NUMBER_LABEL, AS_NUMBER_LABEL, asNumber);
}
if (lsrId != null) {
- pp.addProp("LSR ID", lsrId);
+ pp.addProp(LSR_ID_LABEL, LSR_ID_LABEL, lsrId);
}
if (Boolean.valueOf(abrStatus).equals(true) && Boolean.valueOf(asbrStatus).equals(true)) {
- pp.addProp("Position", ABR_ASBR);
+ pp.addProp(POSITION_LABEL, POSITION_LABEL, ABR_ASBR);
} else if (Boolean.valueOf(abrStatus).equals(true)) {
- pp.addProp("Position", ABR);
+ pp.addProp(POSITION_LABEL, POSITION_LABEL, ABR);
} else if (Boolean.valueOf(asbrStatus).equals(true)) {
- pp.addProp("Position", ASBR);
+ pp.addProp(POSITION_LABEL, POSITION_LABEL, ASBR);
} else {
- pp.addProp("Position", INNER);
+ pp.addProp(POSITION_LABEL, POSITION_LABEL, INNER);
}
}
}