Merge pull request #6208 from Scoppio/autoresolve

Autoresolve support

.gitignore

@@ -1,3 +1,4 @@
+/tmp/
 /.metadata
 /.recommenders/
 /RemoteSystemsTempFiles/

megamek/src/megamek/client/bot/ui/swing/BotGUI.java

@@ -134,7 +134,7 @@ public void gameClientFeedbackRequest(GameCFREvent evt) {
     }
 
     @Override
-    public void gameVictory(GameVictoryEvent e) {
+    public void gameVictory(PostGameResolution e) {
 
     }
 }

megamek/src/megamek/client/ui/swing/AbstractPhaseDisplay.java

@@ -219,7 +219,7 @@ public void gameNewAction(GameNewActionEvent e) { }
     public void gameClientFeedbackRequest(GameCFREvent evt) { }
 
     @Override
-    public void gameVictory(GameVictoryEvent e) { }
+    public void gameVictory(PostGameResolution e) { }
 
     //endregion
 }

megamek/src/megamek/client/ui/swing/AccessibilityWindow.java

@@ -266,7 +266,7 @@ public void gameClientFeedbackRequest(GameCFREvent e) {
         }
 
         @Override
-        public void gameVictory(GameVictoryEvent e) {
+        public void gameVictory(PostGameResolution e) {
             systemEvent("Game Victory! (unneeded.)");
         }
     };

megamek/src/megamek/client/ui/swing/boardview/BoardViewSpriteHandler.java

@@ -121,6 +121,6 @@ public void gameNewAction(GameNewActionEvent e) { }
     public void gameClientFeedbackRequest(GameCFREvent e) { }
 
     @Override
-    public void gameVictory(GameVictoryEvent e) { }
+    public void gameVictory(PostGameResolution e) { }
     //endregion
 }

megamek/src/megamek/client/ui/swing/forceDisplay/ForceDisplayPanel.java

@@ -331,7 +331,7 @@ public void gameClientFeedbackRequest(GameCFREvent evt) {
     }
 
     @Override
-    public void gameVictory(GameVictoryEvent e) {
+    public void gameVictory(PostGameResolution e) {
         // noaction default
     }
 

megamek/src/megamek/common/event/GameListener.java

@@ -23,7 +23,7 @@
  * removed using the <code>removeGameListener</code> method. When Game is
  * changed the appropriate method will be invoked.
  * </p>
- * 
+ *
  * @see GameListenerAdapter
  * @see GameEvent
  */
@@ -61,10 +61,10 @@ public interface GameListener extends java.util.EventListener {
     void gameEntityChange(GameEntityChangeEvent e);
 
     void gameNewAction(GameNewActionEvent e);
-    
+
     void gameClientFeedbackRequest(GameCFREvent e);
-    
-    void gameVictory(GameVictoryEvent e);
+
+    void gameVictory(PostGameResolution e);
 
     default void gameScriptedEvent(GameScriptedEvent event) { }
 

megamek/src/megamek/common/event/GameListenerAdapter.java

@@ -21,7 +21,7 @@
  * Classes that wish to deal with <code>GamedEvent</code>s can extend this
  * class and override only the methods which they are interested in.
  * </p>
- * 
+ *
  * @see GameListener
  * @see GameEvent
  */
@@ -94,13 +94,13 @@ public void gameEntityChange(GameEntityChangeEvent e) {
     @Override
     public void gameNewAction(GameNewActionEvent e) {
     }
-    
+
     @Override
     public void gameClientFeedbackRequest(GameCFREvent evt) {
     }
 
     @Override
-    public void gameVictory(GameVictoryEvent e) {        
-    }    
+    public void gameVictory(PostGameResolution e) {
+    }
 
 }

megamek/src/megamek/common/event/GameVictoryEvent.java

@@ -29,7 +29,7 @@
  * @see Game#end(int, int)
  * @see GameListener
  */
-public class GameVictoryEvent extends GameEvent {
+public class GameVictoryEvent extends GameEvent implements PostGameResolution {
     private static final long serialVersionUID = -8470655646019563063L;
 
     /**
@@ -73,13 +73,15 @@ public String getEventName() {
     /**
      * @return an enumeration of all the entities in the game.
      */
+    @Override
     public Enumeration<Entity> getEntities() {
         return entities.elements();
     }
 
     /**
      * @return the entity with the given id number, if any.
      */
+    @Override
     public Entity getEntity(int id) {
         return entityIds.get(id);
     }
@@ -88,6 +90,7 @@ public Entity getEntity(int id) {
      * @return an enumeration of salvageable entities.
      */
     // TODO: Correctly implement "Captured" Entities
+    @Override
     public Enumeration<Entity> getGraveyardEntities() {
         Vector<Entity> graveyard = new Vector<>();
 
@@ -105,6 +108,7 @@ public Enumeration<Entity> getGraveyardEntities() {
     /**
      * @return an enumeration of wrecked entities.
      */
+    @Override
     public Enumeration<Entity> getWreckedEntities() {
         Vector<Entity> wrecks = new Vector<>();
         for (Entity entity : vOutOfGame) {
@@ -121,6 +125,7 @@ public Enumeration<Entity> getWreckedEntities() {
     /**
      * Returns an enumeration of entities that have retreated
      */
+    @Override
     public Enumeration<Entity> getRetreatedEntities() {
         Vector<Entity> sanctuary = new Vector<>();
 
@@ -137,6 +142,7 @@ public Enumeration<Entity> getRetreatedEntities() {
     /**
      * Returns an enumeration of entities that were utterly destroyed
      */
+    @Override
     public Enumeration<Entity> getDevastatedEntities() {
         Vector<Entity> smithereens = new Vector<>();
 

megamek/src/megamek/common/event/PostGameResolution.java

@@ -0,0 +1,19 @@
+package megamek.common.event;
+
+import megamek.common.Entity;
+
+import java.util.Enumeration;
+
+public interface PostGameResolution {
+    Enumeration<Entity> getEntities();
+
+    Entity getEntity(int id);
+
+    Enumeration<Entity> getGraveyardEntities();
+
+    Enumeration<Entity> getWreckedEntities();
+
+    Enumeration<Entity> getRetreatedEntities();
+
+    Enumeration<Entity> getDevastatedEntities();
+}