octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-23 11:29:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #495 from matthew16550/margin-regressions

Browse Source 
Fix default margin regressions
This commit is contained in:
arnaudroques 2021-03-19 13:49:04 +01:00 committed by GitHub
commit 409d7bfef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java
View File

@ -52,6 +52,7 @@ import net.sourceforge.plantuml.cucadiagram.Ident;
import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.LeafType;
import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy;
import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbol;
import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
import net.sourceforge.plantuml.utils.UniqueSequence; import net.sourceforge.plantuml.utils.UniqueSequence;
public class ActivityDiagram extends CucaDiagram { public class ActivityDiagram extends CucaDiagram {
@ -206,4 +207,9 @@ public class ActivityDiagram extends CucaDiagram {
lastEntityBrancheConsulted = null; lastEntityBrancheConsulted = null;
} }
@Override
public ClockwiseTopRightBottomLeft getDefaultMargins() {
// Strange numbers here for backwards compatibility
return ClockwiseTopRightBottomLeft.topRightBottomLeft(-1, 5, 5, 6);
}
} }

6
src/net/sourceforge/plantuml/classdiagram/ClassDiagram.java
View File

@ -55,6 +55,7 @@ import net.sourceforge.plantuml.cucadiagram.Link;
import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlock;
import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbol;
import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram; import net.sourceforge.plantuml.objectdiagram.AbstractClassOrObjectDiagram;
import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
import net.sourceforge.plantuml.svek.image.EntityImageClass; import net.sourceforge.plantuml.svek.image.EntityImageClass;
import net.sourceforge.plantuml.ugraphic.ImageBuilder; import net.sourceforge.plantuml.ugraphic.ImageBuilder;
import net.sourceforge.plantuml.ugraphic.ImageParameter; import net.sourceforge.plantuml.ugraphic.ImageParameter;
@ -234,4 +235,9 @@ public class ClassDiagram extends AbstractClassOrObjectDiagram {
return super.checkFinalError(); return super.checkFinalError();
} }
@Override
public ClockwiseTopRightBottomLeft getDefaultMargins() {
// Strange numbers here for backwards compatibility
return ClockwiseTopRightBottomLeft.topRightBottomLeft(-1, 5, 5, 7);
}
} }

6
src/net/sourceforge/plantuml/cucadiagram/CucaDiagram.java
View File

@ -62,7 +62,6 @@ import net.sourceforge.plantuml.sdot.CucaDiagramFileMakerSmetana;
import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.security.SecurityUtils;
import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.skin.VisibilityModifier;
import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.statediagram.StateDiagram;
import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; import net.sourceforge.plantuml.svek.CucaDiagramFileMaker;
import net.sourceforge.plantuml.svek.CucaDiagramFileMakerSvek; import net.sourceforge.plantuml.svek.CucaDiagramFileMakerSvek;
import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.ColorMapper;
@ -919,9 +918,4 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy,
link2.setLinkConstraint(linkConstraint); link2.setLinkConstraint(linkConstraint);
return CommandExecutionResult.ok(); return CommandExecutionResult.ok();
} }
@Override
public ClockwiseTopRightBottomLeft getDefaultMargins() {
return ClockwiseTopRightBottomLeft.topRightBottomLeft(0, 5, 5, 0);
}
} }

6
src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java
View File

@ -44,6 +44,7 @@ import net.sourceforge.plantuml.cucadiagram.ILeaf;
import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.Ident;
import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.LeafType;
import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbol;
import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
public class DescriptionDiagram extends AbstractEntityDiagram { public class DescriptionDiagram extends AbstractEntityDiagram {
@ -127,4 +128,9 @@ public class DescriptionDiagram extends AbstractEntityDiagram {
return super.checkFinalError(); return super.checkFinalError();
} }
@Override
public ClockwiseTopRightBottomLeft getDefaultMargins() {
// Strange numbers here for backwards compatibility
return ClockwiseTopRightBottomLeft.topRightBottomLeft(-1, 5, 5, 7);
}
} }

4
src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java
View File

@ -531,6 +531,8 @@ public class SequenceDiagram extends UmlDiagram {
@Override @Override
public ClockwiseTopRightBottomLeft getDefaultMargins() { public ClockwiseTopRightBottomLeft getDefaultMargins() {
return ClockwiseTopRightBottomLeft.same(5); return modeTeoz() // this is for backward compatibility
? ClockwiseTopRightBottomLeft.same(5)
: ClockwiseTopRightBottomLeft.topRightBottomLeft(5, 5, 5, 0);
} }
} }

6
src/net/sourceforge/plantuml/statediagram/StateDiagram.java
View File

@ -50,6 +50,7 @@ import net.sourceforge.plantuml.cucadiagram.LeafType;
import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.Link;
import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy;
import net.sourceforge.plantuml.graphic.USymbol; import net.sourceforge.plantuml.graphic.USymbol;
import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft;
import net.sourceforge.plantuml.utils.UniqueSequence; import net.sourceforge.plantuml.utils.UniqueSequence;
public class StateDiagram extends AbstractEntityDiagram { public class StateDiagram extends AbstractEntityDiagram {
@ -307,4 +308,9 @@ public class StateDiagram extends AbstractEntityDiagram {
} }
@Override
public ClockwiseTopRightBottomLeft getDefaultMargins() {
// Strange numbers here for backwards compatibility
return ClockwiseTopRightBottomLeft.topRightBottomLeft(-2, 5, 5, 7);
}
} }