Merge pull request #210 from HannesWell/fix-export-branding

Fix potential NPEs during export branding and fix Extension example
kieler · Oct 21, 2024 · 44d08e1 · 44d08e1
2 parents f8ce58e + 9420a41
commit 44d08e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/....piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AuthorConfidentialExportBranding.java b/....piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/AuthorConfidentialExportBranding.java
@@ -41,12 +41,12 @@
  * <pre>
  * {@code
  * <extension
- *       point="de.cau.cs.kieler.klighd.piccolo.exportHooks">
- *    <exportHook
- *          class="de.cau.cs.kieler.klighd.piccolo.export.AuthorConfidentialExportHook"
+ *       point="de.cau.cs.kieler.klighd.extensions">
+ *    <exportBranding
+ *          class="de.cau.cs.kieler.klighd.piccolo.export.AuthorConfidentialExportBranding"
  *          id="de.cau.cs.kieler.klighd.piccolo.export.AuthorConfidentialExportHook"
  *          supportedFormats="bmp, jpeg, png, pdf, printout">
- *    </exportHook>
+ *    </exportBranding>
  * </extension>}
  * </pre>
  *

diff --git a/...u.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/BitmapExporter.java b/...u.cs.kieler.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/export/BitmapExporter.java
@@ -78,7 +78,7 @@ public IStatus export(final KlighdCanvas canvas, final ExportData data) {
         final TilingData tilingInfo = data.tilingInfo();
 
         final Trim trim = getMaximumDiagramTrim(brandings, bounds);
-        final Trim tileTrimScaled = getMaximumDiagramTileTrim(brandings);
+        final Trim tileTrimScaled = getMaximumDiagramTileTrim(brandings, bounds, null, null);
 
         // determine the employed image's size
         final double width = data.scale() * (bounds.getWidth() + trim.getWidth());

diff --git a/...er.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsImpl.java b/...er.klighd.piccolo/src/de/cau/cs/kieler/klighd/piccolo/internal/KlighdSWTGraphicsImpl.java
@@ -437,7 +437,7 @@ public FontData getFontData() {
     protected static final HashMap<FontData, Font> FONT_CACHE = new HashMap<FontData, Font>();
 
     private boolean cacheFonts = true;
-    private List<org.eclipse.swt.graphics.Font> temporaryFonts = null;
+    private final List<Font> temporaryFonts = new ArrayList<>();
 
 
     /**
@@ -486,9 +486,6 @@ public void setFont(final FontData fontData, final int maxLineWidth) {
             curFont = font;
 
         } else {
-            if (temporaryFonts == null) {
-                temporaryFonts = new ArrayList<>();
-            }
             curFont = new org.eclipse.swt.graphics.Font(
                         fontCreationDevice != null ? fontCreationDevice : device, fontData);
             temporaryFonts.add(curFont);