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

Refactor string utils to common class

Browse Source
This commit is contained in:
SiboVG 2023-03-06 19:55:35 +01:00
parent ccdd54f64a
commit 80e33ba01b
17 changed files with 84 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/file/openrocket/importt/SingleSimulationHandler.java
View File

@ -20,7 +20,7 @@ import net.sf.openrocket.simulation.extension.SimulationExtension;
import net.sf.openrocket.simulation.extension.SimulationExtensionProvider; import net.sf.openrocket.simulation.extension.SimulationExtensionProvider;
import net.sf.openrocket.simulation.extension.impl.JavaCode; import net.sf.openrocket.simulation.extension.impl.JavaCode;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
import com.google.inject.Key; import com.google.inject.Key;
@ -85,7 +85,7 @@ class SingleSimulationHandler extends AbstractElementHandler {
} }
} else if (element.equals("listener") && content.trim().length() > 0) { } else if (element.equals("listener") && content.trim().length() > 0) {
extensions.add(compatibilityExtension(content.trim())); extensions.add(compatibilityExtension(content.trim()));
} else if (element.equals("extension") && !StringUtil.isEmpty(attributes.get("extensionid"))) { } else if (element.equals("extension") && !StringUtils.isEmpty(attributes.get("extensionid"))) {
String id = attributes.get("extensionid"); String id = attributes.get("extensionid");
SimulationExtension extension = null; SimulationExtension extension = null;
Set<SimulationExtensionProvider> extensionProviders = Application.getInjector().getInstance(new Key<Set<SimulationExtensionProvider>>() { Set<SimulationExtensionProvider> extensionProviders = Application.getInjector().getInstance(new Key<Set<SimulationExtensionProvider>>() {

4
core/src/net/sf/openrocket/preset/loader/DoubleUnitColumnParser.java
View File

@ -4,7 +4,7 @@ import net.sf.openrocket.preset.TypedKey;
import net.sf.openrocket.preset.TypedPropertyMap; import net.sf.openrocket.preset.TypedPropertyMap;
import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
public class DoubleUnitColumnParser extends BaseUnitColumnParser { public class DoubleUnitColumnParser extends BaseUnitColumnParser {
@ -19,7 +19,7 @@ public class DoubleUnitColumnParser extends BaseUnitColumnParser {
@Override @Override
protected void doParse(String columnData, String[] data, TypedPropertyMap props) { protected void doParse(String columnData, String[] data, TypedPropertyMap props) {
try { try {
if (StringUtil.isEmpty(columnData)) { if (StringUtils.isEmpty(columnData)) {
return; return;
} }
double value = Double.valueOf(columnData); double value = Double.valueOf(columnData);

4
core/src/net/sf/openrocket/preset/loader/LineMaterialColumnParser.java
View File

@ -4,7 +4,7 @@ import net.sf.openrocket.database.Databases;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.preset.TypedKey; import net.sf.openrocket.preset.TypedKey;
import net.sf.openrocket.preset.TypedPropertyMap; import net.sf.openrocket.preset.TypedPropertyMap;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
public class LineMaterialColumnParser extends BaseColumnParser { public class LineMaterialColumnParser extends BaseColumnParser {
@ -22,7 +22,7 @@ public class LineMaterialColumnParser extends BaseColumnParser {
@Override @Override
protected void doParse(String columnData, String[] data, TypedPropertyMap props) { protected void doParse(String columnData, String[] data, TypedPropertyMap props) {
if (StringUtil.isEmpty(columnData)) { if (StringUtils.isEmpty(columnData)) {
return; return;
} }

4
core/src/net/sf/openrocket/preset/loader/MassColumnParser.java
View File

@ -2,7 +2,7 @@ package net.sf.openrocket.preset.loader;
import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.TypedPropertyMap; import net.sf.openrocket.preset.TypedPropertyMap;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
/** /**
* Special DoubleUnitColumnParser for Mass column. Here we assume that if a mass of 0 is * Special DoubleUnitColumnParser for Mass column. Here we assume that if a mass of 0 is
@ -18,7 +18,7 @@ public class MassColumnParser extends DoubleUnitColumnParser {
@Override @Override
protected void doParse(String columnData, String[] data, TypedPropertyMap props) { protected void doParse(String columnData, String[] data, TypedPropertyMap props) {
if ( StringUtil.isEmpty(columnData) || "?".equals(columnData.trim())) { if ( StringUtils.isEmpty(columnData) || "?".equals(columnData.trim())) {
return; return;
} }
double d = Double.valueOf(columnData); double d = Double.valueOf(columnData);

4
core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java
View File

@ -5,7 +5,7 @@ import net.sf.openrocket.material.Material;
import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.TypedKey; import net.sf.openrocket.preset.TypedKey;
import net.sf.openrocket.preset.TypedPropertyMap; import net.sf.openrocket.preset.TypedPropertyMap;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
public class MaterialColumnParser extends BaseColumnParser { public class MaterialColumnParser extends BaseColumnParser {
@ -27,7 +27,7 @@ public class MaterialColumnParser extends BaseColumnParser {
@Override @Override
protected void doParse(String columnData, String[] data, TypedPropertyMap props) { protected void doParse(String columnData, String[] data, TypedPropertyMap props) {
if (StringUtil.isEmpty(columnData)) { if (StringUtils.isEmpty(columnData)) {
return; return;
} }

4
core/src/net/sf/openrocket/preset/loader/RockSimComponentFileLoader.java
View File

@ -18,7 +18,7 @@ import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.ArrayList;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
import com.opencsv.CSVReader; import com.opencsv.CSVReader;
/** /**
@ -138,7 +138,7 @@ public abstract class RockSimComponentFileLoader {
if (data.length == 0) { if (data.length == 0) {
continue; continue;
} }
if (data.length == 1 && StringUtil.isEmpty(data[0])) { if (data.length == 1 && StringUtils.isEmpty(data[0])) {
continue; continue;
} }
parseData(data); parseData(data);

4
core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
View File

@ -4,7 +4,7 @@ import net.sf.openrocket.database.Databases;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.preset.TypedKey; import net.sf.openrocket.preset.TypedKey;
import net.sf.openrocket.preset.TypedPropertyMap; import net.sf.openrocket.preset.TypedPropertyMap;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
public class SurfaceMaterialColumnParser extends BaseColumnParser { public class SurfaceMaterialColumnParser extends BaseColumnParser {
@ -22,7 +22,7 @@ public class SurfaceMaterialColumnParser extends BaseColumnParser {
@Override @Override
protected void doParse(String columnData, String[] data, TypedPropertyMap props) { protected void doParse(String columnData, String[] data, TypedPropertyMap props) {
if (StringUtil.isEmpty(columnData)) { if (StringUtils.isEmpty(columnData)) {
return; return;
} }

4
core/src/net/sf/openrocket/simulation/FlightDataType.java
View File

@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
/** /**
* A class defining a storable simulation variable type. This class defined numerous ready * A class defining a storable simulation variable type. This class defined numerous ready
@ -272,7 +272,7 @@ public class FlightDataType implements Comparable<FlightDataType> {
// found it from symbol // found it from symbol
// if name was not given (empty string), can use the one we found // if name was not given (empty string), can use the one we found
if ( s == null || StringUtil.isEmpty(s)){ if ( s == null || StringUtils.isEmpty(s)){
s = type.getName(); s = type.getName();
} }
if ( u == null ){ if ( u == null ){

8
core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
View File

@ -11,7 +11,7 @@ import net.sf.openrocket.simulation.SimulationStatus;
import net.sf.openrocket.unit.FixedUnitGroup; import net.sf.openrocket.unit.FixedUnitGroup;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.ArrayList;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -227,7 +227,7 @@ public class CustomExpression implements Cloneable {
} }
public boolean checkSymbol() { public boolean checkSymbol() {
if (StringUtil.isEmpty(symbol)) { if (StringUtils.isEmpty(symbol)) {
return false; return false;
} }
@ -254,7 +254,7 @@ public class CustomExpression implements Cloneable {
} }
public boolean checkName() { public boolean checkName() {
if (StringUtil.isEmpty(name)) { if (StringUtils.isEmpty(name)) {
return false; return false;
} }
@ -304,7 +304,7 @@ public class CustomExpression implements Cloneable {
* building the expression. * building the expression.
*/ */
public boolean checkExpression() { public boolean checkExpression() {
if (StringUtil.isEmpty(expression)) { if (StringUtils.isEmpty(expression)) {
return false; return false;
} }

7
core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java
View File

@ -14,13 +14,12 @@ import de.congrace.exp4j.ExpressionBuilder;
import de.congrace.exp4j.Variable; import de.congrace.exp4j.Variable;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.logging.Markers; import net.sf.openrocket.logging.Markers;
import net.sf.openrocket.simulation.customexpression.CustomExpression;
import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.FlightDataType;
import net.sf.openrocket.simulation.SimulationStatus; import net.sf.openrocket.simulation.SimulationStatus;
import net.sf.openrocket.util.ArrayUtils; import net.sf.openrocket.util.ArrayUtils;
import net.sf.openrocket.util.LinearInterpolator; import net.sf.openrocket.util.LinearInterpolator;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
public class RangeExpression extends CustomExpression { public class RangeExpression extends CustomExpression {
private static final Logger log = LoggerFactory.getLogger(RangeExpression.class); private static final Logger log = LoggerFactory.getLogger(RangeExpression.class);
@ -30,10 +29,10 @@ public class RangeExpression extends CustomExpression {
public RangeExpression(OpenRocketDocument doc, String startTime, String endTime, String variableType) { public RangeExpression(OpenRocketDocument doc, String startTime, String endTime, String variableType) {
super(doc); super(doc);
if (StringUtil.isEmpty(startTime)){ if (StringUtils.isEmpty(startTime)){
startTime = "0"; startTime = "0";
} }
if (StringUtil.isEmpty(endTime)){ if (StringUtils.isEmpty(endTime)){
endTime = "t"; endTime = "t";
} }

6
core/src/net/sf/openrocket/simulation/extension/impl/JavaCode.java
View File

@ -5,7 +5,7 @@ import net.sf.openrocket.simulation.SimulationConditions;
import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.exception.SimulationException;
import net.sf.openrocket.simulation.extension.AbstractSimulationExtension; import net.sf.openrocket.simulation.extension.AbstractSimulationExtension;
import net.sf.openrocket.simulation.listeners.SimulationListener; import net.sf.openrocket.simulation.listeners.SimulationListener;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Injector; import com.google.inject.Injector;
@ -19,7 +19,7 @@ public class JavaCode extends AbstractSimulationExtension {
public void initialize(SimulationConditions conditions) throws SimulationException { public void initialize(SimulationConditions conditions) throws SimulationException {
String className = getClassName(); String className = getClassName();
try { try {
if (!StringUtil.isEmpty(className)) { if (!StringUtils.isEmpty(className)) {
Class<?> clazz = Class.forName(className); Class<?> clazz = Class.forName(className);
if (!SimulationListener.class.isAssignableFrom(clazz)) { if (!SimulationListener.class.isAssignableFrom(clazz)) {
throw new SimulationException("Class " + className + " does not implement SimulationListener"); throw new SimulationException("Class " + className + " does not implement SimulationListener");
@ -40,7 +40,7 @@ public class JavaCode extends AbstractSimulationExtension {
public String getName() { public String getName() {
String name = trans.get("SimulationExtension.javacode.name") + ": "; String name = trans.get("SimulationExtension.javacode.name") + ": ";
String className = getClassName(); String className = getClassName();
if (!StringUtil.isEmpty(className)) { if (!StringUtils.isEmpty(className)) {
name = name + className; name = name + className;
} else { } else {
name = name + trans.get("SimulationExtension.javacode.name.none"); name = name + trans.get("SimulationExtension.javacode.name.none");

4
core/src/net/sf/openrocket/unit/UnitGroup.java
View File

@ -18,7 +18,7 @@ import java.util.regex.Pattern;
import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.FlightConfiguration;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtils;
/** /**
@ -672,7 +672,7 @@ public class UnitGroup {
throw new NumberFormatException("string did not match required pattern"); throw new NumberFormatException("string did not match required pattern");
} }
double value = StringUtil.convertToDouble(matcher.group(1)); double value = StringUtils.convertToDouble(matcher.group(1));
String unit = matcher.group(2).trim(); String unit = matcher.group(2).trim();
if (unit.equals("")) { if (unit.equals("")) {

29
core/src/net/sf/openrocket/util/StringUtil.java → core/src/net/sf/openrocket/util/StringUtils.java
View File

@ -1,6 +1,33 @@
package net.sf.openrocket.util; package net.sf.openrocket.util;
public class StringUtil { import java.util.List;
public class StringUtils {
public static String join(String sep, Object[] values) {
if ( values == null || values.length == 0 ) {
return "";
}
StringBuilder value = new StringBuilder();
for( Object v : values ) {
if( value.length() > 0 ) {
value.append(sep);
}
value.append(String.valueOf(v));
}
return value.toString();
}
/**
* Join starting with a list of strings rather than an array
* @param sep separator
* @param listValues list of values
* @return joined string
*/
public static String join(String sep, List<String> listValues) {
String[] values = listValues.toArray(new String[0]);
return join(sep, values);
}
/** /**
* Returns true if the argument is null or empty. * Returns true if the argument is null or empty.

52
core/test/net/sf/openrocket/util/StringUtilTest.java
View File

@ -8,40 +8,40 @@ import static org.junit.Assert.assertEquals;
/** /**
* A class that tests * A class that tests
* {@link net.sf.openrocket.util.StringUtil}. * {@link StringUtils}.
*/ */
public class StringUtilTest { public class StringUtilTest {
@Test @Test
public void testStrings() { public void testStrings() {
assertTrue(StringUtil.isEmpty("")); assertTrue(StringUtils.isEmpty(""));
assertTrue(StringUtil.isEmpty(new StringBuilder().toString())); // "" assertTrue(StringUtils.isEmpty(new StringBuilder().toString())); // ""
assertTrue(StringUtil.isEmpty(" ")); assertTrue(StringUtils.isEmpty(" "));
assertTrue(StringUtil.isEmpty(" ")); assertTrue(StringUtils.isEmpty(" "));
assertTrue(StringUtil.isEmpty(" ")); assertTrue(StringUtils.isEmpty(" "));
assertTrue(StringUtil.isEmpty(null)); assertTrue(StringUtils.isEmpty(null));
assertFalse(StringUtil.isEmpty("A")); assertFalse(StringUtils.isEmpty("A"));
assertFalse(StringUtil.isEmpty(" . ")); assertFalse(StringUtils.isEmpty(" . "));
} }
@Test @Test
public void testConvertToDouble() { public void testConvertToDouble() {
assertEquals(0.2, StringUtil.convertToDouble(".2"), MathUtil.EPSILON); assertEquals(0.2, StringUtils.convertToDouble(".2"), MathUtil.EPSILON);
assertEquals(0.2, StringUtil.convertToDouble(",2"), MathUtil.EPSILON); assertEquals(0.2, StringUtils.convertToDouble(",2"), MathUtil.EPSILON);
assertEquals(1, StringUtil.convertToDouble("1,"), MathUtil.EPSILON); assertEquals(1, StringUtils.convertToDouble("1,"), MathUtil.EPSILON);
assertEquals(2, StringUtil.convertToDouble("2."), MathUtil.EPSILON); assertEquals(2, StringUtils.convertToDouble("2."), MathUtil.EPSILON);
assertEquals(1, StringUtil.convertToDouble("1"), MathUtil.EPSILON); assertEquals(1, StringUtils.convertToDouble("1"), MathUtil.EPSILON);
assertEquals(1.52, StringUtil.convertToDouble("1.52"), MathUtil.EPSILON); assertEquals(1.52, StringUtils.convertToDouble("1.52"), MathUtil.EPSILON);
assertEquals(1.52, StringUtil.convertToDouble("1,52"), MathUtil.EPSILON); assertEquals(1.52, StringUtils.convertToDouble("1,52"), MathUtil.EPSILON);
assertEquals(1.5, StringUtil.convertToDouble("1.500"), MathUtil.EPSILON); assertEquals(1.5, StringUtils.convertToDouble("1.500"), MathUtil.EPSILON);
assertEquals(1.5, StringUtil.convertToDouble("1,500"), MathUtil.EPSILON); assertEquals(1.5, StringUtils.convertToDouble("1,500"), MathUtil.EPSILON);
assertEquals(1500.61, StringUtil.convertToDouble("1.500,61"), MathUtil.EPSILON); assertEquals(1500.61, StringUtils.convertToDouble("1.500,61"), MathUtil.EPSILON);
assertEquals(1500.61, StringUtil.convertToDouble("1,500.61"), MathUtil.EPSILON); assertEquals(1500.61, StringUtils.convertToDouble("1,500.61"), MathUtil.EPSILON);
assertEquals(1500.2, StringUtil.convertToDouble("1,500,200"), MathUtil.EPSILON); assertEquals(1500.2, StringUtils.convertToDouble("1,500,200"), MathUtil.EPSILON);
assertEquals(1500.2, StringUtil.convertToDouble("1.500.200"), MathUtil.EPSILON); assertEquals(1500.2, StringUtils.convertToDouble("1.500.200"), MathUtil.EPSILON);
assertEquals(1500200.23, StringUtil.convertToDouble("1500200.23"), MathUtil.EPSILON); assertEquals(1500200.23, StringUtils.convertToDouble("1500200.23"), MathUtil.EPSILON);
assertEquals(1500200.23, StringUtil.convertToDouble("1500200,23"), MathUtil.EPSILON); assertEquals(1500200.23, StringUtils.convertToDouble("1500200,23"), MathUtil.EPSILON);
assertEquals(1500200.23, StringUtil.convertToDouble("1,500,200.23"), MathUtil.EPSILON); assertEquals(1500200.23, StringUtils.convertToDouble("1,500,200.23"), MathUtil.EPSILON);
assertEquals(1500200.23, StringUtil.convertToDouble("1.500.200,23"), MathUtil.EPSILON); assertEquals(1500200.23, StringUtils.convertToDouble("1.500.200,23"), MathUtil.EPSILON);
} }
} }

2
swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java
View File

@ -10,7 +10,7 @@ import java.util.HashMap;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JTable; import javax.swing.JTable;
import net.sf.openrocket.utils.StringUtils; import net.sf.openrocket.util.StringUtils;
import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.text.StringEscapeUtils;
import net.sf.openrocket.aerodynamics.Warning; import net.sf.openrocket.aerodynamics.Warning;

2
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
View File

@ -16,6 +16,7 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea; import javax.swing.JTextArea;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import net.sf.openrocket.util.StringUtils;
import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartFactory;
import org.jfree.chart.ChartPanel; import org.jfree.chart.ChartPanel;
import org.jfree.chart.JFreeChart; import org.jfree.chart.JFreeChart;
@ -33,7 +34,6 @@ import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.motor.ThrustCurveMotor;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.utils.StringUtils;
@SuppressWarnings("serial") @SuppressWarnings("serial")
class MotorInformationPanel extends JPanel { class MotorInformationPanel extends JPanel {

33
swing/src/net/sf/openrocket/utils/StringUtils.java
View File

@ -1,33 +0,0 @@
package net.sf.openrocket.utils;
import java.util.List;
public class StringUtils {
public static String join(String sep, Object[] values) {
if ( values == null || values.length == 0 ) {
return "";
}
StringBuilder value = new StringBuilder();
for( Object v : values ) {
if( value.length() > 0 ) {
value.append(sep);
}
value.append(String.valueOf(v));
}
return value.toString();
}
/**
* Join starting with a list of strings rather than an array
* @param sep
* @param listValues
* @return
*/
public static String join(String sep, List<String> listValues) {
String[] values = listValues.toArray(new String[listValues.size()]);
return join(sep, values);
}
}