From 38d5625b3a49d97c3105093a72674c3dac6ccc01 Mon Sep 17 00:00:00 2001 From: soloturn Date: Tue, 8 Feb 2022 23:33:30 +0100 Subject: [PATCH] always true, collapse also, remove assert from PSystemCommandFactory, getCandidate --- src/net/sourceforge/plantuml/code/URLEncoder.java | 6 +++--- src/net/sourceforge/plantuml/code/Upf9Decoder.java | 8 ++++---- .../plantuml/command/PSystemCommandFactory.java | 9 ++++----- .../plantuml/descdiagram/DescriptionDiagram.java | 10 +++++----- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/net/sourceforge/plantuml/code/URLEncoder.java b/src/net/sourceforge/plantuml/code/URLEncoder.java index e102a54c0..8d6b3171e 100644 --- a/src/net/sourceforge/plantuml/code/URLEncoder.java +++ b/src/net/sourceforge/plantuml/code/URLEncoder.java @@ -5,12 +5,12 @@ * (C) Copyright 2009-2023, Arnaud Roques * * Project Info: http://plantuml.com - * + * * If you like this project or if you find it useful, you can support us at: - * + * * http://plantuml.com/patreon (only 1$ per month!) * http://plantuml.com/paypal - * + * * This file is part of PlantUML. * * PlantUML is free software; you can redistribute it and/or modify it diff --git a/src/net/sourceforge/plantuml/code/Upf9Decoder.java b/src/net/sourceforge/plantuml/code/Upf9Decoder.java index e2fb4a251..65706c536 100644 --- a/src/net/sourceforge/plantuml/code/Upf9Decoder.java +++ b/src/net/sourceforge/plantuml/code/Upf9Decoder.java @@ -5,12 +5,12 @@ * (C) Copyright 2009-2023, Arnaud Roques * * Project Info: http://plantuml.com - * + * * If you like this project or if you find it useful, you can support us at: - * + * * http://plantuml.com/patreon (only 1$ per month!) * http://plantuml.com/paypal - * + * * This file is part of PlantUML. * * PlantUML is free software; you can redistribute it and/or modify it @@ -64,7 +64,7 @@ public class Upf9Decoder { final int read1 = is.read(); return (char) ((read0 << 8) + read1); } - if (read0 >= 0x80 && read0 <= 0xFF) { + if (read0 >= 0x80) { final int read1 = is.read(); return (char) (((read0 - 0x60) << 8) + read1); } diff --git a/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java b/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java index 610d6fc2f..2138049e4 100644 --- a/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemCommandFactory.java @@ -5,12 +5,12 @@ * (C) Copyright 2009-2023, Arnaud Roques * * Project Info: http://plantuml.com - * + * * If you like this project or if you find it useful, you can support us at: - * + * * http://plantuml.com/patreon (only 1$ per month!) * http://plantuml.com/paypal - * + * * This file is part of PlantUML. * * PlantUML is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * * * Original Author: Arnaud Roques - * + * * */ package net.sourceforge.plantuml.command; @@ -165,7 +165,6 @@ public abstract class PSystemCommandFactory extends PSystemAbstractFactory { continue; it.copyStateFrom(cloned); - assert lines != null; return new Step(cmd, lines); } } diff --git a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java index cb0ea85d8..fab79f0f6 100644 --- a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java +++ b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java @@ -5,12 +5,12 @@ * (C) Copyright 2009-2023, Arnaud Roques * * Project Info: http://plantuml.com - * + * * If you like this project or if you find it useful, you can support us at: - * + * * http://plantuml.com/patreon (only 1$ per month!) * http://plantuml.com/paypal - * + * * This file is part of PlantUML. * * PlantUML is free software; you can redistribute it and/or modify it @@ -30,7 +30,7 @@ * * * Original Author: Arnaud Roques - * + * * */ package net.sourceforge.plantuml.descdiagram; @@ -117,7 +117,7 @@ public class DescriptionDiagram extends AbstractEntityDiagram { @Override public void makeDiagramReady() { super.makeDiagramReady(); - final LeafType defaultType = isUsecase() ? LeafType.DESCRIPTION : LeafType.DESCRIPTION; + final LeafType defaultType = LeafType.DESCRIPTION; final USymbol defaultSymbol = isUsecase() ? getSkinParam().actorStyle().toUSymbol() : USymbols.INTERFACE; for (ILeaf leaf : getLeafsvalues()) { if (leaf.getLeafType() == LeafType.STILL_UNKNOWN) {