diff options
Diffstat (limited to 'src/net/sourceforge/plantuml/classdiagram')
5 files changed, 6 insertions, 7 deletions
diff --git a/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java b/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java index b8021ed..ebc0c6a 100644 --- a/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java +++ b/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java @@ -47,8 +47,6 @@ import net.sourceforge.plantuml.classdiagram.command.CommandCreateElementFull2; import net.sourceforge.plantuml.classdiagram.command.CommandCreateElementFull2.Mode; import net.sourceforge.plantuml.classdiagram.command.CommandDiamondAssociation; import net.sourceforge.plantuml.classdiagram.command.CommandHideShow2; -import net.sourceforge.plantuml.classdiagram.command.CommandHideShowSpecificClass; -import net.sourceforge.plantuml.classdiagram.command.CommandHideShowSpecificStereotype; import net.sourceforge.plantuml.classdiagram.command.CommandImport; import net.sourceforge.plantuml.classdiagram.command.CommandLayoutNewLine; import net.sourceforge.plantuml.classdiagram.command.CommandLinkClass; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java index 4c4f0e2..35481b4 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java @@ -51,7 +51,7 @@ public class CommandAllowMixing extends SingleLineCommand2<ClassDiagram> { private static RegexConcat getRegexConcat() { return new RegexConcat(new RegexLeaf("^"), // - new RegexLeaf("allow_mixing"), // + new RegexLeaf("allow_?mixing"), // new RegexLeaf("$")); } diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java index d047558..e730651 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java @@ -75,7 +75,7 @@ public class CommandCreateClass extends SingleLineCommand2<ClassDiagram> { private static RegexConcat getRegexConcat() { return new RegexConcat(new RegexLeaf("^"), // new RegexLeaf("TYPE", // - "(interface|enum|annotation|abstract[%s]+class|abstract|class|entity|circle)[%s]+"), // + "(interface|enum|annotation|abstract[%s]+class|abstract|class|entity|circle|diamond)[%s]+"), // new RegexOr(// new RegexConcat(// new RegexLeaf("DISPLAY1", DISPLAY_WITH_GENERIC), // diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java index b8d24b7..7d482c4 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java @@ -113,7 +113,7 @@ public class CommandCreateElementFull2 extends SingleLineCommand2<ClassDiagram> protected CommandExecutionResult executeArg(ClassDiagram diagram, RegexResult arg) { if (mode == Mode.NORMAL_KEYWORD && diagram.isAllowMixing() == false) { return CommandExecutionResult - .error("Use 'allow_mixing' if you want to mix classes and other UML elements."); + .error("Use 'allowmixing' if you want to mix classes and other UML elements."); } String codeRaw = arg.getLazzy("CODE", 0); final String displayRaw = arg.getLazzy("DISPLAY", 0); diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java index 6df8885..21025b9 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow2.java @@ -50,7 +50,7 @@ public class CommandHideShow2 extends SingleLineCommand2<CucaDiagram> { static RegexConcat getRegexConcat() { return new RegexConcat(new RegexLeaf("^"), // - new RegexLeaf("COMMAND", "(hide|show)"), // + new RegexLeaf("COMMAND", "(hide|hide-class|show|show-class)"), // new RegexLeaf("[%s]+"), // new RegexLeaf("WHAT", "(.+)"), // new RegexLeaf("$")); @@ -59,7 +59,8 @@ public class CommandHideShow2 extends SingleLineCommand2<CucaDiagram> { @Override protected CommandExecutionResult executeArg(CucaDiagram diagram, RegexResult arg) { - final boolean show = arg.get("COMMAND", 0).equalsIgnoreCase("show"); + final char tmp = arg.get("COMMAND", 0).charAt(0); + final boolean show = tmp == 's' || tmp == 'S'; final String what = arg.get("WHAT", 0).trim(); diagram.hideOrShow2(what, show); return CommandExecutionResult.ok(); |