Skip to content

Commit 0ec8e4d

Browse files
hannesbraunhannesbraun
committed
Remove unnecessary DataTypes wrapper class
1 parent 1503ba9 commit 0ec8e4d

File tree

6 files changed

+22
-27
lines changed

6 files changed

+22
-27
lines changed

‎src/main/java/rv/comm/rcssserver/ServerComm.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.logging.log4j.Logger;
3434
import org.magmaoffenburg.roboviz.configuration.Config.General;
3535
import org.magmaoffenburg.roboviz.configuration.Config.Networking;
36-
import org.magmaoffenburg.roboviz.util.DataTypes;
36+
import org.magmaoffenburg.roboviz.util.Mode;
3737
import rv.comm.drawing.DrawComm.DrawCommListener;
3838
import rv.world.WorldModel;
3939

@@ -217,7 +217,7 @@ private void writeToLogfile(String msg)
217217
logfileOutput.write("\n");
218218
}
219219

220-
public ServerComm(WorldModel world, DataTypes.Mode viewerMode)
220+
public ServerComm(WorldModel world, Mode viewerMode)
221221
{
222222
this.world = world;
223223

@@ -235,7 +235,7 @@ public ServerComm(WorldModel world, DataTypes.Mode viewerMode)
235235
autoConnectTimer.start();
236236
}
237237

238-
recordLogs = viewerMode != DataTypes.Mode.LOG && General.INSTANCE.getRecordLogs();
238+
recordLogs = viewerMode != Mode.LOG && General.INSTANCE.getRecordLogs();
239239
logfileDirectory = General.INSTANCE.getLogfileDirectory();
240240
}
241241

‎src/main/java/rv/world/WorldModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.magmaoffenburg.roboviz.configuration.Config;
2929
import org.magmaoffenburg.roboviz.configuration.Config.TeamColors;
3030
import org.magmaoffenburg.roboviz.rendering.CameraController;
31-
import org.magmaoffenburg.roboviz.util.DataTypes;
31+
import org.magmaoffenburg.roboviz.util.Mode;
3232
import rv.comm.rcssserver.GameState;
3333
import rv.comm.rcssserver.ISceneGraphItem;
3434
import rv.comm.rcssserver.scenegraph.SceneGraph;
@@ -185,7 +185,7 @@ public Team getRightTeam()
185185
return rightTeam;
186186
}
187187

188-
public void init(GL glObj, ContentManager cm, DataTypes.Mode mode)
188+
public void init(GL glObj, ContentManager cm, Mode mode)
189189
{
190190
this.cm = cm;
191191
GL2 gl = glObj.getGL2();

‎src/main/kotlin/org/magmaoffenburg/roboviz/Main.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.magmaoffenburg.roboviz.configuration.Config.General
77
import org.magmaoffenburg.roboviz.etc.LookAndFeelController
88
import org.magmaoffenburg.roboviz.gui.MainWindow
99
import org.magmaoffenburg.roboviz.rendering.Renderer
10-
import org.magmaoffenburg.roboviz.util.DataTypes.Mode
10+
import org.magmaoffenburg.roboviz.util.Mode
1111
import java.awt.EventQueue
1212

1313
class Main {

‎src/main/kotlin/org/magmaoffenburg/roboviz/gui/MainWindow.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.magmaoffenburg.roboviz.configuration.Config.Graphics
88
import org.magmaoffenburg.roboviz.gui.menus.*
99
import org.magmaoffenburg.roboviz.gui.windows.LogPlayerControlsPanel
1010
import org.magmaoffenburg.roboviz.rendering.Renderer
11-
import org.magmaoffenburg.roboviz.util.DataTypes
11+
import org.magmaoffenburg.roboviz.util.Mode
1212
import org.magmaoffenburg.roboviz.util.SwingUtils
1313
import rv.comm.rcssserver.LogPlayer
1414
import rv.comm.rcssserver.ServerComm
@@ -49,7 +49,7 @@ class MainWindow : JFrame(), ServerComm.ServerChangeListener, LogPlayer.StateCha
4949
isVisible = true // set visible after everything is initialized
5050
instance = this
5151

52-
if (Main.mode == DataTypes.Mode.LOG) {
52+
if (Main.mode == Mode.LOG) {
5353
initializeLogPlayerControls()
5454
}
5555
}
@@ -83,8 +83,8 @@ class MainWindow : JFrame(), ServerComm.ServerChangeListener, LogPlayer.StateCha
8383
jMenuBar.removeAll()
8484

8585
when (Main.mode) {
86-
DataTypes.Mode.LIVE -> initializeLiveMenu()
87-
DataTypes.Mode.LOG -> initializeLogMenu()
86+
Mode.LIVE -> initializeLiveMenu()
87+
Mode.LOG -> initializeLogMenu()
8888
}
8989
}
9090

@@ -165,8 +165,8 @@ class MainWindow : JFrame(), ServerComm.ServerChangeListener, LogPlayer.StateCha
165165
SwingUtilities.updateComponentTreeUI(this)
166166

167167
when (Main.mode) {
168-
DataTypes.Mode.LOG -> initializeLogPlayerControls()
169-
DataTypes.Mode.LIVE -> logPlayerControls?.dispose()
168+
Mode.LOG -> initializeLogPlayerControls()
169+
Mode.LIVE -> logPlayerControls?.dispose()
170170
}
171171
}
172172

