summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--altoslib/AltosEeprom.java (renamed from altoslib/AltosEepromNew.java)12
-rw-r--r--altoslib/AltosEepromDownload.java2
-rw-r--r--altoslib/AltosEepromRecord.java4
-rw-r--r--altoslib/AltosEepromRecordFireTwo.java4
-rw-r--r--altoslib/AltosEepromRecordFull.java4
-rw-r--r--altoslib/AltosEepromRecordGps.java4
-rw-r--r--altoslib/AltosEepromRecordMega.java4
-rw-r--r--altoslib/AltosEepromRecordMetrum.java4
-rw-r--r--altoslib/AltosEepromRecordMini.java4
-rw-r--r--altoslib/AltosEepromRecordSet.java6
-rw-r--r--altoslib/AltosEepromRecordTiny.java4
-rw-r--r--altoslib/Makefile.am2
12 files changed, 27 insertions, 27 deletions
diff --git a/altoslib/AltosEepromNew.java b/altoslib/AltosEeprom.java
index c373bff3..2600e802 100644
--- a/altoslib/AltosEepromNew.java
+++ b/altoslib/AltosEeprom.java
@@ -17,7 +17,7 @@ package org.altusmetrum.altoslib_11;
import java.util.*;
import java.io.*;
-public class AltosEepromNew {
+public class AltosEeprom {
private AltosJson config;
ArrayList<Byte> data;
@@ -268,24 +268,24 @@ public class AltosEepromNew {
/*
* Constructors
*/
- public AltosEepromNew(InputStream stream) throws IOException {
+ public AltosEeprom(InputStream stream) throws IOException {
read(stream);
}
- public AltosEepromNew(String s) throws IOException {
+ public AltosEeprom(String s) throws IOException {
read(new AltosStringInputStream(s));
}
- public AltosEepromNew(AltosJson config, ArrayList<Byte> data) {
+ public AltosEeprom(AltosJson config, ArrayList<Byte> data) {
this.config = config;
this.data = data;
}
- public AltosEepromNew(AltosConfigData config_data, ArrayList<Byte> data) {
+ public AltosEeprom(AltosConfigData config_data, ArrayList<Byte> data) {
this.config = new AltosJson(config_data);
this.data = data;
}
- public AltosEepromNew() {
+ public AltosEeprom() {
}
}
diff --git a/altoslib/AltosEepromDownload.java b/altoslib/AltosEepromDownload.java
index 8a2053ec..961b32cd 100644
--- a/altoslib/AltosEepromDownload.java
+++ b/altoslib/AltosEepromDownload.java
@@ -181,7 +181,7 @@ public class AltosEepromDownload implements Runnable {
}
/* Construct our internal representation of the eeprom data */
- AltosEepromNew eeprom = new AltosEepromNew(flights.config_data, data);
+ AltosEeprom eeprom = new AltosEeprom(flights.config_data, data);
/* Now see if we can't actually parse the resulting
* file to generate a better filename. Note that this
diff --git a/altoslib/AltosEepromRecord.java b/altoslib/AltosEepromRecord.java
index 75fe5381..c479a621 100644
--- a/altoslib/AltosEepromRecord.java
+++ b/altoslib/AltosEepromRecord.java
@@ -16,7 +16,7 @@ package org.altusmetrum.altoslib_11;
public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord> {
- AltosEepromNew eeprom;
+ AltosEeprom eeprom;
int wide_tick;
@@ -115,7 +115,7 @@ public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
public abstract AltosEepromRecord next();
- public AltosEepromRecord(AltosEepromNew eeprom, int start, int length) {
+ public AltosEepromRecord(AltosEeprom eeprom, int start, int length) {
this.eeprom = eeprom;
this.start = start;
this.length = length;
diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java
index 713d0bb7..48d480c5 100644
--- a/altoslib/AltosEepromRecordFireTwo.java
+++ b/altoslib/AltosEepromRecordFireTwo.java
@@ -92,11 +92,11 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
return new AltosEepromRecordFireTwo(eeprom, s);
}
- public AltosEepromRecordFireTwo(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordFireTwo(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
- public AltosEepromRecordFireTwo(AltosEepromNew eeprom) {
+ public AltosEepromRecordFireTwo(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java
index c29da025..10ae0bef 100644
--- a/altoslib/AltosEepromRecordFull.java
+++ b/altoslib/AltosEepromRecordFull.java
@@ -104,11 +104,11 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
return new AltosEepromRecordFull(eeprom, s);
}
- public AltosEepromRecordFull(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordFull(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
- public AltosEepromRecordFull(AltosEepromNew eeprom) {
+ public AltosEepromRecordFull(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
diff --git a/altoslib/AltosEepromRecordGps.java b/altoslib/AltosEepromRecordGps.java
index a992abff..ee76d073 100644
--- a/altoslib/AltosEepromRecordGps.java
+++ b/altoslib/AltosEepromRecordGps.java
@@ -135,11 +135,11 @@ public class AltosEepromRecordGps extends AltosEepromRecord {
return new AltosEepromRecordGps(eeprom, s);
}
- public AltosEepromRecordGps(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordGps(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
- public AltosEepromRecordGps(AltosEepromNew eeprom) {
+ public AltosEepromRecordGps(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
diff --git a/altoslib/AltosEepromRecordMega.java b/altoslib/AltosEepromRecordMega.java
index d0da1b7c..fdbbd6f7 100644
--- a/altoslib/AltosEepromRecordMega.java
+++ b/altoslib/AltosEepromRecordMega.java
@@ -249,12 +249,12 @@ public class AltosEepromRecordMega extends AltosEepromRecord {
return new AltosEepromRecordMega(eeprom, s);
}
- public AltosEepromRecordMega(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordMega(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
log_format = eeprom.config_data().log_format;
}
- public AltosEepromRecordMega(AltosEepromNew eeprom) {
+ public AltosEepromRecordMega(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
diff --git a/altoslib/AltosEepromRecordMetrum.java b/altoslib/AltosEepromRecordMetrum.java
index 248709b3..65d8f086 100644
--- a/altoslib/AltosEepromRecordMetrum.java
+++ b/altoslib/AltosEepromRecordMetrum.java
@@ -135,11 +135,11 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
return new AltosEepromRecordMetrum(eeprom, s);
}
- public AltosEepromRecordMetrum(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordMetrum(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
- public AltosEepromRecordMetrum(AltosEepromNew eeprom) {
+ public AltosEepromRecordMetrum(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
diff --git a/altoslib/AltosEepromRecordMini.java b/altoslib/AltosEepromRecordMini.java
index 22bd073a..787f4e0d 100644
--- a/altoslib/AltosEepromRecordMini.java
+++ b/altoslib/AltosEepromRecordMini.java
@@ -95,11 +95,11 @@ public class AltosEepromRecordMini extends AltosEepromRecord {
return new AltosEepromRecordMini(eeprom, s);
}
- public AltosEepromRecordMini(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordMini(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
- public AltosEepromRecordMini(AltosEepromNew eeprom) {
+ public AltosEepromRecordMini(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 1f10e677..df1aad9f 100644
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -18,7 +18,7 @@ import java.io.*;
import java.util.*;
public class AltosEepromRecordSet implements AltosRecordSet {
- AltosEepromNew eeprom;
+ AltosEeprom eeprom;
TreeSet<AltosEepromRecord> ordered;
AltosCalData cal_data;
@@ -50,7 +50,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
listener.finish();
}
- public AltosEepromRecordSet(AltosEepromNew eeprom) {
+ public AltosEepromRecordSet(AltosEeprom eeprom) {
this.eeprom = eeprom;
AltosConfigData config_data = eeprom.config_data();
@@ -115,6 +115,6 @@ public class AltosEepromRecordSet implements AltosRecordSet {
}
public AltosEepromRecordSet(InputStream input) throws IOException {
- this(new AltosEepromNew(input));
+ this(new AltosEeprom(input));
}
}
diff --git a/altoslib/AltosEepromRecordTiny.java b/altoslib/AltosEepromRecordTiny.java
index 70960a2a..628e18c3 100644
--- a/altoslib/AltosEepromRecordTiny.java
+++ b/altoslib/AltosEepromRecordTiny.java
@@ -77,11 +77,11 @@ public class AltosEepromRecordTiny extends AltosEepromRecord implements AltosDat
return new AltosEepromRecordTiny(eeprom, s);
}
- public AltosEepromRecordTiny(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordTiny(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
- public AltosEepromRecordTiny(AltosEepromNew eeprom) {
+ public AltosEepromRecordTiny(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index ce934b4f..11b5d562 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -35,7 +35,7 @@ altoslib_JAVA = \
AltosCRCException.java \
AltosCSV.java \
AltosDebug.java \
- AltosEepromNew.java \
+ AltosEeprom.java \
AltosRecordSet.java \
AltosEepromRecord.java \
AltosEepromRecordFull.java \
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-15 23:17:25 +0000