From: plaa Date: Sun, 4 Sep 2011 17:54:10 +0000 (+0000) Subject: renamed private method X-Git-Tag: upstream/1.1.9^2~15 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=90d06d455ef16eb3ea48c5c7a5fba4bc1e30e61f;p=debian%2Fopenrocket renamed private method git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@169 180e2498-e6e9-4542-8430-84ac67f01cd8 --- diff --git a/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java b/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java index dac1c83d..be139e14 100644 --- a/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java +++ b/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java @@ -58,7 +58,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { public Coordinate getCP(Configuration configuration, FlightConditions conditions, WarningSet warnings) { checkCache(configuration); - AerodynamicForces forces = getNonAxial(configuration, conditions, null, warnings); + AerodynamicForces forces = calculateNonAxialForces(configuration, conditions, null, warnings); return forces.getCP(); } @@ -83,7 +83,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { // Calculate non-axial force data - AerodynamicForces total = getNonAxial(configuration, conditions, map, warnings); + AerodynamicForces total = calculateNonAxialForces(configuration, conditions, map, warnings); // Calculate friction data @@ -124,7 +124,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { warnings = ignoreWarningSet; // Calculate non-axial force data - AerodynamicForces total = getNonAxial(configuration, conditions, null, warnings); + AerodynamicForces total = calculateNonAxialForces(configuration, conditions, null, warnings); // Calculate friction data total.setFrictionCD(calculateFrictionDrag(configuration, conditions, null, warnings)); @@ -150,7 +150,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { /* * Perform the actual CP calculation. */ - private AerodynamicForces getNonAxial(Configuration configuration, FlightConditions conditions, + private AerodynamicForces calculateNonAxialForces(Configuration configuration, FlightConditions conditions, Map map, WarningSet warnings) { checkCache(configuration);