mirror of
https://github.com/RetGal/Dayon.git
synced 2024-10-04 02:18:34 +03:00
Move package, set additional system property only when value differs from default
This commit is contained in:
parent
4e9089a45c
commit
ca978cc9ad
@ -8,7 +8,7 @@ import java.util.concurrent.Semaphore;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.capture.Capture;
|
||||
import mpo.dayon.common.concurrent.DefaultThreadFactoryEx;
|
||||
import mpo.dayon.common.concurrent.Executable;
|
||||
|
@ -9,7 +9,7 @@ import mpo.dayon.assistant.network.NetworkAssistantEngine;
|
||||
import mpo.dayon.assistant.network.NetworkAssistantEngineListener;
|
||||
import mpo.dayon.assistant.utils.NetworkUtilities;
|
||||
import mpo.dayon.common.capture.CaptureEngineConfiguration;
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.capture.Capture;
|
||||
import mpo.dayon.common.capture.Gray8Bits;
|
||||
import mpo.dayon.common.error.FatalErrorHandler;
|
||||
@ -78,7 +78,7 @@ public class Assistant implements ClipboardOwner {
|
||||
|
||||
private AssistantConfiguration configuration;
|
||||
|
||||
private NetworkAssistantEngineConfiguration networkConfiguration;
|
||||
private final NetworkAssistantEngineConfiguration networkConfiguration;
|
||||
|
||||
private CaptureEngineConfiguration captureEngineConfiguration;
|
||||
|
||||
@ -105,14 +105,16 @@ public class Assistant implements ClipboardOwner {
|
||||
|
||||
if (tokenServerUrl != null) {
|
||||
this.tokenServerUrl = tokenServerUrl + PORT_PARAM;
|
||||
System.setProperty("dayon.custom.tokenServer", this.tokenServerUrl);
|
||||
} else if (!networkConfiguration.getTokenServerUrl().isEmpty()) {
|
||||
this.tokenServerUrl = networkConfiguration.getTokenServerUrl() + PORT_PARAM;
|
||||
System.setProperty("dayon.custom.tokenServer", this.tokenServerUrl);
|
||||
} else {
|
||||
this.tokenServerUrl = DEFAULT_TOKEN_SERVER_URL + PORT_PARAM;
|
||||
}
|
||||
|
||||
if (!this.tokenServerUrl.startsWith(DEFAULT_TOKEN_SERVER_URL)) {
|
||||
System.setProperty("dayon.custom.tokenServer", this.tokenServerUrl);
|
||||
}
|
||||
|
||||
this.configuration = new AssistantConfiguration();
|
||||
// has not been overridden by command line
|
||||
if (language == null && !Locale.getDefault().getLanguage().equals(configuration.getLanguage())) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
package mpo.dayon.assistant.network;
|
||||
|
||||
import com.dosse.upnp.UPnP;
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.capture.CaptureEngineConfiguration;
|
||||
import mpo.dayon.common.concurrent.RunnableEx;
|
||||
import mpo.dayon.common.configuration.ReConfigurable;
|
||||
|
@ -3,8 +3,8 @@ package mpo.dayon.assisted.gui;
|
||||
import mpo.dayon.assisted.capture.CaptureEngine;
|
||||
import mpo.dayon.common.capture.CaptureEngineConfiguration;
|
||||
import mpo.dayon.assisted.capture.RobotCaptureFactory;
|
||||
import mpo.dayon.assisted.compressor.CompressorEngine;
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngine;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.assisted.control.NetworkControlMessageHandler;
|
||||
import mpo.dayon.assisted.control.RobotNetworkControlMessageHandler;
|
||||
import mpo.dayon.assisted.mouse.MouseEngine;
|
||||
@ -67,14 +67,16 @@ public class Assisted implements Subscriber, ClipboardOwner {
|
||||
|
||||
if (tokenServerUrl != null) {
|
||||
this.tokenServerUrl = tokenServerUrl + TOKEN_PARAM;
|
||||
System.setProperty("dayon.custom.tokenServer", tokenServerUrl);
|
||||
} else if (!networkConfiguration.getTokenServerUrl().isEmpty()) {
|
||||
this.tokenServerUrl = networkConfiguration.getTokenServerUrl() + TOKEN_PARAM;
|
||||
System.setProperty("dayon.custom.tokenServer", this.tokenServerUrl);
|
||||
} else {
|
||||
this.tokenServerUrl = DEFAULT_TOKEN_SERVER_URL + TOKEN_PARAM;
|
||||
}
|
||||
|
||||
if (!this.tokenServerUrl.startsWith(DEFAULT_TOKEN_SERVER_URL)) {
|
||||
System.setProperty("dayon.custom.tokenServer", this.tokenServerUrl);
|
||||
}
|
||||
|
||||
final String lnf = getDefaultLookAndFeel();
|
||||
try {
|
||||
UIManager.setLookAndFeel(lnf);
|
||||
|
@ -1,7 +1,7 @@
|
||||
package mpo.dayon.assisted.network;
|
||||
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineListener;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineListener;
|
||||
import mpo.dayon.assisted.control.NetworkControlMessageHandler;
|
||||
import mpo.dayon.assisted.mouse.MouseEngineListener;
|
||||
import mpo.dayon.common.buffer.MemByteBuffer;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package mpo.dayon.assisted.compressor;
|
||||
package mpo.dayon.common.compressor;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
@ -1,4 +1,4 @@
|
||||
package mpo.dayon.assisted.compressor;
|
||||
package mpo.dayon.common.compressor;
|
||||
|
||||
import mpo.dayon.common.configuration.Configuration;
|
||||
import mpo.dayon.common.preference.Preferences;
|
@ -1,4 +1,4 @@
|
||||
package mpo.dayon.assisted.compressor;
|
||||
package mpo.dayon.common.compressor;
|
||||
|
||||
import mpo.dayon.common.buffer.MemByteBuffer;
|
||||
import mpo.dayon.common.capture.Capture;
|
@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit;
|
||||
import mpo.dayon.common.network.message.*;
|
||||
|
||||
import mpo.dayon.common.capture.CaptureEngineConfiguration;
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.buffer.MemByteBuffer;
|
||||
import mpo.dayon.common.capture.Capture;
|
||||
import mpo.dayon.common.concurrent.DefaultThreadFactoryEx;
|
||||
|
@ -2,7 +2,7 @@ package mpo.dayon.common.network.message;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.buffer.MemByteBuffer;
|
||||
import mpo.dayon.common.squeeze.CompressionMethod;
|
||||
import mpo.dayon.common.utils.UnitUtilities;
|
||||
|
@ -2,7 +2,7 @@ package mpo.dayon.common.network.message;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.squeeze.CompressionMethod;
|
||||
|
||||
public class NetworkCompressorConfigurationMessage extends NetworkMessage {
|
||||
|
@ -3,7 +3,7 @@ package mpo.dayon.common.event;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import mpo.dayon.assisted.capture.CaptureEngineListener;
|
||||
import mpo.dayon.assisted.compressor.CompressorEngine;
|
||||
import mpo.dayon.common.compressor.CompressorEngine;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
class ListenersTest {
|
||||
|
@ -1,6 +1,6 @@
|
||||
package mpo.dayon.common.network;
|
||||
|
||||
import mpo.dayon.assisted.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.compressor.CompressorEngineConfiguration;
|
||||
import mpo.dayon.common.buffer.MemByteBuffer;
|
||||
import mpo.dayon.common.capture.Capture;
|
||||
import mpo.dayon.common.capture.CaptureEngineConfiguration;
|
||||
|
Loading…
Reference in New Issue
Block a user