1 files changed, 15 insertions, 6 deletions
diff --git a/src/net/sourceforge/plantuml/command/CommandEndPackage.java b/src/net/sourceforge/plantuml/command/CommandEndPackage.java
index 3932ca3..047a015 100644
--- a/src/net/sourceforge/plantuml/command/CommandEndPackage.java
+++ b/src/net/sourceforge/plantuml/command/CommandEndPackage.java
@@ -2,7 +2,7 @@
  * PlantUML : a free UML diagram generator
  * ========================================================================
  *
- * (C) Copyright 2009-2017, Arnaud Roques
+ * (C) Copyright 2009-2020, Arnaud Roques
  *
  * Project Info:  http://plantuml.com
  * 
@@ -35,20 +35,29 @@
  */
 package net.sourceforge.plantuml.command;
 
-import java.util.List;
-
+import net.sourceforge.plantuml.LineLocation;
 import net.sourceforge.plantuml.classdiagram.AbstractEntityDiagram;
+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;
 import net.sourceforge.plantuml.cucadiagram.EntityUtils;
 import net.sourceforge.plantuml.cucadiagram.IGroup;
 
-public class CommandEndPackage extends SingleLineCommand<AbstractEntityDiagram> {
+public class CommandEndPackage extends SingleLineCommand2<AbstractEntityDiagram> {
 
 	public CommandEndPackage() {
-		super("(?i)^\\}$");
+		super(getRegexConcat());
+	}
+
+	static IRegex getRegexConcat() {
+		return RegexConcat.build(CommandEndPackage.class.getName(), RegexLeaf.start(), //
+				new RegexLeaf("\\}"), //
+				RegexLeaf.end()); //
 	}
 
 	@Override
-	protected CommandExecutionResult executeArg(AbstractEntityDiagram diagram, List<String> arg) {
+	protected CommandExecutionResult executeArg(AbstractEntityDiagram diagram, LineLocation location, RegexResult arg) {
 		final IGroup currentPackage = diagram.getCurrentGroup();
 		if (EntityUtils.groupRoot(currentPackage)) {
 			return CommandExecutionResult.error("No package or namespace defined");