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

Fix compilation errors.

Browse Source
This commit is contained in:
Doug Pedrick 2012-09-20 20:03:33 +00:00
parent e099a6264a
commit 03d9a295a5
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,33 +8,33 @@ import net.sf.openrocket.preset.TypedPropertyMap;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtil;
public class MaterialColumnParser extends BaseColumnParser { public class MaterialColumnParser extends BaseColumnParser {
private final MaterialHolder materialMap; private final MaterialHolder materialMap;
private final TypedKey<Material> param; private final TypedKey<Material> param;
public MaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey<Material> param) { public MaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey<Material> param) {
super(columnName); super(columnName);
this.param = param; this.param = param;
this.materialMap = materialMap; this.materialMap = materialMap;
} }
public MaterialColumnParser(MaterialHolder materialMap) { public MaterialColumnParser(MaterialHolder materialMap) {
this(materialMap, "Material", ComponentPreset.MATERIAL); this(materialMap, "Material", ComponentPreset.MATERIAL);
} }
@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 (StringUtil.isEmpty(columnData)) {
return; return;
} }
Material.Bulk tmpMaterial = (Material.Bulk) Databases.findMaterial(Material.Type.BULK, columnData, 0.0); Material.Bulk tmpMaterial = (Material.Bulk) Databases.findMaterial(Material.Type.BULK, columnData, 0.0);
Material.Bulk m = materialMap.getBulkMaterial(tmpMaterial); Material.Bulk m = materialMap.getBulkMaterial(tmpMaterial);
props.put(param, m != null ? m : tmpMaterial); props.put(param, m != null ? m : tmpMaterial);
} }
} }

2
core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java
View File

@ -126,7 +126,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 && StringUtil.isEmpty(data[0])) {
continue; continue;
} }
parseData(data); parseData(data);

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

@ -7,29 +7,29 @@ import net.sf.openrocket.preset.TypedPropertyMap;
import net.sf.openrocket.util.StringUtil; import net.sf.openrocket.util.StringUtil;
public class SurfaceMaterialColumnParser extends BaseColumnParser { public class SurfaceMaterialColumnParser extends BaseColumnParser {
private final MaterialHolder materialMap; private final MaterialHolder materialMap;
private final TypedKey<Material> param; private final TypedKey<Material> param;
public SurfaceMaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey<Material> param) { public SurfaceMaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey<Material> param) {
super(columnName); super(columnName);
this.param = param; this.param = param;
this.materialMap = materialMap; this.materialMap = materialMap;
} }
@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 (StringUtil.isEmpty(columnData)) {
return; return;
} }
Material.Surface myMaterial = (Material.Surface) Databases.findMaterial(Material.Type.SURFACE, columnData, 0.0); Material.Surface myMaterial = (Material.Surface) Databases.findMaterial(Material.Type.SURFACE, columnData, 0.0);
Material.Surface m = materialMap.getSurfaceMaterial(myMaterial, null); Material.Surface m = materialMap.getSurfaceMaterial(myMaterial, null);
props.put(param, m != null ? m : myMaterial); props.put(param, m != null ? m : myMaterial);
} }
} }