Skip to content

Commit 4117675

Browse files
committed
Change Nullable formatting.
1 parent 5a7dce4 commit 4117675

3 files changed

Lines changed: 9 additions & 15 deletions

File tree

src/main/java/de/eskalon/commons/screen/ManagedScreen.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ public abstract class ManagedScreen implements Screen {
6060
* <p>
6161
* These params are usually accessed in {@link #show()}.
6262
*/
63-
@Nullable
64-
protected Object[] pushParams;
63+
protected @Nullable Object[] pushParams;
6564

6665
private boolean initialized = false;
6766

src/main/java/de/eskalon/commons/screen/ScreenManager.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,12 @@ public class ScreenManager<S extends ManagedScreen, T extends ScreenTransition>
8787
* The screen that was shown before the {@linkplain #currScreen current
8888
* screen}.
8989
*/
90-
@Nullable
91-
private ManagedScreen lastScreen;
90+
private @Nullable ManagedScreen lastScreen;
9291

9392
/**
9493
* The current screen.
9594
*/
96-
@Nullable
97-
private ManagedScreen currScreen;
95+
private @Nullable ManagedScreen currScreen;
9896

9997
/**
10098
* The input processors of the {@linkplain #currScreen current screen}.
@@ -109,8 +107,7 @@ public class ScreenManager<S extends ManagedScreen, T extends ScreenTransition>
109107
/**
110108
* The transition effect currently rendered.
111109
*/
112-
@Nullable
113-
private T transition;
110+
private @Nullable T transition;
114111

115112
/**
116113
* A map with all initialized screens.
@@ -133,10 +130,10 @@ public class ScreenManager<S extends ManagedScreen, T extends ScreenTransition>
133130
private boolean hasDepth; // needed, when the framebuffers are (re)created
134131

135132
public void initialize(BasicInputMultiplexer gameInputMultiplexer,
136-
int width, int height, boolean hasDepth) {
133+
int screenWidth, int screenHeight, boolean hasDepth) {
137134
this.gameInputMultiplexer = gameInputMultiplexer;
138-
this.currentWidth = width;
139-
this.currentHeight = height;
135+
this.currentWidth = screenWidth;
136+
this.currentHeight = screenHeight;
140137
this.hasDepth = hasDepth;
141138
this.blankScreen = new BlankScreen();
142139
this.currScreen = this.blankScreen;
@@ -456,8 +453,7 @@ public void dispose() {
456453
* {@linkplain #getCurrentScreen() current screen}
457454
*/
458455
@SuppressWarnings("unchecked")
459-
@Nullable
460-
public S getLastScreen() {
456+
public @Nullable S getLastScreen() {
461457
if (lastScreen == blankScreen)
462458
return null; // return null, as the blank screen is not the right
463459
// type

src/main/java/de/eskalon/commons/screen/transition/TimedTransition.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
*/
3030
public abstract class TimedTransition extends ScreenTransition {
3131

32-
@Nullable
33-
protected Interpolation interpolation;
32+
protected @Nullable Interpolation interpolation;
3433
protected float duration;
3534
protected float timePassed;
3635

0 commit comments

Comments
 (0)