Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

100 #2

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/bin/
/bin/
34 changes: 17 additions & 17 deletions .project
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>shipment-service</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>shipment-service</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
22 changes: 11 additions & 11 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -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
Empty file added 1.txt
Empty file.
Empty file added 2.txt
Empty file.
5 changes: 5 additions & 0 deletions src/org/edureka/assignment/Feature1.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.edureka.assignment;

public class Feature1 {
//This is feature 1
}
5 changes: 5 additions & 0 deletions src/org/edureka/assignment/Feature2.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.edureka.assignment;

public class Feature2 {
//This is feature 2
}
5 changes: 5 additions & 0 deletions src/org/edureka/assignment/File1.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.edureka.assignment;

public class File1 {
//This is the initial version of File1
}
10 changes: 5 additions & 5 deletions src/org/edureka/shipping/Constants.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package org.edureka.shipping;

public interface Constants {

}
package org.edureka.shipping;
public interface Constants {
}
22 changes: 11 additions & 11 deletions src/org/edureka/shipping/IShipment.java
Original file line number Diff line number Diff line change
@@ -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();
}
198 changes: 99 additions & 99 deletions src/org/edureka/shipping/Shipment.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
46 changes: 23 additions & 23 deletions src/org/edureka/shipping/ShipmentServiceImpl.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
10 changes: 5 additions & 5 deletions src/org/edureka/shipping/Utilities.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package org.edureka.shipping;

public class Utilities {

}
package org.edureka.shipping;
public class Utilities {
}