Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BattleArena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package 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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Scherbaum Maximilian
BattleArena
Commits
d6f12c4f
Commit
d6f12c4f
authored
1 year ago
by
Scherbaum Maximilian
Browse files
Options
Downloads
Patches
Plain Diff
fix: missing "}" and wrong export statement
parent
2946682a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
+8
-10
8 additions, 10 deletions
...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
src/main/java/module-info.java
+0
-1
0 additions, 1 deletion
src/main/java/module-info.java
with
8 additions
and
11 deletions
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
+
8
−
10
View file @
d6f12c4f
...
@@ -41,9 +41,12 @@ public class RuntimeInfo {
...
@@ -41,9 +41,12 @@ public class RuntimeInfo {
private
boolean
gameWon
;
private
boolean
gameWon
;
private
RuntimeInfo
(){};
private
RuntimeInfo
()
{
}
;
public
static
RuntimeInfo
getInstance
(){
public
static
RuntimeInfo
getInstance
()
{
return
runtimeInfoSingleton
;
return
runtimeInfoSingleton
;
}
}
...
@@ -52,19 +55,17 @@ public class RuntimeInfo {
...
@@ -52,19 +55,17 @@ public class RuntimeInfo {
Parser
.
mapDataValid
(
mapData
);
Parser
.
mapDataValid
(
mapData
);
Parser
.
mapNameValid
(
mapName
);
Parser
.
mapNameValid
(
mapName
);
return
new
MapData
(
HashGenerator
.
hashAndHex
(
mapData
),
mapName
,
18
,
18
,
mapData
);
return
new
MapData
(
HashGenerator
.
hashAndHex
(
mapData
),
mapName
,
18
,
18
,
mapData
);
}
}
catch
(
Exception
e
)
{
catch
(
Exception
e
){
log
.
error
(
e
);
log
.
error
(
e
);
throw
new
ParserException
(
e
.
getMessage
());
throw
new
ParserException
(
e
.
getMessage
());
}
}
}
}
public
void
setGameMap
(
MapData
mapSelected
){
//Create Game Scene Dropdown list directly gives reference to selected map
public
void
setGameMap
(
MapData
mapSelected
)
{
//Create Game Scene Dropdown list directly gives reference to selected map
try
{
try
{
mapGame
=
mapSelected
;
mapGame
=
mapSelected
;
mapDataGame
=
mapSelected
.
getMapData
();
mapDataGame
=
mapSelected
.
getMapData
();
}
}
catch
(
Exception
e
)
{
catch
(
Exception
e
){
log
.
error
(
e
);
log
.
error
(
e
);
}
}
}
}
...
@@ -117,9 +118,6 @@ public class RuntimeInfo {
...
@@ -117,9 +118,6 @@ public class RuntimeInfo {
this
.
gameplayObjects
=
gameplayObjects
;
this
.
gameplayObjects
=
gameplayObjects
;
}
}
public
int
gameTimeInHours
(){
return
persistenceInst
.
getStatistics
().
getGameTime
()
/
3600
;
public
String
getMapDataGame
()
{
public
String
getMapDataGame
()
{
return
mapDataGame
;
return
mapDataGame
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/module-info.java
+
0
−
1
View file @
d6f12c4f
...
@@ -26,5 +26,4 @@ module gui {
...
@@ -26,5 +26,4 @@ module gui {
exports
de
.
hdm_stuttgart
.
battlearena
.
Controller
.
Utilities
;
exports
de
.
hdm_stuttgart
.
battlearena
.
Controller
.
Utilities
;
exports
de
.
hdm_stuttgart
.
battlearena
.
Model
.
Multiplayer
;
exports
de
.
hdm_stuttgart
.
battlearena
.
Model
.
Multiplayer
;
exports
de
.
hdm_stuttgart
.
battlearena
.
Model
.
Entity
.
GameplayObjects
to
javafx
.
fxml
;
exports
de
.
hdm_stuttgart
.
battlearena
.
Model
.
Entity
.
GameplayObjects
to
javafx
.
fxml
;
opens
de
.
hdm_stuttgart
.
battlearena
.
Controller
.
Utilities
to
javafx
.
fxml
;
}
}
\ No newline at end of file
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