Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

[ANY] Рефакторинг.

Browse source
This commit is contained in:
zaxar163 2019-04-21 16:01:16 +03:00
parent b325609a59
commit 3a69e622ec
No known key found for this signature in database
GPG key ID: E3B309DD3852DE06
7 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java
View file

@ -1,7 +1,6 @@
package ru.gravit.launchserver.manangers; package ru.gravit.launchserver.manangers;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.managers.GsonManager; import ru.gravit.launcher.managers.GsonManager;
import ru.gravit.launchserver.auth.handler.AuthHandler; import ru.gravit.launchserver.auth.handler.AuthHandler;
import ru.gravit.launchserver.auth.hwid.HWIDHandler; import ru.gravit.launchserver.auth.hwid.HWIDHandler;
@ -11,7 +10,6 @@
import ru.gravit.launchserver.auth.texture.TextureProvider; import ru.gravit.launchserver.auth.texture.TextureProvider;
import ru.gravit.launchserver.components.Component; import ru.gravit.launchserver.components.Component;
import ru.gravit.utils.UniversalJsonAdapter; import ru.gravit.utils.UniversalJsonAdapter;
import ru.gravit.utils.helper.LogHelper;
public class LaunchServerGsonManager extends GsonManager { public class LaunchServerGsonManager extends GsonManager {
@Override @Override

2
LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java
View file

@ -36,7 +36,7 @@
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.HashMap; import java.util.HashMap;
@SuppressWarnings({"unused", "rawtypes"}) @SuppressWarnings("rawtypes")
public class WebSocketService { public class WebSocketService {
public final ChannelGroup channels; public final ChannelGroup channels;

3
LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java
View file

@ -39,7 +39,8 @@ public R request() throws Exception {
return requestDo(); return requestDo();
} }
protected R requestDo() throws Exception @SuppressWarnings("unchecked")
protected R requestDo() throws Exception
{ {
return (R) service.sendRequest(this); return (R) service.sendRequest(this);
} }

5
LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java
View file

@ -18,12 +18,13 @@ public class StandartClientWebSocketService extends ClientWebSocketService {
public StandartClientWebSocketService(GsonBuilder gsonBuilder, String address, int i) { public StandartClientWebSocketService(GsonBuilder gsonBuilder, String address, int i) {
super(gsonBuilder, address, i); super(gsonBuilder, address, i);
} }
public class RequestFuture implements Future public class RequestFuture implements Future<ResultInterface>
{ {
public final WaitEventHandler.ResultEvent event; public final WaitEventHandler.ResultEvent event;
public boolean isCanceled = false; public boolean isCanceled = false;
public RequestFuture(RequestInterface request) throws IOException { @SuppressWarnings("rawtypes")
public RequestFuture(RequestInterface request) throws IOException {
event = new WaitEventHandler.ResultEvent(); event = new WaitEventHandler.ResultEvent();
event.type = request.getType(); event.type = request.getType();
if(request instanceof Request) if(request instanceof Request)

6
libLauncher/build.gradle
View file

@ -2,7 +2,7 @@
targetCompatibility = '1.8' targetCompatibility = '1.8'
dependencies { dependencies {
compileOnly 'org.fusesource.jansi:jansi:1.17.1' compileOnly 'org.fusesource.jansi:jansi:1.17.1'
compileOnly 'jline:jline:2.14.6' compileOnly 'jline:jline:2.14.6'
compile 'com.google.code.gson:gson:2.8.5' compile 'com.google.code.gson:gson:2.8.5'
} }

1
libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java
View file

@ -1,6 +1,5 @@
package ru.gravit.utils; package ru.gravit.utils;
import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.VerifyHelper; import ru.gravit.utils.helper.VerifyHelper;
import java.util.Map; import java.util.Map;

2
modules

@ -1 +1 @@
Subproject commit 24f1909589b8bfa23064725fe65a734a9f7af281 Subproject commit 412ac81c5c60b572d4e36ebdb7c2828dbac86876