reorganisation of code

matsim-org · Dec 20, 2024 · 9e65b09 · 9e65b09
1 parent 1eac344
commit 9e65b09
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/contribs/freight/src/main/java/org/matsim/freight/carriers/CarrierShipment.java b/contribs/freight/src/main/java/org/matsim/freight/carriers/CarrierShipment.java
@@ -254,7 +254,7 @@ public double getDeliveryDuration() {
 	/**
 	 * Do we really need the setter? We do have it in the builder.
 	 * I do not see, why we should be able to update it, since most of the values are immutable.
-	 * @deprecated Consider setting it using the Builder. This will maybe be removed and the field gets immutable..
+	 * @deprecated Consider setting it using the Builder. This will maybe be removed and the field gets immutable.
 	 * kturner, dec'24
 	 */
 	@Deprecated(since = "dec'24")
@@ -265,7 +265,7 @@ public void setPickupDuration(double pickupDuration) {
 	/**
 	* Do we really need the setter? We do have it in the builder.
 	* I do not see, why we should be able to update it, since most of the values are immutable.
-	* @deprecated Consider setting it using the Builder. This will maybe be removed and the field gets immutable..
+	* @deprecated Consider setting it using the Builder. This will maybe be removed and the field gets immutable.
 	* kturner, dec'24
 	*/
 	@Deprecated(since = "dec'24")
@@ -317,6 +317,7 @@ public int getSize() {
 		return getDemand();
 	}
 
+
 	/**
 	 * @deprecated please inline and use {@link #getPickupLinkId()} instead
 	 */
@@ -325,14 +326,6 @@ public Id<Link> getFrom() {
 		return getPickupLinkId();
 	}
 
-	/**
-	 * @deprecated please inline and use {@link #getDeliveryLinkId()} instead
-	 */
-	@Deprecated(since = "dec'24")
-	public Id<Link> getTo() {
-		return getDeliveryLinkId();
-	}
-
 	/**
 	 * @deprecated please inline and use {@link #getPickupStartsTimeWindow()} instead
 	 */
@@ -341,13 +334,12 @@ public TimeWindow getPickupTimeWindow() {
 		return getPickupStartsTimeWindow();
 	}
 
-
 	/**
-	 * @deprecated please inline and use {@link #getDeliveryStartsTimeWindow()} instead
+	 * @deprecated please inline and use {@link #setPickupDuration(double)} instead
 	 */
 	@Deprecated(since = "dec'24")
-	public TimeWindow getDeliveryTimeWindow() {
-		return getDeliveryStartsTimeWindow();
+	public void setPickupServiceTime(double pickupDuration) {
+		setPickupDuration(pickupDuration);
 	}
 
 	/**
@@ -358,12 +350,21 @@ public double getPickupServiceTime() {
 		return getPickupDuration();
 	}
 
+
 	/**
-	 * @deprecated please inline and use {@link #setPickupDuration(double)} instead
+	 * @deprecated please inline and use {@link #getDeliveryLinkId()} instead
 	 */
 	@Deprecated(since = "dec'24")
-	public void setPickupServiceTime(double pickupDuration) {
-		setPickupDuration(pickupDuration);
+	public Id<Link> getTo() {
+		return getDeliveryLinkId();
+	}
+
+	/**
+	 * @deprecated please inline and use {@link #getDeliveryStartsTimeWindow()} instead
+	 */
+	@Deprecated(since = "dec'24")
+	public TimeWindow getDeliveryTimeWindow() {
+		return getDeliveryStartsTimeWindow();
 	}
 
 	/**