Commit 9d383b74 authored by Antoine Guérin's avatar Antoine Guérin
Browse files

gestion et correction des conflits

parents 7042cd82 39b2f624
namespace java fr.univnantes.alma.thrift namespace java fr.univnantes.alma.thrift
namespace js common namespace js common
namespace js core namespace js core
exception InvalidOperationException { exception InvalidOperationException {
......
= Conception préliminaire = Conception préliminaire
== Création d'une partie
== Diagrammes de séquences == Diagrammes de séquences
[.lead] [.lead]
......
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
:source-highlighter: rouge :source-highlighter: rouge
[source,java]
----
public class Usine{
int stmth;
}
----
== ServeurNotAlone == ServeurNotAlone
......
package fr.univnantes.alma; package fr.univnantes.alma;
import fr.univnantes.alma.thrift.GameService; import fr.univnantes.alma.thrift.GameService;
import fr.univnantes.alma.handler.GameServiceHandler; import fr.univnantes.alma.handler.GameServiceHandler;
import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocolFactory; import org.apache.thrift.protocol.TProtocolFactory;
...@@ -32,7 +30,6 @@ public class NotAloneApplication { ...@@ -32,7 +30,6 @@ public class NotAloneApplication {
@Bean @Bean
public ServletRegistrationBean gameServer(TProtocolFactory protocolFactory, GameServiceHandler handler) { public ServletRegistrationBean gameServer(TProtocolFactory protocolFactory, GameServiceHandler handler) {
TServlet tServlet = new TServlet(new GameService.Processor<GameServiceHandler>(handler), protocolFactory); TServlet tServlet = new TServlet(new GameService.Processor<GameServiceHandler>(handler), protocolFactory);
return new ServletRegistrationBean(tServlet, "/api"); return new ServletRegistrationBean(tServlet, "/api");
} }
......
...@@ -57,6 +57,7 @@ public class Game { ...@@ -57,6 +57,7 @@ public class Game {
} }
} }
private void handleRequest(GameJoinRequest request) { private void handleRequest(GameJoinRequest request) {
} }
} }
...@@ -4,7 +4,6 @@ import fr.univnantes.alma.common.GameInterface; ...@@ -4,7 +4,6 @@ import fr.univnantes.alma.common.GameInterface;
import fr.univnantes.alma.common.GameJoinRequest; import fr.univnantes.alma.common.GameJoinRequest;
import fr.univnantes.alma.thrift.GameService; import fr.univnantes.alma.thrift.GameService;
import fr.univnantes.alma.thrift.JoinRequest; import fr.univnantes.alma.thrift.JoinRequest;
import fr.univnantes.alma.common.GameJoinRequest;
import fr.univnantes.alma.thrift.GameNotFound; import fr.univnantes.alma.thrift.GameNotFound;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -24,7 +24,6 @@ class NotAloneApplicationTest { ...@@ -24,7 +24,6 @@ class NotAloneApplicationTest {
@LocalServerPort @LocalServerPort
protected int port; protected int port;
protected GameService.Iface client; protected GameService.Iface client;
@BeforeEach @BeforeEach
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment