reformat class
This commit is contained in:
@@ -45,44 +45,45 @@ public enum ForgeManager implements Runnable {
|
|||||||
Logger.error(e);
|
Logger.error(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (workOrder == null) {
|
// Null workOrders should not exist.
|
||||||
Logger.error("NULL workOrder in queue");
|
// Perhaps log?
|
||||||
|
|
||||||
|
if (workOrder == null)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// Completed or canceled work orders are not re-enqueued
|
// Completed or canceled work orders are not re-enqueued
|
||||||
|
|
||||||
if (workOrder.runCanceled || workOrder.runCompleted)
|
if (workOrder.runCanceled || workOrder.runCompleted)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Create in memory items to add to collections
|
// Create in memory items to add to collections
|
||||||
forgeItems(workOrder);
|
|
||||||
|
|
||||||
Logger.info("item forged:" + workOrder.workOrderID + " (" + workOrder.total_produced + "/" + workOrder.total_to_produce + ")");
|
forgeItems(workOrder);
|
||||||
|
|
||||||
|
Logger.info("item forged:" + workOrder.workOrderID + " (" + workOrder.total_produced + "/" + workOrder.total_to_produce + ")");
|
||||||
|
|
||||||
|
|
||||||
if (workOrder.total_produced >= workOrder.total_to_produce) {
|
if (workOrder.total_produced >= workOrder.total_to_produce) {
|
||||||
|
|
||||||
Logger.info("workOrder has completed: " + workOrder.workOrderID);
|
Logger.info("workOrder has completed: " + workOrder.workOrderID);
|
||||||
|
|
||||||
// Persist current items that are currently building for this
|
// Persist current items that are currently building for this
|
||||||
// worker after first removing the negative id item from all
|
// worker after first removing the negative id item from all
|
||||||
// collections.
|
// collections.
|
||||||
|
|
||||||
// Add new item to the vendors inventory
|
// Add new item to the vendors inventory
|
||||||
|
|
||||||
workOrder.runCompleted = true;
|
workOrder.runCompleted = true;
|
||||||
workOrder.vendor.workOrders.remove(workOrder);
|
workOrder.vendor.workOrders.remove(workOrder);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// enQueue this workOrder again; back into the oven
|
||||||
|
// until all items for this workOrder are completed.
|
||||||
|
|
||||||
// enQueue this workOrder again; back into the oven
|
workOrder.completionTime = System.currentTimeMillis() + workOrder.rollingDuration;
|
||||||
// until all items for this workOrder are completed.
|
forge.add(workOrder);
|
||||||
|
Logger.info(workOrder.toString());
|
||||||
workOrder.completionTime = System.currentTimeMillis() + workOrder.rollingDuration;
|
|
||||||
forge.add(workOrder);
|
|
||||||
Logger.info(workOrder.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user