octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-24 13:57:33 +00:00
Code Issues Releases Wiki Activity

Merge entity and relationship commands

Browse Source
This commit is contained in:
Benjamin Davies 2023-11-16 09:49:18 +13:00
parent e26ccf756a
commit 4d01e6fd6c
No known key found for this signature in database
GPG Key ID: 9FFDE0674336C460
4 changed files with 5 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/sourceforge/plantuml/cheneer/ChenEerDiagramFactory.java
View File

@ -39,10 +39,9 @@ import java.util.List;
import java.util.Map;
import net.sourceforge.plantuml.AbstractPSystem;
import net.sourceforge.plantuml.cheneer.command.CommandAssociateRelationship;
import net.sourceforge.plantuml.cheneer.command.CommandAssociate;
import net.sourceforge.plantuml.cheneer.command.CommandCreateAttribute;
import net.sourceforge.plantuml.cheneer.command.CommandCreateEntity;
import net.sourceforge.plantuml.cheneer.command.CommandCreateRelationship;
import net.sourceforge.plantuml.cheneer.command.CommandEndGroup;
import net.sourceforge.plantuml.command.Command;
import net.sourceforge.plantuml.command.CommonCommands;
@ -59,9 +58,8 @@ public class ChenEerDiagramFactory extends PSystemCommandFactory {
@Override
protected void initCommandsList(List<Command> cmds) {
cmds.add(new CommandCreateEntity());
cmds.add(new CommandCreateRelationship());
cmds.add(new CommandCreateAttribute());
cmds.add(new CommandAssociateRelationship());
cmds.add(new CommandAssociate());
cmds.add(new CommandEndGroup());
CommonCommands.addTitleCommands(cmds);

4
src/net/sourceforge/plantuml/cheneer/command/CommandAssociateRelationship.java → src/net/sourceforge/plantuml/cheneer/command/CommandAssociate.java
View File

@ -53,9 +53,9 @@ import net.sourceforge.plantuml.regex.RegexOptional;
import net.sourceforge.plantuml.regex.RegexResult;
import net.sourceforge.plantuml.utils.LineLocation;
public class CommandAssociateRelationship extends SingleLineCommand2<ChenEerDiagram> {
public class CommandAssociate extends SingleLineCommand2<ChenEerDiagram> {
public CommandAssociateRelationship() {
public CommandAssociate() {
super(getRegexConcat());
}

2
src/net/sourceforge/plantuml/cheneer/command/CommandCreateEntity.java
View File

@ -57,7 +57,7 @@ public class CommandCreateEntity extends SingleLineCommand2<ChenEerDiagram> {
private static IRegex getRegexConcat() {
return RegexConcat.build(CommandCreateEntity.class.getName(), RegexLeaf.start(), //
new RegexLeaf("entity"), //
new RegexLeaf("TYPE", "(entity|relationship)"), //
RegexLeaf.spaceOneOrMore(), //
new RegexLeaf("NAME", "(\\w+)"), //
RegexLeaf.spaceZeroOrMore(), //

90
src/net/sourceforge/plantuml/cheneer/command/CommandCreateRelationship.java
View File

@ -1,90 +0,0 @@
/* ========================================================================
* PlantUML : a free UML diagram generator
* ========================================================================
*
* (C) Copyright 2009-2024, Arnaud Roques
*
* Project Info: https://plantuml.com
*
* If you like this project or if you find it useful, you can support us at:
*
* https://plantuml.com/patreon (only 1$ per month!)
* https://plantuml.com/paypal
*
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* PlantUML distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
* License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
* USA.
*
*
* Original Author: Arnaud Roques
*
*
*/
package net.sourceforge.plantuml.cheneer.command;
import net.sourceforge.plantuml.abel.Entity;
import net.sourceforge.plantuml.abel.LeafType;
import net.sourceforge.plantuml.cheneer.ChenEerDiagram;
import net.sourceforge.plantuml.command.CommandExecutionResult;
import net.sourceforge.plantuml.command.SingleLineCommand2;
import net.sourceforge.plantuml.klimt.color.NoSuchColorException;
import net.sourceforge.plantuml.klimt.creole.Display;
import net.sourceforge.plantuml.plasma.Quark;
import net.sourceforge.plantuml.regex.IRegex;
import net.sourceforge.plantuml.regex.RegexConcat;
import net.sourceforge.plantuml.regex.RegexLeaf;
import net.sourceforge.plantuml.regex.RegexResult;
import net.sourceforge.plantuml.utils.LineLocation;
public class CommandCreateRelationship extends SingleLineCommand2<ChenEerDiagram> {
public CommandCreateRelationship() {
super(getRegexConcat());
}
private static IRegex getRegexConcat() {
return RegexConcat.build(CommandCreateEntity.class.getName(), RegexLeaf.start(), //
new RegexLeaf("relationship"), //
RegexLeaf.spaceOneOrMore(), //
new RegexLeaf("NAME", "(\\w+)"), //
RegexLeaf.spaceZeroOrMore(), //
new RegexLeaf("\\{"), //
RegexLeaf.end());
}
@Override
protected CommandExecutionResult executeArg(ChenEerDiagram diagram, LineLocation location, RegexResult arg)
throws NoSuchColorException {
final LeafType type = LeafType.OBJECT;
final String name = diagram.cleanId(arg.get("NAME", 0));
final Quark<Entity> quark = diagram.quarkInContext(true, name);
Entity entity = quark.getData();
if (entity == null) {
Display display = Display.getWithNewlines(name);
entity = diagram.reallyCreateLeaf(quark, display, type, null);
} else {
if (entity.muteToType(type, null) == false)
return CommandExecutionResult.error("Bad name");
}
diagram.pushOwner(entity);
return CommandExecutionResult.ok();
}
}