Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BAPL-1113 Designer - Data Object and Association #3179

Closed
wants to merge 5 commits into from
Closed

BAPL-1113 Designer - Data Object and Association #3179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
644bd19
BAPL-1113 Designer - Data Object and Association
Jan 16, 2020
c00eb3d
additional tests
Feb 26, 2020
3fc75b2
additional tests part 2
Feb 28, 2020
69d8b56
DataObject name validation and tests
Mar 3, 2020
a13e95e
dataobject node validation
Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...ie/workbench/common/stunner/client/widgets/canvas/actions/TextEditorMultiLineBoxTest.java
View file
Open in desktop
Expand Up @@ -45,6 +45,7 @@ public class TextEditorMultiLineBoxTest {

public static final String NAME = "name";
public static final String MODIFIED_NAME = "modified_name";
public static final String OLD_NAME = "old_name";
public static final String ID = "id";

protected TextEditorMultiLineBox presenter;
Expand Down Expand Up @@ -173,7 +174,8 @@ public void testCloseButton() {
verify(canvasCommandFactory,
never()).updatePropertyValue(element,
ID,
MODIFIED_NAME);
MODIFIED_NAME,
OLD_NAME);

verify(commandProvider,
never()).getCommandManager();
Expand All @@ -195,7 +197,8 @@ protected void verifyNameNotSaved() {
verify(canvasCommandFactory,
never()).updatePropertyValue(element,
ID,
MODIFIED_NAME);
MODIFIED_NAME,
OLD_NAME);

verify(commandProvider,
never()).getCommandManager();
Expand Down Expand Up @@ -223,7 +226,8 @@ protected void verifyNameFlushed() {
verify(definitionUtils).getNameIdentifier(objectDefinition);
verify(canvasCommandFactory).updatePropertyValue(element,
ID,
MODIFIED_NAME);
MODIFIED_NAME,
NAME);

verify(commandProvider).getCommandManager();
verify(canvasCommandManager).execute(any(),
Expand Down
9 changes: 6 additions & 3 deletions ...e/workbench/common/stunner/client/widgets/canvas/actions/TextEditorSingleLineBoxTest.java
View file
Open in desktop
Expand Up @@ -173,7 +173,8 @@ public void testCloseButton() {
verify(canvasCommandFactory,
never()).updatePropertyValue(element,
ID,
MODIFIED_NAME);
MODIFIED_NAME,
NAME);

verify(commandProvider,
never()).getCommandManager();
Expand All @@ -195,7 +196,8 @@ protected void verifyNameNotSaved() {
verify(canvasCommandFactory,
never()).updatePropertyValue(element,
ID,
MODIFIED_NAME);
MODIFIED_NAME,
NAME);

verify(commandProvider,
never()).getCommandManager();
Expand Down Expand Up @@ -223,7 +225,8 @@ protected void verifyNameFlushed() {
verify(definitionUtils).getNameIdentifier(objectDefinition);
verify(canvasCommandFactory).updatePropertyValue(element,
ID,
MODIFIED_NAME);
MODIFIED_NAME,
NAME);

verify(commandProvider).getCommandManager();
verify(canvasCommandManager).execute(any(),
Expand Down
5 changes: 5 additions & 0 deletions .../main/java/org/kie/workbench/common/stunner/core/client/command/CanvasCommandFactory.java
View file
Open in desktop
Expand Up @@ -110,6 +110,11 @@ CanvasCommand<H> updatePropertyValue(Element element,
String propertyId,
Object value);

CanvasCommand<H> updatePropertyValue(Element element,
String propertyId,
Object value,
Object oldValue);

CanvasCommand<H> updateDomainObjectPropertyValue(DomainObject domainObject,
String propertyId,
Object value);
Expand Down
11 changes: 11 additions & 0 deletions .../kie/workbench/common/stunner/core/client/canvas/command/DefaultCanvasCommandFactory.java
View file
Open in desktop
Expand Up @@ -208,6 +208,17 @@ public CanvasCommand<AbstractCanvasHandler> updatePropertyValue(final Element el
value);
}

@Override
public CanvasCommand<AbstractCanvasHandler> updatePropertyValue(final Element element,
final String propertyId,
final Object value,
final Object oldValue) {
return new UpdateElementPropertyCommand(element,
propertyId,
value,
oldValue);
}

@Override
public CanvasCommand<AbstractCanvasHandler> updateDomainObjectPropertyValue(final DomainObject domainObject,
final String propertyId,
Expand Down
17 changes: 16 additions & 1 deletion ...kie/workbench/common/stunner/core/client/canvas/command/UpdateElementPropertyCommand.java
View file
Open in desktop
Expand Up @@ -28,13 +28,23 @@ public class UpdateElementPropertyCommand extends AbstractCanvasGraphCommand {
private final Element element;
private final String propertyId;
private final Object value;
private final Object oldValue;

public UpdateElementPropertyCommand(final Element element,
final String propertyId,
final Object value) {
this(element, propertyId, value, null);

}

public UpdateElementPropertyCommand(final Element element,
final String propertyId,
final Object value,
final Object oldValue) {
this.element = element;
this.propertyId = propertyId;
this.value = value;
this.oldValue = oldValue;
}

@Override
Expand All @@ -43,7 +53,8 @@ protected Command<GraphCommandExecutionContext, RuleViolation> newGraphCommand(f
return (element instanceof Node ?
new UpdateElementPropertyValueCommand(element,
propertyId,
value) :
value,
oldValue) :
new UpdateElementPropertyValueCommand(element.getUUID(),
propertyId,
value));
Expand All @@ -66,6 +77,10 @@ public Object getValue() {
return value;
}

public Object getOldValue() {
return oldValue;
}

@Override
public String toString() {
return getClass().getSimpleName() +
Expand Down
6 changes: 5 additions & 1 deletion ...h/common/stunner/core/client/canvas/controls/actions/DefaultTextPropertyProviderImpl.java
View file
Open in desktop
Expand Up @@ -66,10 +66,14 @@ public void setText(final AbstractCanvasHandler canvasHandler,
final String text) {
final Object def = element.getContent().getDefinition();
final String nameId = definitionUtils.getNameIdentifier(def);
final String oldName = definitionUtils.getName(def);


if (null != nameId) {
final CanvasCommand<AbstractCanvasHandler> command = canvasCommandFactory.updatePropertyValue(element,
nameId,
text);
text,
oldName);
commandManager.execute(canvasHandler,
command);
}
Expand Down
5 changes: 4 additions & 1 deletion ...mmon/stunner/core/client/canvas/controls/actions/DefaultTextPropertyProviderImplTest.java
View file
Open in desktop
Expand Up @@ -72,7 +72,9 @@ public void setup() {
when(element.getContent()).thenReturn(content);
when(content.getDefinition()).thenReturn(definition);
when(definitionUtils.getNameIdentifier(eq(definition))).thenReturn("name");
when(definitionUtils.getName(eq(definition))).thenReturn("oldvalue");
when(canvasCommandFactory.updatePropertyValue(eq(element),
anyString(),
anyString(),
anyString())).thenReturn(command);
}
Expand Down Expand Up @@ -105,7 +107,8 @@ public void checkWriteUsesCommandToUpdateNamePropertyMetaData() {

verify(canvasCommandFactory).updatePropertyValue(eq(element),
eq("name"),
eq("text"));
eq("text"),
eq("oldvalue"));
verify(commandManager).execute(eq(canvasHandler),
eq(command));
}
Expand Down
10 changes: 10 additions & 0 deletions ...in/java/org/kie/workbench/common/stunner/core/graph/command/impl/GraphCommandFactory.java
View file
Open in desktop
Expand Up @@ -122,6 +122,16 @@ public UpdateElementPositionCommand updatePosition(final Node<? extends View<?>,
}

@SuppressWarnings("unchecked")
public UpdateElementPropertyValueCommand updatePropertyValue(final Element element,
final String propertyId,
final Object value,
final Object oldValue) {
return new UpdateElementPropertyValueCommand(element,
propertyId,
value,
oldValue);
}

public UpdateElementPropertyValueCommand updatePropertyValue(final Element element,
final String propertyId,
final Object value) {
Expand Down
14 changes: 13 additions & 1 deletion ...e/workbench/common/stunner/core/graph/command/impl/UpdateElementPropertyValueCommand.java
View file
Open in desktop
Expand Up @@ -54,10 +54,21 @@ public UpdateElementPropertyValueCommand(final @MapsTo("elementUUID") String ele
public UpdateElementPropertyValueCommand(final Element<?> element,
final String propertyId,
final Object value) {
this(element,
propertyId,
value,
null);
}

public UpdateElementPropertyValueCommand(final Element<?> element,
final String propertyId,
final Object value,
final Object oldValue) {
this(element.getUUID(),
propertyId,
value);
this.element = element;
this.oldValue = oldValue;
}

@Override
Expand All @@ -84,7 +95,8 @@ public CommandResult<RuleViolation> execute(final GraphCommandExecutionContext c
public CommandResult<RuleViolation> undo(final GraphCommandExecutionContext context) {
final UpdateElementPropertyValueCommand undoCommand = new UpdateElementPropertyValueCommand(getNullSafeElement(context),
propertyId,
oldValue);
oldValue,
value);
return undoCommand.execute(context);
}

Expand Down
4 changes: 3 additions & 1 deletion ...unner-bpmn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/BPMNDefinitionSet.java
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
import org.kie.workbench.common.stunner.bpmn.definition.AdHocSubprocess;
import org.kie.workbench.common.stunner.bpmn.definition.BPMNDiagramImpl;
import org.kie.workbench.common.stunner.bpmn.definition.BusinessRuleTask;
import org.kie.workbench.common.stunner.bpmn.definition.DataObject;
import org.kie.workbench.common.stunner.bpmn.definition.DirectionalAssociation;
import org.kie.workbench.common.stunner.bpmn.definition.EmbeddedSubprocess;
import org.kie.workbench.common.stunner.bpmn.definition.EndCompensationEvent;
Expand Down Expand Up @@ -125,7 +126,8 @@
SequenceFlow.class,
DirectionalAssociation.class,
NonDirectionalAssociation.class,
TextAnnotation.class
TextAnnotation.class,
DataObject.class
},
builder = BPMNDefinitionSet.BPMNDefinitionSetBuilder.class
)
Expand Down
1 change: 0 additions & 1 deletion ...mn-api/src/main/java/org/kie/workbench/common/stunner/bpmn/definition/BPMNCategories.java
View file
Open in desktop
Expand Up @@ -38,5 +38,4 @@ public class BPMNCategories {

public static final String SERVICE_TASKS = "ServiceTasks";

public static final String TEXT_ANNOTATION = "TextAnnotations";
}