Fixed merge conflicts

revert-70aa11f8
Dileesha Rajapakse 9 years ago
commit 13d9672b74

@ -24,10 +24,14 @@ public interface FeatureManager {
boolean addFeature(Feature feature) throws DeviceManagementException;
boolean addFeatures(List<Feature> features) throws DeviceManagementException;
Feature getFeature(String name) throws DeviceManagementException;
List<Feature> getFeatures() throws DeviceManagementException;
boolean removeFeature(String name) throws DeviceManagementException;
boolean addSupportedFeaturesToDB() throws DeviceManagementException;
}

@ -1,5 +1,5 @@
CREATE TABLE DM_DEVICE_TYPE (
ID INT identity NOT NULL,
ID INT IDENTITY NOT NULL,
NAME VARCHAR(300) DEFAULT NULL,
PRIMARY KEY (ID)
);
@ -403,4 +403,5 @@ CREATE TABLE DM_NOTIFICATION (
-- TO:DO - Remove this INSERT sql statement.
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');

@ -398,4 +398,5 @@ CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
-- TO:DO - Remove this INSERT sql statement.
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');

@ -1,5 +1,5 @@
CREATE TABLE DM_DEVICE_TYPE (
ID NUMBER(10) NOT NULL,
ID NUMBER(10) NOT NULL,
NAME VARCHAR2(300) DEFAULT NULL,
PRIMARY KEY (ID)
);
@ -629,4 +629,5 @@ END;
-- TO:DO - Remove this INSERT sql statement.
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');

Loading…
Cancel
Save