From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Fri, 13 Apr 2012 01:56:06 +0000 (+0000)
Subject: When loading from preset use the direct assignment for material instead of the setter... 
X-Git-Tag: upstream/12.09^2~367
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=03de3b3ac69710fefc45e20961ca093e5b38c5ff;p=debian%2Fopenrocket

When loading from preset use the direct assignment for material instead of the setter method.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@547 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
index 177fddc4..4377a8c3 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
@@ -113,7 +113,6 @@ public abstract class ExternalComponent extends RocketComponent {
 		material = mat;
 		clearPreset();
 		fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
-		clearPreset();
 	}
 
 	public Finish getFinish() {
@@ -137,7 +136,7 @@ public abstract class ExternalComponent extends RocketComponent {
 		if ( preset.has(ComponentPreset.MATERIAL ) ) {
 			Material mat = preset.get(ComponentPreset.MATERIAL);
 			if ( mat != null ) {
-				setMaterial(mat);
+				material = mat;
 			} /*
 			TODO - 
 			else if (c.isMassOverridden()) {