From 168f889446be53b3ddef130078b40f9a1c8211a4 Mon Sep 17 00:00:00 2001
From: Daniel_M_Williams <daniel.mcclintic.williams@gmail.com>
Date: Tue, 27 Oct 2015 10:24:15 -0400
Subject: [PATCH] fixed vector sort call to Java 1.7 conformant version

---
 .../sf/openrocket/rocketcomponent/ParameterSet.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/ParameterSet.java b/core/src/net/sf/openrocket/rocketcomponent/ParameterSet.java
index 01e04b488..b5c0fc206 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/ParameterSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/ParameterSet.java
@@ -1,5 +1,7 @@
 package net.sf.openrocket.rocketcomponent;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.EventObject;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -10,6 +12,7 @@ import java.util.Vector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.sf.openrocket.util.ArrayList;
 import net.sf.openrocket.util.StateChangeListener;
 import net.sf.openrocket.util.Utils;
 
@@ -124,10 +127,14 @@ public class ParameterSet<E extends FlightConfigurableParameter<E>> implements F
 
 	@Override
 	public List<FlightConfigurationID> getSortedConfigurationIDs(){
-		Vector<FlightConfigurationID> toReturn = new Vector<FlightConfigurationID>(); 
+		ArrayList<FlightConfigurationID> toReturn = new ArrayList<FlightConfigurationID>(); 
 		
 		toReturn.addAll( this.map.keySet() );
-		toReturn.sort( null );
+		// Java 1.8:
+		//toReturn.sort( null );
+		
+		// Java 1.7: 
+	    Collections.sort(toReturn);
 			
 		return toReturn;
 	}