diff --git a/app/src/main/java/com/example/sprout/Sprout.java b/app/src/main/java/com/example/sprout/Sprout.java index d3f028c..48089d4 100644 --- a/app/src/main/java/com/example/sprout/Sprout.java +++ b/app/src/main/java/com/example/sprout/Sprout.java @@ -12,10 +12,6 @@ import com.example.sprout.battles.BattlesConnection; import com.example.sprout.battles.Team; import com.example.sprout.battles.UpdateActor; -import com.example.sprout.refactor.Constant; -import com.example.sprout.refactor.api.SproutService; -import com.example.sprout.refactor.repository.RegistrationRepository; -import com.example.sprout.refactor.repository.RoomRepository; import com.example.sprout.rooms.RoomsConnection; import java.util.HashMap; @@ -28,10 +24,6 @@ import framework.model3D.Position3D; import framework.model3D.Universe; import java3d.Vector3d; -import okhttp3.OkHttpClient; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; /** * Sprout APplication class @@ -41,10 +33,6 @@ public class Sprout extends Application { private static Sprout instance = null; - private OkHttpClient okHttpClient = null; - private SproutService sproutService = null; - private RegistrationRepository registrationRepository = null; - private RoomRepository roomRepository = null; @Override public void onCreate() { @@ -56,46 +44,6 @@ return instance; } - public OkHttpClient getOkHttpClient() { - if (okHttpClient == null) { - if (Constant.DEVELOP) { - HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); - interceptor.setLevel(HttpLoggingInterceptor.Level.BODY); - okHttpClient = new OkHttpClient.Builder().addInterceptor(interceptor).build(); - } else { - okHttpClient = new OkHttpClient.Builder().build(); - } - } - return okHttpClient; - } - - public SproutService getSproutService() { - if (sproutService == null) { - sproutService = new Retrofit - .Builder() - .baseUrl("http://nitta-lab-www2.is.konan-u.ac.jp:8080/SproutServer/") - .client(getOkHttpClient()) - .addConverterFactory(GsonConverterFactory.create()) - .build() - .create(SproutService.class); - } - return sproutService; - } - - public RegistrationRepository getRegistrationRepository() { - if (registrationRepository == null) { - registrationRepository = new RegistrationRepository(getSproutService()); - } - return registrationRepository; - } - - public RoomRepository getRoomRepository() { - if (roomRepository == null) { - roomRepository = new RoomRepository(getSproutService()); - } - return roomRepository; - } - private RoomsConnection roomsConnection = null; private BattlesConnection battlesConnection = null; private AccountsConnection accountsConnection = null;