HomePhabricator
Diffusion openhab2-addons eb97edf67be4

Merge branch 'max-4' of https://github.com/marcelrv/openhab2 into marcelrv-max-4
eb97edf67be4Unpublished
Actions

Authored by Kai Kreuzer <kai@openhab.org> on Dec 12 2014, 8:54 AM.

Unpublished Commit · Learn More

  • Repository Importing: This repository is still importing.
  • Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'max-4' of https://github.com/marcelrv/openhab2 into marcelrv-max-4

Details

Committed
Kai Kreuzer <kai@openhab.org>Dec 12 2014, 8:54 AM
Parents
R40:c5f65f182cd9: MAX! Fixed second NPE
R40:7408a00c9d1e: Fixes #53
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

CommitAuthorDetailsCommitted
c5f65f182cd9Marcel Verpaalen
MAX! Fixed second NPE 
Dec 10 2014
665618d6381fMarcel Verpaalen
MAX! binding Fixed NPE and updated acc to comments 
Dec 10 2014
f58e5686ced6Marcel Verpaalen
Initial contribution MAX! binding 
Dec 1 2014

Changes (61)

PathPackages
A(dir)addons/binding/org.openhab.binding.max/
Paddons/binding/org.openhab.binding.max/.classpath
Copied from addons/binding/org.openhab.binding.sonos/.classpath
Paddons/binding/org.openhab.binding.max/.project
Copied from bundles/ui/org.openhab.ui.dashboard/.project
A(dir)addons/binding/org.openhab.binding.max/ESH-INF/
A(dir)addons/binding/org.openhab.binding.max/ESH-INF/binding/
Aaddons/binding/org.openhab.binding.max/ESH-INF/binding/binding.xml
A(dir)addons/binding/org.openhab.binding.max/ESH-INF/thing/
Aaddons/binding/org.openhab.binding.max/ESH-INF/thing/bridge.xml
Aaddons/binding/org.openhab.binding.max/ESH-INF/thing/thing-types.xml
A(dir)addons/binding/org.openhab.binding.max/META-INF/
Paddons/binding/org.openhab.binding.max/META-INF/MANIFEST.MF
Copied from addons/binding/org.openhab.binding.sonos/META-INF/MANIFEST.MF
A(dir)addons/binding/org.openhab.binding.max/OSGI-INF/
Paddons/binding/org.openhab.binding.max/OSGI-INF/MaxCubeDiscovery.xml
Copied from bundles/core/org.openhab.core.compat1x/OSGI-INF/itemfactory.xml
Paddons/binding/org.openhab.binding.max/OSGI-INF/MaxCubeHandlerFactory.xml
Copied from bundles/core/org.openhab.core.compat1x/OSGI-INF/audioaction.xml
Paddons/binding/org.openhab.binding.max/build.properties
Copied from addons/binding/org.openhab.binding.sonos/build.properties
Paddons/binding/org.openhab.binding.max/pom.xml
Copied from addons/binding/org.openhab.binding.sonos/pom.xml
A(dir)addons/binding/org.openhab.binding.max/src/
A(dir)addons/binding/org.openhab.binding.max/src/main/
A(dir)addons/binding/org.openhab.binding.max/src/main/java/
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/MaxBinding.java
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/config/
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/config/MaxCubeBridgeConfiguration.java
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/Utils.java
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscovery.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscoveryResult.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeDiscover.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxDeviceDiscoveryService.java
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/factory/
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/factory/MaxCubeHandlerFactory.java
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/DeviceStatusListener.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeBridgeHandler.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeHandler.java
A(dir)addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/C_Message.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/Device.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/DeviceConfiguration.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/DeviceInformation.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/DeviceType.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/EcoSwitch.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/H_Message.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/HeatingThermostat.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/L_Message.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/M_Message.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MaxTokenizer.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/Message.java
Paddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MessageType.java
Copied from bundles/core/org.openhab.core.compat1x/src/main/java/org/openhab/core/binding/BindingConfig.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/RoomInformation.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/S_Command.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/S_Message.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/SendCommand.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/ShutterContact.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/ThermostatModeType.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/UnsupportedDevice.java
Aaddons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/WallMountedThermostat.java

R40:eb97edf67be4

View Options

addons/binding/org.openhab.binding.max/.classpath

Loading...
View Options

addons/binding/org.openhab.binding.max/.project

Loading...
View Options

addons/binding/org.openhab.binding.max/ESH-INF/binding/binding.xml

Loading...
View Options

addons/binding/org.openhab.binding.max/ESH-INF/thing/bridge.xml

Loading...
View Options

addons/binding/org.openhab.binding.max/ESH-INF/thing/thing-types.xml

Loading...
View Options

addons/binding/org.openhab.binding.max/META-INF/MANIFEST.MF

Loading...
View Options

addons/binding/org.openhab.binding.max/OSGI-INF/MaxCubeDiscovery.xml

Loading...
View Options

addons/binding/org.openhab.binding.max/OSGI-INF/MaxCubeHandlerFactory.xml

Loading...
View Options

addons/binding/org.openhab.binding.max/build.properties

Loading...
View Options

addons/binding/org.openhab.binding.max/pom.xml

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/MaxBinding.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/config/MaxCubeBridgeConfiguration.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/Utils.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscovery.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeBridgeDiscoveryResult.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxCubeDiscover.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/discovery/MaxDeviceDiscoveryService.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/factory/MaxCubeHandlerFactory.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/DeviceStatusListener.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeBridgeHandler.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/handler/MaxCubeHandler.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/C_Message.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/Device.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/DeviceConfiguration.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/DeviceInformation.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/DeviceType.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/EcoSwitch.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/H_Message.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/HeatingThermostat.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/L_Message.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/M_Message.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MaxTokenizer.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/Message.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/MessageType.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/RoomInformation.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/S_Command.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/S_Message.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/SendCommand.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/ShutterContact.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/ThermostatModeType.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/UnsupportedDevice.java

Loading...
View Options

addons/binding/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/message/WallMountedThermostat.java

Loading...