Remove unnecessary DataTypes wrapper class

magmaOffenburg · Sep 23, 2023 · 0ec8e4d · 0ec8e4d
1 parent 1503ba9
commit 0ec8e4d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 27 deletions.
diff --git a/src/main/java/rv/comm/rcssserver/ServerComm.java b/src/main/java/rv/comm/rcssserver/ServerComm.java
@@ -33,7 +33,7 @@
 import org.apache.logging.log4j.Logger;
 import org.magmaoffenburg.roboviz.configuration.Config.General;
 import org.magmaoffenburg.roboviz.configuration.Config.Networking;
-import org.magmaoffenburg.roboviz.util.DataTypes;
+import org.magmaoffenburg.roboviz.util.Mode;
 import rv.comm.drawing.DrawComm.DrawCommListener;
 import rv.world.WorldModel;
 
@@ -217,7 +217,7 @@ private void writeToLogfile(String msg)
 		logfileOutput.write("\n");
 	}
 
-	public ServerComm(WorldModel world, DataTypes.Mode viewerMode)
+	public ServerComm(WorldModel world, Mode viewerMode)
 	{
 		this.world = world;
 
@@ -235,7 +235,7 @@ public ServerComm(WorldModel world, DataTypes.Mode viewerMode)
 			autoConnectTimer.start();
 		}
 
-		recordLogs = viewerMode != DataTypes.Mode.LOG && General.INSTANCE.getRecordLogs();
+		recordLogs = viewerMode != Mode.LOG && General.INSTANCE.getRecordLogs();
 		logfileDirectory = General.INSTANCE.getLogfileDirectory();
 	}
 

diff --git a/src/main/java/rv/world/WorldModel.java b/src/main/java/rv/world/WorldModel.java
@@ -28,7 +28,7 @@
 import org.magmaoffenburg.roboviz.configuration.Config;
 import org.magmaoffenburg.roboviz.configuration.Config.TeamColors;
 import org.magmaoffenburg.roboviz.rendering.CameraController;
-import org.magmaoffenburg.roboviz.util.DataTypes;
+import org.magmaoffenburg.roboviz.util.Mode;
 import rv.comm.rcssserver.GameState;
 import rv.comm.rcssserver.ISceneGraphItem;
 import rv.comm.rcssserver.scenegraph.SceneGraph;
@@ -185,7 +185,7 @@ public Team getRightTeam()
 		return rightTeam;
 	}
 
-	public void init(GL glObj, ContentManager cm, DataTypes.Mode mode)
+	public void init(GL glObj, ContentManager cm, Mode mode)
 	{
 		this.cm = cm;
 		GL2 gl = glObj.getGL2();

diff --git a/src/main/kotlin/org/magmaoffenburg/roboviz/Main.kt b/src/main/kotlin/org/magmaoffenburg/roboviz/Main.kt
@@ -7,7 +7,7 @@ import org.magmaoffenburg.roboviz.configuration.Config.General
 import org.magmaoffenburg.roboviz.etc.LookAndFeelController
 import org.magmaoffenburg.roboviz.gui.MainWindow
 import org.magmaoffenburg.roboviz.rendering.Renderer
-import org.magmaoffenburg.roboviz.util.DataTypes.Mode
+import org.magmaoffenburg.roboviz.util.Mode
 import java.awt.EventQueue
 
 class Main {

diff --git a/src/main/kotlin/org/magmaoffenburg/roboviz/gui/MainWindow.kt b/src/main/kotlin/org/magmaoffenburg/roboviz/gui/MainWindow.kt
@@ -8,7 +8,7 @@ import org.magmaoffenburg.roboviz.configuration.Config.Graphics
 import org.magmaoffenburg.roboviz.gui.menus.*
 import org.magmaoffenburg.roboviz.gui.windows.LogPlayerControlsPanel
 import org.magmaoffenburg.roboviz.rendering.Renderer
-import org.magmaoffenburg.roboviz.util.DataTypes
+import org.magmaoffenburg.roboviz.util.Mode
 import org.magmaoffenburg.roboviz.util.SwingUtils
 import rv.comm.rcssserver.LogPlayer
 import rv.comm.rcssserver.ServerComm
@@ -49,7 +49,7 @@ class MainWindow : JFrame(), ServerComm.ServerChangeListener, LogPlayer.StateCha
         isVisible = true // set visible after everything is initialized
         instance = this
 
-        if (Main.mode == DataTypes.Mode.LOG) {
+        if (Main.mode == Mode.LOG) {
             initializeLogPlayerControls()
         }
     }
@@ -83,8 +83,8 @@ class MainWindow : JFrame(), ServerComm.ServerChangeListener, LogPlayer.StateCha
         jMenuBar.removeAll()
 
         when (Main.mode) {
-            DataTypes.Mode.LIVE -> initializeLiveMenu()
-            DataTypes.Mode.LOG -> initializeLogMenu()
+            Mode.LIVE -> initializeLiveMenu()
+            Mode.LOG -> initializeLogMenu()
         }
     }
 
@@ -165,8 +165,8 @@ class MainWindow : JFrame(), ServerComm.ServerChangeListener, LogPlayer.StateCha
         SwingUtilities.updateComponentTreeUI(this)
 
         when (Main.mode) {
-            DataTypes.Mode.LOG -> initializeLogPlayerControls()
-            DataTypes.Mode.LIVE -> logPlayerControls?.dispose()
+            Mode.LOG -> initializeLogPlayerControls()
+            Mode.LIVE -> logPlayerControls?.dispose()
         }
     }
 

