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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pirkl-poo-2018
tp-4
Commits
b5b3788b
Commit
b5b3788b
authored
6 years ago
by
Quentin Leblanc
Browse files
Options
Downloads
Patches
Plain Diff
In the opposite of its name, number is NOT a number...
parent
4768fcef
No related branches found
No related tags found
2 merge requests
!21
*poof* final version
,
!18
Open transport stuff
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/ch/hepia/api/transport/Journey.java
+4
-4
4 additions, 4 deletions
src/main/java/ch/hepia/api/transport/Journey.java
with
4 additions
and
4 deletions
src/main/java/ch/hepia/api/transport/Journey.java
+
4
−
4
View file @
b5b3788b
...
...
@@ -11,7 +11,7 @@ public class Journey {
private
String
name
;
private
String
category
;
private
int
categoryCode
;
private
in
t
number
;
private
Str
in
g
number
;
private
String
operator
;
private
String
to
;
private
List
<
Stop
>
passList
;
...
...
@@ -28,7 +28,7 @@ public class Journey {
* @throws ParseException
*/
private
EmptyJourney
()
throws
ParseException
{
super
(
""
,
""
,
0
,
0
,
""
,
""
,
super
(
""
,
""
,
0
,
""
,
""
,
""
,
new
ArrayList
<>(),
0
,
0
);
}
}
...
...
@@ -45,7 +45,7 @@ public class Journey {
* @param capacity1st number of seats inst class
* @param capacity2nd number of seats in nd class
*/
private
Journey
(
String
name
,
String
category
,
int
categoryCode
,
in
t
number
,
String
operator
,
String
to
,
List
<
Stop
>
passList
,
int
capacity1st
,
int
capacity2nd
){
private
Journey
(
String
name
,
String
category
,
int
categoryCode
,
Str
in
g
number
,
String
operator
,
String
to
,
List
<
Stop
>
passList
,
int
capacity1st
,
int
capacity2nd
){
this
.
name
=
name
;
this
.
category
=
category
;
this
.
categoryCode
=
categoryCode
;
...
...
@@ -125,7 +125,7 @@ public class Journey {
String
name
=
datas
.
isNull
(
"name"
)
?
""
:
datas
.
getString
(
"name"
);
String
category
=
datas
.
isNull
(
"category"
)
?
""
:
datas
.
getString
(
"category"
);
int
categoryCode
=
datas
.
isNull
(
"categoryCode"
)
?
0
:
datas
.
getInt
(
"categoryCode"
);
in
t
number
=
datas
.
isNull
(
"number"
)
?
0
:
datas
.
get
Int
(
"number"
);
Str
in
g
number
=
datas
.
isNull
(
"number"
)
?
""
:
datas
.
get
String
(
"number"
);
String
operator
=
datas
.
isNull
(
"operator"
)
?
""
:
datas
.
getString
(
"operator"
);
String
to
=
datas
.
isNull
(
"to"
)
?
""
:
datas
.
getString
(
"to"
);
...
...
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