Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ARSnova Backend
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
John Samuel Ako Deutesfeld
ARSnova Backend
Commits
bc9c01cf
Commit
bc9c01cf
authored
6 years ago
by
Daniel Gerhardt
Committed by
Daniel Gerhardt
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Consistently use SessionFeature field of outer class for ImportExportSession
The field of the inner class is kept for compatibilty reasons.
parent
894a8d53
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java
+6
-7
6 additions, 7 deletions
...e/thm/arsnova/entities/transport/ImportExportSession.java
with
6 additions
and
7 deletions
src/main/java/de/thm/arsnova/entities/transport/ImportExportSession.java
+
6
−
7
View file @
bc9c01cf
...
...
@@ -44,8 +44,6 @@ public class ImportExportSession {
private
List
<
Motd
>
motds
;
private
SessionFeature
sessionFeature
=
new
SessionFeature
();
private
SessionInfo
sessionInfo
;
public
ImportExportSession
()
{
...
...
@@ -91,11 +89,11 @@ public class ImportExportSession {
}
public
SessionFeature
getSessionFeature
()
{
return
sessionFeature
;
return
session
.
sessionFeature
;
}
public
void
setSessionFeature
(
SessionFeature
sF
)
{
sessionFeature
=
sF
;
session
.
sessionFeature
=
sF
;
}
public
SessionInfo
getSessionInfo
()
{
...
...
@@ -114,7 +112,7 @@ public class ImportExportSession {
PublicPool
p
=
new
PublicPool
();
p
.
setPpFromSession
(
s
);
iesession
.
setPublicPool
(
p
);
sessionFeature
=
s
.
getFeatures
();
iesession
.
sessionFeature
=
s
.
getFeatures
();
session
=
iesession
;
}
...
...
@@ -240,7 +238,7 @@ public class ImportExportSession {
private
PublicPool
publicPool
;
private
SessionFeature
sessionFeature
;
private
SessionFeature
sessionFeature
=
new
SessionFeature
()
;
@ApiModelProperty
(
required
=
true
,
value
=
"used to display short name"
)
public
String
getName
()
{
...
...
@@ -287,7 +285,8 @@ public class ImportExportSession {
this
.
publicPool
=
publicPool
;
}
public
SessionFeature
getSessionFeature
()
{
/* Use getSessionFeature() of outer class for public access. */
private
SessionFeature
getSessionFeature
()
{
return
this
.
sessionFeature
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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