Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] More String interning of some fields

This commit is contained in:
Robert von Burg 2022-09-06 13:09:04 +02:00
parent fd2ba1be0c
commit ca046f7e66
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
4 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
li.strolch.model/src/main/java/li/strolch/model/activity/Action.java
View File

@ -61,10 +61,20 @@ public class Action extends GroupedParameterizedElement implements IActivityElem
}
public Action(String id, String name, String type) {
super(id, name, type);
super(trimOrEmpty(id).intern(), trimOrEmpty(name).intern(), trimOrEmpty(type));
this.state = State.CREATED;
}
@Override
public void setId(String id) {
super.setId(trimOrEmpty(id).intern());
}
@Override
public void setName(String name) {
super.setName(trimOrEmpty(name).intern());
}
public Action(String id, String name, String type, String resourceId, String resourceType) {
super(id, name, type);
this.resourceId = resourceId;
@ -133,7 +143,7 @@ public class Action extends GroupedParameterizedElement implements IActivityElem
*/
public void setResourceType(String resourceType) {
assertNotReadonly();
this.resourceType = resourceType;
this.resourceType = trimOrEmpty(resourceType).intern();
}
/**

10
li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java
View File

@ -60,6 +60,16 @@ public abstract class AbstractParameter<T> extends AbstractStrolchElement implem
super(trimOrEmpty(id).intern(), trimOrEmpty(name).intern());
}
@Override
public void setId(String id) {
super.setId(trimOrEmpty(id).intern());
}
@Override
public void setName(String name) {
super.setName(trimOrEmpty(name).intern());
}
@Override
public boolean isHidden() {
return this.hidden;

8
li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java
View File

@ -39,8 +39,8 @@ public abstract class PolicyDef {
private static final Logger logger = LoggerFactory.getLogger(PolicyDef.class);
protected String type;
protected String value;
protected final String type;
protected final String value;
/**
* Create a new policy definition
@ -52,8 +52,8 @@ public abstract class PolicyDef {
*/
public PolicyDef(String type, String value) {
super();
this.type = type.intern();
this.value = value.intern();
this.type = type;
this.value = value;
}
/**

16
li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java
View File

@ -49,10 +49,20 @@ public abstract class AbstractStrolchTimedState<T extends IValue> extends Abstra
}
public AbstractStrolchTimedState(String id, String name) {
super(trimOrEmpty(id).intern(), trimOrEmpty(name).intern());
super(id, name);
this.state = new TimedState<>();
}
@Override
public void setId(String id) {
super.setId(trimOrEmpty(id).intern());
}
@Override
public void setName(String name) {
super.setName(trimOrEmpty(name).intern());
}
@Override
public boolean isHidden() {
return this.hidden;
@ -75,7 +85,7 @@ public abstract class AbstractStrolchTimedState<T extends IValue> extends Abstra
if (StringHelper.isEmpty(interpretation)) {
this.interpretation = INTERPRETATION_NONE;
} else {
this.interpretation = interpretation.intern();
this.interpretation = interpretation;
}
}
@ -100,7 +110,7 @@ public abstract class AbstractStrolchTimedState<T extends IValue> extends Abstra
if (StringHelper.isEmpty(uom)) {
this.uom = UOM_NONE;
} else {
this.uom = uom.intern();
this.uom = uom;
}
}