From 34ddba4e2f68b914c5ebc5fb445cf608c5538912 Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Tue, 13 Jul 2021 20:25:59 +0200 Subject: [PATCH] [fixes #969] Updated custom FinSet appearance with unstable --- .../sf/openrocket/rocketcomponent/FinSet.java | 49 ++----------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java index 7c6e637a2..b298608bc 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/FinSet.java +++ b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java @@ -122,10 +122,7 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona private double totalVolume = Double.NaN; private Coordinate centerOfMass = Coordinate.NaN; - // Settings for inside/edge appearance - private Appearance insideAppearance = null; - private boolean insideSameAsOutside = true; - private boolean edgesSameAsInside = true; + private final InsideColorComponentHandler insideColorComponentHandler = new InsideColorComponentHandler(this); /** * New FinSet with given number of fins and given base rotation angle. @@ -1272,47 +1269,7 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona } @Override - public Appearance getInsideAppearance() { - return this.insideAppearance; - } - - @Override - public void setInsideAppearance(Appearance appearance) { - this.insideAppearance = appearance; - if (this.insideAppearance != null) { - Decal d = this.insideAppearance.getTexture(); - if (d != null) { - d.getImage().addChangeListener(new StateChangeListener() { - - @Override - public void stateChanged(EventObject e) { - fireComponentChangeEvent(ComponentChangeEvent.TEXTURE_CHANGE); - } - - }); - } - } - // CHECK - should this be a TEXTURE_CHANGE and not NONFUNCTIONAL_CHANGE? - fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); - } - - @Override - public boolean isEdgesSameAsInside() { - return this.edgesSameAsInside; - } - - @Override - public void setEdgesSameAsInside(boolean newState) { - this.edgesSameAsInside = newState; - } - - @Override - public boolean isInsideSameAsOutside() { - return this.insideSameAsOutside; - } - - @Override - public void setInsideSameAsOutside(boolean newState) { - this.insideSameAsOutside = newState; + public InsideColorComponentHandler getInsideColorComponentHandler() { + return this.insideColorComponentHandler; } }