diff options
| author | Justin Vreeland <vreeland.justin@gmail.com> | 2016-04-21 08:30:10 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2016-04-21 21:34:18 -0400 |
| commit | f10fbff6758dfcfbeeeb224f8ab02fa107aae5f6 (patch) | |
| tree | d090893b0ac03918ddc9e2c7765901a997c1f7f4 | |
| parent | c989237366ada094cdc817f50b7f58bbcf5b377a (diff) | |
Fix java class differing only by case
OSX and Windows cannot handle files with names differing only by
case. When these files are present in either there's a constant
unfixable change viewable in git status and git diff.
Since this code can be run and compiled on both platforms
names different only by case should be avoided.
Signed-off-by: Justin Vreeland <vreeland.justin@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altoslib/AltosEepromChunk.java | 2 | ||||
| -rw-r--r-- | altoslib/AltosEepromFile.java | 2 | ||||
| -rw-r--r-- | altoslib/AltosEepromTMini.java (renamed from altoslib/AltosEepromTm.java) | 10 | ||||
| -rw-r--r-- | altoslib/Makefile.am | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/altoslib/AltosEepromChunk.java b/altoslib/AltosEepromChunk.java index d20bcd0a..7a80e294 100644 --- a/altoslib/AltosEepromChunk.java +++ b/altoslib/AltosEepromChunk.java @@ -69,7 +69,7 @@ public class AltosEepromChunk { eeprom = new AltosEepromTM(this, offset); break; case AltosLib.AO_LOG_FORMAT_TINY: - eeprom = new AltosEepromTm(this, offset, state); + eeprom = new AltosEepromTMini(this, offset, state); break; case AltosLib.AO_LOG_FORMAT_TELEMETRY: case AltosLib.AO_LOG_FORMAT_TELESCIENCE: diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java index 6c75cb90..000bb1be 100644 --- a/altoslib/AltosEepromFile.java +++ b/altoslib/AltosEepromFile.java @@ -89,7 +89,7 @@ public class AltosEepromFile extends AltosStateIterable { body = new AltosEepromIterable(AltosEepromTM.read(input)); break; case AltosLib.AO_LOG_FORMAT_TINY: - body = new AltosEepromIterable(AltosEepromTm.read(input)); + body = new AltosEepromIterable(AltosEepromTMini.read(input)); break; case AltosLib.AO_LOG_FORMAT_TELEMETRY: case AltosLib.AO_LOG_FORMAT_TELESCIENCE: diff --git a/altoslib/AltosEepromTm.java b/altoslib/AltosEepromTMini.java index b11a594d..8f01c088 100644 --- a/altoslib/AltosEepromTm.java +++ b/altoslib/AltosEepromTMini.java @@ -21,7 +21,7 @@ import java.io.*; import java.util.*; import java.text.*; -public class AltosEepromTm extends AltosEeprom { +public class AltosEepromTMini extends AltosEeprom { public int i; public int a; public int b; @@ -58,7 +58,7 @@ public class AltosEepromTm extends AltosEeprom { } } - public AltosEepromTm (AltosEepromChunk chunk, int start, AltosState state) throws ParseException { + public AltosEepromTMini (AltosEepromChunk chunk, int start, AltosState state) throws ParseException { int value = chunk.data16(start); int i = (chunk.address + start) / record_length; @@ -100,7 +100,7 @@ public class AltosEepromTm extends AltosEeprom { } } - public AltosEepromTm (String line) { + public AltosEepromTMini (String line) { valid = false; tick = 0; a = 0; @@ -130,7 +130,7 @@ public class AltosEepromTm extends AltosEeprom { } } - public AltosEepromTm(int in_cmd, int in_tick, int in_a, int in_b) { + public AltosEepromTMini(int in_cmd, int in_tick, int in_a, int in_b) { valid = true; cmd = in_cmd; tick = in_tick; @@ -146,7 +146,7 @@ public class AltosEepromTm extends AltosEeprom { String line = AltosLib.gets(input); if (line == null) break; - AltosEepromTm tm = new AltosEepromTm(line); + AltosEepromTMini tm = new AltosEepromTMini(line); tms.add(tm); } catch (IOException ie) { break; diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am index d1f8f265..e5d8c964 100644 --- a/altoslib/Makefile.am +++ b/altoslib/Makefile.am @@ -39,7 +39,7 @@ altoslib_JAVA = \ AltosEepromDownload.java \ AltosEepromFile.java \ AltosEepromTM.java \ - AltosEepromTm.java \ + AltosEepromTMini.java \ AltosEepromHeader.java \ AltosEepromIterable.java \ AltosEepromList.java \ |