From 264bb1eaaad7a1526ca515c0d88c62f1ba825ad5 Mon Sep 17 00:00:00 2001 From: JoelCourtney Date: Wed, 27 Mar 2024 17:04:50 -0700 Subject: [PATCH] Add .procedural. to package path --- .../jpl/aerie/{ => procedural}/constraints/ActivityId.kt | 2 +- .../jpl/aerie/{ => procedural}/constraints/Constraint.kt | 2 +- .../jpl/aerie/{ => procedural}/constraints/Violation.kt | 2 +- .../jpl/aerie/{ => procedural}/constraints/Violations.kt | 9 +++------ 4 files changed, 6 insertions(+), 9 deletions(-) rename procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/{ => procedural}/constraints/ActivityId.kt (81%) rename procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/{ => procedural}/constraints/Constraint.kt (92%) rename procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/{ => procedural}/constraints/Violation.kt (94%) rename procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/{ => procedural}/constraints/Violations.kt (90%) diff --git a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/ActivityId.kt b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/ActivityId.kt similarity index 81% rename from procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/ActivityId.kt rename to procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/ActivityId.kt index e43816b1f6..337df89065 100644 --- a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/ActivityId.kt +++ b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/ActivityId.kt @@ -1,4 +1,4 @@ -package gov.nasa.jpl.aerie.constraints +package gov.nasa.jpl.aerie.procedural.constraints /** An activity ID, referencing either a directive or instance. */ sealed interface ActivityId { diff --git a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Constraint.kt b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Constraint.kt similarity index 92% rename from procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Constraint.kt rename to procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Constraint.kt index 4a78ea3703..2fbd717b9b 100644 --- a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Constraint.kt +++ b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Constraint.kt @@ -1,4 +1,4 @@ -package gov.nasa.jpl.aerie.constraints +package gov.nasa.jpl.aerie.procedural.constraints import gov.nasa.jpl.aerie.timeline.CollectOptions import gov.nasa.jpl.aerie.timeline.plan.Plan diff --git a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Violation.kt b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Violation.kt similarity index 94% rename from procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Violation.kt rename to procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Violation.kt index 78d243833b..9e51a81e08 100644 --- a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Violation.kt +++ b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Violation.kt @@ -1,4 +1,4 @@ -package gov.nasa.jpl.aerie.constraints +package gov.nasa.jpl.aerie.procedural.constraints import gov.nasa.jpl.aerie.timeline.Interval import gov.nasa.jpl.aerie.timeline.payloads.IntervalLike diff --git a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Violations.kt b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Violations.kt similarity index 90% rename from procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Violations.kt rename to procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Violations.kt index 9fe8eeccd9..43af1ee4ac 100644 --- a/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/constraints/Violations.kt +++ b/procedural/constraints/src/main/kotlin/gov/nasa/jpl/aerie/procedural/constraints/Violations.kt @@ -1,19 +1,16 @@ -package gov.nasa.jpl.aerie.constraints +package gov.nasa.jpl.aerie.procedural.constraints -import gov.nasa.jpl.aerie.constraints.ActivityId.DirectiveId -import gov.nasa.jpl.aerie.constraints.ActivityId.InstanceId -import gov.nasa.jpl.aerie.constraints.Violations.Companion.getActivityId +import gov.nasa.jpl.aerie.procedural.constraints.ActivityId.DirectiveId +import gov.nasa.jpl.aerie.procedural.constraints.ActivityId.InstanceId import gov.nasa.jpl.aerie.timeline.BaseTimeline import gov.nasa.jpl.aerie.timeline.BoundsTransformer import gov.nasa.jpl.aerie.timeline.Timeline -import gov.nasa.jpl.aerie.timeline.collections.Instances import gov.nasa.jpl.aerie.timeline.collections.Intervals import gov.nasa.jpl.aerie.timeline.collections.Windows import gov.nasa.jpl.aerie.timeline.collections.profiles.Real import gov.nasa.jpl.aerie.timeline.ops.* import gov.nasa.jpl.aerie.timeline.ops.coalesce.CoalesceNoOp import gov.nasa.jpl.aerie.timeline.payloads.IntervalLike -import gov.nasa.jpl.aerie.timeline.payloads.activities.Activity import gov.nasa.jpl.aerie.timeline.payloads.activities.Directive import gov.nasa.jpl.aerie.timeline.payloads.activities.Instance import gov.nasa.jpl.aerie.timeline.util.preprocessList