Merge pull request matsim-org#3584 from matsim-org/freightReceivers

Renamed packaged in line with freight and vsp’s logistics

Author: JWJoubert

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Order.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Order.java

@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ProductType.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ProductType.java

@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Identifiable;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Receiver.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Receiver.java

@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverAgent.java

@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverConfigGroup.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverConfigGroup.java

@@ -15,7 +15,7 @@
  *   See also COPYING, LICENSE and WARRANTY file                           *
  *                                                                         *
  * *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverControlerListener.java

@@ -16,7 +16,7 @@
  *                                                                         *
  * *********************************************************************** */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import com.google.inject.Inject;
 import org.apache.logging.log4j.LogManager;
@@ -29,8 +29,8 @@
 import org.matsim.freight.carriers.CarriersUtils;
 import org.matsim.freight.carriers.ScheduledTour;
 import org.matsim.freight.carriers.Tour;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
-import org.matsim.contrib.freightreceiver.replanning.ReceiverStrategyManager;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.replanning.ReceiverStrategyManager;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.events.*;
 import org.matsim.core.controler.listener.*;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocation.java

@@ -18,7 +18,7 @@
  * ***********************************************************************
  */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.matsim.freight.carriers.Carrier;
 

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationEqualProportion.java

@@ -18,7 +18,7 @@
  * ***********************************************************************
  */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import com.google.inject.Inject;
 import org.matsim.api.core.v01.Id;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationFixed.java

@@ -17,7 +17,7 @@
  * *
  * ***********************************************************************
  */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 import org.apache.logging.log4j.LogManager;
 import org.matsim.freight.carriers.Carrier;

contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationType.java renamed to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationType.java

@@ -18,7 +18,7 @@
  * ***********************************************************************
  */
 
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
 
 /**
  * The supported ways in which the carrier's cost is spread among the receivers.