From 97ff03990afdcc68d78a6e0a3fff0d767647d7ca Mon Sep 17 00:00:00 2001 From: "J. Neugebauer" Date: Mon, 25 Jul 2022 19:05:28 +0200 Subject: [PATCH] Shape caching entfernt In Tests konnten keine Geschwindigkeitsvorteile festgestellt werden. --- .../java/schule/ngb/zm/shapes/Rectangle.java | 5 ++--- src/main/java/schule/ngb/zm/shapes/Shape.java | 20 ++----------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/main/java/schule/ngb/zm/shapes/Rectangle.java b/src/main/java/schule/ngb/zm/shapes/Rectangle.java index ce8cdb9..170ffec 100644 --- a/src/main/java/schule/ngb/zm/shapes/Rectangle.java +++ b/src/main/java/schule/ngb/zm/shapes/Rectangle.java @@ -15,6 +15,8 @@ public class Rectangle extends Shape { this.width = width; this.height = height; this.anchor = Options.Direction.NORTHWEST; + + //this.cacheEnabled = getClass().equals(Rectangle.class); } public Rectangle( Rectangle pRechteck ) { @@ -64,12 +66,10 @@ public class Rectangle extends Shape { public void setWidth( double width ) { this.width = width; - invalidate(); } public void setHeight( double height ) { this.height = height; - invalidate(); } @Override @@ -92,7 +92,6 @@ public class Rectangle extends Shape { super.scale(factor); width *= factor; height *= factor; - invalidate(); } @Override diff --git a/src/main/java/schule/ngb/zm/shapes/Shape.java b/src/main/java/schule/ngb/zm/shapes/Shape.java index e2bd2e0..398d957 100644 --- a/src/main/java/schule/ngb/zm/shapes/Shape.java +++ b/src/main/java/schule/ngb/zm/shapes/Shape.java @@ -66,11 +66,6 @@ public abstract class Shape extends FilledShape { */ protected Options.Direction anchor = Options.Direction.CENTER; - /** - * Zwischenspeicher für die AWT-Shape zu dieser Form. - */ - protected java.awt.Shape awtShape = null; - /** * Setzt die x- und y-Koordinate der Form auf 0. */ @@ -406,13 +401,6 @@ public abstract class Shape extends FilledShape { */ public abstract java.awt.Shape getShape(); - /** - * Interne Methode, um den Zwischenspeicher der Java-AWT Shape zu löschen. - */ - protected void invalidate() { - awtShape = null; - } - /** * Gibt die Begrenzungen der Form zurück. *

@@ -566,12 +554,8 @@ public abstract class Shape extends FilledShape { return; } - if( awtShape == null ) { - awtShape = getShape(); - } - - if( awtShape != null ) { - java.awt.Shape shape = awtShape; + java.awt.Shape shape = getShape(); + if( shape != null ) { if( transform != null ) { shape = transform.createTransformedShape(shape); }