diff --git a/.classpath b/.classpath index fceb480..63b7e89 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - - - - - - + + + + + + diff --git a/.gitignore b/.gitignore index ae3c172..3e2fcc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/bin/ +/bin/ diff --git a/.project b/.project index eddf65b..d2188da 100644 --- a/.project +++ b/.project @@ -1,17 +1,17 @@ - - - shipment-service - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + shipment-service + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 3a21537..bb35fa0 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/1.txt b/1.txt new file mode 100644 index 0000000..e69de29 diff --git a/2.txt b/2.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/org/edureka/assignment/Feature1.java b/src/org/edureka/assignment/Feature1.java new file mode 100644 index 0000000..426fc15 --- /dev/null +++ b/src/org/edureka/assignment/Feature1.java @@ -0,0 +1,5 @@ +package org.edureka.assignment; + +public class Feature1 { + //This is feature 1 +} \ No newline at end of file diff --git a/src/org/edureka/assignment/Feature2.java b/src/org/edureka/assignment/Feature2.java new file mode 100644 index 0000000..a32c4f1 --- /dev/null +++ b/src/org/edureka/assignment/Feature2.java @@ -0,0 +1,5 @@ +package org.edureka.assignment; + +public class Feature2 { + //This is feature 2 +} \ No newline at end of file diff --git a/src/org/edureka/assignment/File1.java b/src/org/edureka/assignment/File1.java new file mode 100644 index 0000000..3cf22c5 --- /dev/null +++ b/src/org/edureka/assignment/File1.java @@ -0,0 +1,5 @@ +package org.edureka.assignment; + +public class File1 { + //This is the initial version of File1 +} \ No newline at end of file diff --git a/src/org/edureka/shipping/Constants.java b/src/org/edureka/shipping/Constants.java index 192f6a5..83f62b4 100644 --- a/src/org/edureka/shipping/Constants.java +++ b/src/org/edureka/shipping/Constants.java @@ -1,5 +1,5 @@ -package org.edureka.shipping; - -public interface Constants { - -} +package org.edureka.shipping; + +public interface Constants { + +} diff --git a/src/org/edureka/shipping/IShipment.java b/src/org/edureka/shipping/IShipment.java index f251550..40ca96b 100644 --- a/src/org/edureka/shipping/IShipment.java +++ b/src/org/edureka/shipping/IShipment.java @@ -1,11 +1,11 @@ -package org.edureka.shipping; - -public interface IShipment { - - public boolean addShipment(); - - public boolean deleteShipment(); - - public boolean getShipment(); - -} +package org.edureka.shipping; + +public interface IShipment { + + public boolean addShipment(); + + public boolean deleteShipment(); + + public boolean getShipment(); + +} diff --git a/src/org/edureka/shipping/Shipment.java b/src/org/edureka/shipping/Shipment.java index 3e9822d..f2608ee 100644 --- a/src/org/edureka/shipping/Shipment.java +++ b/src/org/edureka/shipping/Shipment.java @@ -1,99 +1,99 @@ -package org.edureka.shipping; - -import java.util.Date; - -public class Shipment { - int resourceId; - Date shipmentDate; - Date expiryDate; - String deliveryText; - Order order; - ShipmentLocation shipmentLocation; - Date deliveryDate; - int trackigNumber; - int chargeAmount; - - public int getResourceId() { - return resourceId; - } - - public void setResourceId(int resourceId) { - this.resourceId = resourceId; - } - - public Date getShipmentDate() { - return shipmentDate; - } - - public void setShipmentDate(Date shipmentDate) { - this.shipmentDate = shipmentDate; - } - - public Date getExpiryDate() { - return expiryDate; - } - - public void setExpiryDate(Date expiryDate) { - this.expiryDate = expiryDate; - } - - public String getDeliveryText() { - return deliveryText; - } - - public void setDeliveryText(String deliveryText) { - this.deliveryText = deliveryText; - } - - public Order getOrder() { - return order; - } - - public void setOrder(Order order) { - this.order = order; - } - - public ShipmentLocation getShipmentLocation() { - return shipmentLocation; - } - - public void setShipmentLocation(ShipmentLocation shipmentLocation) { - this.shipmentLocation = shipmentLocation; - } - - public Date getDeliveryDate() { - return deliveryDate; - } - - public void setDeliveryDate(Date deliveryDate) { - this.deliveryDate = deliveryDate; - } - - public int getTrackigNumber() { - return trackigNumber; - } - - public void setTrackigNumber(int trackigNumber) { - this.trackigNumber = trackigNumber; - } - - public int getChargeAmount() { - return chargeAmount; - } - - public void setChargeAmount(int chargeAmount) { - this.chargeAmount = chargeAmount; - } - - static class ShipmentLocation { - String firstName; - String lastName; - String streetAddress; - int Pincode; - } - - static class Order { - int resourceId; - } - -} +package org.edureka.shipping; + +import java.util.Date; + +public class Shipment { + int resourceId; + Date shipmentDate; + Date expiryDate; + String deliveryText; + Order order; + ShipmentLocation shipmentLocation; + Date deliveryDate; + int trackigNumber; + int chargeAmount; + + public int getResourceId() { + return resourceId; + } + + public void setResourceId(int resourceId) { + this.resourceId = resourceId; + } + + public Date getShipmentDate() { + return shipmentDate; + } + + public void setShipmentDate(Date shipmentDate) { + this.shipmentDate = shipmentDate; + } + + public Date getExpiryDate() { + return expiryDate; + } + + public void setExpiryDate(Date expiryDate) { + this.expiryDate = expiryDate; + } + + public String getDeliveryText() { + return deliveryText; + } + + public void setDeliveryText(String deliveryText) { + this.deliveryText = deliveryText; + } + + public Order getOrder() { + return order; + } + + public void setOrder(Order order) { + this.order = order; + } + + public ShipmentLocation getShipmentLocation() { + return shipmentLocation; + } + + public void setShipmentLocation(ShipmentLocation shipmentLocation) { + this.shipmentLocation = shipmentLocation; + } + + public Date getDeliveryDate() { + return deliveryDate; + } + + public void setDeliveryDate(Date deliveryDate) { + this.deliveryDate = deliveryDate; + } + + public int getTrackigNumber() { + return trackigNumber; + } + + public void setTrackigNumber(int trackigNumber) { + this.trackigNumber = trackigNumber; + } + + public int getChargeAmount() { + return chargeAmount; + } + + public void setChargeAmount(int chargeAmount) { + this.chargeAmount = chargeAmount; + } + + static class ShipmentLocation { + String firstName; + String lastName; + String streetAddress; + int Pincode; + } + + static class Order { + int resourceId; + } + +} diff --git a/src/org/edureka/shipping/ShipmentServiceImpl.java b/src/org/edureka/shipping/ShipmentServiceImpl.java index 695b10c..4b64f87 100644 --- a/src/org/edureka/shipping/ShipmentServiceImpl.java +++ b/src/org/edureka/shipping/ShipmentServiceImpl.java @@ -1,23 +1,23 @@ -package org.edureka.shipping; - -public class ShipmentServiceImpl implements IShipment { - - @Override - public boolean addShipment() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean deleteShipment() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean getShipment() { - // TODO Auto-generated method stub - return false; - } - -} +package org.edureka.shipping; + +public class ShipmentServiceImpl implements IShipment { + + @Override + public boolean addShipment() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean deleteShipment() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean getShipment() { + // TODO Auto-generated method stub + return false; + } + +} diff --git a/src/org/edureka/shipping/Utilities.java b/src/org/edureka/shipping/Utilities.java index b6fa5d9..fb12f0a 100644 --- a/src/org/edureka/shipping/Utilities.java +++ b/src/org/edureka/shipping/Utilities.java @@ -1,5 +1,5 @@ -package org.edureka.shipping; - -public class Utilities { - -} +package org.edureka.shipping; + +public class Utilities { + +}