StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Stephan Richter
2021-06-24 17:41:52 +02:00
parent 1454a81803
commit aa74814b7c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.5.4</version> <version>1.5.5</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

10
src/main/java/de/srsoftware/web4rail/functions/Function.java
View File

@@ -26,16 +26,22 @@ public abstract class Function extends BaseClass{
public static Object action(Params params) { public static Object action(Params params) {
String action = params.getString(ACTION); String action = params.getString(ACTION);
Function function = BaseClass.get(Id.from(params)); Id funId = Id.from(params);
Function function = BaseClass.get(funId);
BaseClass parent = isSet(function) ? function.parent() : null; BaseClass parent = isSet(function) ? function.parent() : null;
String message = null;
switch (action) { switch (action) {
case ACTION_DROP: case ACTION_DROP:
if (isSet(function)) { if (isSet(function)) {
function.remove(); function.remove();
return parent.properties(); return parent.properties();
} }
message = t("Unknown function: {}",funId);
break;
default:
message = t("Unknown action: {}",params.get(Constants.ACTION));
} }
String message = t("Unknown action: {}",params.get(Constants.ACTION));
return isSet(parent) ? parent.properties(message) : message; return isSet(parent) ? parent.properties(message) : message;
} }