refactored the model to incoporate a correct folder structure
This commit is contained in:
		@@ -1,9 +1,5 @@
 | 
				
			|||||||
package pp.mdga.client;
 | 
					package pp.mdga.client;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import pp.mdga.notification.Notification;
 | 
					 | 
				
			||||||
import pp.mdga.notification.PieceInGameNotification;
 | 
					 | 
				
			||||||
import pp.mdga.notification.PlayerInGameNotification;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
public enum MdgaState {
 | 
					public enum MdgaState {
 | 
				
			||||||
    NONE,
 | 
					    NONE,
 | 
				
			||||||
    MAIN,
 | 
					    MAIN,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import pp.mdga.client.view.GameView;
 | 
					import pp.mdga.client.view.GameView;
 | 
				
			||||||
import pp.mdga.client.view.LobbyView;
 | 
					import pp.mdga.client.view.LobbyView;
 | 
				
			||||||
import pp.mdga.notification.*;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,18 +1,12 @@
 | 
				
			|||||||
package pp.mdga.client.board.Outline;
 | 
					package pp.mdga.client.board.Outline;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.jme3.asset.AssetManager;
 | 
					import com.jme3.asset.AssetManager;
 | 
				
			||||||
import com.jme3.material.Material;
 | 
					 | 
				
			||||||
import com.jme3.material.RenderState;
 | 
					 | 
				
			||||||
import com.jme3.material.RenderState.BlendMode;
 | 
					 | 
				
			||||||
import com.jme3.math.ColorRGBA;
 | 
					import com.jme3.math.ColorRGBA;
 | 
				
			||||||
import com.jme3.post.Filter;
 | 
					 | 
				
			||||||
import com.jme3.post.FilterPostProcessor;
 | 
					import com.jme3.post.FilterPostProcessor;
 | 
				
			||||||
import com.jme3.renderer.Camera;
 | 
					import com.jme3.renderer.Camera;
 | 
				
			||||||
import com.jme3.renderer.RenderManager;
 | 
					import com.jme3.renderer.RenderManager;
 | 
				
			||||||
import com.jme3.renderer.ViewPort;
 | 
					import com.jme3.renderer.ViewPort;
 | 
				
			||||||
import com.jme3.scene.Node;
 | 
					 | 
				
			||||||
import com.jme3.scene.Spatial;
 | 
					import com.jme3.scene.Spatial;
 | 
				
			||||||
import pp.mdga.game.Color;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class SelectObjectOutliner {
 | 
					public class SelectObjectOutliner {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,8 @@
 | 
				
			|||||||
import com.jme3.network.serializing.Serializer;
 | 
					import com.jme3.network.serializing.Serializer;
 | 
				
			||||||
import pp.mdga.game.Game;
 | 
					import pp.mdga.game.Game;
 | 
				
			||||||
import pp.mdga.game.Player;
 | 
					import pp.mdga.game.Player;
 | 
				
			||||||
import pp.mdga.message.client.*;
 | 
					import pp.mdga.server.ServerGameLogic;
 | 
				
			||||||
import pp.mdga.message.server.*;
 | 
					import pp.mdga.server.ServerSender;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.io.FileInputStream;
 | 
					import java.io.FileInputStream;
 | 
				
			||||||
import java.io.IOException;
 | 
					import java.io.IOException;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,11 +8,6 @@
 | 
				
			|||||||
import pp.mdga.client.MdgaApp;
 | 
					import pp.mdga.client.MdgaApp;
 | 
				
			||||||
import pp.mdga.client.MdgaState;
 | 
					import pp.mdga.client.MdgaState;
 | 
				
			||||||
import pp.mdga.client.gui.GuiHandler;
 | 
					import pp.mdga.client.gui.GuiHandler;
 | 
				
			||||||
import pp.mdga.game.Color;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import java.util.ArrayList;
 | 
					 | 
				
			||||||
import java.util.List;
 | 
					 | 
				
			||||||
import java.util.UUID;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class GameView extends MdgaView {
 | 
					public class GameView extends MdgaView {
 | 
				
			||||||
    private BoardHandler boardHandler;
 | 
					    private BoardHandler boardHandler;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@
 | 
				
			|||||||
import pp.mdga.client.dialog.SingleButtonLeftDialog;
 | 
					import pp.mdga.client.dialog.SingleButtonLeftDialog;
 | 
				
			||||||
import pp.mdga.client.dialog.SingleButtonRightDialog;
 | 
					import pp.mdga.client.dialog.SingleButtonRightDialog;
 | 
				
			||||||
import pp.mdga.client.MdgaApp;
 | 
					import pp.mdga.client.MdgaApp;
 | 
				
			||||||
import pp.mdga.client.MdgaState;
 | 
					 | 
				
			||||||
import pp.mdga.game.Color;
 | 
					import pp.mdga.game.Color;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,5 @@
 | 
				
			|||||||
package pp.mdga.client;
 | 
					package pp.mdga.client;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import pp.mdga.message.server.*;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
public abstract class ClientStateMachine extends ClientState {
 | 
					public abstract class ClientStateMachine extends ClientState {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private ClientState state;
 | 
					    private ClientState state;
 | 
				
			||||||
@@ -0,0 +1,8 @@
 | 
				
			|||||||
 | 
					package pp.mdga.client;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public abstract class DialogStates extends ClientState{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public DialogStates(ClientState parent, ClientGameLogic logic){
 | 
				
			||||||
 | 
					        super(parent, logic);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package pp.mdga.client;
 | 
					package pp.mdga.client;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class StartDialog extends ClientState {
 | 
					public class StartDialog extends DialogStates {
 | 
				
			||||||
    public StartDialog(ClientState parent, ClientGameLogic logic) {
 | 
					    public StartDialog(ClientState parent, ClientGameLogic logic) {
 | 
				
			||||||
        super(parent, logic);
 | 
					        super(parent, logic);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user