This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 1ac7fb75e1e [kie-issues#1446] BPMN Editor - Decision name UI field
removal (#2541)
1ac7fb75e1e is described below
commit 1ac7fb75e1e19d401885bfa6cacb9fdd899e79fe
Author: Jason Porter <[email protected]>
AuthorDate: Wed Aug 21 11:19:53 2024 -0600
[kie-issues#1446] BPMN Editor - Decision name UI field removal (#2541)
Signed-off-by: Jason Porter <[email protected]>
Co-authored-by: Jozef Marko <[email protected]>
---
.../task/BusinessRuleTaskExecutionSet.java | 28 +--------
.../definition/property/task/DecisionName.java | 73 ----------------------
.../resources/i18n/StunnerBPMNConstants.properties | 2 -
.../i18n/StunnerBPMNConstants_es.properties | 2 -
.../i18n/StunnerBPMNConstants_fr.properties | 2 -
.../i18n/StunnerBPMNConstants_ja.properties | 2 -
.../bpmn/definition/HashCodeAndEqualityTest.java | 3 -
.../dataproviders/DecisionNameFormProvider.java | 58 -----------------
.../ClientBPMNDocumentationService.java | 2 -
.../BusinessRuleTaskChangeHandler.java | 2 -
.../forms/filters/RuleLanguageFilterProvider.java | 6 +-
.../properties/BusinessRuleTaskPropertyWriter.java | 5 --
.../fromstunner/tasks/TaskConverter.java | 1 -
.../properties/BusinessRuleTaskPropertyReader.java | 4 --
.../tostunner/tasks/BaseTaskConverter.java | 5 --
15 files changed, 2 insertions(+), 193 deletions(-)
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/property/task/BusinessRuleTaskExecutionSet.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/property/task/BusinessRuleTaskExecutionSet.java
index 4e4959927cb..590303cb890 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/property/task/BusinessRuleTaskExecutionSet.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/property/task/BusinessRuleTaskExecutionSet.java
@@ -46,7 +46,6 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
public static final String RULE_FLOW_GROUP = "ruleFlowGroup";
public static final String FILE_NAME = "fileName";
public static final String NAMESPACE = "namespace";
- public static final String DECISON_NAME = "decisionName";
public static final String DMN_MODEL_NAME = "dmnModelName";
@Property
@@ -91,19 +90,7 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
@Property
@FormField(
- afterElement = "namespace",
- type = ComboBoxFieldType.class
- )
- @SelectorDataProvider(
- type = SelectorDataProvider.ProviderType.CLIENT,
- className =
"org.kie.workbench.common.stunner.bpmn.client.dataproviders.DecisionNameFormProvider"
- )
- @Valid
- private DecisionName decisionName;
-
- @Property
- @FormField(
- afterElement = "decisionName"
+ afterElement = "namespace"
)
@Valid
private DmnModelName dmnModelName;
@@ -140,7 +127,6 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
new RuleFlowGroup(),
new FileName(),
new Namespace(),
- new DecisionName(),
new DmnModelName(),
new OnEntryAction(new ScriptTypeListValue().addValue(new
ScriptTypeValue("java",
""))),
@@ -155,7 +141,6 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
final @MapsTo("ruleFlowGroup")
RuleFlowGroup ruleFlowGroup,
final @MapsTo("fileName") FileName
fileName,
final @MapsTo("namespace") Namespace
namespace,
- final @MapsTo("decisionName")
DecisionName decisionName,
final @MapsTo("dmnModelName")
DmnModelName dmnModelName,
final @MapsTo("onEntryAction")
OnEntryAction onEntryAction,
final @MapsTo("onExitAction")
OnExitAction onExitAction,
@@ -166,7 +151,6 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
this.ruleFlowGroup = ruleFlowGroup;
this.fileName = fileName;
this.namespace = namespace;
- this.decisionName = decisionName;
this.dmnModelName = dmnModelName;
this.onEntryAction = onEntryAction;
this.onExitAction = onExitAction;
@@ -207,14 +191,6 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
this.namespace = namespace;
}
- public DecisionName getDecisionName() {
- return decisionName;
- }
-
- public void setDecisionName(DecisionName decisionName) {
- this.decisionName = decisionName;
- }
-
public DmnModelName getDmnModelName() {
return dmnModelName;
}
@@ -269,7 +245,6 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
Objects.hashCode(ruleFlowGroup),
Objects.hashCode(fileName),
Objects.hashCode(namespace),
- Objects.hashCode(decisionName),
Objects.hashCode(dmnModelName),
Objects.hashCode(onEntryAction),
Objects.hashCode(onExitAction),
@@ -286,7 +261,6 @@ public class BusinessRuleTaskExecutionSet implements
BPMNPropertySet {
Objects.equals(ruleFlowGroup, other.ruleFlowGroup) &&
Objects.equals(fileName, other.fileName) &&
Objects.equals(namespace, other.namespace) &&
- Objects.equals(decisionName, other.decisionName) &&
Objects.equals(dmnModelName, other.dmnModelName) &&
Objects.equals(onEntryAction, other.onEntryAction) &&
Objects.equals(onExitAction, other.onExitAction) &&
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/property/task/DecisionName.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/property/task/DecisionName.java
deleted file mode 100644
index 0f5583248af..00000000000
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/property/task/DecisionName.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.kie.workbench.common.stunner.bpmn.definition.property.task;
-
-import java.util.Objects;
-
-import org.jboss.errai.common.client.api.annotations.Portable;
-import org.jboss.errai.databinding.client.api.Bindable;
-import
org.kie.workbench.common.forms.adf.definitions.annotations.metaModel.FieldDefinition;
-import
org.kie.workbench.common.forms.adf.definitions.annotations.metaModel.FieldValue;
-import
org.kie.workbench.common.forms.adf.definitions.annotations.metaModel.I18nMode;
-import org.kie.workbench.common.stunner.bpmn.definition.BPMNProperty;
-import org.kie.workbench.common.stunner.core.definition.annotation.Property;
-import
org.kie.workbench.common.stunner.core.definition.annotation.property.Value;
-
-@Portable
-@Bindable
-@Property
-@FieldDefinition(i18nMode = I18nMode.OVERRIDE_I18N_KEY)
-public class DecisionName implements BPMNProperty {
-
- @Value
- @FieldValue
- private String value;
-
- public DecisionName() {
- this("");
- }
-
- public DecisionName(final String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(final String value) {
- this.value = value;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(value);
- }
-
- @Override
- public boolean equals(Object o) {
- if (o instanceof DecisionName) {
- DecisionName other = (DecisionName) o;
- return Objects.equals(value, other.value);
- }
- return false;
- }
-}
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants.properties
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants.properties
index 3a554041a67..0cc85482a01 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants.properties
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants.properties
@@ -440,8 +440,6 @@
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.lab
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.description=On
Entry Action
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.label=On
Exit Action
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.description=On
Exit Action
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.label=Decision
Name
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.description=The
Decision Name
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.label=DMN
Model Name
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.description=The
DMN Model Name
org.kie.workbench.common.stunner.bpmn.definition.property.task.Namespace.label=Namespace
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_es.properties
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_es.properties
index 15574c6f772..94f3579f83e 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_es.properties
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_es.properties
@@ -423,8 +423,6 @@
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.lab
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.description=Acerca
de la acción de entrada
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.label=Acerca
de la acción de salida
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.description=Acerca
de la acción de salida
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.label=Nombre
de la decisión
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.description=El
nombre de la decisión
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.label=Nombre
del modelo DMN
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.description=El
nombre del modelo DMN
org.kie.workbench.common.stunner.bpmn.definition.property.task.Namespace.label=Espacio
de nombres
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_fr.properties
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_fr.properties
index 1a9736e2a12..5fb173793b0 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_fr.properties
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_fr.properties
@@ -423,8 +423,6 @@
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.lab
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.description=Action
à l''entrée
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.label=Action
à la sortie
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.description=Action
à la sortie
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.label=Nom
de décision
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.description=Nom
de la décision
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.label=Nom
de modèle DMN
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.description=Nom
du modèle DMN
org.kie.workbench.common.stunner.bpmn.definition.property.task.Namespace.label=Espace
de nommage
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_ja.properties
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_ja.properties
index 96dde6c9675..727eaa75e87 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_ja.properties
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/main/resources/org/kie/workbench/common/stunner/bpmn/resources/i18n/StunnerBPMNConstants_ja.properties
@@ -423,8 +423,6 @@
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.lab
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnEntryAction.description=開始時アクション
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.label=終了時アクション
org.kie.workbench.common.stunner.bpmn.definition.property.task.OnExitAction.description=終了時アクション
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.label=デシジョンの名前
-org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName.description=デシジョンの名前
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.label=DMN
モデル名
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName.description=DMN
モデル名
org.kie.workbench.common.stunner.bpmn.definition.property.task.Namespace.label=名前空間
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/test/java/org/kie/workbench/common/stunner/bpmn/definition/HashCodeAndEqualityTest.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/test/java/org/kie/workbench/common/stunner/bpmn/definition/HashCodeAndEqualityTest.java
index 336f065ca79..94ebc9f1121 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/test/java/org/kie/workbench/common/stunner/bpmn/definition/HashCodeAndEqualityTest.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/src/test/java/org/kie/workbench/common/stunner/bpmn/definition/HashCodeAndEqualityTest.java
@@ -89,7 +89,6 @@ import
org.kie.workbench.common.stunner.bpmn.definition.property.task.BusinessRu
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.CalledElement;
import org.kie.workbench.common.stunner.bpmn.definition.property.task.Content;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.CreatedBy;
-import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.Description;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName;
import org.kie.workbench.common.stunner.bpmn.definition.property.task.FileName;
@@ -1537,7 +1536,6 @@ public class HashCodeAndEqualityTest {
new
RuleFlowGroup(),
new FileName(),
new Namespace(),
- new
DecisionName(),
new
DmnModelName(),
new
OnEntryAction(),
new
OnExitAction(),
@@ -1548,7 +1546,6 @@ public class HashCodeAndEqualityTest {
new
RuleFlowGroup(),
new FileName(),
new Namespace(),
- new
DecisionName(),
new
DmnModelName(),
new
OnEntryAction(),
new
OnExitAction(),
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/dataproviders/DecisionNameFormProvider.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/dataproviders/DecisionNameFormProvider.java
deleted file mode 100644
index 3e77a86a400..00000000000
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/dataproviders/DecisionNameFormProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.kie.workbench.common.stunner.bpmn.client.dataproviders;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
-import org.kie.workbench.common.forms.dynamic.model.config.SelectorData;
-import
org.kie.workbench.common.forms.dynamic.model.config.SelectorDataProvider;
-import
org.kie.workbench.common.forms.dynamic.service.shared.FormRenderingContext;
-import
org.kie.workbench.common.stunner.bpmn.client.util.DmnResourceContentFetcher;
-
-@Dependent
-public class DecisionNameFormProvider implements SelectorDataProvider {
-
- @Inject
- private DmnResourceContentFetcher dmnResourceContentFetcher;
-
- @Override
- public String getProviderName() {
- return getClass().getSimpleName();
- }
-
- @Override
- public SelectorData<String> getSelectorData(final FormRenderingContext
context) {
- SelectorData<String> selector = new SelectorData<>();
- Map<String, String> fileNames = new HashMap<>();
-
- if (dmnResourceContentFetcher != null &&
dmnResourceContentFetcher.getDecisions() != null) {
- for (String value : dmnResourceContentFetcher.getDecisions())
- fileNames.put(value, value);
- }
-
- selector.setValues(fileNames);
- return selector;
- }
-}
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/documentation/ClientBPMNDocumentationService.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/documentation/ClientBPMNDocumentationSer
[...]
index c9bedd472ce..8c5ed51e6dd 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/documentation/ClientBPMNDocumentationService.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/documentation/ClientBPMNDocumentationService.java
@@ -83,7 +83,6 @@ import
org.kie.workbench.common.stunner.bpmn.definition.property.simulation.Stan
import
org.kie.workbench.common.stunner.bpmn.definition.property.simulation.TimeUnit;
import
org.kie.workbench.common.stunner.bpmn.definition.property.simulation.UnitCost;
import
org.kie.workbench.common.stunner.bpmn.definition.property.simulation.WorkingHours;
-import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.IsMultipleInstance;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.Namespace;
@@ -462,7 +461,6 @@ public class ClientBPMNDocumentationService implements
BPMNDocumentationService
BindableAdapterUtils.getPropertyId(Width.class),
BindableAdapterUtils.getPropertyId(ProcessVariables.class),
BindableAdapterUtils.getPropertyId(DmnModelName.class),
-
BindableAdapterUtils.getPropertyId(DecisionName.class),
BindableAdapterUtils.getPropertyId(Namespace.class),
BindableAdapterUtils.getPropertyId(IsMultipleInstance.class),
BindableAdapterUtils.getPropertyId(Min.class),
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/changeHandlers/businessRuleTask/BusinessRuleTaskChangeHandler.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/changeHandl
[...]
index cce4209dca4..f79e084a59a 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/changeHandlers/businessRuleTask/BusinessRuleTaskChangeHandler.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/changeHandlers/businessRuleTask/BusinessRuleTaskChangeHandler.java
@@ -66,7 +66,6 @@ public class BusinessRuleTaskChangeHandler implements
DomainObjectFieldChangeHan
public void reset() {
businessRuleTask.getExecutionSet().getNamespace().setValue("");
businessRuleTask.getExecutionSet().getDmnModelName().setValue("");
- businessRuleTask.getExecutionSet().getDecisionName().setValue("");
dmnResourceContentFetcher.getDecisions().clear();
dmnResourceContentFetcher.refreshForms();
}
@@ -74,7 +73,6 @@ public class BusinessRuleTaskChangeHandler implements
DomainObjectFieldChangeHan
protected void setData(DmnDocumentData dmnDocumentData) {
businessRuleTask.getExecutionSet().getNamespace().setValue(dmnDocumentData.getNamespace());
businessRuleTask.getExecutionSet().getDmnModelName().setValue(dmnDocumentData.getName());
- businessRuleTask.getExecutionSet().getDecisionName().setValue(""); //
Clear the value
dmnResourceContentFetcher.setDecisions(dmnDocumentData.getDecisions().stream()
.map(DmnDecision::getName)
.collect(Collectors.toList()));
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/filters/RuleLanguageFilterProvider.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/filters/RuleLanguageFilterProvider.java
index 135c52cb04f..eaa53192d2e 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/filters/RuleLanguageFilterProvider.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/filters/RuleLanguageFilterProvider.java
@@ -84,15 +84,11 @@ public class RuleLanguageFilterProvider implements
StunnerFormElementFilterProvi
new FormElementFilter(BusinessRuleTask.EXECUTION_SET + "."
+
BusinessRuleTaskExecutionSet.NAMESPACE, dmnPredicate);
- final FormElementFilter decisionNameFilter =
- new FormElementFilter(BusinessRuleTask.EXECUTION_SET + "." +
-
BusinessRuleTaskExecutionSet.DECISON_NAME, dmnPredicate);
-
final FormElementFilter dmnModelNameFilter =
new FormElementFilter(BusinessRuleTask.EXECUTION_SET + "." +
BusinessRuleTaskExecutionSet.DMN_MODEL_NAME, dmnPredicate);
- return Arrays.asList(ruleFlowGroupFilter, fileNameFilter,
namespaceFilter, decisionNameFilter, dmnModelNameFilter);
+ return Arrays.asList(ruleFlowGroupFilter, fileNameFilter,
namespaceFilter, dmnModelNameFilter);
}
void onFormFieldChanged(@Observes FormFieldChanged formFieldChanged) {
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/fromstunner/properties/BusinessRuleTaskPropertyWriter.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/m
[...]
index 97da45e27e5..ae5ad3839b0 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/fromstunner/properties/BusinessRuleTaskPropertyWriter.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/fromstunner/properties/BusinessRuleTaskPropertyWriter.java
@@ -28,7 +28,6 @@ import
org.kie.workbench.common.stunner.bpmn.client.marshall.converters.custompr
import
org.kie.workbench.common.stunner.bpmn.client.marshall.converters.customproperties.CustomElement;
import
org.kie.workbench.common.stunner.bpmn.client.marshall.converters.customproperties.CustomInput;
import
org.kie.workbench.common.stunner.bpmn.client.marshall.converters.tostunner.properties.Scripts;
-import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName;
import org.kie.workbench.common.stunner.bpmn.definition.property.task.FileName;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.Namespace;
@@ -83,10 +82,6 @@ public class BusinessRuleTaskPropertyWriter extends
ActivityPropertyWriter {
this.dmnModelName.set(dmnModelName.getValue());
}
- public void setDecisionName(DecisionName decisionName) {
- this.decisionName.set(decisionName.getValue());
- }
-
public void setOnEntryAction(OnEntryAction onEntryAction) {
Scripts.setOnEntryAction(flowElement, onEntryAction);
}
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/fromstunner/tasks/TaskConverter.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/fro
[...]
index 95ab32e92e5..5bcefd1f7c6 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/fromstunner/tasks/TaskConverter.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/fromstunner/tasks/TaskConverter.java
@@ -222,7 +222,6 @@ public class TaskConverter {
} else if (ruleLanguage.getValue().equals(RuleLanguage.DMN)) {
p.setFileName(executionSet.getFileName());
p.setNamespace(executionSet.getNamespace());
- p.setDecisionName(executionSet.getDecisionName());
p.setDmnModelName(executionSet.getDmnModelName());
}
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/properties/BusinessRuleTaskPropertyReader.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/mar
[...]
index f10d37d2b23..66ad3c42362 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/properties/BusinessRuleTaskPropertyReader.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/properties/BusinessRuleTaskPropertyReader.java
@@ -60,10 +60,6 @@ public class BusinessRuleTaskPropertyReader extends
TaskPropertyReader {
return CustomInput.namespace.of(task).get();
}
- public String getDecisionName() {
- return CustomInput.decisionName.of(task).get();
- }
-
public String getDmnModelName() {
return CustomInput.dmnModelName.of(task).get();
}
diff --git
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/tasks/BaseTaskConverter.java
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/t
[...]
index 4fe6973d971..9aa079072af 100644
---
a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/tasks/BaseTaskConverter.java
+++
b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/tasks/BaseTaskConverter.java
@@ -58,7 +58,6 @@ import
org.kie.workbench.common.stunner.bpmn.definition.property.service.Generic
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.AdHocAutostart;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.BaseUserTaskExecutionSet;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.BusinessRuleTaskExecutionSet;
-import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DecisionName;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.DmnModelName;
import
org.kie.workbench.common.stunner.bpmn.definition.property.task.EmptyTaskExecutionSet;
import org.kie.workbench.common.stunner.bpmn.definition.property.task.FileName;
@@ -220,19 +219,16 @@ public abstract class BaseTaskConverter<U extends
BaseUserTask<S>, S extends Bas
RuleFlowGroup ruleFlowGroup = null;
FileName fileName = null;
Namespace namespace = null;
- DecisionName decisionName = null;
DmnModelName dmnModelName = null;
if (ruleLanguage.getValue().equals(RuleLanguage.DRL)) {
ruleFlowGroup = new RuleFlowGroup(p.getRuleFlowGroup());
namespace = new Namespace();
- decisionName = new DecisionName();
dmnModelName = new DmnModelName();
} else if (ruleLanguage.getValue().equals(RuleLanguage.DMN)) {
ruleFlowGroup = new RuleFlowGroup();
fileName = new FileName(p.getFileName());
namespace = new Namespace(p.getNamespace());
- decisionName = new DecisionName(p.getDecisionName());
dmnModelName = new DmnModelName(p.getDmnModelName());
}
@@ -241,7 +237,6 @@ public abstract class BaseTaskConverter<U extends
BaseUserTask<S>, S extends Bas
ruleFlowGroup,
fileName,
namespace,
- decisionName,
dmnModelName,
new OnEntryAction(p.getOnEntryAction()),
new OnExitAction(p.getOnExitAction()),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
