Skip to content

Commit

Permalink
impl, improvements
Browse files Browse the repository at this point in the history 
Issue #266
  • Loading branch information
@rsoika
rsoika committed Jul 2, 2023
1 parent 333e27e commit 4007cf6
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 68 deletions.
115 changes: 55 additions & 60 deletions ...lsp-server/src/main/java/org/openbpmn/glsp/provider/BPMNCommandPaletteActionProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,74 +80,73 @@ public List<LabeledAction> getActions(final EditorContext editorContext) {
}
}

// Create node actions are always possible
actions.addAll(Sets.newHashSet(
new LabeledAction("Create Manual Task",
if (selectedBPMNNodeElements.size() == 0) {
actions.add(new LabeledAction("Create Task",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.TASK,
lastMousePosition.orElse(point(0, 0)))),
"inspect"));
actions.add(new LabeledAction("Create Manual Task",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.MANUAL_TASK,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create User Task",
lastMousePosition.orElse(point(0, 0)))),
"inspect"));
actions.add(new LabeledAction("Create User Task",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.USER_TASK,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Send Task",
lastMousePosition.orElse(point(0, 0)))),
"inspect"));
actions.add(new LabeledAction("Create Send Task",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.SEND_TASK,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Service Task",
lastMousePosition.orElse(point(0, 0)))),
"inspect"));
actions.add(new LabeledAction("Create Service Task",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.SERVICE_TASK,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Script Task",
lastMousePosition.orElse(point(0, 0)))),
"inspect"));
actions.add(new LabeledAction("Create Script Task",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.SCRIPT_TASK,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
lastMousePosition.orElse(point(0, 0)))),
"inspect"));

new LabeledAction("Create Start Event",
// Events
actions.add(new LabeledAction("Create Start Event",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.START_EVENT,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create End Event",
lastMousePosition.orElse(point(0, 0)))),
"circle-filled"));

actions.add(new LabeledAction("Create End Event",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.END_EVENT,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Catch Event",
lastMousePosition.orElse(point(0, 0)))),
"circle-filled"));
actions.add(new LabeledAction("Create Catch Event",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.CATCH_EVENT,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Throw Event",
lastMousePosition.orElse(point(0, 0)))),
"circle-filled"));
actions.add(new LabeledAction("Create Throw Event",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.THROW_EVENT,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
lastMousePosition.orElse(point(0, 0)))),
"circle-filled"));

new LabeledAction("Create Exclusive Gateway",
// Gateways
actions.add(new LabeledAction("Create Exclusive Gateway",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.EXCLUSIVE_GATEWAY,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Parallel Gateway",
lastMousePosition.orElse(point(0, 0)))),
"debug-breakpoint-log-unverified"));

actions.add(new LabeledAction("Create Parallel Gateway",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.PARALLEL_GATEWAY,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Inclusive Gateway",
lastMousePosition.orElse(point(0, 0)))),
"debug-breakpoint-log-unverified"));

actions.add(new LabeledAction("Create Inclusive Gateway",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.INCLUSIVE_GATEWAY,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Event Gateway",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.EVENTBASED_GATEWAY,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
new LabeledAction("Create Complex Gateway",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.COMPLEX_GATEWAY,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square"))),
lastMousePosition.orElse(point(0, 0)))),
"debug-breakpoint-log-unverified"));

// Pool
new LabeledAction("Create Pool",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.POOL,
lastMousePosition.orElse(point(0, 0)),
"fa-plus-square")))
actions.add(new LabeledAction("Create Event Gateway",
Lists.newArrayList(new CreateNodeOperation(BPMNTypes.EVENTBASED_GATEWAY,
lastMousePosition.orElse(point(0, 0)))),
"debug-breakpoint-log-unverified"));

));
}

// Create edge actions between two nodes only if to BPMN nodes are selected
if (selectedBPMNNodeElements.size() == 2) {
Expand All @@ -162,14 +161,10 @@ public List<LabeledAction> getActions(final EditorContext editorContext) {
}
}

// Delete action
if (selectedElements.size() == 1) {
// Delete action - symbol-property
if (selectedBPMNNodeElements.size() == 1) {
actions.add(new LabeledAction("Delete", Lists.newArrayList(new DeleteOperation(selectedIds)),
"fa-minus-square"));
} else if (selectedElements.size() > 1) {
actions.add(new LabeledAction("Delete All",
Lists.newArrayList(new DeleteOperation(selectedIds)),
"fa-minus-square"));
"trash"));
}

return actions;
Expand Down Expand Up @@ -207,7 +202,7 @@ private LabeledAction createSequenceFlowAction(final String label, final GNode s
return new LabeledAction(label,
Lists.newArrayList(new CreateEdgeOperation(BPMNTypes.SEQUENCE_FLOW, source.getId(),
node.getId())),
"fa-plus-square");
"export");
}

private Set<LabeledAction> createEdgeActions(final GNode source, final Set<? extends GNode> targets) {
Expand Down
16 changes: 8 additions & 8 deletions ...pmn.glsp-server/src/main/java/org/openbpmn/glsp/provider/BPMNToolPaletteItemProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,27 @@ public List<PaletteItem> getItems(final Map<String, String> args) {
// Create custom Palette Groups
return Lists.newArrayList(
PaletteItem.createPaletteGroup("pool-group", "Pools", createPalettePools(),
"symbol-property", "A"),
"circuit-board", "A"),
PaletteItem.createPaletteGroup("task-group", "Tasks", createPaletteTaskItems(),
"symbol-property", "B"),
"inspect", "B"),
PaletteItem.createPaletteGroup("event-group", "Events", createPaletteEventItems(),
"symbol-property",
"circle-filled",
"C"),
PaletteItem.createPaletteGroup("event-group", "Event Definitions",
createPaletteEventDefinitions(),
"symbol-property", "D"),
"layers", "D"),
PaletteItem.createPaletteGroup("gateway-group", "Gateways", createPaletteGatewayItems(),
"symbol-property", "E"),
"debug-breakpoint-log-unverified", "E"),

PaletteItem.createPaletteGroup("gateway-group", "Data Items", createPaletteDataItems(),
"symbol-property", "F"),
"notebook-template", "F"),

PaletteItem.createPaletteGroup("edge-group", "Edges", createPaletteSequenceFlowItems(),
"symbol-property", "G"),
"export", "G"),

PaletteItem.createPaletteGroup("extension-group", "Extensions",
createPaletteExtensions(),
"symbol-property", "H")
"extensions", "H")

);

Expand Down

0 comments on commit 4007cf6

Please sign in to comment.