diff --git a/src/main/kotlin/org/magmaoffenburg/roboviz/rendering/Renderer.kt b/src/main/kotlin/org/magmaoffenburg/roboviz/rendering/Renderer.kt
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.kotlin.logger
 import org.magmaoffenburg.roboviz.Main
 import org.magmaoffenburg.roboviz.configuration.Config.*
 import org.magmaoffenburg.roboviz.gui.MainWindow
-import org.magmaoffenburg.roboviz.util.DataTypes
+import org.magmaoffenburg.roboviz.util.Mode
 import rv.comm.NetworkManager
 import rv.comm.drawing.Drawings
 import rv.comm.rcssserver.LogPlayer
@@ -115,7 +115,7 @@ class Renderer : GLProgram(MainWindow.instance.width, MainWindow.instance.height
         // initialize all camera stuff
         cameraController = CameraController(drawable)
 
-        if (Main.mode == DataTypes.Mode.LIVE) {
+        if (Main.mode == Mode.LIVE) {
             netManager = NetworkManager()
             netManager.init()
             netManager.server.addChangeListener(world.gameState)
@@ -132,7 +132,7 @@ class Renderer : GLProgram(MainWindow.instance.width, MainWindow.instance.height
         if (activeScreenIsInitialized()) {
             activeScreen.setEnabled(MainWindow.glCanvas, false)
         }
-        activeScreen = if (Main.mode == DataTypes.Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
+        activeScreen = if (Main.mode == Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
         activeScreen.setEnabled(MainWindow.glCanvas, true)
 
         gl?.let { initEffects(gl) }
@@ -415,18 +415,18 @@ class Renderer : GLProgram(MainWindow.instance.width, MainWindow.instance.height
         cameraController.initPicker()
 
         when (Main.mode) {
-            DataTypes.Mode.LIVE -> {
+            Mode.LIVE -> {
                 netManager = NetworkManager()
                 netManager.init()
                 netManager.server.addChangeListener(world.gameState)
                 netManager.server.addChangeListener(MainWindow.instance)
             }
-            DataTypes.Mode.LOG -> {
+            Mode.LOG -> {
                 initLogPlayer()
             }
         }
 
-        activeScreen = if (Main.mode == DataTypes.Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
+        activeScreen = if (Main.mode == Mode.LIVE) LiveGameScreen() else LogfileModeScreen()
         activeScreen.setEnabled(MainWindow.glCanvas, true)
     }
 

diff --git a/src/main/kotlin/org/magmaoffenburg/roboviz/util/DataTypes.kt b/src/main/kotlin/org/magmaoffenburg/roboviz/util/DataTypes.kt
@@ -1,10 +1,5 @@
 package org.magmaoffenburg.roboviz.util
-
-class DataTypes {
-
-    enum class Mode {
-        LOG,
-        LIVE
-    }
-
-}
+enum class Mode {
+    LOG,
+    LIVE
+}