Fixed build dist containing the correct structure and be able to build zip files explicitly.

Also fixed some compile warnings
This commit is contained in:
Ziver Koc 2025-12-18 03:47:54 +01:00
parent c7f0d4e8b3
commit 1779916d97
111 changed files with 254 additions and 162 deletions

View file

@ -1,3 +1,27 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2025 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package se.hal.plugin.zwave;
import org.zwave4j.*;
@ -19,8 +43,8 @@ import java.util.logging.Logger;
public class HalZWaveController implements HalSensorController, HalEventController, HalAutostartController, NotificationWatcher {
private static final Logger logger = LogUtil.getLogger();
public static final String CONFIG_ZWAVE_PORT = "hal_zwave.com_port";
public static final String CONFIG_ZWAVE_CFG_PATH = "hal_zwave.cfg_path";
public static final String ZWAVE_CFG_PATH = "plugins/hal-zwave/resources/zwave-config";
public static final String CONFIG_ZWAVE_PORT = "hal_zwave.com_port";
private String serialPort;
private long homeId;
@ -39,16 +63,14 @@ public class HalZWaveController implements HalSensorController, HalEventControll
@Override
public boolean isAvailable() {
return HalContext.containsProperty(CONFIG_ZWAVE_PORT) &&
HalContext.containsProperty(CONFIG_ZWAVE_CFG_PATH);
return HalContext.containsProperty(CONFIG_ZWAVE_PORT);
}
@Override
public void initialize() {
initialize(HalContext.getStringProperty(CONFIG_ZWAVE_PORT),
HalContext.getStringProperty(CONFIG_ZWAVE_CFG_PATH));
initialize(HalContext.getStringProperty(CONFIG_ZWAVE_PORT));
}
public void initialize(String comPort, String configDir) {
options = Options.create(configDir, "", "");
public void initialize(String comPort) {
options = Options.create(HalContext.RESOURCE_ROOT + "/" + ZWAVE_CFG_PATH, "", "");
options.addOptionBool("ConsoleOutput", false);
options.lock();

Some files were not shown because too many files have changed in this diff Show more