From 03d9a295a5d4a0a09548d1d6b924505439fe6997 Mon Sep 17 00:00:00 2001 From: Doug Pedrick Date: Thu, 20 Sep 2012 20:03:33 +0000 Subject: [PATCH] Fix compilation errors. --- .../preset/loader/MaterialColumnParser.java | 22 +++++++++---------- .../loader/RocksimComponentFileLoader.java | 2 +- .../loader/SurfaceMaterialColumnParser.java | 20 ++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java b/core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java index 1f6817560..f8e274d2e 100644 --- a/core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java +++ b/core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java @@ -8,33 +8,33 @@ import net.sf.openrocket.preset.TypedPropertyMap; import net.sf.openrocket.util.StringUtil; public class MaterialColumnParser extends BaseColumnParser { - + private final MaterialHolder materialMap; - + private final TypedKey param; - + public MaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey param) { super(columnName); this.param = param; this.materialMap = materialMap; } - + public MaterialColumnParser(MaterialHolder materialMap) { this(materialMap, "Material", ComponentPreset.MATERIAL); } - - + + @Override protected void doParse(String columnData, String[] data, TypedPropertyMap props) { - - if (StringUtil.isEmpty(columnData) { + + if (StringUtil.isEmpty(columnData)) { return; } - + Material.Bulk tmpMaterial = (Material.Bulk) Databases.findMaterial(Material.Type.BULK, columnData, 0.0); Material.Bulk m = materialMap.getBulkMaterial(tmpMaterial); props.put(param, m != null ? m : tmpMaterial); - + } - + } diff --git a/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java b/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java index 2317b66f4..e559127a0 100644 --- a/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java +++ b/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java @@ -126,7 +126,7 @@ public abstract class RocksimComponentFileLoader { if (data.length == 0) { continue; } - if (data.length == 1 && StringUtil.isEmpty(data[0]) { + if (data.length == 1 && StringUtil.isEmpty(data[0])) { continue; } parseData(data); diff --git a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java index fbb319474..690d6f455 100644 --- a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java +++ b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java @@ -7,29 +7,29 @@ import net.sf.openrocket.preset.TypedPropertyMap; import net.sf.openrocket.util.StringUtil; public class SurfaceMaterialColumnParser extends BaseColumnParser { - + private final MaterialHolder materialMap; - + private final TypedKey param; - + public SurfaceMaterialColumnParser(MaterialHolder materialMap, String columnName, TypedKey param) { super(columnName); this.param = param; this.materialMap = materialMap; } - - + + @Override protected void doParse(String columnData, String[] data, TypedPropertyMap props) { - - if (StringUtil.isEmpty(columnData) { + + if (StringUtil.isEmpty(columnData)) { return; } - + Material.Surface myMaterial = (Material.Surface) Databases.findMaterial(Material.Type.SURFACE, columnData, 0.0); Material.Surface m = materialMap.getSurfaceMaterial(myMaterial, null); props.put(param, m != null ? m : myMaterial); - + } - + }