From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 16 Feb 2012 19:24:12 +0000 (+0000)
Subject: When downloading burn files, prefer RockSim formatted files of RASP since they appear... 
X-Git-Tag: upstream/12.03~1^2~47
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=312a1e7a1039c9aecdeba0d01807f313426e0b0c;p=debian%2Fopenrocket

When downloading burn files, prefer RockSim formatted files of RASP since they appear to be better.  In particular there is a RASP file for the AeroTech G76 which contains the incorrect motor designation of G72.

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

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
index c075d53f..45326104 100644
--- a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
@@ -14,6 +14,11 @@ public class DownloadResponse {
 		MotorBurnFile currentData = data.get(mbd.getMotorId());
 		if ( currentData == null || currentData.getThrustCurveMotor() == null ) {
 			data.put(mbd.getMotorId(),mbd);
+		} else {
+			// Prefer RASP motors.
+			if ( "RockSim".equals(mbd.getFiletype()) && !"RockSim".equals(currentData.getFiletype()) ) {
+				data.put(mbd.getMotorId(), mbd);
+			}
 		}
 	}