Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Oskars
JAVA_seminar3
Commits
22af89bc
Commit
22af89bc
authored
Mar 11, 2021
by
Oskars
Browse files
Add: finUser method to GuestUser class, implemented in User class
parent
37c9910e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
5 deletions
+27
-5
src/model/users/GuestUser.java
src/model/users/GuestUser.java
+5
-1
src/model/users/PrivateUser.java
src/model/users/PrivateUser.java
+3
-0
src/model/users/User.java
src/model/users/User.java
+19
-4
No files found.
src/model/users/GuestUser.java
View file @
22af89bc
package
model.users
;
package
model.users
;
public
class
GuestUser
{
import
model.users.User
;
public
abstract
class
GuestUser
{
private
int
generatedId
;
private
int
generatedId
;
private
static
int
IdCounter
=
0
;
private
static
int
IdCounter
=
0
;
//CONSTRUCTOR
//CONSTRUCTOR
public
GuestUser
()
{
public
GuestUser
()
{
generatedId
=
++
IdCounter
;
generatedId
=
++
IdCounter
;
...
@@ -17,5 +20,6 @@ public class GuestUser {
...
@@ -17,5 +20,6 @@ public class GuestUser {
return
generatedId
;
return
generatedId
;
}
}
//OTHER METHODS
//OTHER METHODS
public
abstract
User
findUser
(
int
id
);
}
}
src/model/users/PrivateUser.java
View file @
22af89bc
...
@@ -70,6 +70,9 @@ public class PrivateUser extends User{
...
@@ -70,6 +70,9 @@ public class PrivateUser extends User{
posts
.
add
(
newPost
);
posts
.
add
(
newPost
);
return
newPost
;
return
newPost
;
}
}
}
}
src/model/users/User.java
View file @
22af89bc
...
@@ -15,6 +15,7 @@ public abstract class User extends GuestUser implements IPost{
...
@@ -15,6 +15,7 @@ public abstract class User extends GuestUser implements IPost{
private
String
password
;
private
String
password
;
private
String
generatedPassword
;
private
String
generatedPassword
;
//MD5 hashes are no longer considered cryptographically secure, and they should not be used for cryptographic authentication.
//MD5 hashes are no longer considered cryptographically secure, and they should not be used for cryptographic authentication.
public
static
ArrayList
<
User
>
allUsers
=
new
ArrayList
<
User
>();
//CONSTRUCTORS
//CONSTRUCTORS
public
User
()
{
public
User
()
{
...
@@ -23,6 +24,7 @@ public abstract class User extends GuestUser implements IPost{
...
@@ -23,6 +24,7 @@ public abstract class User extends GuestUser implements IPost{
username
=
"Empty"
;
username
=
"Empty"
;
password
=
"Empty"
;
password
=
"Empty"
;
generatedPassword
=
null
;
generatedPassword
=
null
;
allUsers
.
add
(
this
);
}
}
public
User
(
String
nameAndSurname
,
String
username
,
String
password
)
{
public
User
(
String
nameAndSurname
,
String
username
,
String
password
)
{
...
@@ -38,6 +40,7 @@ public abstract class User extends GuestUser implements IPost{
...
@@ -38,6 +40,7 @@ public abstract class User extends GuestUser implements IPost{
this
.
password
=
"Empty"
;
this
.
password
=
"Empty"
;
generatedPassword
=
null
;
generatedPassword
=
null
;
}
}
allUsers
.
add
(
this
);
}
}
...
@@ -63,6 +66,10 @@ public abstract class User extends GuestUser implements IPost{
...
@@ -63,6 +66,10 @@ public abstract class User extends GuestUser implements IPost{
}
}
public
void
setAllUsers
(
ArrayList
<
User
>
userList
)
{
allUsers
=
(
userList
!=
null
)
?
userList
:
new
ArrayList
<
User
>();
}
//GETTERS
//GETTERS
public
String
getNameAndSurname
()
{
public
String
getNameAndSurname
()
{
...
@@ -81,6 +88,10 @@ public abstract class User extends GuestUser implements IPost{
...
@@ -81,6 +88,10 @@ public abstract class User extends GuestUser implements IPost{
return
generatedPassword
;
return
generatedPassword
;
}
}
public
ArrayList
<
User
>
getAllUsers
()
{
return
allUsers
;
}
//OTHER METHODS
//OTHER METHODS
public
String
toString
()
{
public
String
toString
()
{
return
"User ID: "
+
super
.
getId
()
+
"Full name: "
+
nameAndSurname
+
", Username: "
+
username
;
return
"User ID: "
+
super
.
getId
()
+
"Full name: "
+
nameAndSurname
+
", Username: "
+
username
;
...
@@ -101,9 +112,13 @@ public abstract class User extends GuestUser implements IPost{
...
@@ -101,9 +112,13 @@ public abstract class User extends GuestUser implements IPost{
return
false
;
return
false
;
}
}
//IMPLEMENTED METHODS
//DERRIVED METHODS
//public void createPost(PostType postType, String msg) {}
@Override
//don't implement this if derived classes has to have implementation
public
User
findUser
(
int
id
)
{
//}
for
(
User
usr:
allUsers
)
{
if
(
usr
.
getId
()
==
id
)
return
usr
;
}
return
null
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment