mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Minor refactorings and fixing formatting issues
This commit is contained in:
Dileesha Rajapakse
parent
6b4d11c1e4
commit
5b33f791ae
@ -26,8 +26,16 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
|
||||
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
|
||||
import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
|
||||
|
||||
import java.io.*;
|
||||
import java.sql.*;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectOutputStream;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
@ -84,14 +92,14 @@ public class ApplicationDAOImpl implements ApplicationDAO {
|
||||
try {
|
||||
bao.close();
|
||||
} catch (IOException e) {
|
||||
log.warn("Error occurred while closing ByteArrayOutputStream", e);
|
||||
log.error("Error occurred while closing ByteArrayOutputStream", e);
|
||||
}
|
||||
}
|
||||
if (oos != null) {
|
||||
try {
|
||||
oos.close();
|
||||
} catch (IOException e) {
|
||||
log.warn("Error occurred while closing ObjectOutputStream", e);
|
||||
log.error("Error occurred while closing ObjectOutputStream", e);
|
||||
}
|
||||
}
|
||||
DeviceManagementDAOUtil.cleanupResources(stmt, rs);
|
||||
@ -150,14 +158,14 @@ public class ApplicationDAOImpl implements ApplicationDAO {
|
||||
try {
|
||||
bao.close();
|
||||
} catch (IOException e) {
|
||||
log.warn("Error occurred while closing ByteArrayOutputStream", e);
|
||||
log.error("Error occurred while closing ByteArrayOutputStream", e);
|
||||
}
|
||||
}
|
||||
if (oos != null) {
|
||||
try {
|
||||
oos.close();
|
||||
} catch (IOException e) {
|
||||
log.warn("Error occurred while closing ObjectOutputStream", e);
|
||||
log.error("Error occurred while closing ObjectOutputStream", e);
|
||||
}
|
||||
}
|
||||
DeviceManagementDAOUtil.cleanupResources(stmt, null);
|
||||
@ -193,7 +201,7 @@ public class ApplicationDAOImpl implements ApplicationDAO {
|
||||
conn.rollback();
|
||||
}
|
||||
} catch (SQLException e1) {
|
||||
log.warn("Error occurred while roll-backing the transaction", e);
|
||||
log.error("Error occurred while roll-backing the transaction", e);
|
||||
}
|
||||
throw new DeviceManagementDAOException("Error occurred while removing bulk application list", e);
|
||||
} finally {
|
||||
|
||||
@ -40,27 +40,27 @@ function loadGeoFencing() {
|
||||
|
||||
function openTools(id) {
|
||||
lastId = id;
|
||||
if(drawControl){
|
||||
if (drawControl) {
|
||||
try{
|
||||
map.removeControl(drawControl);
|
||||
}catch(e){
|
||||
} catch(e) {
|
||||
console.log("error: " + e.message);
|
||||
}
|
||||
console.log("removed drawControl");
|
||||
}
|
||||
if(removeAllControl){
|
||||
try{
|
||||
if (removeAllControl) {
|
||||
try {
|
||||
map.removeControl(removeAllControl);
|
||||
}catch(e){
|
||||
} catch(e) {
|
||||
console.log("error: " + e.message);
|
||||
}
|
||||
console.log("removed removeAllControl");
|
||||
}
|
||||
if(drawnItems){
|
||||
if (drawnItems) {
|
||||
try{
|
||||
map.removeLayer(drawnItems);
|
||||
console.log("removing layer");
|
||||
}catch(e){
|
||||
} catch(e) {
|
||||
console.log("error: " + e.message);
|
||||
}
|
||||
console.log("removed drawnItems");
|
||||
@ -112,7 +112,7 @@ function openTools(id) {
|
||||
drawnItems = new L.FeatureGroup();
|
||||
map.addLayer(drawnItems);
|
||||
|
||||
if(id=="WithIn"){
|
||||
if (id=="WithIn") {
|
||||
// Initialise the draw control and pass it the FeatureGroup of editable layers
|
||||
drawControl = new L.Control.Draw({
|
||||
draw: {
|
||||
@ -139,7 +139,7 @@ function openTools(id) {
|
||||
featureGroup: drawnItems
|
||||
}
|
||||
});
|
||||
} else if(id=="Exit"){
|
||||
} else if (id=="Exit") {
|
||||
// Initialise the draw control and pass it the FeatureGroup of editable layers
|
||||
drawControl = new L.Control.Draw({
|
||||
draw: {
|
||||
@ -198,7 +198,7 @@ function openTools(id) {
|
||||
featureGroup: drawnItems
|
||||
}
|
||||
});
|
||||
} else if(id=="Traffic"){
|
||||
} else if (id=="Traffic") {
|
||||
// Initialise the draw control and pass it the FeatureGroup of editable layers
|
||||
drawControl = new L.Control.Draw({
|
||||
draw: {
|
||||
@ -233,7 +233,7 @@ function openTools(id) {
|
||||
featureGroup: drawnItems
|
||||
}
|
||||
});
|
||||
} else if(id =="Prediction"){
|
||||
} else if (id =="Prediction") {
|
||||
drawControl = new L.Control.Draw({
|
||||
draw: {
|
||||
polygon: false,
|
||||
@ -260,20 +260,20 @@ function openTools(id) {
|
||||
}
|
||||
|
||||
function createPopup(layer,id) {
|
||||
if(id=="WithIn"){
|
||||
if (id=="WithIn") {
|
||||
var popupTemplate = $('#setWithinAlert');
|
||||
popupTemplate.find('#addWithinAlert').attr('leaflet_id', layer._leaflet_id);
|
||||
} else if(id=="Exit"){
|
||||
} else if (id=="Exit") {
|
||||
var popupTemplate = $('#setExitAlert');
|
||||
popupTemplate.find('#addExitAlert').attr('leaflet_id', layer._leaflet_id);
|
||||
} else if(id=="Stationery"){
|
||||
} else if (id=="Stationery") {
|
||||
var popupTemplate = $('#setStationeryAlert');
|
||||
popupTemplate.find('#addStationeryAlert').attr('leaflet_id', layer._leaflet_id);
|
||||
} else if(id=="Traffic"){
|
||||
} else if (id=="Traffic") {
|
||||
var popupTemplate = $('#setTrafficAlert');
|
||||
popupTemplate.find('#addTrafficAlert').attr('leaflet_id', layer._leaflet_id);
|
||||
//console.log(">>got here " + id + " " + popupTemplate.find('#addTrafficAlert') + " " + layer._leaflet_id);
|
||||
} else if(id=="Prediction"){
|
||||
} else if (id=="Prediction") {
|
||||
getPrediction(layer._leaflet_id);
|
||||
return;
|
||||
}
|
||||
@ -364,7 +364,7 @@ function viewFence(geoFenceElement,id) {
|
||||
var areaName = $(geoFenceElement).attr('data-areaName');
|
||||
var geometryShape;
|
||||
|
||||
if(geoJson.type=="Point"){
|
||||
if (geoJson.type=="Point") {
|
||||
|
||||
var circleOptions = {
|
||||
color: '#ff0043'
|
||||
@ -373,7 +373,7 @@ function viewFence(geoFenceElement,id) {
|
||||
// var marker=new L.marker([geoJson.coordinates[1],geoJson.coordinates[0]]);
|
||||
map.addLayer(geometryShape);
|
||||
// map.addLayer(marker);
|
||||
} else if(geoJson.type=="Polygon"){
|
||||
} else if (geoJson.type=="Polygon") {
|
||||
geoJson.coordinates[0].pop(); // popout the last coordinate set(lat,lng pair) due to circular chain
|
||||
var leafletLatLngs = [];
|
||||
$.each(geoJson.coordinates[0], function (idx, pItem) {
|
||||
@ -385,7 +385,7 @@ function viewFence(geoFenceElement,id) {
|
||||
|
||||
var geoPublicUri = $("#geo-charts").data("geo-public-uri");
|
||||
|
||||
if(id=="Stationery"){
|
||||
if (id=="Stationery") {
|
||||
|
||||
var stationeryTime=$(geoFenceElement).attr('data-stationeryTime');
|
||||
$('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewStationeryAlert", function () {
|
||||
@ -401,7 +401,7 @@ function viewFence(geoFenceElement,id) {
|
||||
$(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
|
||||
|
||||
});
|
||||
} else if(id=="WithIn"){
|
||||
} else if (id=="WithIn") {
|
||||
|
||||
$('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewWithinAlert", function () {
|
||||
var popupTemplate = $('#templateLoader').find('#viewWithinAlert');
|
||||
@ -414,7 +414,7 @@ function viewFence(geoFenceElement,id) {
|
||||
// transparent the layer .leaflet-popup-content-wrapper
|
||||
$(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
|
||||
});
|
||||
} else if(id=="Exit"){
|
||||
} else if (id=="Exit") {
|
||||
|
||||
$('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewExitAlert", function () {
|
||||
var popupTemplate = $('#templateLoader').find('#viewExitAlert');
|
||||
@ -427,7 +427,7 @@ function viewFence(geoFenceElement,id) {
|
||||
// transparent the layer .leaflet-popup-content-wrapper
|
||||
$(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
|
||||
});
|
||||
} else if(id=="Traffic"){
|
||||
} else if (id=="Traffic") {
|
||||
}
|
||||
closeAll();
|
||||
}
|
||||
@ -440,7 +440,7 @@ function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
|
||||
geoJson = JSON.parse(geoJson.replace(/'/g, '"'));
|
||||
var geometryShape;
|
||||
|
||||
if(geoJson.type=="Point"){
|
||||
if (geoJson.type=="Point") {
|
||||
|
||||
var circleOptions = {
|
||||
color: '#ff0043'
|
||||
@ -449,7 +449,7 @@ function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
|
||||
// var marker=new L.marker([geoJson.coordinates[1],geoJson.coordinates[0]]);
|
||||
map.addLayer(geometryShape);
|
||||
// map.addLayer(marker);
|
||||
} else if(geoJson.type=="Polygon"){
|
||||
} else if (geoJson.type=="Polygon") {
|
||||
geoJson.coordinates[0].pop(); // popout the last coordinate set(lat,lng pair) due to circular chain
|
||||
var leafletLatLngs = [];
|
||||
$.each(geoJson.coordinates[0], function (idx, pItem) {
|
||||
@ -461,7 +461,7 @@ function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
|
||||
|
||||
var geoPublicUri = $("#geo-charts").data("geo-public-uri");
|
||||
|
||||
if(id=="Stationery"){
|
||||
if (id=="Stationery") {
|
||||
|
||||
$('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewStationeryAlert", function () {
|
||||
var popupTemplate = $('#templateLoader').find('#viewStationeryAlert');
|
||||
@ -473,7 +473,7 @@ function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
|
||||
$(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
|
||||
|
||||
});
|
||||
} else if(id=="WithIn"){
|
||||
} else if (id=="WithIn") {
|
||||
|
||||
$('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewWithinAlert", function () {
|
||||
var popupTemplate = $('#templateLoader').find('#viewWithinAlert');
|
||||
@ -486,7 +486,7 @@ function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
|
||||
// transparent the layer .leaflet-popup-content-wrapper
|
||||
$(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
|
||||
});
|
||||
} else if(id=="Exit"){
|
||||
} else if (id=="Exit") {
|
||||
|
||||
$('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewExitAlert", function () {
|
||||
var popupTemplate = $('#templateLoader').find('#viewExitAlert');
|
||||
@ -499,7 +499,7 @@ function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
|
||||
// transparent the layer .leaflet-popup-content-wrapper
|
||||
$(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
|
||||
});
|
||||
} else if(id=="Traffic"){
|
||||
} else if (id=="Traffic") {
|
||||
}
|
||||
closeAll();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user