Freight: Add a CarrierJob interface

contribs/freight/src/main/java/org/matsim/freight/carriers/CarrierJob.java

@@ -0,0 +1,19 @@
+package org.matsim.freight.carriers;
+
+import org.matsim.utils.objectattributes.attributable.Attributable;
+
+/**
+ * A job that a {@link Carrier} can do.
+ * <p>
+ * In a first step this is more or less a marker interface.
+ * <p>
+ * In the next steps it will be extended, as follows
+ * 1) existing common methods of {@link CarrierShipment} and {@link
+ * CarrierService} where moved up here
+ * 2) some similiar, but differently named methods of {@link
+ * CarrierShipment} and {@link CarrierService} were renamed to the same name and moved up here
+ * ...
+ * future) It maybe gets generalized in way, that we only have one job definition with 1 or 2
+ * location(s). This then defines, if jsprit takes the job as a service or as a shipment.
+ */
+public interface CarrierJob extends Attributable {}

contribs/freight/src/main/java/org/matsim/freight/carriers/CarrierService.java

@@ -28,7 +28,7 @@
 import org.matsim.utils.objectattributes.attributable.AttributesImpl;
 
 
-public final class CarrierService implements Attributable {
+public final class CarrierService implements CarrierJob {
 
 	public static class Builder {
 

contribs/freight/src/main/java/org/matsim/freight/carriers/CarrierShipment.java

@@ -36,7 +36,7 @@
  * @author sschroeder
  *
  */
-public final class CarrierShipment implements Attributable {
+public final class CarrierShipment implements CarrierJob {
 
 	/**
 	 * A builder that builds shipments.