hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed vector sort call to Java 1.7 conformant version

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-10-27 10:24:15 -04:00
parent 5e0c866481
commit 168f889446
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/rocketcomponent/ParameterSet.java
View File

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