From 23e20aeda50b5c082f34e5bddcc953e0c169b7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Kr=C3=A1sa?= Date: Sat, 30 Mar 2019 13:33:31 +0100 Subject: [PATCH] cleanup --- .../plantuml/idea/rendering/PlantUmlNormalRenderer.java | 9 ++++++--- .../plantuml/idea/rendering/PlantUmlPartialRenderer.java | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/org/plantuml/idea/rendering/PlantUmlNormalRenderer.java b/src/org/plantuml/idea/rendering/PlantUmlNormalRenderer.java index 59364420..d0ef452b 100644 --- a/src/org/plantuml/idea/rendering/PlantUmlNormalRenderer.java +++ b/src/org/plantuml/idea/rendering/PlantUmlNormalRenderer.java @@ -149,7 +149,8 @@ private void incrementalRendering(RenderRequest renderRequest, RenderCacheItem c boolean shouldRender = pageRequested && (obsolete || !cachedItem.hasImage(i)); if (shouldRender) { - renderResult.addRenderedImage(generateImageItem(renderRequest, documentSource, sourceSplit[i], reader, formatOption, i, i, RenderingType.NORMAL, titles.get(i))); + ImageItem imageItem = generateImageItem(renderRequest, documentSource, sourceSplit[i], reader, formatOption, i, i, RenderingType.NORMAL, titles.get(i)); + renderResult.addRenderedImage(imageItem); } else if (obsolete) { logger.debug("page ", i, " title only"); renderResult.addUpdatedTitle(new ImageItem(renderRequest.getBaseDir(), documentSource, sourceSplit[i], i, TITLE_ONLY, null, null, RenderingType.NORMAL, titles.get(i))); @@ -162,10 +163,12 @@ private void incrementalRendering(RenderRequest renderRequest, RenderCacheItem c private void normalRendering(RenderRequest renderRequest, String[] sourceSplit, String documentSource, SourceStringReader reader, Titles titles, RenderResult renderResult, FileFormatOption formatOption, boolean containsIncludedNewPage, int i, boolean pageRequested) throws IOException { String pageSource = pageSource(sourceSplit, containsIncludedNewPage, i); if (pageRequested) { - renderResult.addRenderedImage(generateImageItem(renderRequest, documentSource, pageSource, reader, formatOption, i, i, RenderingType.NORMAL, titles.get(i))); + ImageItem imageItem = generateImageItem(renderRequest, documentSource, pageSource, reader, formatOption, i, i, RenderingType.NORMAL, titles.get(i)); + renderResult.addRenderedImage(imageItem); } else { logger.debug("page ", i, " title only"); - renderResult.addUpdatedTitle(new ImageItem(renderRequest.getBaseDir(), documentSource, pageSource, i, TITLE_ONLY, null, null, RenderingType.NORMAL, titles.get(i))); + ImageItem imageItem = new ImageItem(renderRequest.getBaseDir(), documentSource, pageSource, i, TITLE_ONLY, null, null, RenderingType.NORMAL, titles.get(i)); + renderResult.addUpdatedTitle(imageItem); } } diff --git a/src/org/plantuml/idea/rendering/PlantUmlPartialRenderer.java b/src/org/plantuml/idea/rendering/PlantUmlPartialRenderer.java index 68e0f61b..c678db33 100644 --- a/src/org/plantuml/idea/rendering/PlantUmlPartialRenderer.java +++ b/src/org/plantuml/idea/rendering/PlantUmlPartialRenderer.java @@ -117,7 +117,8 @@ private ImageItem renderImage(RenderRequest renderRequest, int page, FileFormatO logger.warn("too many titles " + titles + ", partialSource=" + partialSource); } try { - return new ImageItem(page, generateImageItem(renderRequest, renderRequest.getSource(), partialSource, reader, formatOption, 0, page, RenderingType.PARTIAL, titles.get(0))); + ImageItem item = generateImageItem(renderRequest, renderRequest.getSource(), partialSource, reader, formatOption, 0, page, RenderingType.PARTIAL, titles.get(0)); + return new ImageItem(page, item); } catch (RenderingCancelledException e) { throw e; } catch (Throwable e) {