‎src/main/kotlin/org/magmaoffenburg/roboviz/rendering/Renderer.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.kotlin.logger
2121
import org.magmaoffenburg.roboviz.Main
2222
import org.magmaoffenburg.roboviz.configuration.Config.*
2323
import org.magmaoffenburg.roboviz.gui.MainWindow
24-
import org.magmaoffenburg.roboviz.util.DataTypes
24+
import org.magmaoffenburg.roboviz.util.Mode
2525
import rv.comm.NetworkManager
2626
import rv.comm.drawing.Drawings
2727
import rv.comm.rcssserver.LogPlayer
@@ -115,7 +115,7 @@ class Renderer : GLProgram(MainWindow.instance.width, MainWindow.instance.height
115115
// initialize all camera stuff
116116
cameraController = CameraController(drawable)
117117

118-
if (Main.mode == DataTypes.Mode.LIVE) {
118+
if (Main.mode == Mode.LIVE) {
119119
netManager = NetworkManager()
120120
netManager.init()
121121
netManager.server.addChangeListener(world.gameState)
@@ -132,7 +132,7 @@ class Renderer : GLProgram(MainWindow.instance.width, MainWindow.instance.height
132132
if (activeScreenIsInitialized()) {
133133
activeScreen.setEnabled(MainWindow.glCanvas, false)
134134
}
135-
activeScreen = if (Main.mode == DataTypes.Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
135+
activeScreen = if (Main.mode == Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
136136
activeScreen.setEnabled(MainWindow.glCanvas, true)
137137

138138
gl?.let { initEffects(gl) }
@@ -415,18 +415,18 @@ class Renderer : GLProgram(MainWindow.instance.width, MainWindow.instance.height
415415
cameraController.initPicker()
416416

417417
when (Main.mode) {
418-
DataTypes.Mode.LIVE -> {
418+
Mode.LIVE -> {
419419
netManager = NetworkManager()
420420
netManager.init()
421421
netManager.server.addChangeListener(world.gameState)
422422
netManager.server.addChangeListener(MainWindow.instance)
423423
}
424-
DataTypes.Mode.LOG -> {
424+
Mode.LOG -> {
425425
initLogPlayer()
426426
}
427427
}
428428

429-
activeScreen = if (Main.mode == DataTypes.Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
429+
activeScreen = if (Main.mode == Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
430430
activeScreen.setEnabled(MainWindow.glCanvas, true)
431431
}
432432

‎src/main/kotlin/org/magmaoffenburg/roboviz/util/DataTypes.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package org.magmaoffenburg.roboviz.util
2-
3-
class DataTypes {
4-
5-
enum class Mode {
6-
LOG,
7-
LIVE
8-
}
9-
10-
}
2+
enum class Mode {
3+
LOG,
4+
LIVE
5+
}

0 commit comments

Comments
 (0)