From cbd50476f0c51c58c5cd1d885f12f143c5d9fa42 Mon Sep 17 00:00:00 2001
From: Benjamin Barth <benjamin.barth@oio.de>
Date: Mon, 10 Aug 2015 16:48:29 +0200
Subject: [PATCH] Refactored EventDTO structure

---
 .../shared/eventlist/EventListEventDTO.java   |  6 +++++
 .../gwt/ui/shared/start/EventStageDTO.java    | 23 +++----------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/eventlist/EventListEventDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/eventlist/EventListEventDTO.java
index bf230060052..9038d2c53ac 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/eventlist/EventListEventDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/eventlist/EventListEventDTO.java
@@ -1,10 +1,16 @@
 package com.sap.sailing.gwt.ui.shared.eventlist;
 
 import com.sap.sailing.gwt.ui.shared.general.EventMetadataDTO;
+import com.sap.sailing.gwt.ui.shared.general.EventState;
+import com.sap.sailing.gwt.ui.shared.start.StageEventType;
 
 public class EventListEventDTO extends EventMetadataDTO {
     private String baseURL;
     private boolean isOnRemoteServer;
+    
+    public StageEventType getStageType() {
+        return getState() == EventState.RUNNING ? StageEventType.RUNNING : StageEventType.POPULAR;
+    }
 
     public String getBaseURL() {
         return baseURL;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/start/EventStageDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/start/EventStageDTO.java
index cfe5edee279..fab735262d0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/start/EventStageDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/start/EventStageDTO.java
@@ -1,30 +1,13 @@
 package com.sap.sailing.gwt.ui.shared.start;
 
-import com.sap.sailing.gwt.ui.shared.general.EventMetadataDTO;
+import com.sap.sailing.gwt.ui.shared.eventlist.EventListEventDTO;
 
-public class EventStageDTO extends EventMetadataDTO {
+public class EventStageDTO extends EventListEventDTO {
 
     private StageEventType stageType;
-    private String baseURL;
-    private boolean isOnRemoteServer;
     private String stageImageURL;
 
-    public String getBaseURL() {
-        return baseURL;
-    }
-
-    public void setBaseURL(String baseURL) {
-        this.baseURL = baseURL;
-    }
-
-    public boolean isOnRemoteServer() {
-        return isOnRemoteServer;
-    }
-
-    public void setOnRemoteServer(boolean isOnRemoteServer) {
-        this.isOnRemoteServer = isOnRemoteServer;
-    }
-
+    @Override
     public StageEventType getStageType() {
         return stageType;
     }