Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
tp-4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pirkl-poo-2018
tp-4
Commits
fe8bd6f8
Verified
Commit
fe8bd6f8
authored
6 years ago
by
Michaël El Kharroubi
Browse files
Options
Downloads
Plain Diff
Merge branch 'gui-mq' of
ssh://ssh.hesge.ch:10572/pirkl-poo-2018/tp-4
into gui-mq
parents
330e9bd2
40b4a0eb
Branches
Branches containing commit
No related tags found
2 merge requests
!21
*poof* final version
,
!17
Gui mq
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/ch/hepia/events/JoinedJourney.java
+16
-0
16 additions, 0 deletions
src/main/java/ch/hepia/events/JoinedJourney.java
src/main/java/ch/hepia/events/LeftJourney.java
+16
-0
16 additions, 0 deletions
src/main/java/ch/hepia/events/LeftJourney.java
with
32 additions
and
0 deletions
src/main/java/ch/hepia/events/JoinedJourney.java
+
16
−
0
View file @
fe8bd6f8
...
@@ -27,6 +27,22 @@ public class JoinedJourney implements Serializable{
...
@@ -27,6 +27,22 @@ public class JoinedJourney implements Serializable{
this
.
sections
=
new
ArrayList
<>(
sections
);
this
.
sections
=
new
ArrayList
<>(
sections
);
}
}
/**
* Returns the user
* @return the user
*/
public
User
getUser
(){
return
user
;
}
/**
* Returns the list of sections of this journey.
* @return the list of sections of this journey
*/
public
List
<
Section
>
getSections
(){
return
new
ArrayList
<>(
sections
);
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
// TODO
// TODO
...
...
This diff is collapsed.
Click to expand it.
src/main/java/ch/hepia/events/LeftJourney.java
+
16
−
0
View file @
fe8bd6f8
...
@@ -27,6 +27,22 @@ public class LeftJourney implements Serializable {
...
@@ -27,6 +27,22 @@ public class LeftJourney implements Serializable {
this
.
sections
=
new
ArrayList
<>(
sections
);
this
.
sections
=
new
ArrayList
<>(
sections
);
}
}
/**
* Returns the user
* @return the user
*/
public
User
getUser
(){
return
user
;
}
/**
* Returns the list of sections of this journey.
* @return the list of sections of this journey
*/
public
List
<
Section
>
getSections
(){
return
new
ArrayList
<>(
sections
);
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
// TODO
// TODO
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment