Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Team 5 - Smart Towns
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Rhys Evans
Team 5 - Smart Towns
Merge requests
!45
Extention Merge 1.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Extention Merge 1.
d1656298/client-project:Extension
into
main
Overview
1
Commits
11
Pipelines
0
Changes
15
Closed
Connor Brock
requested to merge
d1656298/client-project:Extension
into
main
1 year ago
Overview
1
Commits
11
Pipelines
0
Changes
15
Expand
Complation of weeks worth of commits, merging to triple check main functionality.
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
ed3b7dbf
11 commits,
1 year ago
15 files
+
281
−
142
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
15
Search (e.g. *.vue) (Ctrl+P)
src/main/java/Team5/SmartTowns/dragonstale/DragonsTale.java
+
12
−
12
Options
@@ -8,18 +8,18 @@ import java.util.List;
@Data
public
class
DragonsTale
{
Landmarks
landmarks
=
new
Landmarks
();
private
int
landmarkID
;
private
String
landmarkName
;
private
String
landmarkDescription
;
private
String
imgPath
;
private
String
qrCodeURL
;
//As there were already landmark fields created, I used composition to import them into the class to be used within the file.
private
int
landmarkID
=
landmarks
.
getLandmarkID
();
private
String
landmarkName
=
landmarks
.
getLandmarkName
();
private
String
landmarkDescription
=
landmarks
.
getLandmarkDescription
();
private
String
getImgPath
;
public
static
List
<
Landmarks
>
landmarksDragonstrail
=
List
.
of
(
new
Landmarks
(
1
,
"A scent of...Dragon"
,
"The Dragon has been spotted near by, find the QR code to continue"
,
"Start your discovery, at the sweet shop."
),
new
Landmarks
(
2
,
"They've been found!"
,
"Don't let them escape, find the next QR code to continue!"
,
"Location test"
)
);
public
static
List
<
Landmarks
>
getLandmarksDragonstrail
()
{
return
landmarksDragonstrail
;
public
DragonsTale
(
int
landmarkID
,
String
landmarkName
,
String
landmarkDescription
,
String
imgPath
,
String
qrCodeURL
)
{
this
.
landmarkID
=
landmarkID
;
this
.
landmarkName
=
landmarkName
;
this
.
landmarkDescription
=
landmarkDescription
;
this
.
imgPath
=
imgPath
;
this
.
qrCodeURL
=
qrCodeURL
;
}
}
Loading