mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 19:56:49 +02:00
Code Issues Projects Releases Wiki Activity

Removal of deprecated UI methods

Browse Source 
- removed deprecated addProp() methods from property panel
- removed deprecated DateTimeZone based withZone() method

Change-Id: I251ca70e49f37714e60cb5312a444baa0ef88bd8
This commit is contained in:
Ray Milkey 2019-02-19 11:31:29 -08:00 committed by Thomas Vachuska
parent f632826bc2
commit 312221c3b5
6 changed files with 44 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java
View File

@ -33,6 +33,13 @@ public class AlarmTopovOverlay extends UiTopoOverlay {
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 @@ public class AlarmTopovOverlay extends UiTopoOverlay {
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);
}

2
apps/linkprops/src/main/java/org/onosproject/linkprops/LinkPropsTopovOverlay.java
View File

@ -53,7 +53,7 @@ public class LinkPropsTopovOverlay extends UiTopoOverlay {
FLOWS,
VERSION
)
.addProp(VERSION, MY_VERSION);
.addProp(VERSION, VERSION, MY_VERSION);
}
}

21
apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovOverlay.java
View File

@ -44,7 +44,7 @@ import org.onlab.packet.IpAddress;
*/
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 class PceWebTopovOverlay extends UiTopoOverlay {
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 @@ public class PceWebTopovOverlay extends UiTopoOverlay {
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);
}
}
}

14
core/api/src/main/java/org/onosproject/ui/table/cell/TimeFormatter.java
View File

@ -30,7 +30,6 @@ import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
import java.util.Locale;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -90,19 +89,6 @@ public final class TimeFormatter extends AbstractCellFormatter {
return this;
}
/**
* Sets the time zone to use for formatting the time.
*
* @param zone time zone to use
* @return self, for chaining
*
* @deprecated in 1.12.0
*/
@Deprecated
public TimeFormatter withZone(DateTimeZone zone) {
return withZone(zone.toTimeZone().toZoneId());
}
@Override
protected String nonNullFormat(Object value) {
if (value instanceof TemporalAccessor) {

80
core/api/src/main/java/org/onosproject/ui/topo/PropertyPanel.java
View File

@ -166,86 +166,6 @@ public class PropertyPanel {
return this;
}
/*
* The following degenerate forms of addProp(...) for backward compatibility.
*/
/**
* Adds a property to the panel data.
* Note that the key is used as the label.
*
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
* @deprecated as of Loon (1.11) in deference to the localized version
*/
@Deprecated
public PropertyPanel addProp(String key, String value) {
return addProp(key, key, value);
}
/**
* Adds a property to the panel data, using a decimal formatter.
* Note that the key is used as the label.
*
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
* @deprecated as of Loon (1.11) in deference to the localized version
*/
@Deprecated
public PropertyPanel addProp(String key, int value) {
return addProp(key, key, value);
}
/**
* Adds a property to the panel data, using a decimal formatter.
* Note that the key is used as the label.
*
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
* @deprecated as of Loon (1.11) in deference to the localized version
*/
@Deprecated
public PropertyPanel addProp(String key, long value) {
return addProp(key, key, value);
}
/**
* Adds a property to the panel data. Note that the value's
* {@link Object#toString toString()} method is used to convert the
* value to a string.
* Note also that the key is used as the label.
*
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
* @deprecated as of Loon (1.11) in deference to the localized version
*/
@Deprecated
public PropertyPanel addProp(String key, Object value) {
return addProp(key, key, value);
}
/**
* Adds a property to the panel data. Note that the value's
* {@link Object#toString toString()} method is used to convert the
* value to a string, from which the characters defined in the given
* regular expression string are stripped.
* Note also that the key is used as the label.
*
* @param key property key (also used as display label)
* @param value property value
* @param reStrip regexp characters to strip from value string
* @return self, for chaining
* @deprecated as of Loon (1.11) in deference to the localized version
*/
@Deprecated
public PropertyPanel addProp(String key, Object value, String reStrip) {
return addProp(key, key, value, reStrip);
}
/**
* Adds a separator to the panel data.
*

30
core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java
View File

@ -160,9 +160,9 @@ public class PropertyPanelTest {
@Test
public void props() {
basic();
pp.addProp(KEY_A, VALUE_A)
.addProp(KEY_B, VALUE_B)
.addProp(KEY_C, VALUE_C);
pp.addProp(KEY_A, KEY_A, VALUE_A)
.addProp(KEY_B, KEY_B, VALUE_B)
.addProp(KEY_C, KEY_C, VALUE_C);
assertEquals("bad props", 3, pp.properties().size());
validateProps(KEY_A, KEY_B, KEY_C);
}
@ -181,7 +181,7 @@ public class PropertyPanelTest {
@Test
public void nonLocalizedProp() {
basic();
pp.addProp(KEY_A, VALUE_A);
pp.addProp(KEY_A, KEY_A, VALUE_A);
Prop p = pp.properties().get(0);
assertEquals("wrong key", KEY_A, p.key());
assertEquals("wrong label", KEY_A, p.label());
@ -192,7 +192,7 @@ public class PropertyPanelTest {
public void separator() {
props();
pp.addSeparator()
.addProp(KEY_Z, VALUE_Z);
.addProp(KEY_Z, KEY_Z, VALUE_Z);
assertEquals("bad props", 5, pp.properties().size());
validateProps(KEY_A, KEY_B, KEY_C, SEP, KEY_Z);
@ -210,16 +210,16 @@ public class PropertyPanelTest {
public void adjustProps() {
props();
pp.removeProps(KEY_B, KEY_A);
pp.addProp(KEY_Z, VALUE_Z);
pp.addProp(KEY_Z, KEY_Z, VALUE_Z);
validateProps(KEY_C, KEY_Z);
}
@Test
public void intValues() {
basic();
pp.addProp(KEY_A, 200)
.addProp(KEY_B, 2000)
.addProp(KEY_C, 1234567);
pp.addProp(KEY_A, KEY_A, 200)
.addProp(KEY_B, KEY_B, 2000)
.addProp(KEY_C, KEY_C, 1234567);
validateProp(KEY_A, "200");
validateProp(KEY_B, "2,000");
@ -229,10 +229,10 @@ public class PropertyPanelTest {
@Test
public void longValues() {
basic();
pp.addProp(KEY_A, 200L)
.addProp(KEY_B, 2000L)
.addProp(KEY_C, 1234567L)
.addProp(KEY_Z, Long.MAX_VALUE);
pp.addProp(KEY_A, KEY_A, 200L)
.addProp(KEY_B, KEY_B, 2000L)
.addProp(KEY_C, KEY_C, 1234567L)
.addProp(KEY_Z, KEY_Z, Long.MAX_VALUE);
validateProp(KEY_A, "200");
validateProp(KEY_B, "2,000");
@ -243,8 +243,8 @@ public class PropertyPanelTest {
@Test
public void objectValue() {
basic();
pp.addProp(KEY_A, new FooClass("a"))
.addProp(KEY_B, new FooClass("bxyyzy"), "[xz]");
pp.addProp(KEY_A, KEY_A, new FooClass("a"))
.addProp(KEY_B, KEY_B, new FooClass("bxyyzy"), "[xz]");
validateProp(KEY_A, ">a<");
validateProp(KEY_B, ">byyy<");