6160 Restore WaypointBuilder

This commit is contained in:
Ethan Roseman 2020-04-16 17:33:21 -04:00
parent 9e14a52645
commit 94deee76d9

View File

@ -479,7 +479,6 @@ public final class WaypointBuilder {
@Override @Override
public void process(ResultSet rs) { public void process(ResultSet rs) {
List<Waypoint> waypoints = new ArrayList<>(); List<Waypoint> waypoints = new ArrayList<>();
//List<List<Waypoint>> tracks = new ArrayList<>();
try { try {
while (rs.next()) { while (rs.next()) {
int artifact_type_id = rs.getInt("artifact_type_id"); //NON-NLS int artifact_type_id = rs.getInt("artifact_type_id"); //NON-NLS
@ -487,12 +486,7 @@ public final class WaypointBuilder {
ARTIFACT_TYPE type = ARTIFACT_TYPE.fromID(artifact_type_id); ARTIFACT_TYPE type = ARTIFACT_TYPE.fromID(artifact_type_id);
if (artifactTypes.contains(type)) { if (artifactTypes.contains(type)) {
List<Waypoint> curWaypoints = getWaypointForArtifact(skCase.getBlackboardArtifact(artifact_id), type); waypoints.addAll(getWaypointForArtifact(skCase.getBlackboardArtifact(artifact_id), type));
/*if (type == ARTIFACT_TYPE.TSK_GPS_TRACKPOINT ||
type == ARTIFACT_TYPE.TSK_GPS_TRACK) {
//tracks.add(curWaypoints);
}*/
waypoints.addAll(curWaypoints);
} }
} }