Changeset 416 for tapas/domain/interface/com/ether/user/User.java

Timestamp:

03/15/12 18:54:48 (12 years ago)

Author:

vmipsl

Message:

User : ajout laboratoire & pays
BO : idem
Création compte : idem
DataProtocole?
Clean accent properties
Language

File:

• tapas/domain/interface/com/ether/user/User.java (modified) (4 diffs)

tapas/domain/interface/com/ether/user/User.java

@@ -16 +16 @@
     }
 
-    public User( @NotNull final String lastName, @Nullable final String firstName, @NotNull final String email, @NotNull final String password, @Nullable final UserRole role, final boolean hasAccessToBO, @NotNull final Date creationDate )
+    public User( @NotNull final String lastName, @Nullable final String firstName, @NotNull final String email, @NotNull final String password, @Nullable final UserRole role, final boolean hasAccessToBO, @Nullable final String laboratory, @Nullable final String country, @NotNull final Date creationDate )
     {
         _lastName = lastName;
@@ -24 +24 @@
         _role = role;
         _accessToBO = hasAccessToBO;
+        _laboratory = laboratory;
+        _country = country;
         _creationDate = creationDate;
     }
 
-    public User( @NotNull final String lastName, @Nullable final String firstName, @NotNull final String email, @NotNull final String pwd, @Nullable final String role, final Boolean hasAccessToBO, @NotNull final Date date )
+    public User( @NotNull final String lastName, @Nullable final String firstName, @NotNull final String email, @NotNull final String pwd, @Nullable final String role, final Boolean hasAccessToBO, @Nullable final String laboratory, @Nullable final String country, @NotNull final Date date )
     {
-        this( lastName, firstName, email, pwd, UserRole.valueOf( role ), hasAccessToBO, date );
+        this( lastName, firstName, email, pwd, UserRole.valueOf( role ), hasAccessToBO, laboratory, country, date );
     }
 
@@ -118 +120 @@
     }
 
+    @Nullable
+    public String getLaboratory()
+    {
+        return _laboratory;
+    }
+
+    public void setLaboratory( @Nullable final String laboratory )
+    {
+        _laboratory = laboratory;
+    }
+
+    @Nullable
+    public String getCountry()
+    {
+        return _country;
+    }
+
+    public void setCountry( @Nullable final String country )
+    {
+        _country = country;
+    }
+
     private Integer _id;
     @NotNull
@@ -132 +156 @@
     @NotNull
     private Date _creationDate;
+    @Nullable
+    private String _laboratory;
+    @Nullable
+    private String _country;
 }