mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-16 18:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated scroll-table.css to have dynamic max-height, cleaned up

Browse Source 
warnings, removed order by name.
This commit is contained in:
Admin
2017-08-03 15:26:12 -05:00
parent 5ea14f9069
commit 60e8855aa7
25 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.bwssystems.HABridge</groupId>
<artifactId>ha-bridge</artifactId>
<version>4.5.6a</version>
<version>4.5.6b</version>
<packaging>jar</packaging>
<name>HA Bridge</name>

5
src/main/java/com/bwssystems/HABridge/api/hue/GroupResponse.java
View File

@@ -1,12 +1,7 @@
package com.bwssystems.HABridge.api.hue;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.bwssystems.HABridge.dao.DeviceDescriptor;
import com.bwssystems.HABridge.dao.GroupDescriptor;
import com.google.gson.annotations.SerializedName;

3
src/main/java/com/bwssystems/HABridge/api/hue/GroupState.java
View File

@@ -1,8 +1,5 @@
package com.bwssystems.HABridge.api.hue;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Florian Foerderreuther on 07/23/17
*/

2
src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
View File

@@ -32,7 +32,7 @@ import com.google.gson.JsonSyntaxException;
import java.util.Collection;
import java.util.List;
import java.util.Arrays;
import java.util.ArrayList;
/*
* This is an in memory list to manage the configured devices and saves the list as a JSON string to a file for later
* loading.

1
src/main/java/com/bwssystems/HABridge/dao/GroupDescriptor.java
View File

@@ -4,7 +4,6 @@ import com.bwssystems.HABridge.api.hue.DeviceState;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.bwssystems.HABridge.api.hue.GroupState;
import com.bwssystems.HABridge.dao.DeviceDescriptor;
/*
* Object to handle the device configuration

3
src/main/java/com/bwssystems/HABridge/dao/GroupRepository.java
View File

@@ -2,7 +2,6 @@ package com.bwssystems.HABridge.dao;
import java.io.IOException;
import java.math.BigInteger;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -13,8 +12,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.xml.bind.DatatypeConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
View File

@@ -25,7 +25,6 @@ import com.bwssystems.HABridge.api.CallItem;
import com.bwssystems.HABridge.dao.BackupFilename;
import com.bwssystems.HABridge.dao.DeviceDescriptor;
import com.bwssystems.HABridge.dao.DeviceRepository;
import com.bwssystems.HABridge.dao.GroupDescriptor;
import com.bwssystems.HABridge.dao.GroupRepository;
import com.bwssystems.HABridge.dao.ErrorMessage;
import com.bwssystems.HABridge.util.JsonTransformer;
@@ -92,6 +91,7 @@ public class DeviceResource {
else {
devices = new Gson().fromJson("[" + request.body() + "]", DeviceDescriptor[].class);
}
@SuppressWarnings("unused")
CallItem[] callItems = null;
String errorMessage = null;
for(int i = 0; i < devices.length; i++) {

2
src/main/java/com/bwssystems/HABridge/hue/ColorData.java
View File

@@ -1,7 +1,5 @@
package com.bwssystems.HABridge.hue;
import java.util.List;
public class ColorData {
public enum ColorMode { XY, CT, HS}

1
src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java
View File

@@ -141,6 +141,7 @@ public class ColorDecode {
return value;
}
@SuppressWarnings("unchecked")
public static String replaceColorData(String request, ColorData colorData, int setIntensity, boolean isHex) {
if (request == null) {
return null;

3
src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
View File

@@ -747,7 +747,6 @@ public class HueMulator {
"invalid/missing parameters in body", null, null, null).getTheErrors(), HueError[].class);
}
String type = theGroup.getType();
String groupClass = theGroup.getClass_name();
String name = theGroup.getName();
if (!(name == null || name.trim().equals(""))) {
@@ -831,6 +830,7 @@ public class HueMulator {
bridgeSettingMaster.updateConfigFile();
if (groupId.equalsIgnoreCase("0")) {
@SuppressWarnings("unchecked")
GroupResponse theResponse = GroupResponse.createDefaultGroupResponse((Map<String, DeviceResponse>)lightsListHandler(userId, requestIp));
return theResponse;
} else {
@@ -1257,6 +1257,7 @@ public class HueMulator {
}
@SuppressWarnings("unchecked")
private String changeGroupState(String userId, String groupId, String body, String ipAddress, boolean fakeLightResponse) {
log.debug("PUT action to group " + groupId + " from " + ipAddress + " user " + userId + " with body " + body);
HueError[] theErrors = null;

3
src/main/java/com/bwssystems/HABridge/hue/HueMulatorHandler.java
View File

@@ -4,9 +4,6 @@ import com.bwssystems.HABridge.api.CallItem;
import com.bwssystems.HABridge.dao.DeviceDescriptor;
import com.bwssystems.HABridge.hue.ColorData;
import java.util.List;
public interface HueMulatorHandler {
public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity, Integer targetBri, Integer targetBriInc, ColorData colorData, DeviceDescriptor device, String body);
}

1
src/main/java/com/bwssystems/HABridge/plugins/NestBridge/NestHome.java
View File

@@ -1,7 +1,6 @@
package com.bwssystems.HABridge.plugins.NestBridge;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import java.util.Set;

1
src/main/java/com/bwssystems/HABridge/plugins/exec/CommandHome.java
View File

@@ -1,7 +1,6 @@
package com.bwssystems.HABridge.plugins.exec;
import java.io.IOException;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java
View File

@@ -1,7 +1,5 @@
package com.bwssystems.HABridge.plugins.http;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java
View File

@@ -3,7 +3,6 @@ package com.bwssystems.HABridge.plugins.hue;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

2
src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
View File

@@ -131,6 +131,7 @@ public class LifxHome implements Home {
return deviceList;
}
@SuppressWarnings("unused")
private Boolean addLifxLights(LFXLightCollection theDeviceList) {
if(!validLifx)
return false;
@@ -143,6 +144,7 @@ public class LifxHome implements Home {
return true;
}
@SuppressWarnings("unused")
private Boolean addLifxGroups(LFXGroupCollection theDeviceList) {
if(!validLifx)
return false;

2
src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
View File

@@ -5,8 +5,6 @@ import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
import org.eclipse.paho.client.mqttv3.MqttSecurityException;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHome.java
View File

@@ -3,7 +3,6 @@ package com.bwssystems.HABridge.plugins.mqtt;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;

1
src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/Device.java
View File

@@ -1,7 +1,6 @@
package com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

1
src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/GetSetup.java
View File

@@ -1,7 +1,6 @@
package com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

1
src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
View File

@@ -7,7 +7,6 @@ import java.net.Socket;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.xml.bind.DatatypeConverter;

2
src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
View File

@@ -3,8 +3,6 @@ package com.bwssystems.HABridge.plugins.udp;
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.DatatypeConverter;

3
src/main/resources/public/css/scrollable-table.css
View File

@@ -1,5 +1,5 @@
.scrollableContainer {
/* height: 310px;*/
/* height: 310px; */
position: relative;
padding-top: 35px;
overflow: hidden;
@@ -29,6 +29,7 @@
.scrollArea {
height: 100%;
max-height: 800px;
overflow-x: auto;
overflow-y: auto;
border: 1px solid #d5d5d5;

2
src/main/resources/public/views/configuration.html
View File

@@ -74,7 +74,7 @@
<th>Actions</th>
</tr>
</thead>
<tr ng-repeat="device in bridge.devices | orderBy:'name' | filterDevicesByRequester:bridge.state.filterDevicesByIpAddress:bridge.state.filterDevicesOnlyFiltered:bridge.state.filterDeviceType" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
<tr ng-repeat="device in bridge.devices | filterDevicesByRequester:bridge.state.filterDevicesByIpAddress:bridge.state.filterDevicesOnlyFiltered:bridge.state.filterDeviceType" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
<td>{{$index+1}}</td>
<td>{{device.id}}</td>
<td>{{device.name}}</td>

5
src/main/resources/public/views/editdevice.html
View File

@@ -54,9 +54,8 @@
Bridge Device</button>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-success"
ng-click="editDevice(false)">Update Bridge Device</button>
<button class="btn btn-danger" ng-click="clearDevice()">Clear
Device</button>
<button class="btn" ng-click="changeEditmode()">Change Editmode</button>
<button class="btn btn-danger" ng-click="clearDevice()">Clear</button>
<button class="btn" ng-click="changeEditmode()">Change Edit Mode</button>
</p>
<table class="table table-bordered table-striped table-hover">