diff options
Diffstat (limited to 'src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java')
| -rw-r--r-- | src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java index 7ae1357..f0eab11 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java @@ -35,9 +35,11 @@ */ package net.sourceforge.plantuml.activitydiagram3.command; +import net.sourceforge.plantuml.LineLocation; import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; +import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; @@ -50,16 +52,17 @@ public class CommandGroup3 extends SingleLineCommand2<ActivityDiagram3> { super(getRegexConcat()); } - static RegexConcat getRegexConcat() { - return new RegexConcat(new RegexLeaf("^"), // + static IRegex getRegexConcat() { + return RegexConcat.build(CommandGroup3.class.getName(), RegexLeaf.start(), // new RegexLeaf("group"), // - new RegexLeaf("\\s*"), // + RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("NAME", "(.*)"), // - new RegexLeaf(";?$")); + new RegexLeaf(";?"), // + RegexLeaf.end()); } @Override - protected CommandExecutionResult executeArg(ActivityDiagram3 diagram, RegexResult arg) { + protected CommandExecutionResult executeArg(ActivityDiagram3 diagram, LineLocation location, RegexResult arg) { diagram.startGroup(Display.getWithNewlines(arg.get("NAME", 0)), null, null, null, USymbol.FRAME, 0); return CommandExecutionResult.ok(); } |