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

Fix/improve import warnings

Browse Source
This commit is contained in:
SiboVG 2023-03-15 22:53:07 +01:00
parent 30088ab5a0
commit e3c34f197a
6 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/file/rasaero/importt/BodyTubeHandler.java
View File

@ -44,7 +44,13 @@ public class BodyTubeHandler extends BaseHandler<BodyTube> {
if (RASAeroCommonConstants.FIN.equals(element)) { if (RASAeroCommonConstants.FIN.equals(element)) {
return new FinHandler(this.bodyTube, warnings); return new FinHandler(this.bodyTube, warnings);
} }
return PlainTextHandler.INSTANCE; if (RASAeroCommonConstants.LENGTH.equals(element) || RASAeroCommonConstants.DIAMETER.equals(element) ||
RASAeroCommonConstants.LAUNCH_LUG_DIAMETER.equals(element) || RASAeroCommonConstants.LAUNCH_LUG_LENGTH.equals(element) ||
RASAeroCommonConstants.RAIL_GUIDE_DIAMETER.equals(element) || RASAeroCommonConstants.RAIL_GUIDE_HEIGHT.equals(element) ||
RASAeroCommonConstants.LOCATION.equals(element) || RASAeroCommonConstants.COLOR.equals(element)) {
return PlainTextHandler.INSTANCE;
}
return null;
} }
@Override @Override

2
core/src/net/sf/openrocket/file/rasaero/importt/LaunchSiteHandler.java
View File

@ -28,7 +28,7 @@ public class LaunchSiteHandler extends AbstractElementHandler {
|| RASAeroCommonConstants.LAUNCH_TEMPERATURE.equals(element) || RASAeroCommonConstants.LAUNCH_WIND_SPEED.equals(element)) { || RASAeroCommonConstants.LAUNCH_TEMPERATURE.equals(element) || RASAeroCommonConstants.LAUNCH_WIND_SPEED.equals(element)) {
return PlainTextHandler.INSTANCE; return PlainTextHandler.INSTANCE;
} }
warnings.add("Unknown element " + element + ", ignoring."); warnings.add("Unknown element " + element + " for launch site, ignoring.");
return null; return null;
} }

1
core/src/net/sf/openrocket/file/rasaero/importt/RASAeroCommonConstants.java
View File

@ -20,6 +20,7 @@ public class RASAeroCommonConstants {
public static final String FILE_VERSION = "FileVersion"; public static final String FILE_VERSION = "FileVersion";
public static final String ROCKET_DESIGN = "RocketDesign"; public static final String ROCKET_DESIGN = "RocketDesign";
public static final String PART_TYPE = "PartType";
public static final String LENGTH = "Length"; public static final String LENGTH = "Length";
public static final String DIAMETER = "Diameter"; public static final String DIAMETER = "Diameter";
public static final String LOCATION = "Location"; public static final String LOCATION = "Location";

3
core/src/net/sf/openrocket/file/rasaero/importt/RASAeroHandler.java
View File

@ -48,7 +48,7 @@ public class RASAeroHandler extends AbstractElementHandler {
public ElementHandler openElement(String element, HashMap<String, String> attributes, WarningSet warnings) throws SAXException { public ElementHandler openElement(String element, HashMap<String, String> attributes, WarningSet warnings) throws SAXException {
// Check for unknown elements // Check for unknown elements
if (!RASAeroCommonConstants.RASAERO_DOCUMENT.equals(element)) { if (!RASAeroCommonConstants.RASAERO_DOCUMENT.equals(element)) {
warnings.add("Unknown element " + element + ", ignoring."); warnings.add("Unknown element " + element + " in RASAeroDocument, ignoring.");
return null; return null;
} }
@ -192,6 +192,7 @@ public class RASAeroHandler extends AbstractElementHandler {
return PlainTextHandler.INSTANCE; return PlainTextHandler.INSTANCE;
} }
//warnings.add("Unknown element " + element + " in RocketDesign, ignoring.");
return null; return null;
} }

1
core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java
View File

@ -42,6 +42,7 @@ public class RecoveryHandler extends AbstractElementHandler {
public RecoveryHandler(Rocket rocket) { public RecoveryHandler(Rocket rocket) {
this.rocket = rocket; this.rocket = rocket;
} }
@Override @Override
public ElementHandler openElement(String element, HashMap<String, String> attributes, WarningSet warnings) throws SAXException { public ElementHandler openElement(String element, HashMap<String, String> attributes, WarningSet warnings) throws SAXException {
String[] elements = new String[] {RASAeroCommonConstants.RECOVERY_ALTITUDE, RASAeroCommonConstants.RECOVERY_DEVICE_TYPE, String[] elements = new String[] {RASAeroCommonConstants.RECOVERY_ALTITUDE, RASAeroCommonConstants.RECOVERY_DEVICE_TYPE,

2
core/test/net/sf/openrocket/file/rasaero/importt/RASAeroLoaderTest.java
View File

@ -201,6 +201,6 @@ public class RASAeroLoaderTest extends BaseTestCase {
} }
// TODO: this also includes all motor warnings, so change motor db in setUp() to include OR motors so the total // TODO: this also includes all motor warnings, so change motor db in setUp() to include OR motors so the total
// warning size decreases // warning size decreases
assertEquals(10, loader.getWarnings().size()); assertEquals(4, loader.getWarnings().size());
} }
} }