From d45b68a78e4783bf04c8985402eb03439d0f9a80 Mon Sep 17 00:00:00 2001 From: batwings Date: Wed, 24 Oct 2012 13:42:09 -0500 Subject: [PATCH] Change name of class SupportsFlightConfiguration to FlightConfigurable. --- .../net/sf/openrocket/rocketcomponent/BaseMotorMount.java | 2 +- ...ortsFlightConfiguration.java => FlightConfigurable.java} | 2 +- core/src/net/sf/openrocket/rocketcomponent/MotorMount.java | 2 +- .../net/sf/openrocket/rocketcomponent/RecoveryDevice.java | 2 +- .../rocketvisitors/CopyFlightConfigurationVisitor.java | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename core/src/net/sf/openrocket/rocketcomponent/{SupportsFlightConfiguration.java => FlightConfigurable.java} (87%) diff --git a/core/src/net/sf/openrocket/rocketcomponent/BaseMotorMount.java b/core/src/net/sf/openrocket/rocketcomponent/BaseMotorMount.java index dc600cb4d..481016ee3 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/BaseMotorMount.java +++ b/core/src/net/sf/openrocket/rocketcomponent/BaseMotorMount.java @@ -4,7 +4,7 @@ import java.util.HashMap; import net.sf.openrocket.motor.Motor; -class BaseMotorMount implements SupportsFlightConfiguration, Cloneable { +class BaseMotorMount implements FlightConfigurable, Cloneable { private HashMap motors = new HashMap(); private MotorConfiguration defaultConfiguration = MotorConfiguration.makeDefaultMotorConfiguration(); diff --git a/core/src/net/sf/openrocket/rocketcomponent/SupportsFlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurable.java similarity index 87% rename from core/src/net/sf/openrocket/rocketcomponent/SupportsFlightConfiguration.java rename to core/src/net/sf/openrocket/rocketcomponent/FlightConfigurable.java index 104556291..b2df915da 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/SupportsFlightConfiguration.java +++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurable.java @@ -1,6 +1,6 @@ package net.sf.openrocket.rocketcomponent; -public interface SupportsFlightConfiguration { +public interface FlightConfigurable { public T getFlightConfiguration( String configId ); diff --git a/core/src/net/sf/openrocket/rocketcomponent/MotorMount.java b/core/src/net/sf/openrocket/rocketcomponent/MotorMount.java index 828243267..862ab1859 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/MotorMount.java +++ b/core/src/net/sf/openrocket/rocketcomponent/MotorMount.java @@ -4,7 +4,7 @@ import net.sf.openrocket.motor.Motor; import net.sf.openrocket.util.ChangeSource; import net.sf.openrocket.util.Coordinate; -public interface MotorMount extends ChangeSource, SupportsFlightConfiguration { +public interface MotorMount extends ChangeSource, FlightConfigurable { /** * Is the component currently a motor mount. diff --git a/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java b/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java index fda5e504b..b225e5aa1 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java @@ -23,7 +23,7 @@ import net.sf.openrocket.util.MathUtil; * * @author Sampo Niskanen */ -public abstract class RecoveryDevice extends MassObject implements SupportsFlightConfiguration { +public abstract class RecoveryDevice extends MassObject implements FlightConfigurable { private static final Translator trans = Application.getTranslator(); private Map deploymentConfigurations = new HashMap(); diff --git a/core/src/net/sf/openrocket/rocketvisitors/CopyFlightConfigurationVisitor.java b/core/src/net/sf/openrocket/rocketvisitors/CopyFlightConfigurationVisitor.java index 5f56dc5a3..1f0313c59 100644 --- a/core/src/net/sf/openrocket/rocketvisitors/CopyFlightConfigurationVisitor.java +++ b/core/src/net/sf/openrocket/rocketvisitors/CopyFlightConfigurationVisitor.java @@ -1,7 +1,7 @@ package net.sf.openrocket.rocketvisitors; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.rocketcomponent.SupportsFlightConfiguration; +import net.sf.openrocket.rocketcomponent.FlightConfigurable; public class CopyFlightConfigurationVisitor extends DepthFirstRecusiveVisitor { @@ -17,8 +17,8 @@ public class CopyFlightConfigurationVisitor extends DepthFirstRecusiveVisitor { @Override public void doAction(RocketComponent visitable) { - if ( visitable instanceof SupportsFlightConfiguration ) { - ((SupportsFlightConfiguration)visitable).cloneFlightConfiguration(oldConfigId, newConfigId); + if ( visitable instanceof FlightConfigurable ) { + ((FlightConfigurable)visitable).cloneFlightConfiguration(oldConfigId, newConfigId); } }