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

Clean up FIXME - adding more information to the warning message.

Browse Source
This commit is contained in:
Kevin Ruland 2012-08-23 02:20:21 +00:00
parent e366b40008
commit d72a6099cf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
View File

@ -2087,27 +2087,26 @@ public ComponentPresetSetter(Reflection.Method set) {
@Override @Override
public void set(RocketComponent c, String name, HashMap<String, String> attributes, public void set(RocketComponent c, String name, HashMap<String, String> attributes,
WarningSet warnings) { WarningSet warnings) {
// FIXME - probably need more data in the warning messages - like what component preset...
String manufacturerName = attributes.get("manufacturer"); String manufacturerName = attributes.get("manufacturer");
if ( manufacturerName == null ) { if ( manufacturerName == null ) {
warnings.add(Warning.fromString("Invalid ComponentPreset, no manufacturer specified. Ignored")); warnings.add(Warning.fromString("Invalid ComponentPreset for component " + c.getName() + ", no manufacturer specified. Ignored"));
return; return;
} }
String productNo = attributes.get("partno"); String productNo = attributes.get("partno");
if ( productNo == null ) { if ( productNo == null ) {
warnings.add(Warning.fromString("Invalid ComponentPreset, no partno specified. Ignored")); warnings.add(Warning.fromString("Invalid ComponentPreset for component " + c.getName() + ", no partno specified. Ignored"));
return; return;
} }
String digest = attributes.get("digest"); String digest = attributes.get("digest");
if ( digest == null ) { if ( digest == null ) {
warnings.add(Warning.fromString("Invalid ComponentPreset, no digest specified.")); warnings.add(Warning.fromString("Invalid ComponentPreset for component " + c.getName() + ", no digest specified."));
} }
String type = attributes.get("type"); String type = attributes.get("type");
if ( type == null ) { if ( type == null ) {
warnings.add(Warning.fromString("Invalid ComponentPreset, no type specified.")); warnings.add(Warning.fromString("Invalid ComponentPreset for component " + c.getName() + ", no type specified."));
} }
List<ComponentPreset> presets = Application.getComponentPresetDao().find( manufacturerName, productNo ); List<ComponentPreset> presets = Application.getComponentPresetDao().find( manufacturerName, productNo );
@ -2128,12 +2127,12 @@ public void set(RocketComponent c, String name, HashMap<String, String> attribut
// Was any found? // Was any found?
if ( matchingPreset == null ) { if ( matchingPreset == null ) {
warnings.add(Warning.fromString("No matching ComponentPreset found " + manufacturerName + " " + productNo)); warnings.add(Warning.fromString("No matching ComponentPreset for component " + c.getName() + " found matching " + manufacturerName + " " + productNo));
return; return;
} }
if ( digest != null && !matchingPreset.getDigest().equals(digest) ) { if ( digest != null && !matchingPreset.getDigest().equals(digest) ) {
warnings.add(Warning.fromString("ComponentPreset has wrong digest")); warnings.add(Warning.fromString("ComponentPreset for component " + c.getName() + " has wrong digest"));
} }
setMethod.invoke(c, matchingPreset); setMethod.invoke(c, matchingPreset);