Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added color to AssetDescriptor

Rich Turnera8968d94af27
diff --git a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java b/model/src/main/java/org/openremote/model/asset/AssetAttribute.java
index a1b0b9e0c..5c00e3314 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetAttribute.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetAttribute.java
@@ -19,6 +19,7 @@
*/
package org.openremote.model.asset;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.openremote.model.AbstractValueHolder;
import org.openremote.model.ValidationFailure;
import org.openremote.model.attribute.*;
@@ -144,6 +145,7 @@ public class AssetAttribute extends Attribute {
return getReference().orElseThrow(() -> new IllegalStateException("Attribute doesn't have an attribute ref"));
}
+ @JsonIgnore
public Optional<AttributeState> getState() {
return getReference().map(ref -> new AttributeState(ref, getValue().orElse(null)));
}
@@ -210,6 +212,7 @@ public class AssetAttribute extends Attribute {
}
}
+ @JsonIgnore
public boolean isExecutable() {
return getMetaStream()
.filter(isMetaNameEqualTo(EXECUTABLE))
@@ -226,10 +229,12 @@ public class AssetAttribute extends Attribute {
}
}
+ @JsonIgnore
public boolean hasAgentLink() {
return getMetaStream().anyMatch(isMetaNameEqualTo(AGENT_LINK));
}
+ @JsonIgnore
public boolean isProtocolConfiguration() {
return getMetaStream()
.filter(isMetaNameEqualTo(PROTOCOL_CONFIGURATION))
@@ -238,6 +243,7 @@ public class AssetAttribute extends Attribute {
.orElse(false);
}
+ @JsonIgnore
public boolean isShowOnDashboard() {
return getMetaStream()
.filter(isMetaNameEqualTo(SHOW_ON_DASHBOARD))
@@ -254,6 +260,7 @@ public class AssetAttribute extends Attribute {
}
}
+ @JsonIgnore
public boolean hasFormat() {
return getMetaStream().anyMatch(isMetaNameEqualTo(FORMAT));
}
diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
index ef0fef5c6..80fb6ac82 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java
@@ -32,9 +32,15 @@ public interface AssetDescriptor {
String getName();
@JsonProperty
String getType();
+
+ /**
+ * A HEX RGB color value {@link org.openremote.model.attribute.AttributeValueType#COLOR_HEX}
+ */
@JsonProperty
String getIcon();
@JsonProperty
+ String getColor();
+ @JsonProperty
boolean getAccessPublicRead();
@JsonProperty
AttributeDescriptor[] getAttributeDescriptors();
diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java
index 3384951f2..623d46fc4 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptorImpl.java
@@ -31,6 +31,7 @@ public class AssetDescriptorImpl implements AssetDescriptor {
protected String name;
protected String type;
protected String icon;
+ protected String color;
protected boolean accessPublicRead;
AttributeDescriptor[] attributeDescriptors;
@@ -39,11 +40,13 @@ public class AssetDescriptorImpl implements AssetDescriptor {
public AssetDescriptorImpl(@JsonProperty("name") String name,
@JsonProperty("type") String type,
@JsonProperty("icon") String icon,
+ @JsonProperty("color") String color,
@JsonProperty("accessPublicRead") boolean accessPublicRead,
@JsonProperty("attributeDescriptors") AttributeDescriptor[] attributeDescriptors) {
this.name = name;
this.type = type;
this.icon = icon;
+ this.color = color;
this.accessPublicRead = accessPublicRead;
this.attributeDescriptors = attributeDescriptors;
}
@@ -63,6 +66,11 @@ public class AssetDescriptorImpl implements AssetDescriptor {
return icon;
}
+ @Override
+ public String getColor() {
+ return null;
+ }
+
public boolean getAccessPublicRead() {
return accessPublicRead;
}
diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.java
index d1e7568eb..a81f83512 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetType.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java
@@ -34,39 +34,41 @@ import static org.openremote.model.attribute.AttributeType.*;
*/
public enum AssetType implements AssetDescriptor {
- CUSTOM(null, "cube"),
+ CUSTOM(null, "cube", null),
- BUILDING(ASSET_NAMESPACE + ":building", "building",
+ BUILDING(ASSET_NAMESPACE + ":building", "building", null,
SURFACE_AREA,
GEO_STREET,
GEO_CITY,
GEO_COUNTRY,
GEO_POSTAL_CODE),
- FLOOR(ASSET_NAMESPACE + ":floor", "bars"),
+ FLOOR(ASSET_NAMESPACE + ":floor", "bars", null),
- RESIDENCE(ASSET_NAMESPACE + ":residence", "home"),
+ RESIDENCE(ASSET_NAMESPACE + ":residence", "home", null),
- ROOM(ASSET_NAMESPACE + ":room", "door-open"),
+ ROOM(ASSET_NAMESPACE + ":room", "door-open", null),
- AGENT(ASSET_NAMESPACE + ":agent", "cogs"),
+ AGENT(ASSET_NAMESPACE + ":agent", "cogs", null),
- CONSOLE(ASSET_NAMESPACE + ":console", "bullseye"),
+ CONSOLE(ASSET_NAMESPACE + ":console", "bullseye", null),
- THING(ASSET_NAMESPACE + ":thing", "cube");
+ THING(ASSET_NAMESPACE + ":thing", "cube", null);
final protected String type;
final protected String icon;
+ final protected String color;
final protected boolean accessPublicRead;
final protected AttributeDescriptor[] attributeDescriptors;
- AssetType(String type, String icon, AttributeDescriptor... attributeDescriptors) {
- this(type, icon, false, attributeDescriptors);
+ AssetType(String type, String icon, String color, AttributeDescriptor... attributeDescriptors) {
+ this(type, icon, color, false, attributeDescriptors);
}
- AssetType(String type, String icon, boolean accessPublicRead, AttributeDescriptor... attributeDescriptors) {
+ AssetType(String type, String icon, String color, boolean accessPublicRead, AttributeDescriptor... attributeDescriptors) {
this.type = type;
this.icon = icon;
+ this.color = color;
this.accessPublicRead = accessPublicRead;
this.attributeDescriptors = attributeDescriptors;
}
@@ -97,6 +99,11 @@ public enum AssetType implements AssetDescriptor {
return icon;
}
+ @Override
+ public String getColor() {
+ return null;
+ }
+
@Override
public boolean getAccessPublicRead() {
return accessPublicRead;