demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

model.script.StateAndCommandProvider: make methods static (#5401)

Browse Source
This commit is contained in:
Дилян Палаузов
2026-03-26 23:07:14 +01:00
committed by GitHub
parent 5aadd40c97
commit fc854f5a79
5 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend
-5
View File
@@ -24,7 +24,6 @@ import org.openhab.core.model.script.jvmmodel.ScriptTypeComputer
import org.openhab.core.model.script.scoping.ActionClassLoader
import org.openhab.core.model.script.scoping.ScriptImplicitlyImportedTypes
import org.openhab.core.model.script.scoping.ScriptImportSectionNamespaceScopeProvider
import org.openhab.core.model.script.scoping.StateAndCommandProvider
import org.eclipse.xtext.common.types.access.IJvmTypeProvider
import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeProviderFactory
import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeScopeProvider
@@ -57,10 +56,6 @@ import org.eclipse.xtext.xbase.typesystem.computation.ITypeComputer
return ScriptImplicitlyImportedTypes
}
def Class<StateAndCommandProvider> bindStateAndCommandProvider() {
return StateAndCommandProvider
}
override Class<? extends IGenerator> bindIGenerator() {
return NullGenerator
}
bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
+1 -5
View File
@@ -65,9 +65,6 @@ class RulesJvmModelInferrer extends ScriptJvmModelInferrer {
@Inject
ThingRegistry thingRegistry
@Inject
StateAndCommandProvider stateAndCommandProvider
/**
* Is called for each instance of the first argument's type contained in a resource.
*
@@ -90,8 +87,7 @@ class RulesJvmModelInferrer extends ScriptJvmModelInferrer {
val Set<String> fieldNames = newHashSet()
val types = stateAndCommandProvider.allTypes
types.forEach [ type |
StateAndCommandProvider::allTypes.forEach [ type |
val name = type.toString
if (fieldNames.add(name)) {
members += ruleModel.toField(name, typeRef(type.class)) [
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend
+1 -4
View File
@@ -51,9 +51,6 @@ class ScriptInterpreter extends XbaseInterpreter {
@Inject
ItemRegistry itemRegistry
@Inject
StateAndCommandProvider stateAndCommandProvider
@Inject
IBatchTypeResolver typeResolver;
@@ -100,7 +97,7 @@ class ScriptInterpreter extends XbaseInterpreter {
}
def protected Type getStateOrCommand(String name) {
for (Type type : stateAndCommandProvider.getAllTypes()) {
for (Type type : StateAndCommandProvider::allTypes) {
if (type.toString == name) {
return type
}
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend
+1 -5
View File
@@ -98,9 +98,6 @@ class ScriptJvmModelInferrer extends AbstractModelInferrer {
@Inject
ItemRegistry itemRegistry
@Inject
StateAndCommandProvider stateAndCommandProvider
/**
* Is called for each instance of the first argument's type contained in a resource.
*
@@ -116,8 +113,7 @@ class ScriptJvmModelInferrer extends AbstractModelInferrer {
val Set<String> fieldNames = newHashSet()
val types = stateAndCommandProvider.allTypes
types.forEach [ type |
StateAndCommandProvider::allTypes.forEach [ type |
val name = type.toString
if (fieldNames.add(name)) {
members += script.toField(name, typeRef(type.class)) [
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java
+3 -6
View File
@@ -29,8 +29,6 @@ import org.openhab.core.types.State;
import org.openhab.core.types.Type;
import org.openhab.core.types.UnDefType;
import com.google.inject.Singleton;
/**
* This is a class which provides all available states and commands (obviously only the enum-based ones with a fixed
* name).
@@ -38,7 +36,6 @@ import com.google.inject.Singleton;
*
* @author Kai Kreuzer - Initial contribution
*/
@Singleton
public class StateAndCommandProvider {
protected static final Set<Command> COMMANDS = new HashSet<>();
@@ -79,15 +76,15 @@ public class StateAndCommandProvider {
TYPES.addAll(STATES);
}
public Iterable<Type> getAllTypes() {
static public Iterable<Type> getAllTypes() {
return TYPES;
}
public Iterable<Command> getAllCommands() {
static public Iterable<Command> getAllCommands() {
return COMMANDS;
}
public Iterable<State> getAllStates() {
static public Iterable<State> getAllStates() {
return STATES;
}
}