Merge branch 'master' into 'master'

Add RadioGroup and NotificationList Classes to  Policymgt UI

See merge request entgra/carbon-device-mgt!511
reporting
Dharmakeerthi Lasantha 5 years ago
commit c36761baa6

@ -30,12 +30,13 @@ public class Item {
private boolean isRequired; private boolean isRequired;
private String subTitle; private String subTitle;
private ConditionList conditionList; private ConditionList conditionList;
private Notification notification;
private Checkbox checkbox; private Checkbox checkbox;
private Select select; private Select select;
private Input input; private Input input;
private TimeSelector timeSelector; private TimeSelector timeSelector;
private Table table; private Table table;
private RadioGroup radioGroup;
private NotificationList notificationList;
@XmlElement(name = "Label") @XmlElement(name = "Label")
public String getLabel() { public String getLabel() {
@ -92,11 +93,6 @@ public class Item {
public void setConditionList(ConditionList conditionList) { this.conditionList = conditionList; } public void setConditionList(ConditionList conditionList) { this.conditionList = conditionList; }
@XmlElement(name = "Notification")
public Notification getNotification() { return notification; }
public void setNotification(Notification notification) { this.notification = notification; }
@XmlElement(name = "Checkbox") @XmlElement(name = "Checkbox")
public Checkbox getCheckbox() { public Checkbox getCheckbox() {
return checkbox; return checkbox;
@ -133,4 +129,18 @@ public class Item {
public Table getTable() { return table; } public Table getTable() { return table; }
public void setTable(Table table) { this.table = table; } public void setTable(Table table) { this.table = table; }
@XmlElement(name = "RadioGroup")
public RadioGroup getRadioGroup() {
return radioGroup;
}
public void setRadioGroup(RadioGroup radioGroup) {
this.radioGroup = radioGroup;
}
@XmlElement(name = "NotificationList")
public NotificationList getNotificationList() { return notificationList; }
public void setNotificationList(NotificationList notificationList) { this.notificationList = notificationList; }
} }

@ -0,0 +1,37 @@
/* Copyright (c) 2020, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
*
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.common.policy.mgt.ui;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlRootElement(name = "NotificationList")
public class NotificationList {
List<Notification> notification;
@XmlElement(name = "Notification")
public List<Notification> getConditions() {
return notification;
}
public void setConditions(List<Notification> notification) {
this.notification = notification;
}
}

@ -0,0 +1,38 @@
/* Copyright (c) 2020, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
*
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.common.policy.mgt.ui;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlRootElement(name = "RadioGroup")
public class RadioGroup {
private List<Option> options;
@XmlElementWrapper(name = "Options")
@XmlElement(name = "Option")
public List<Option> getOptions() {
return options;
}
public void setOptions(List<Option> options) {
this.options = options;
}
}
Loading…
Cancel
Save