Merge pull request #17 from HakumenNC/master

Ajout informations d'une agence #16

.gitignore

@@ -1,2 +1,4 @@
 /nbproject/
-/target/
+/target/
+.idea/
+tempsattente-sdk.iml

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.adriens.github.opt.tempsattente</groupId>
     <artifactId>tempsattente-sdk</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/github/adriens/opt/tempsattente/sdk/Agence.java

@@ -27,6 +27,15 @@ public class Agence {
     private double coordonneeY;
     private long coordonneeXPrecise;
     private long coordonneeYPrecise;
+    private String commune;
+    private String type;
+    private String codeESirius;
+    private String codePostal;
+    private String lieuDitOuTribu;
+    private String localite;
+    private String idRefloc;
+    private String codePostalRefloc;
+    private String localiteRefloc;
 
     /**
      * Default constructor.
@@ -39,6 +48,15 @@ public Agence() {
         this.coordonneeY = 0;
         this.coordonneeXPrecise = 0;
         this.coordonneeYPrecise = 0;
+        this.commune = "";
+        this.type = "";
+        this.codeESirius = "";
+        this.codePostal = "";
+        this.lieuDitOuTribu = "";
+        this.localite = "";
+        this.idRefloc = "";
+        this.codePostalRefloc = "";
+        this.localiteRefloc = "";
     }
 
     /**
@@ -52,14 +70,23 @@ public Agence() {
      * @param coordonneeXPrecise the precise X coordinate of the agency.
      * @param coordonneeYPrecise the precise Y coordinate of the agency.
      */
-    public Agence(int idAgence, String designation, long realMaxWaitingTimeMs, double coordonneeX, double coordonneeY, long coordonneeXPrecise, long coordonneeYPrecise) {
+    public Agence(int idAgence, String designation, long realMaxWaitingTimeMs, double coordonneeX, double coordonneeY, long coordonneeXPrecise, long coordonneeYPrecise, String commune, String type, String codeESirius, String codePostal, String lieuDitOuTribu, String localite, String idRefloc, String codePostalRefloc, String localiteRefloc) {
         this.idAgence = idAgence;
         this.designation = designation;
         this.realMaxWaitingTimeMs = realMaxWaitingTimeMs;
         this.coordonneeX = coordonneeX;
         this.coordonneeY = coordonneeY;
         this.coordonneeXPrecise = coordonneeXPrecise;
         this.coordonneeYPrecise = coordonneeYPrecise;
+        this.commune = commune;
+        this.type = type;
+        this.codeESirius = codeESirius;
+        this.codePostal = codePostal;
+        this.lieuDitOuTribu = lieuDitOuTribu;
+        this.localite = localite;
+        this.idRefloc = idRefloc;
+        this.codePostalRefloc = codePostalRefloc;
+        this.localiteRefloc = localiteRefloc;
     }
 
     /**
@@ -125,6 +152,87 @@ public long getCoordonneeYPrecise() {
         return this.coordonneeYPrecise;
     }
 
+    /**
+     * Return the commune of the agency.
+     *
+     * @return the commune of the agency.
+     */
+    public String getCommune() {
+        return this.commune;
+    }
+
+    /**
+     * Return the type of the agency.
+     *
+     * @return the type of the agency.
+     */
+    public String getType() {
+        return this.type;
+    }
+
+    /**
+     * Return the Esirius code of the agency.
+     *
+     * @return the Esirius code of the agency.
+     */
+    public String getCodeESirius() {
+        return this.codeESirius;
+    }
+
+    /**
+     * Return the postal code of the agency.
+     *
+     * @return the postal code of the agency.
+     */
+    public String getCodePostal() {
+        return this.codePostal;
+    }
+
+    /**
+     * Return the locality or tribe of the agency.
+     *
+     * @return the locality or tribe of the agency.
+     */
+    public String getLieuDitOuTribu() {
+        return this.lieuDitOuTribu;
+    }
+
+    /**
+     * Return the locality of the agency.
+     *
+     * @return the locality of the agency.
+     */
+    public String getLocalite() {
+        return this.localite;
+    }
+
+    /**
+     * Return the refloc id of the agency.
+     *
+     * @return the refloc id of the agency.
+     */
+    public String getIdRefloc() {
+        return this.idRefloc;
+    }
+
+    /**
+     * Return the refloc postal code of the agency.
+     *
+     * @return the refloc postal code of the agency.
+     */
+    public String getCodePostalRefloc() {
+        return this.codePostalRefloc;
+    }
+
+    /**
+     * Return the refloc locality of the agency.
+     *
+     * @return the refloc locality of the agency.
+     */
+    public String getLocaliteRefloc() {
+        return this.localiteRefloc;
+    }
+
     /**
      * Set the agency's ID number.
      *
@@ -187,6 +295,78 @@ public void setCoordonneeYPrecise(long coordonneeYPrecise) {
         this.coordonneeYPrecise = coordonneeYPrecise;
     }
 
+    /**
+     * Set the commune of the agency.
+     * @param commune the type of the agency.
+     */
+    public void setCommune(String commune) {
+        this.commune = commune;
+    }
+
+    /**
+     * Set the type of the agency.
+     * @param type the type of the agency.
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Set the Esirius code of the agency.
+     * @param codeESirius the Esirius code of the agency.
+     */
+    public void setCodeESirius(String codeESirius) {
+        this.codeESirius = codeESirius;
+    }
+
+    /**
+     * Set the postal code of the agency.
+     * @param codePostal the postal code of the agency.
+     */
+    public void setCodePostal(String codePostal) {
+        this.codePostal = codePostal;
+    }
+
+    /**
+     * Set the locality or tribe of the agency.
+     * @param lieuDitOuTribu the locality or tribe of the agency.
+     */
+    public void setLieuDitOuTribu(String lieuDitOuTribu) {
+        this.lieuDitOuTribu = lieuDitOuTribu;
+    }
+
+    /**
+     * Set the locality of the agency.
+     * @param localite the locality of the agency.
+     */
+    public void setLocalite(String localite) {
+        this.localite = localite;
+    }
+
+    /**
+     * Set the refloc id of the agency.
+     * @param idRefloc the refloc id of the agency.
+     */
+    public void setIdRefloc(String idRefloc) {
+        this.idRefloc = idRefloc;
+    }
+
+    /**
+     * Set the refloc postal code of the agency.
+     * @param codePostalRefloc the refloc postal code of the agency.
+     */
+    public void setCodePostalRefloc(String codePostalRefloc) {
+        this.codePostalRefloc = codePostalRefloc;
+    }
+
+    /**
+     * Set the refloc locality of the agency.
+     * @param localiteRefloc the refloc locality of the agency.
+     */
+    public void setLocaliteRefloc(String localiteRefloc) {
+        this.localiteRefloc = localiteRefloc;
+    }
+
     /**
      * Return the agency with the ID number in parameter.
      *
@@ -228,6 +408,15 @@ public String toString() {
                 + ", coordonneeY: " + this.coordonneeY
                 + ", coordonneeXPrecise: " + this.coordonneeXPrecise
                 + ", coordonneeYPrecise: " + this.coordonneeYPrecise
+                + ", commune: " + this.commune
+                + ", type: " + this.type
+                + ", codeESirius: " + this.codeESirius
+                + ", codePostal: " + this.codePostal
+                + ", lieuDitOuTribu: " + this.lieuDitOuTribu
+                + ", localite: " + this.localite
+                + ", idRefloc: " + this.idRefloc
+                + ", codePostalRefloc: " + this.codePostalRefloc
+                + ", localiteRefloc: " + this.localiteRefloc
                 + ">";
     }