Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zoneminder] Made constants and handler packages ineternal #4037

Merged
merged 1 commit into from
Jan 26, 2019
+20 −26
Merged

[zoneminder] Made constants and handler packages ineternal #4037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-SymbolicName: org.openhab.binding.zoneminder;singleton:=true
Bundle-Vendor: openHAB
Bundle-Version: 2.5.0.qualifier
Export-Package:
org.openhab.binding.zoneminder,
org.openhab.binding.zoneminder.handler
Import-Package:
com.google.common.collect,
javax.ws.rs.client,
Expand All @@ -33,8 +30,6 @@ Import-Package:
org.eclipse.smarthome.core.thing.binding.builder,
org.eclipse.smarthome.core.thing.type,
org.eclipse.smarthome.core.types,
org.openhab.binding.zoneminder,
org.openhab.binding.zoneminder.handler,
org.osgi.framework,
org.slf4j
Service-Component: OSGI-INF/*.xml
2 changes: 1 addition & 1 deletion ...nding/zoneminder/ZoneMinderConstants.java → ...eminder/internal/ZoneMinderConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.zoneminder;
package org.openhab.binding.zoneminder.internal;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.smarthome.core.thing.ThingTypeUID;
Expand Down
5 changes: 2 additions & 3 deletions ...inder/src/main/java/org/openhab/binding/zoneminder/internal/ZoneMinderHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
import org.eclipse.smarthome.core.thing.binding.ThingHandler;
import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.handler.ZoneMinderServerBridgeHandler;
import org.openhab.binding.zoneminder.handler.ZoneMinderThingMonitorHandler;
import org.openhab.binding.zoneminder.internal.handler.ZoneMinderServerBridgeHandler;
import org.openhab.binding.zoneminder.internal.handler.ZoneMinderThingMonitorHandler;
import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...ding/zoneminder/ZoneMinderProperties.java → ...minder/internal/ZoneMinderProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.zoneminder;
package org.openhab.binding.zoneminder.internal;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderBridgeServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
package org.openhab.binding.zoneminder.internal.config;

import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;

/**
* Configuration data according to zoneminderserver.xml
Expand Down
2 changes: 1 addition & 1 deletion ...r/src/main/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
package org.openhab.binding.zoneminder.internal.config;

import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;

/**
* Monitor configuration from openHAB.
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/openhab/binding/zoneminder/internal/config/ZoneMinderThingMonitorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
package org.openhab.binding.zoneminder.internal.config;

import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;

/**
* Specific configuration class for Monitor COnfig.
Expand Down
6 changes: 3 additions & 3 deletions ...in/java/org/openhab/binding/zoneminder/internal/discovery/ZoneMinderDiscoveryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import org.eclipse.smarthome.config.discovery.ExtendedDiscoveryService;
import org.eclipse.smarthome.core.thing.ThingTypeUID;
import org.eclipse.smarthome.core.thing.ThingUID;
import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.handler.ZoneMinderServerBridgeHandler;
import org.openhab.binding.zoneminder.handler.ZoneMinderThingMonitorHandler;
import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.handler.ZoneMinderServerBridgeHandler;
import org.openhab.binding.zoneminder.internal.handler.ZoneMinderThingMonitorHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions ...r/handler/ZoneMinderBaseThingHandler.java → ...l/handler/ZoneMinderBaseThingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.zoneminder.handler;
package org.openhab.binding.zoneminder.internal.handler;

import java.io.IOException;
import java.math.BigDecimal;
Expand All @@ -33,8 +33,8 @@
import org.eclipse.smarthome.core.types.Command;
import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.core.types.UnDefType;
import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum;
import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.config.ZoneMinderThingConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...zoneminder/handler/ZoneMinderHandler.java → ...r/internal/handler/ZoneMinderHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.zoneminder.handler;
package org.openhab.binding.zoneminder.internal.handler;

import java.io.IOException;
import java.security.GeneralSecurityException;
Expand Down
6 changes: 3 additions & 3 deletions ...andler/ZoneMinderServerBridgeHandler.java → ...andler/ZoneMinderServerBridgeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.zoneminder.handler;
package org.openhab.binding.zoneminder.internal.handler;

import java.io.IOException;
import java.math.BigDecimal;
Expand Down Expand Up @@ -43,9 +43,9 @@
import org.eclipse.smarthome.core.types.RefreshType;
import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.core.types.UnDefType;
import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.ZoneMinderProperties;
import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum;
import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.ZoneMinderProperties;
import org.openhab.binding.zoneminder.internal.config.ZoneMinderBridgeServerConfig;
import org.openhab.binding.zoneminder.internal.discovery.ZoneMinderDiscoveryService;
import org.osgi.framework.ServiceRegistration;
Expand Down
6 changes: 3 additions & 3 deletions ...andler/ZoneMinderThingMonitorHandler.java → ...andler/ZoneMinderThingMonitorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.zoneminder.handler;
package org.openhab.binding.zoneminder.internal.handler;

import java.io.IOException;
import java.math.BigDecimal;
Expand All @@ -34,9 +34,9 @@
import org.eclipse.smarthome.core.types.RefreshType;
import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.core.types.UnDefType;
import org.openhab.binding.zoneminder.ZoneMinderConstants;
import org.openhab.binding.zoneminder.ZoneMinderProperties;
import org.openhab.binding.zoneminder.internal.DataRefreshPriorityEnum;
import org.openhab.binding.zoneminder.internal.ZoneMinderConstants;
import org.openhab.binding.zoneminder.internal.ZoneMinderProperties;
import org.openhab.binding.zoneminder.internal.config.ZoneMinderThingMonitorConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...neminder/handler/ZoneMinderThingType.java → ...internal/handler/ZoneMinderThingType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.zoneminder.handler;
package org.openhab.binding.zoneminder.internal.handler;

/**
* Enumerator for each Bridge and Thing
Expand Down