queue = outQueueList.remove(0);
+
+ if (queue.isEmpty()) return null;
+
+ byte[] message = queue.remove(0);
+ if (!queue.isEmpty()) {
+ outQueueList.add(queue);
+ }
+ return message;
}
public final void addMessageHandler(MessageHandler handler) {
@@ -99,10 +113,9 @@ public final void removeMessageHandler(MessageHandler handler) {
messageHandlers.remove(handler);
}
- protected void dispatchMessage(byte[] message) {
- var id = getId();
- if (messageHandlers.isEmpty()) {
- log.warn("message received but not messageHandlers registered for {}.", id);
+ private void dispatchMessage(String id, byte[] message) {
+ if (messageHandlers.size() == 0) {
+ log.warn("message received but not messageHandlers registered.");
}
for (MessageHandler handler : messageHandlers) {
@@ -110,9 +123,9 @@ protected void dispatchMessage(byte[] message) {
}
}
- protected final void dispatchCompressedMessage(byte[] compressedMessage) {
+ protected final void dispatchCompressedMessage(String id, byte[] compressedMessage) {
var message = inflate(compressedMessage);
- dispatchMessage(message);
+ dispatchMessage(id, message);
}
protected final void writeMessage(OutputStream out, byte[] message) throws IOException {
@@ -226,7 +239,7 @@ public final void removeActivityListener(ActivityListener listener) {
listeners.remove(listener);
}
- protected void notifyListeners(
+ private void notifyListeners(
ActivityListener.Direction direction,
ActivityListener.State state,
int totalTransferSize,
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/connection/Connection.java b/src/main/java/net/rptools/clientserver/simple/connection/Connection.java
similarity index 100%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/connection/Connection.java
rename to src/main/java/net/rptools/clientserver/simple/connection/Connection.java
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/connection/SocketConnection.java b/src/main/java/net/rptools/clientserver/simple/connection/SocketConnection.java
similarity index 51%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/connection/SocketConnection.java
rename to src/main/java/net/rptools/clientserver/simple/connection/SocketConnection.java
index 42124691c5..418c8d7625 100644
--- a/clientserver/src/main/java/net/rptools/clientserver/simple/connection/SocketConnection.java
+++ b/src/main/java/net/rptools/clientserver/simple/connection/SocketConnection.java
@@ -16,12 +16,13 @@
import java.io.*;
import java.net.Socket;
-import java.net.SocketTimeoutException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* @author drice
+ * TODO To change the template for this generated type comment go to Window - Preferences -
+ * Java - Code Style - Code Templates
*/
public class SocketConnection extends AbstractConnection implements Connection {
/** Instance used for log messages. */
@@ -34,56 +35,61 @@ public class SocketConnection extends AbstractConnection implements Connection {
private String hostName;
private int port;
- public SocketConnection(String id, String hostName, int port) {
+ public SocketConnection(String id, String hostName, int port) throws IOException {
this.id = id;
this.hostName = hostName;
this.port = port;
}
- public SocketConnection(String id, Socket socket) {
+ public SocketConnection(String id, Socket socket) throws IOException {
this.id = id;
- this.socket = socket;
-
+ this.hostName = socket.getInetAddress().getHostName();
+ this.port = socket.getPort();
initialize(socket);
}
- @Override
- public String getId() {
- return id;
- }
-
- private void initialize(Socket socket) {
+ private void initialize(Socket socket) throws IOException {
this.socket = socket;
- this.send = new SendThread(socket);
- this.receive = new ReceiveThread(socket);
-
+ this.send = new SendThread(new BufferedOutputStream(socket.getOutputStream()));
+ this.receive = new ReceiveThread(this, socket.getInputStream());
this.send.start();
this.receive.start();
}
+ public String getId() {
+ return id;
+ }
+
@Override
public void open() throws IOException {
initialize(new Socket(hostName, port));
}
- @Override
public void sendMessage(Object channel, byte[] message) {
addMessage(channel, message);
+ synchronized (send) {
+ send.notify();
+ }
}
- @Override
- protected void onClose() {
- receive.interrupt();
- send.interrupt();
+ protected boolean isStopRequested() {
+ return send.stopRequested;
+ }
+
+ public synchronized void close() {
+ if (isStopRequested()) {
+ return;
+ }
+ send.requestStop();
+ receive.requestStop();
try {
socket.close();
} catch (IOException e) {
- log.warn("Failed to close socket", e);
+ log.warn(e.toString());
}
}
- @Override
public boolean isAlive() {
return !socket.isClosed();
}
@@ -97,41 +103,49 @@ public String getError() {
// send thread
// /////////////////////////////////////////////////////////////////////////
private class SendThread extends Thread {
- private final Socket socket;
+ private final OutputStream out;
+ private boolean stopRequested = false;
- public SendThread(Socket socket) {
+ public SendThread(OutputStream out) {
setName("SocketConnection.SendThread");
- this.socket = socket;
+ this.out = out;
+ }
+
+ public void requestStop() {
+ this.stopRequested = true;
+ synchronized (this) {
+ this.notify();
+ }
}
@Override
public void run() {
try {
- final OutputStream out;
- try {
- out = new BufferedOutputStream(socket.getOutputStream());
- } catch (IOException e) {
- log.error("Unable to get socket output stream", e);
- return;
- }
-
- while (!SocketConnection.this.isClosed() && SocketConnection.this.isAlive()) {
- // Blocks for a time until a message is received.
- byte[] message = SocketConnection.this.nextMessage();
- if (message == null) {
- // No message available. Thread may also have been interrupted as part of stopping.
- continue;
- }
-
+ while (!stopRequested && SocketConnection.this.isAlive()) {
try {
- SocketConnection.this.writeMessage(out, message);
- } catch (IOException e) {
- log.error("Error while writing message. Closing connection.", e);
- return;
+ while (SocketConnection.this.hasMoreMessages()) {
+ try {
+ byte[] message = SocketConnection.this.nextMessage();
+ if (message == null) {
+ continue;
+ }
+ SocketConnection.this.writeMessage(out, message);
+ } catch (IndexOutOfBoundsException e) {
+ // just ignore and wait
+ }
+ }
+ synchronized (this) {
+ if (!stopRequested) {
+ this.wait();
+ }
+ }
+ } catch (InterruptedException e) {
+ // do nothing
}
}
- } finally {
- SocketConnection.this.close();
+ } catch (IOException e) {
+ log.error(e);
+ fireDisconnect();
}
}
}
@@ -140,42 +154,35 @@ public void run() {
// receive thread
// /////////////////////////////////////////////////////////////////////////
private class ReceiveThread extends Thread {
- private final Socket socket;
+ private final SocketConnection conn;
+ private final InputStream in;
+ private boolean stopRequested = false;
- public ReceiveThread(Socket socket) {
+ public ReceiveThread(SocketConnection conn, InputStream in) {
setName("SocketConnection.ReceiveThread");
- this.socket = socket;
+ this.conn = conn;
+ this.in = in;
+ }
+
+ public void requestStop() {
+ stopRequested = true;
}
@Override
public void run() {
- try {
- final InputStream in;
+ while (!stopRequested && conn.isAlive()) {
try {
- in = socket.getInputStream();
+ byte[] message = conn.readMessage(in);
+ conn.dispatchCompressedMessage(conn.id, message);
} catch (IOException e) {
- log.error("Unable to get socket input stream", e);
- return;
+ log.error(e);
+ fireDisconnect();
+ break;
+ } catch (Throwable t) {
+ log.error(t);
+ // don't let anything kill this thread via exception
+ t.printStackTrace();
}
-
- while (!SocketConnection.this.isClosed() && SocketConnection.this.isAlive()) {
- try {
- byte[] message = SocketConnection.this.readMessage(in);
- SocketConnection.this.dispatchCompressedMessage(message);
- } catch (SocketTimeoutException e) {
- log.warn("Lost client {}", SocketConnection.this.getId(), e);
- return;
- } catch (IOException e) {
- log.error(e);
- return;
- } catch (Throwable t) {
- // don't let anything kill this thread via exception
- log.error("Unexpected error", t);
- }
- }
- } finally {
- SocketConnection.this.close();
- fireDisconnect();
}
}
}
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/connection/WebRTCConnection.java b/src/main/java/net/rptools/clientserver/simple/connection/WebRTCConnection.java
similarity index 56%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/connection/WebRTCConnection.java
rename to src/main/java/net/rptools/clientserver/simple/connection/WebRTCConnection.java
index 124c6d732b..3c71a080bb 100644
--- a/clientserver/src/main/java/net/rptools/clientserver/simple/connection/WebRTCConnection.java
+++ b/src/main/java/net/rptools/clientserver/simple/connection/WebRTCConnection.java
@@ -20,28 +20,23 @@
import java.io.IOException;
import java.net.URI;
import java.nio.ByteBuffer;
-import java.util.concurrent.atomic.AtomicBoolean;
import net.rptools.clientserver.simple.server.WebRTCServer;
import net.rptools.clientserver.simple.webrtc.*;
+import net.rptools.maptool.client.MapTool;
+import net.rptools.maptool.server.ServerConfig;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
-public class WebRTCConnection extends AbstractConnection implements Connection {
- public interface Listener {
- void onLoginError();
- }
-
+public class WebRTCConnection extends AbstractConnection
+ implements Connection, PeerConnectionObserver, RTCDataChannelObserver {
private static final Logger log = LogManager.getLogger(WebRTCConnection.class);
- private final PeerConnectionObserver peerConnectionObserver = new PeerConnectionObserverImpl();
- private final RTCDataChannelObserver rtcDataChannelObserver = new RTCDataChannelObserverImpl();
private final PeerConnectionFactory factory = new PeerConnectionFactory();
- private final String serverName;
+ private final ServerConfig config;
private final String id;
private final Gson gson = new Gson();
- private final Listener listener;
private WebSocketClient signalingClient;
// only set on server side
private WebRTCServer server;
@@ -53,13 +48,10 @@ public interface Listener {
private final SendThread sendThread = new SendThread();
private Thread handleDisconnect;
- private final AtomicBoolean closed = new AtomicBoolean(false);
-
// used from client side
- public WebRTCConnection(String id, String serverName, Listener listener) {
+ public WebRTCConnection(String id, ServerConfig config) {
this.id = id;
- this.serverName = serverName;
- this.listener = listener;
+ this.config = config;
init();
}
@@ -67,12 +59,11 @@ public WebRTCConnection(String id, String serverName, Listener listener) {
public WebRTCConnection(OfferMessageDto message, WebRTCServer webRTCServer) {
this.id = message.source;
this.server = webRTCServer;
- this.serverName = server.getName();
- this.listener = () -> {};
+ this.config = server.getConfig();
this.signalingClient = server.getSignalingClient();
init();
- peerConnection = factory.createPeerConnection(rtcConfig, peerConnectionObserver);
+ peerConnection = factory.createPeerConnection(rtcConfig, this);
peerConnection.setRemoteDescription(
message.offer,
new SetSessionDescriptionObserver() {
@@ -99,7 +90,7 @@ public void onSuccess(RTCSessionDescription description) {
@Override
public void onSuccess() {
var msg = new AnswerMessageDto();
- msg.source = serverName;
+ msg.source = server.getConfig().getServerName();
msg.destination = getId();
msg.answer = description;
sendSignalingMessage(gson.toJson(msg));
@@ -125,11 +116,9 @@ private boolean isServerSide() {
private String getSource() {
// on server side the id is already user@server
- if (isServerSide()) {
- return getId();
- }
+ if (isServerSide()) return getId();
- return getId() + "@" + serverName;
+ return getId() + "@" + config.getServerName();
}
private void startSignaling() {
@@ -158,9 +147,7 @@ public void onMessage(String message) {
public void onClose(int code, String reason, boolean remote) {
lastError = "WebSocket closed: (" + code + ") " + reason;
log.info(prefix() + lastError);
- if (!isAlive()) {
- fireDisconnectAsync();
- }
+ if (!isAlive()) fireDisconnectAsync();
}
@Override
@@ -211,13 +198,17 @@ private void init() {
public void sendMessage(Object channel, byte[] message) {
log.debug(prefix() + "added message");
addMessage(channel, message);
+ if (peerConnection != null
+ && peerConnection.getConnectionState() == RTCPeerConnectionState.CONNECTED) {
+ synchronized (sendThread) {
+ sendThread.notify();
+ }
+ }
}
@Override
public boolean isAlive() {
- if (peerConnection == null) {
- return false;
- }
+ if (peerConnection == null) return false;
return switch (peerConnection.getConnectionState()) {
case CONNECTED, DISCONNECTED -> true;
@@ -278,15 +269,15 @@ public void onFailure(String error) {
private void onLogin(LoginMessageDto message) {
if (!message.success) {
- listener.onLoginError();
+ MapTool.showError("Handshake.msg.playerAlreadyConnected");
return;
}
- peerConnection = factory.createPeerConnection(rtcConfig, peerConnectionObserver);
+ peerConnection = factory.createPeerConnection(rtcConfig, this);
var initDict = new RTCDataChannelInit();
localDataChannel = peerConnection.createDataChannel("myDataChannel", initDict);
- localDataChannel.registerObserver(rtcDataChannelObserver);
+ localDataChannel.registerObserver(this);
var offerOptions = new RTCOfferOptions();
peerConnection.createOffer(
@@ -302,7 +293,7 @@ public void onSuccess() {
var msg = new OfferMessageDto();
msg.offer = description;
msg.source = getSource();
- msg.destination = serverName;
+ msg.destination = config.getServerName();
sendSignalingMessage(gson.toJson(msg));
}
@@ -324,253 +315,274 @@ private String prefix() {
return isServerSide() ? "S " : "C ";
}
- public void addIceCandidate(RTCIceCandidate candidate) {
- log.info(prefix() + "PeerConnection.addIceCandidate: " + candidate.toString());
- peerConnection.addIceCandidate(candidate);
+ @Override
+ public void onSignalingChange(RTCSignalingState state) {
+ // set thread name for better logs.
+ Thread.currentThread().setName("WebRTCConnection.WebRTCThread_" + getId());
+ log.info(prefix() + "PeerConnection.onSignalingChange: " + state);
}
- private void fireDisconnectAsync() {
- handleDisconnect =
- new Thread(
- () -> {
- fireDisconnect();
- },
- "WebRTCConnection.handleDisconnect");
- handleDisconnect.start();
+ @Override
+ public void onConnectionChange(RTCPeerConnectionState state) {
+ log.info(prefix() + "PeerConnection.onConnectionChange " + state);
+ switch (state) {
+ case FAILED -> {
+ lastError = "PeerConnection failed";
+ peerConnection = null;
+ fireDisconnectAsync();
+ }
+ case CONNECTED -> {
+ if (hasMoreMessages()) {
+ synchronized (sendThread) {
+ sendThread.notify();
+ }
+ }
+ }
+ }
}
@Override
- protected void onClose() {
- // signalingClient should be closed if connection was established
- if (!isServerSide() && signalingClient.isOpen()) {
- signalingClient.close();
- }
+ public void onIceConnectionChange(RTCIceConnectionState state) {
+ log.info(prefix() + "PeerConnection.onIceConnectionChange " + state);
+ }
- sendThread.interrupt();
- if (peerConnection != null) {
- peerConnection.close();
- peerConnection = null;
- }
+ @Override
+ public void onStandardizedIceConnectionChange(RTCIceConnectionState state) {
+ log.info(prefix() + "PeerConnection.onStandardizedIceConnectionChange " + state);
}
@Override
- public String getError() {
- return lastError;
+ public void onIceConnectionReceivingChange(boolean receiving) {
+ log.info(prefix() + "PeerConnection.onIceConnectionReceivingChange " + receiving);
}
- private class SendThread extends Thread {
- public SendThread() {
- super("WebRTCConnection.SendThread_" + WebRTCConnection.this.getId());
- }
+ @Override
+ public void onIceGatheringChange(RTCIceGatheringState state) {
+ log.info(prefix() + "PeerConnection.onIceGatheringChange " + state);
+ }
- @Override
- public void run() {
- log.debug(prefix() + " sendThread started");
+ @Override
+ public void onIceCandidate(RTCIceCandidate candidate) {
+ var msg = new CandidateMessageDto();
- while (!WebRTCConnection.this.isClosed() && WebRTCConnection.this.isAlive()) {
- // Blocks for a time until a message is received.
- byte[] message = WebRTCConnection.this.nextMessage();
- if (message == null) {
- // No message available. Thread may also have been interrupted as part of stopping.
- continue;
- }
+ if (isServerSide()) {
+ msg.source = config.getServerName();
+ msg.destination = getSource();
+ } else {
+ msg.destination = config.getServerName();
+ msg.source = getSource();
+ }
+ msg.candidate = candidate;
+ sendSignalingMessage(gson.toJson(msg));
+ }
- ByteBuffer buffer = ByteBuffer.allocate(message.length + Integer.BYTES);
- buffer.putInt(message.length).put(message).rewind();
+ @Override
+ public void onIceCandidateError(RTCPeerConnectionIceErrorEvent event) {
+ log.debug(
+ prefix()
+ + "PeerConnection.onIceCandidateError: code:"
+ + event.getErrorCode()
+ + " url: "
+ + event.getUrl()
+ + " address/port: "
+ + event.getAddress()
+ + ":"
+ + event.getPort()
+ + " text: "
+ + event.getErrorText());
+ }
- int chunkSize = 16 * 1024;
+ @Override
+ public void onIceCandidatesRemoved(RTCIceCandidate[] candidates) {
+ log.info(prefix() + "PeerConnection.onIceCandidatesRemoved");
+ }
- while (buffer.remaining() > 0) {
- var amountToSend = Math.min(buffer.remaining(), chunkSize);
- ByteBuffer part = buffer;
+ @Override
+ public void onAddStream(MediaStream stream) {
+ log.info(prefix() + "PeerConnection.onAddStream");
+ }
- if (amountToSend != buffer.capacity()) {
- // we need to allocation a new ByteBuffer because send calls ByteBuffer.array()
- // which would return
- // the whole byte[] and not only the slice. But the lib doesn't use
- // ByteBuffer.arrayOffset().
- var slice = buffer.slice(buffer.position(), amountToSend);
- part = ByteBuffer.allocate(amountToSend);
- part.put(slice);
- }
+ @Override
+ public void onRemoveStream(MediaStream stream) {
+ log.info(prefix() + "PeerConnection.onRemoveStream");
+ }
- buffer.position(buffer.position() + amountToSend);
- try {
- localDataChannel.send(new RTCDataChannelBuffer(part, true));
- } catch (Exception e) {
- log.error(prefix() + e);
- fireDisconnect();
- return;
- }
- log.debug(prefix() + " sent " + part.capacity() + " bytes");
- }
- }
+ @Override
+ public void onDataChannel(RTCDataChannel newDataChannel) {
+ log.info(prefix() + "PeerConnection.onDataChannel");
+ this.localDataChannel = newDataChannel;
+ localDataChannel.registerObserver(this);
- log.debug(prefix() + " sendThread ended");
+ if (isServerSide()) {
+ server.onDataChannelOpened(this);
}
}
- private final class PeerConnectionObserverImpl implements PeerConnectionObserver {
- @Override
- public void onIceCandidate(RTCIceCandidate candidate) {
- var msg = new CandidateMessageDto();
-
- if (isServerSide()) {
- msg.source = serverName;
- msg.destination = getSource();
- } else {
- msg.destination = serverName;
- msg.source = getSource();
- }
- msg.candidate = candidate;
- sendSignalingMessage(gson.toJson(msg));
- }
+ @Override
+ public void onRenegotiationNeeded() {
+ // set thread name for better logs
+ Thread.currentThread().setName("WebRTCConnection.WebRTCThread_" + getId());
+ log.info(prefix() + "PeerConnection.onRenegotiationNeeded");
+ }
- @Override
- public void onAddStream(MediaStream stream) {
- log.info(prefix() + "PeerConnection.onAddStream");
- }
+ @Override
+ public void onAddTrack(RTCRtpReceiver receiver, MediaStream[] mediaStreams) {
+ log.info(prefix() + "PeerConnection.onTrack(multiple Streams)");
+ }
- @Override
- public void onAddTrack(RTCRtpReceiver receiver, MediaStream[] mediaStreams) {
- log.info(prefix() + "PeerConnection.onTrack(multiple Streams)");
- }
+ @Override
+ public void onRemoveTrack(RTCRtpReceiver receiver) {
+ log.info(prefix() + "PeerConnection.onRemoveTrack");
+ }
- @Override
- public void onConnectionChange(RTCPeerConnectionState state) {
- log.info(prefix() + "PeerConnection.onConnectionChange " + state);
- switch (state) {
- case FAILED -> {
- lastError = "PeerConnection failed";
- peerConnection = null;
- fireDisconnectAsync();
- }
- }
- }
+ @Override
+ public void onTrack(RTCRtpTransceiver transceiver) {
+ log.info(prefix() + "PeerConnection.onTrack");
+ }
- @Override
- public void onDataChannel(RTCDataChannel newDataChannel) {
- log.info(prefix() + "PeerConnection.onDataChannel");
- localDataChannel = newDataChannel;
- localDataChannel.registerObserver(rtcDataChannelObserver);
+ public void addIceCandidate(RTCIceCandidate candidate) {
+ log.info(prefix() + "PeerConnection.addIceCandidate: " + candidate.toString());
+ peerConnection.addIceCandidate(candidate);
+ }
- if (isServerSide()) {
- server.onDataChannelOpened(WebRTCConnection.this);
+ // dataChannel
+ @Override
+ public void onBufferedAmountChange(long previousAmount) {
+ log.info(prefix() + "dataChannel onBufferedAmountChange " + previousAmount);
+ }
+
+ // dataChannel
+ @Override
+ public void onStateChange() {
+ var state = localDataChannel.getState();
+ log.info(prefix() + "localDataChannel onStateChange " + state);
+ switch (state) {
+ case OPEN -> {
+ // connection established we don't need the signaling server anymore
+ // for now disabled. We may get additional ice candidates.
+ if (!isServerSide() && signalingClient.isOpen()) signalingClient.close();
+
+ sendThread.start();
+ }
+ case CLOSED -> {
+ close();
+ fireDisconnectAsync();
}
}
+ }
- @Override
- public void onIceCandidateError(RTCPeerConnectionIceErrorEvent event) {
- log.debug(
- prefix()
- + "PeerConnection.onIceCandidateError: code:"
- + event.getErrorCode()
- + " url: "
- + event.getUrl()
- + " address/port: "
- + event.getAddress()
- + ":"
- + event.getPort()
- + " text: "
- + event.getErrorText());
- }
+ // dataChannel
+ @Override
+ public void onMessage(RTCDataChannelBuffer channelBuffer) {
+ log.debug(
+ prefix() + "localDataChannel onMessage: got " + channelBuffer.data.capacity() + " bytes");
- @Override
- public void onIceCandidatesRemoved(RTCIceCandidate[] candidates) {
- log.info(prefix() + "PeerConnection.onIceCandidatesRemoved");
+ if (Thread.currentThread().getContextClassLoader() == null) {
+ ClassLoader cl = ClassLoader.getSystemClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
}
- @Override
- public void onIceConnectionChange(RTCIceConnectionState state) {
- log.info(prefix() + "PeerConnection.onIceConnectionChange " + state);
- }
+ var message = readMessage(channelBuffer.data);
+ if (message != null) dispatchCompressedMessage(id, message);
+ }
- @Override
- public void onIceConnectionReceivingChange(boolean receiving) {
- log.info(prefix() + "PeerConnection.onIceConnectionReceivingChange " + receiving);
- }
+ private void fireDisconnectAsync() {
+ handleDisconnect =
+ new Thread(
+ () -> {
+ fireDisconnect();
+ if (isServerSide()) server.clearClients();
+ },
+ "WebRTCConnection.handleDisconnect");
+ handleDisconnect.start();
+ }
- @Override
- public void onIceGatheringChange(RTCIceGatheringState state) {
- log.info(prefix() + "PeerConnection.onIceGatheringChange " + state);
- }
+ @Override
+ public void close() {
+ // signalingClient should be closed if connection was established
+ if (!isServerSide() && signalingClient.isOpen()) signalingClient.close();
- @Override
- public void onRemoveStream(MediaStream stream) {
- log.info(prefix() + "PeerConnection.onRemoveStream");
- }
+ if (sendThread.stopRequested) return;
- @Override
- public void onRemoveTrack(RTCRtpReceiver receiver) {
- log.info(prefix() + "PeerConnection.onRemoveTrack");
+ sendThread.requestStop();
+ if (peerConnection != null) {
+ peerConnection.close();
+ peerConnection = null;
}
+ }
- @Override
- public void onRenegotiationNeeded() {
- // set thread name for better logs
- Thread.currentThread().setName("WebRTCConnection.WebRTCThread_" + getId());
- log.info(prefix() + "PeerConnection.onRenegotiationNeeded");
- }
+ @Override
+ public String getError() {
+ return lastError;
+ }
- @Override
- public void onSignalingChange(RTCSignalingState state) {
- // set thread name for better logs.
- Thread.currentThread().setName("WebRTCConnection.WebRTCThread_" + getId());
- log.info(prefix() + "PeerConnection.onSignalingChange: " + state);
- }
+ private class SendThread extends Thread {
+ private boolean stopRequested = false;
- @Override
- public void onStandardizedIceConnectionChange(RTCIceConnectionState state) {
- log.info(prefix() + "PeerConnection.onStandardizedIceConnectionChange " + state);
+ public SendThread() {
+ super("WebRTCConnection.SendThread_" + WebRTCConnection.this.getId());
}
- @Override
- public void onTrack(RTCRtpTransceiver transceiver) {
- log.info(prefix() + "PeerConnection.onTrack");
+ public void requestStop() {
+ this.stopRequested = true;
+ synchronized (this) {
+ this.notify();
+ }
}
- }
- private final class RTCDataChannelObserverImpl implements RTCDataChannelObserver {
@Override
- public void onBufferedAmountChange(long previousAmount) {
- log.info(prefix() + "dataChannel onBufferedAmountChange " + previousAmount);
- }
+ public void run() {
+ log.debug(prefix() + " sendThread started");
+ try {
+ while (!stopRequested && WebRTCConnection.this.isAlive()) {
+ while (WebRTCConnection.this.hasMoreMessages()
+ && peerConnection.getConnectionState() == RTCPeerConnectionState.CONNECTED) {
+ byte[] message = WebRTCConnection.this.nextMessage();
+ if (message == null) {
+ continue;
+ }
- @Override
- public void onStateChange() {
- var state = localDataChannel.getState();
- log.info(prefix() + "localDataChannel onStateChange " + state);
- switch (state) {
- case OPEN -> {
- // connection established we don't need the signaling server anymore
- // for now disabled. We may get additional ice candidates.
- if (!isServerSide() && signalingClient.isOpen()) {
- signalingClient.close();
- }
+ ByteBuffer buffer = ByteBuffer.allocate(message.length + Integer.BYTES);
+ buffer.putInt(message.length).put(message).rewind();
- sendThread.start();
- }
- case CLOSED -> {
- close();
- fireDisconnectAsync();
- }
- }
- }
+ int chunkSize = 16 * 1024;
- @Override
- public void onMessage(RTCDataChannelBuffer channelBuffer) {
- log.debug(
- prefix() + "localDataChannel onMessage: got " + channelBuffer.data.capacity() + " bytes");
+ while (buffer.remaining() > 0) {
+ var amountToSend = buffer.remaining() <= chunkSize ? buffer.remaining() : chunkSize;
+ ByteBuffer part = buffer;
- if (Thread.currentThread().getContextClassLoader() == null) {
- ClassLoader cl = ClassLoader.getSystemClassLoader();
- Thread.currentThread().setContextClassLoader(cl);
- }
+ if (amountToSend != buffer.capacity()) {
+ // we need to allocation a new ByteBuffer because send calls ByteBuffer.array()
+ // which would return
+ // the whole byte[] and not only the slice. But the lib doesn't use
+ // ByteBuffer.arrayOffset().
+ var slice = buffer.slice(buffer.position(), amountToSend);
+ part = ByteBuffer.allocate(amountToSend);
+ part.put(slice);
+ }
- var message = readMessage(channelBuffer.data);
- if (message != null) {
- dispatchCompressedMessage(message);
+ buffer.position(buffer.position() + amountToSend);
+ localDataChannel.send(new RTCDataChannelBuffer(part, true));
+ log.debug(prefix() + " sent " + part.capacity() + " bytes");
+ }
+ }
+ synchronized (this) {
+ if (!stopRequested) {
+ try {
+ log.debug(prefix() + "sendThread -> sleep");
+ this.wait();
+ log.debug(prefix() + "sendThread -> woke up");
+ } catch (InterruptedException e) {
+ log.debug(prefix() + "sendThread -> interrupted");
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error(prefix() + e);
+ fireDisconnect();
}
+ log.debug(prefix() + " sendThread ended");
}
}
}
diff --git a/src/main/java/net/rptools/clientserver/simple/server/AbstractServer.java b/src/main/java/net/rptools/clientserver/simple/server/AbstractServer.java
new file mode 100644
index 0000000000..b966028f2a
--- /dev/null
+++ b/src/main/java/net/rptools/clientserver/simple/server/AbstractServer.java
@@ -0,0 +1,162 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.clientserver.simple.server;
+
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import net.rptools.clientserver.simple.DisconnectHandler;
+import net.rptools.clientserver.simple.MessageHandler;
+import net.rptools.clientserver.simple.connection.Connection;
+import net.rptools.maptool.server.Handshake;
+import net.rptools.maptool.server.HandshakeObserver;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class AbstractServer implements DisconnectHandler, Server, HandshakeObserver {
+
+ private static final Logger log = LogManager.getLogger(AbstractServer.class);
+ // private final ReaperThread reaperThread;
+
+ private final Map clients =
+ Collections.synchronizedMap(new HashMap());
+ private final List observerList =
+ Collections.synchronizedList(new ArrayList());
+
+ private final HandshakeProvider handshakeProvider;
+ private final MessageHandler messageHandler;
+
+ public AbstractServer(HandshakeProvider handshakeProvider, MessageHandler messageHandler) {
+ this.handshakeProvider = handshakeProvider;
+ this.messageHandler = messageHandler;
+ }
+
+ public void addObserver(ServerObserver observer) {
+ observerList.add(observer);
+ }
+
+ public void removeObserver(ServerObserver observer) {
+ observerList.remove(observer);
+ }
+
+ public void broadcastMessage(byte[] message) {
+ synchronized (clients) {
+ for (Connection conn : clients.values()) {
+ conn.sendMessage(message);
+ }
+ }
+ }
+
+ public void broadcastMessage(String[] exclude, byte[] message) {
+ Set excludeSet = new HashSet();
+ for (String e : exclude) {
+ excludeSet.add(e);
+ }
+ synchronized (clients) {
+ for (Map.Entry entry : clients.entrySet()) {
+ if (!excludeSet.contains(entry.getKey())) {
+ entry.getValue().sendMessage(message);
+ }
+ }
+ }
+ }
+
+ public void sendMessage(String id, Object channel, byte[] message) {
+ Connection client = clients.get(id);
+ client.sendMessage(channel, message);
+ }
+
+ public void close() {
+ synchronized (clients) {
+ for (Connection conn : clients.values()) {
+ conn.close();
+ }
+ }
+ }
+
+ protected void reapClients() {
+ log.debug("About to reap clients");
+ synchronized (clients) {
+ log.debug("Reaping clients");
+
+ for (Iterator> i = clients.entrySet().iterator();
+ i.hasNext(); ) {
+ Map.Entry entry = i.next();
+ Connection conn = entry.getValue();
+ if (!conn.isAlive()) {
+ log.debug("\tReaping: " + conn.getId());
+ i.remove();
+ try {
+ fireClientDisconnect(conn);
+ conn.close();
+ } catch (Exception e) {
+ // Don't want to raise an error if notification of removing a dead connection failed
+ }
+ }
+ }
+ }
+ }
+
+ protected void fireClientConnect(Connection conn) {
+ log.debug("Firing: clientConnect: " + conn.getId());
+ for (ServerObserver observer : observerList) {
+ observer.connectionAdded(conn);
+ }
+ }
+
+ protected void fireClientDisconnect(Connection conn) {
+ log.debug("Firing: clientDisconnect: " + conn.getId());
+ for (ServerObserver observer : observerList) {
+ observer.connectionRemoved(conn);
+ }
+ }
+
+ ////
+ // DISCONNECT HANDLER
+ public void handleDisconnect(Connection conn) {
+ log.debug("HandleDisconnect: " + conn.getId());
+ fireClientDisconnect(conn);
+ }
+
+ protected void handleConnection(Connection conn) throws ExecutionException, InterruptedException {
+ var handshake = handshakeProvider.getConnectionHandshake(conn);
+ handshake.addObserver(this);
+ // Make sure the client is allowed
+ handshake.startHandshake();
+ }
+
+ public void onCompleted(Handshake handshake) {
+ handshake.removeObserver(this);
+ var conn = handshake.getConnection();
+ handshakeProvider.releaseHandshake(conn);
+ if (handshake.isSuccessful()) {
+ conn.addMessageHandler(messageHandler);
+ conn.addDisconnectHandler(this);
+
+ log.debug("About to add new client");
+ synchronized (clients) {
+ reapClients();
+
+ log.debug("Adding new client");
+ clients.put(conn.getId(), conn);
+ fireClientConnect(conn);
+ // System.out.println("new client " + conn.getId() + " added, " + server.clients.size()
+ // + " total");
+ }
+ } else {
+ log.debug("Client closing: bad handshake");
+ conn.close();
+ }
+ }
+}
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/server/NilServer.java b/src/main/java/net/rptools/clientserver/simple/server/HandshakeProvider.java
similarity index 73%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/server/NilServer.java
rename to src/main/java/net/rptools/clientserver/simple/server/HandshakeProvider.java
index ad9b76bec3..e9444833fb 100644
--- a/clientserver/src/main/java/net/rptools/clientserver/simple/server/NilServer.java
+++ b/src/main/java/net/rptools/clientserver/simple/server/HandshakeProvider.java
@@ -14,11 +14,11 @@
*/
package net.rptools.clientserver.simple.server;
-/** A server implementation that never receives connections */
-public class NilServer extends AbstractServer {
- @Override
- public void start() {}
+import net.rptools.clientserver.simple.connection.Connection;
+import net.rptools.maptool.server.Handshake;
- @Override
- public void close() {}
+public interface HandshakeProvider {
+ Handshake getConnectionHandshake(Connection conn);
+
+ void releaseHandshake(Connection conn);
}
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/server/Server.java b/src/main/java/net/rptools/clientserver/simple/server/Server.java
similarity index 77%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/server/Server.java
rename to src/main/java/net/rptools/clientserver/simple/server/Server.java
index 00b379a7d9..171e8a57e6 100644
--- a/clientserver/src/main/java/net/rptools/clientserver/simple/server/Server.java
+++ b/src/main/java/net/rptools/clientserver/simple/server/Server.java
@@ -24,4 +24,14 @@ public interface Server extends AutoCloseable {
void addObserver(ServerObserver observer);
void removeObserver(ServerObserver observer);
+
+ void broadcastMessage(byte[] message);
+
+ void broadcastMessage(String[] exclude, byte[] message);
+
+ default void sendMessage(String id, byte[] message) {
+ sendMessage(id, null, message);
+ }
+
+ void sendMessage(String id, Object channel, byte[] message);
}
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/server/ServerObserver.java b/src/main/java/net/rptools/clientserver/simple/server/ServerObserver.java
similarity index 94%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/server/ServerObserver.java
rename to src/main/java/net/rptools/clientserver/simple/server/ServerObserver.java
index 7dcdcdee8c..7ea52d9cc4 100644
--- a/clientserver/src/main/java/net/rptools/clientserver/simple/server/ServerObserver.java
+++ b/src/main/java/net/rptools/clientserver/simple/server/ServerObserver.java
@@ -20,4 +20,6 @@
public interface ServerObserver {
public void connectionAdded(Connection conn);
+
+ public void connectionRemoved(Connection conn);
}
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/server/SocketServer.java b/src/main/java/net/rptools/clientserver/simple/server/SocketServer.java
similarity index 84%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/server/SocketServer.java
rename to src/main/java/net/rptools/clientserver/simple/server/SocketServer.java
index 2b4c0ac9c5..633a61ebb3 100644
--- a/clientserver/src/main/java/net/rptools/clientserver/simple/server/SocketServer.java
+++ b/src/main/java/net/rptools/clientserver/simple/server/SocketServer.java
@@ -17,7 +17,8 @@
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ExecutionException;
+import net.rptools.clientserver.simple.MessageHandler;
import net.rptools.clientserver.simple.connection.SocketConnection;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -32,22 +33,21 @@ public class SocketServer extends AbstractServer {
private ServerSocket socket;
private ListeningThread listeningThread;
- public SocketServer(int port) {
+ public SocketServer(int port, HandshakeProvider handshake, MessageHandler messageHandler) {
+ super(handshake, messageHandler);
this.port = port;
}
@Override
public void start() throws IOException {
- var serverSocket = new ServerSocket(port);
- // If the above throws, it will be as though we never started.
-
- socket = serverSocket;
+ socket = new ServerSocket(port);
listeningThread = new ListeningThread(this, socket);
listeningThread.start();
}
@Override
public void close() {
+ super.close();
listeningThread.suppressErrors();
log.debug("Server closing down");
@@ -104,15 +104,12 @@ public void run() {
while (!stopRequested) {
try {
Socket s = socket.accept();
- // Client heartbeat frequency is 20 seconds, so a minute should permit two or three
- // heartbeats to come in if still connected.
- s.setSoTimeout((int) TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES));
log.debug("Client connecting ...");
String id = nextClientId(s);
SocketConnection conn = new SocketConnection(id, s);
- server.fireClientConnect(conn);
- } catch (IOException e) {
+ server.handleConnection(conn);
+ } catch (IOException | ExecutionException | InterruptedException e) {
if (!suppressErrors) {
log.error(e.getMessage(), e);
}
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/server/WebRTCServer.java b/src/main/java/net/rptools/clientserver/simple/server/WebRTCServer.java
similarity index 87%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/server/WebRTCServer.java
rename to src/main/java/net/rptools/clientserver/simple/server/WebRTCServer.java
index 32ad0b8c7b..5954661f99 100644
--- a/clientserver/src/main/java/net/rptools/clientserver/simple/server/WebRTCServer.java
+++ b/src/main/java/net/rptools/clientserver/simple/server/WebRTCServer.java
@@ -19,11 +19,14 @@
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
+import net.rptools.clientserver.simple.MessageHandler;
import net.rptools.clientserver.simple.connection.WebRTCConnection;
import net.rptools.clientserver.simple.webrtc.CandidateMessageDto;
import net.rptools.clientserver.simple.webrtc.LoginMessageDto;
import net.rptools.clientserver.simple.webrtc.MessageDto;
import net.rptools.clientserver.simple.webrtc.OfferMessageDto;
+import net.rptools.maptool.client.MapTool;
+import net.rptools.maptool.server.ServerConfig;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.java_websocket.client.WebSocketClient;
@@ -32,15 +35,8 @@
public class WebRTCServer extends AbstractServer {
private static final Logger log = LogManager.getLogger(WebRTCServer.class);
- public interface Listener {
- void onLoginError();
-
- void onUnexpectedClose();
- }
-
- private final Listener listener;
private WebSocketClient signalingClient;
- private final String serverName;
+ private final ServerConfig config;
private final Gson gson = new Gson();
private String lastError = null;
private URI webSocketUri = null;
@@ -51,9 +47,10 @@ public interface Listener {
public static String WebSocketUrl = "ws://webrtc1.rptools.net:8080";
private boolean disconnectExpected;
- public WebRTCServer(String serverName, Listener listener) {
- this.listener = listener;
- this.serverName = serverName;
+ public WebRTCServer(
+ ServerConfig config, HandshakeProvider handshake, MessageHandler messageHandler) {
+ super(handshake, messageHandler);
+ this.config = config;
try {
webSocketUri = new URI(WebSocketUrl);
@@ -75,7 +72,7 @@ public void onOpen(ServerHandshake handshakeData) {
reconnectCounter = 30;
log.info("S WebSocket connected\n");
var msg = new LoginMessageDto();
- msg.source = serverName;
+ msg.source = config.getServerName();
sendSignalingMessage(gson.toJson(msg));
}
@@ -89,17 +86,12 @@ public void onMessage(String message) {
public void onClose(int code, String reason, boolean remote) {
lastError = "WebSocket closed: remote:" + remote + " (" + code + ") " + reason;
log.info("S " + lastError);
- if (disconnectExpected) {
- return;
- }
+ if (disconnectExpected) return;
// if the connection get closed remotely the rptools.net server disconnected. Try to
// reconnect.
- if (reconnectCounter > 0) {
- retryConnect();
- } else {
- listener.onUnexpectedClose();
- }
+ if (reconnectCounter > 0) retryConnect();
+ else MapTool.stopServer();
}
@Override
@@ -119,7 +111,7 @@ private void handleSignalingMessage(String message) {
case "login" -> {
var loginMsg = gson.fromJson(message, LoginMessageDto.class);
if (!loginMsg.success) {
- listener.onLoginError();
+ MapTool.showError("ServerDialog.error.serverAlreadyExists");
}
}
case "offer" -> {
@@ -139,13 +131,13 @@ public WebSocketClient getSignalingClient() {
return signalingClient;
}
- public String getName() {
- return serverName;
+ public ServerConfig getConfig() {
+ return config;
}
public void onDataChannelOpened(WebRTCConnection connection) {
try {
- fireClientConnect(connection);
+ handleConnection(connection);
} catch (Exception e) {
log.error(e);
}
@@ -162,6 +154,7 @@ public void start() throws IOException {
@Override
public void close() {
+ super.close();
disconnectExpected = true;
reconnectCounter = -1;
signalingClient.close();
@@ -186,4 +179,8 @@ void retryConnect() {
reconnectThread.setName("WebRTCServer.reconnectThread");
reconnectThread.start();
}
+
+ public void clearClients() {
+ reapClients();
+ }
}
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/AnswerMessageDto.java b/src/main/java/net/rptools/clientserver/simple/webrtc/AnswerMessageDto.java
similarity index 100%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/AnswerMessageDto.java
rename to src/main/java/net/rptools/clientserver/simple/webrtc/AnswerMessageDto.java
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/CandidateMessageDto.java b/src/main/java/net/rptools/clientserver/simple/webrtc/CandidateMessageDto.java
similarity index 100%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/CandidateMessageDto.java
rename to src/main/java/net/rptools/clientserver/simple/webrtc/CandidateMessageDto.java
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/LoginMessageDto.java b/src/main/java/net/rptools/clientserver/simple/webrtc/LoginMessageDto.java
similarity index 100%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/LoginMessageDto.java
rename to src/main/java/net/rptools/clientserver/simple/webrtc/LoginMessageDto.java
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/MessageDto.java b/src/main/java/net/rptools/clientserver/simple/webrtc/MessageDto.java
similarity index 100%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/MessageDto.java
rename to src/main/java/net/rptools/clientserver/simple/webrtc/MessageDto.java
diff --git a/clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/OfferMessageDto.java b/src/main/java/net/rptools/clientserver/simple/webrtc/OfferMessageDto.java
similarity index 100%
rename from clientserver/src/main/java/net/rptools/clientserver/simple/webrtc/OfferMessageDto.java
rename to src/main/java/net/rptools/clientserver/simple/webrtc/OfferMessageDto.java
diff --git a/src/main/java/net/rptools/maptool/api/ApiData.java b/src/main/java/net/rptools/maptool/api/ApiData.java
new file mode 100644
index 0000000000..41a4768678
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/ApiData.java
@@ -0,0 +1,26 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+
+public interface ApiData {
+
+ default JsonObject asJsonObject() {
+ Gson gson = new Gson();
+ return gson.toJsonTree(this).getAsJsonObject();
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/client/ui/themes/AarkLaF.java b/src/main/java/net/rptools/maptool/api/ApiException.java
similarity index 62%
rename from src/main/java/net/rptools/maptool/client/ui/themes/AarkLaF.java
rename to src/main/java/net/rptools/maptool/api/ApiException.java
index 2eb8e4ec55..61f69718a6 100644
--- a/src/main/java/net/rptools/maptool/client/ui/themes/AarkLaF.java
+++ b/src/main/java/net/rptools/maptool/api/ApiException.java
@@ -12,23 +12,15 @@
* and specifically the Affero license
* text at .
*/
-package net.rptools.maptool.client.ui.themes;
+package net.rptools.maptool.api;
-import com.formdev.flatlaf.FlatDarkLaf;
+public class ApiException extends Exception {
-public class AarkLaF extends FlatDarkLaf {
- public static final String NAME = "Aark";
-
- public static boolean setup() {
- return setup(new AarkLaF());
- }
-
- public static void installLafInfo() {
- installLafInfo(NAME, AarkLaF.class);
+ public ApiException(String message) {
+ super(message);
}
- @Override
- public String getName() {
- return NAME;
+ public ApiException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/src/main/java/net/rptools/maptool/api/maptool/MapToolApi.java b/src/main/java/net/rptools/maptool/api/maptool/MapToolApi.java
new file mode 100644
index 0000000000..e995a1285d
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/maptool/MapToolApi.java
@@ -0,0 +1,25 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.maptool;
+
+import java.util.concurrent.CompletableFuture;
+import net.rptools.maptool.api.util.ApiResult;
+
+public class MapToolApi {
+
+ public CompletableFuture> getVersion() {
+ return CompletableFuture.completedFuture(new ApiResult(new MapToolInfo()));
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/api/maptool/MapToolInfo.java b/src/main/java/net/rptools/maptool/api/maptool/MapToolInfo.java
new file mode 100644
index 0000000000..937902ce50
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/maptool/MapToolInfo.java
@@ -0,0 +1,28 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.maptool;
+
+import net.rptools.maptool.api.ApiData;
+import net.rptools.maptool.client.MapTool;
+
+// @XmlRootElement
+public record MapToolInfo(
+ String mapToolVersion, String webEndpointVersion, boolean developmentVersion)
+ implements ApiData {
+
+ public MapToolInfo() {
+ this(MapTool.getVersion(), "unavailable", MapTool.isDevelopment());
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/api/util/ApiCall.java b/src/main/java/net/rptools/maptool/api/util/ApiCall.java
new file mode 100644
index 0000000000..54ad4bebed
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/util/ApiCall.java
@@ -0,0 +1,51 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.util;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import javax.swing.SwingUtilities;
+import net.rptools.maptool.api.ApiData;
+import net.rptools.maptool.api.ApiException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class ApiCall {
+
+ private static final Logger log = LogManager.getLogger(ApiCall.class);
+
+ public CompletableFuture> runOnSwingThread(Callable callable) {
+ try {
+ if (SwingUtilities.isEventDispatchThread()) {
+ return CompletableFuture.completedFuture(doCall(callable));
+ } else {
+ return CompletableFuture.supplyAsync(() -> doCall(callable));
+ }
+ } catch (Exception e) {
+ log.error(e);
+ return CompletableFuture.completedFuture(
+ new ApiResult<>(new ApiException("err.internal", e)));
+ }
+ }
+
+ private ApiResult doCall(Callable callable) {
+ try {
+ return new ApiResult(callable.call());
+ } catch (Exception e) {
+ log.error(e);
+ return new ApiResult<>(new ApiException("err.internal", e));
+ }
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/api/util/ApiListResult.java b/src/main/java/net/rptools/maptool/api/util/ApiListResult.java
new file mode 100644
index 0000000000..e6f28dcba6
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/util/ApiListResult.java
@@ -0,0 +1,77 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.util;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.util.List;
+import net.rptools.maptool.api.ApiData;
+import net.rptools.maptool.api.ApiException;
+
+public class ApiListResult {
+
+ private final List data;
+ private final ApiResultStatus status;
+ private final ApiException exception;
+
+ public static ApiListResult INTERNAL_ERROR_RESULT =
+ new ApiListResult<>(List.of(new NoData()));
+
+ public ApiListResult(List data) {
+ this.data = List.copyOf(data);
+ this.exception = null;
+ this.status = data != null ? ApiResultStatus.OK : ApiResultStatus.NONE;
+ }
+
+ public ApiListResult(ApiException e) {
+ this.data = null;
+ this.status = ApiResultStatus.ERROR;
+ this.exception = e;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public ApiResultStatus getStatus() {
+ return status;
+ }
+
+ public String getStatusMessage() {
+ if (exception == null) {
+ return "";
+ } else {
+ return exception.getMessage();
+ }
+ }
+
+ public JsonObject asJsonObject() {
+ JsonObject json = new JsonObject();
+ if (data != null) {
+ JsonArray objList =
+ data.stream()
+ .map(ApiData::asJsonObject)
+ .collect(JsonArray::new, JsonArray::add, JsonArray::addAll);
+ json.add("data", objList);
+ }
+ json.addProperty("status", status.getTextValue());
+ String msg = getStatusMessage();
+ if (msg != null && msg.length() > 0) {
+ json.addProperty("message", msg);
+ }
+
+ return json;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/api/util/ApiNoResult.java b/src/main/java/net/rptools/maptool/api/util/ApiNoResult.java
new file mode 100644
index 0000000000..055c0e032d
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/util/ApiNoResult.java
@@ -0,0 +1,68 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.util;
+
+import com.google.gson.JsonObject;
+import net.rptools.maptool.api.ApiData;
+import net.rptools.maptool.api.ApiException;
+
+public class ApiNoResult {
+
+ private final ApiResultStatus status;
+ private final ApiException exception;
+ private final T data;
+
+ // public static ApiNoResult NOT_FOUND = new ApiNoResult<>(new NoData());
+
+ public ApiNoResult() {
+ this(null);
+ }
+
+ public ApiNoResult(ApiException e) {
+ this.data = null;
+ this.status = ApiResultStatus.ERROR;
+ this.exception = e;
+ }
+
+ public T getData() {
+ return data;
+ }
+
+ public ApiResultStatus getStatus() {
+ return status;
+ }
+
+ public String getStatusMessage() {
+ if (exception == null) {
+ return "";
+ } else {
+ return exception.getMessage();
+ }
+ }
+
+ public JsonObject asJsonObject() {
+ JsonObject json = new JsonObject();
+ if (data != null) {
+ json.add("data", data.asJsonObject());
+ }
+ json.addProperty("status", status.getTextValue());
+ String msg = getStatusMessage();
+ if (msg != null && msg.length() > 0) {
+ json.addProperty("message", msg);
+ }
+
+ return json;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/api/util/ApiResult.java b/src/main/java/net/rptools/maptool/api/util/ApiResult.java
new file mode 100644
index 0000000000..dbac10c2db
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/util/ApiResult.java
@@ -0,0 +1,70 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.util;
+
+import com.google.gson.JsonObject;
+import net.rptools.maptool.api.ApiData;
+import net.rptools.maptool.api.ApiException;
+
+public class ApiResult {
+
+ private final T data;
+ private final ApiResultStatus status;
+ private final ApiException exception;
+
+ public static ApiResult NOT_FOUND = new ApiResult<>(new NoData());
+
+ public ApiResult(T data) {
+ this.data = data;
+ this.exception = null;
+ this.status = data != null ? ApiResultStatus.OK : ApiResultStatus.NONE;
+ }
+
+ public ApiResult(ApiException e) {
+ this.data = null;
+ this.status = ApiResultStatus.ERROR;
+ this.exception = e;
+ }
+
+ public T getData() {
+ return data;
+ }
+
+ public ApiResultStatus getStatus() {
+ return status;
+ }
+
+ public String getStatusMessage() {
+ if (exception == null) {
+ return "";
+ } else {
+ return exception.getMessage();
+ }
+ }
+
+ public JsonObject asJsonObject() {
+ JsonObject json = new JsonObject();
+ if (data != null) {
+ json.add("data", data.asJsonObject());
+ }
+ json.addProperty("status", status.getTextValue());
+ String msg = getStatusMessage();
+ if (msg != null && msg.length() > 0) {
+ json.addProperty("message", msg);
+ }
+
+ return json;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/api/util/ApiResultStatus.java b/src/main/java/net/rptools/maptool/api/util/ApiResultStatus.java
new file mode 100644
index 0000000000..2ead9c24c2
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/util/ApiResultStatus.java
@@ -0,0 +1,37 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.util;
+
+public enum ApiResultStatus {
+ OK("ok", ""),
+ ERROR("error", "Internal API Error"),
+ NONE("none", "Not Found");
+
+ private final String textValue;
+ private final String defaultMessage;
+
+ ApiResultStatus(String val, String defaultMsg) {
+ textValue = val;
+ defaultMessage = defaultMsg;
+ }
+
+ public String getTextValue() {
+ return textValue;
+ }
+
+ public String getDefaultMessage() {
+ return defaultMessage;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/api/util/NoData.java b/src/main/java/net/rptools/maptool/api/util/NoData.java
new file mode 100644
index 0000000000..bd9bda933f
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/api/util/NoData.java
@@ -0,0 +1,19 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.api.util;
+
+import net.rptools.maptool.api.ApiData;
+
+public record NoData() implements ApiData {}
diff --git a/src/main/java/net/rptools/maptool/client/AppActions.java b/src/main/java/net/rptools/maptool/client/AppActions.java
index c49300c1b7..6c56d03f69 100644
--- a/src/main/java/net/rptools/maptool/client/AppActions.java
+++ b/src/main/java/net/rptools/maptool/client/AppActions.java
@@ -31,6 +31,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;
import java.util.zip.ZipEntry;
@@ -77,6 +78,7 @@
import net.rptools.maptool.model.drawing.DrawableTexturePaint;
import net.rptools.maptool.model.player.*;
import net.rptools.maptool.model.player.Player.Role;
+import net.rptools.maptool.model.player.PlayerDatabaseFactory.PlayerDatabaseType;
import net.rptools.maptool.server.ServerConfig;
import net.rptools.maptool.server.ServerPolicy;
import net.rptools.maptool.util.*;
@@ -141,7 +143,7 @@ private static int getMenuShortcutKeyMask() {
public static final Action NEXT_TOKEN =
new ZoneClientAction() {
{
- init("action.nextToken");
+ init("menu.nextToken");
}
@Override
@@ -638,11 +640,13 @@ public boolean isAvailable() {
@Override
protected void executeAction() {
- final var server = MapTool.getServer();
- if (server != null) {
- ConnectionInfoDialog dialog = new ConnectionInfoDialog(server);
- dialog.setVisible(true);
+
+ if (MapTool.getServer() == null) {
+ return;
}
+
+ ConnectionInfoDialog dialog = new ConnectionInfoDialog(MapTool.getServer());
+ dialog.setVisible(true);
}
};
@@ -1276,7 +1280,7 @@ protected void executeAction() {
MapTool.showError("msg.error.cantBootSelf");
return;
}
- if (MapTool.getClient().isPlayerConnected(selectedPlayer.getName())) {
+ if (MapTool.isPlayerConnected(selectedPlayer.getName())) {
String msg = I18N.getText("msg.confirm.bootPlayer", selectedPlayer.getName());
if (MapTool.confirm(msg)) {
MapTool.serverCommand().bootPlayer(selectedPlayer.getName());
@@ -2104,13 +2108,11 @@ public boolean isSelected() {
@Override
protected void executeAction() {
- var client = MapTool.getClient();
- ServerPolicy policy = client.getServerPolicy();
+ ServerPolicy policy = MapTool.getServerPolicy();
policy.setIsMovementLocked(!policy.isMovementLocked());
- client.setServerPolicy(policy);
- client.getServerCommand().setServerPolicy(policy);
+ MapTool.updateServerPolicy(policy);
}
};
@@ -2128,13 +2130,11 @@ public boolean isSelected() {
@Override
protected void executeAction() {
- var client = MapTool.getClient();
- ServerPolicy policy = client.getServerPolicy();
+ ServerPolicy policy = MapTool.getServerPolicy();
policy.setIsTokenEditorLocked(!policy.isTokenEditorLocked());
- client.setServerPolicy(policy);
- client.getServerCommand().setServerPolicy(policy);
+ MapTool.updateServerPolicy(policy);
}
};
@@ -2162,9 +2162,8 @@ protected void executeAction() {
StartServerDialog dialog = new StartServerDialog();
dialog.showDialog();
- if (!dialog.accepted()) { // Results stored in Preferences.userRoot()
- return;
- }
+ if (!dialog.accepted()) // Results stored in Preferences.userRoot()
+ return;
StartServerDialogPreferences serverProps =
new StartServerDialogPreferences(); // data retrieved from
@@ -2228,19 +2227,26 @@ protected void executeAction() {
boolean failed = false;
try {
- MapTool.disconnect();
+ ServerDisconnectHandler.disconnectExpected = true;
MapTool.stopServer();
+ // Use UPnP to open port in router
+ if (serverProps.getUseUPnP()) {
+ UPnPUtil.openPort(serverProps.getPort());
+ }
// Right now set this is set to whatever the last server settings were. If we
// wanted to turn it on and
// leave it turned on, the line would change to:
// campaign.setHasUsedFogToolbar(useIF || campaign.hasUsedFogToolbar());
campaign.setHasUsedFogToolbar(useIF);
- ServerSidePlayerDatabase playerDatabase;
+ PlayerDatabaseFactory.setServerConfig(config);
if (serverProps.getUsePasswordFile()) {
+ PlayerDatabaseFactory.setCurrentPlayerDatabase(
+ PlayerDatabaseType.PASSWORD_FILE);
PasswordFilePlayerDatabase db =
- PlayerDatabaseFactory.getPasswordFilePlayerDatabase();
+ (PasswordFilePlayerDatabase)
+ PlayerDatabaseFactory.getCurrentPlayerDatabase();
db.initialize();
if (serverProps.getRole() == Role.GM) {
db.addTemporaryPlayer(
@@ -2249,22 +2255,13 @@ protected void executeAction() {
db.addTemporaryPlayer(
dialog.getUsernameTextField().getText(), Role.PLAYER, playerPassword);
}
- playerDatabase = db;
} else {
- playerDatabase =
- PlayerDatabaseFactory.getDefaultPlayerDatabase(
- config.getPlayerPassword(), config.getGmPassword());
+ PlayerDatabaseFactory.setCurrentPlayerDatabase(PlayerDatabaseType.DEFAULT);
}
+ PlayerDatabase playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
// Make a copy of the campaign since we don't coordinate local changes well ...
// yet
- Player.Role playerType = (Player.Role) dialog.getRoleCombo().getSelectedItem();
- final var player =
- new LocalPlayer(
- dialog.getUsernameTextField().getText(),
- playerType,
- (playerType == Role.GM) ? gmPassword : playerPassword);
-
/*
* JFJ 2010-10-27 The below creates a NEW campaign with a copy of the existing campaign. However, this is NOT a full copy. In the constructor called below, each zone from the
* previous campaign(ie, the one passed in) is recreated. This means that only some items for that campaign, zone(s), and token's are copied over when you start a new server
@@ -2275,11 +2272,37 @@ protected void executeAction() {
MapTool.startServer(
dialog.getUsernameTextField().getText(),
config,
- serverProps.getUseUPnP(),
policy,
campaign,
playerDatabase,
- player);
+ true);
+
+ // Connect to server
+ Player.Role playerType = (Player.Role) dialog.getRoleCombo().getSelectedItem();
+ Runnable onConnected =
+ () -> {
+ // connecting
+ MapTool.getFrame()
+ .getConnectionStatusPanel()
+ .setStatus(ConnectionStatusPanel.Status.server);
+ MapTool.addLocalMessage(
+ MessageUtil.getFormattedSystemMsg(
+ I18N.getText("msg.info.startServer")));
+ };
+
+ if (playerType == Player.Role.GM) {
+ MapTool.createConnection(
+ config,
+ new LocalPlayer(
+ dialog.getUsernameTextField().getText(), playerType, gmPassword),
+ onConnected);
+ } else {
+ MapTool.createConnection(
+ config,
+ new LocalPlayer(
+ dialog.getUsernameTextField().getText(), playerType, playerPassword),
+ onConnected);
+ }
} catch (UnknownHostException uh) {
MapTool.showError("msg.error.invalidLocalhost", uh);
failed = true;
@@ -2290,7 +2313,9 @@ protected void executeAction() {
| InvalidAlgorithmParameterException
| InvalidKeySpecException
| NoSuchPaddingException
- | InvalidKeyException e) {
+ | InvalidKeyException
+ | ExecutionException
+ | InterruptedException e) {
MapTool.showError("msg.error.initializeCrypto", e);
failed = true;
} catch (PasswordDatabaseException pwde) {
@@ -2301,7 +2326,11 @@ protected void executeAction() {
if (failed) {
try {
MapTool.startPersonalServer(campaign);
- } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+ } catch (IOException
+ | NoSuchAlgorithmException
+ | InvalidKeySpecException
+ | ExecutionException
+ | InterruptedException e) {
MapTool.showError("msg.error.failedStartPersonalServer", e);
}
}
@@ -2330,9 +2359,8 @@ protected void executeAction() {
return;
}
+ ServerDisconnectHandler.disconnectExpected = true;
LOAD_MAP.setSeenWarning(false);
-
- MapTool.disconnect();
MapTool.stopServer();
// Install a temporary gimped campaign until we get the one from the
@@ -2345,8 +2373,9 @@ protected void executeAction() {
.getConnectionStatusPanel()
.setStatus(ConnectionStatusPanel.Status.connected);
- // Show the user something interesting while we're connecting. Look below for the
- // corresponding hideGlassPane
+ // Show the user something interesting until we've got the campaign
+ // Look in ClientMethodHandler.setCampaign() for the corresponding
+ // hideGlassPane
StaticMessageDialog progressDialog =
new StaticMessageDialog(I18N.getText("msg.info.connecting"));
MapTool.getFrame().showFilledGlassPane(progressDialog);
@@ -2364,30 +2393,20 @@ protected void executeAction() {
dialog.getPort(),
prefs.getServerName(),
dialog.getServer(),
- false,
dialog.getUseWebRTC());
String password =
prefs.getUsePublicKey()
? new PasswordGenerator().getPassword()
: prefs.getPassword();
- MapTool.connectToRemoteServer(
+ MapTool.createConnection(
config,
new LocalPlayer(prefs.getUsername(), prefs.getRole(), password),
- (success) -> {
- EventQueue.invokeLater(
- () -> {
- MapTool.getFrame().hideGlassPane();
- if (success) {
- // Show the user something interesting until we've got the campaign
- // Look in ClientMethodHandler.setCampaign() for the corresponding
- // hideGlassPane
- MapTool.getFrame()
- .showFilledGlassPane(
- new StaticMessageDialog(
- I18N.getText("msg.info.campaignLoading")));
- }
- });
+ () -> {
+ MapTool.getFrame().hideGlassPane();
+ MapTool.getFrame()
+ .showFilledGlassPane(
+ new StaticMessageDialog(I18N.getText("msg.info.campaignLoading")));
});
} catch (UnknownHostException e1) {
@@ -2396,7 +2415,10 @@ protected void executeAction() {
} catch (IOException e1) {
MapTool.showError("msg.error.failedLoadCampaign", e1);
failed = true;
- } catch (NoSuchAlgorithmException | InvalidKeySpecException e1) {
+ } catch (NoSuchAlgorithmException
+ | InvalidKeySpecException
+ | ExecutionException
+ | InterruptedException e1) {
MapTool.showError("msg.error.initializeCrypto", e1);
failed = true;
}
@@ -2404,7 +2426,11 @@ protected void executeAction() {
MapTool.getFrame().hideGlassPane();
try {
MapTool.startPersonalServer(oldCampaign);
- } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+ } catch (IOException
+ | NoSuchAlgorithmException
+ | InvalidKeySpecException
+ | ExecutionException
+ | InterruptedException e) {
MapTool.showError("msg.error.failedStartPersonalServer", e);
}
}
@@ -2431,16 +2457,7 @@ protected void executeAction() {
}
};
- /**
- * Disconnects the client and starts a personal server.
- *
- * If we are hosting the server, the personal server will have the same campaign as the server.
- * Otherwise a new basic campaign will be created.
- */
public static void disconnectFromServer() {
- // hide map so player doesn't get a brief GM view
- MapTool.getFrame().setCurrentZoneRenderer(null);
-
Campaign campaign;
if (MapTool.isHostingServer()) {
campaign = MapTool.getCampaign();
@@ -2448,18 +2465,20 @@ public static void disconnectFromServer() {
campaign = CampaignFactory.createBasicCampaign();
new CampaignManager().clearCampaignData();
}
-
+ ServerDisconnectHandler.disconnectExpected = true;
LOAD_MAP.setSeenWarning(false);
-
- MapTool.disconnect();
MapTool.stopServer();
-
+ MapTool.disconnect();
MapTool.getFrame().getToolbarPanel().getMapselect().setVisible(true);
MapTool.getFrame().getToolbarPanel().setTokenSelectionGroupEnabled(true);
try {
MapTool.startPersonalServer(campaign);
- } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+ } catch (IOException
+ | NoSuchAlgorithmException
+ | InvalidKeySpecException
+ | ExecutionException
+ | InterruptedException e) {
MapTool.showError("msg.error.failedStartPersonalServer", e);
}
}
@@ -2472,7 +2491,8 @@ public static void disconnectFromServer() {
@Override
public boolean isAvailable() {
- return MapTool.getClient().getPlayerDatabase() instanceof PersistedPlayerDatabase;
+ return PlayerDatabaseFactory.getCurrentPlayerDatabase()
+ instanceof PersistedPlayerDatabase;
}
@Override
@@ -3339,7 +3359,7 @@ public ToggleWindowAction(MTFrame mtFrame) {
@Override
public boolean isSelected() {
- return !MapTool.getFrame().getFrame(mtFrame).isHidden();
+ return MapTool.getFrame().getFrame(mtFrame).isShowing();
}
@Override
@@ -3350,7 +3370,7 @@ public boolean isAvailable() {
@Override
protected void executeAction() {
DockableFrame frame = MapTool.getFrame().getFrame(mtFrame);
- if (!frame.isHidden()) {
+ if (frame.isShowing()) {
MapTool.getFrame().getDockingManager().hideFrame(mtFrame.name());
} else {
MapTool.getFrame().getDockingManager().showFrame(mtFrame.name());
diff --git a/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java b/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
index 9b66a3a4e0..3e0d16246d 100644
--- a/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
+++ b/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
@@ -18,7 +18,6 @@
import java.awt.Point;
import java.awt.geom.Area;
import java.io.IOException;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -74,7 +73,6 @@
import net.rptools.maptool.server.proto.*;
import net.rptools.maptool.transfer.AssetConsumer;
import net.rptools.maptool.transfer.AssetHeader;
-import net.rptools.maptool.util.MessageUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -87,18 +85,14 @@
public class ClientMessageHandler implements MessageHandler {
private static final Logger log = LogManager.getLogger(ClientMessageHandler.class);
- private final MapToolClient client;
-
- public ClientMessageHandler(MapToolClient client) {
- this.client = client;
- }
+ public ClientMessageHandler() {}
@Override
public void handleMessage(String id, byte[] message) {
try {
var msg = Message.parseFrom(message);
var msgType = msg.getMessageTypeCase();
- log.debug("{} got: {}", id, msgType);
+ log.debug(id + " got: " + msgType);
switch (msgType) {
case ADD_TOPOLOGY_MSG -> handle(msg.getAddTopologyMsg());
@@ -195,7 +189,7 @@ private void handle(UpdateExposedAreaMetaMsg msg) {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
var tokenGUID = msg.hasTokenGuid() ? GUID.valueOf(msg.getTokenGuid().getValue()) : null;
ExposedAreaMetaData meta = new ExposedAreaMetaData(Mapper.map(msg.getArea()));
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.setExposedAreaMetaData(tokenGUID, meta);
});
}
@@ -207,7 +201,7 @@ private void handle(UpdateGmMacrosMsg msg) {
msg.getMacrosList().stream()
.map(MacroButtonProperties::fromDto)
.collect(Collectors.toList());
- client.getCampaign().setGmMacroButtonPropertiesArray(macros);
+ MapTool.getCampaign().setGmMacroButtonPropertiesArray(macros);
MapTool.getFrame().getGmPanel().reset();
});
}
@@ -219,7 +213,7 @@ private void handle(UpdateCampaignMacrosMsg msg) {
msg.getMacrosList().stream()
.map(MacroButtonProperties::fromDto)
.collect(Collectors.toList());
- client.getCampaign().setMacroButtonPropertiesArray(macros);
+ MapTool.getCampaign().setMacroButtonPropertiesArray(macros);
MapTool.getFrame().getCampaignPanel().reset();
});
}
@@ -229,7 +223,7 @@ private void handle(UpdateTokenInitiativeMsg msg) {
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
var tokenGUID = GUID.valueOf(msg.getTokenGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
var list = zone.getInitiativeList();
TokenInitiative ti = list.getTokenInitiative(msg.getIndex());
if (!ti.getId().equals(tokenGUID)) {
@@ -266,7 +260,7 @@ private void handle(UpdateCampaignMsg msg) {
() -> {
CampaignProperties properties = CampaignProperties.fromDto(msg.getProperties());
- client.getCampaign().replaceCampaignProperties(properties);
+ MapTool.getCampaign().replaceCampaignProperties(properties);
MapToolFrame frame = MapTool.getFrame();
ZoneRenderer zr = frame.getCurrentZoneRenderer();
if (zr != null) {
@@ -289,7 +283,7 @@ private void handle(SetServerPolicyMsg msg) {
EventQueue.invokeLater(
() -> {
ServerPolicy policy = ServerPolicy.fromDto(msg.getPolicy());
- client.setServerPolicy(policy);
+ MapTool.setServerPolicy(policy);
MapTool.getFrame().getToolbox().updateTools();
});
}
@@ -347,11 +341,11 @@ private void handle(SetZoneVisibilityMsg msg) {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
boolean visible = msg.getIsVisible();
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.setVisible(visible);
ZoneRenderer currentRenderer = MapTool.getFrame().getCurrentZoneRenderer();
if (!visible
- && !client.getPlayer().isGM()
+ && !MapTool.getPlayer().isGM()
&& currentRenderer != null
&& currentRenderer.getZone().getId().equals(zoneGUID)) {
Collection AllTokenIDs = new ArrayList<>();
@@ -375,7 +369,7 @@ private void handle(UndoDrawMsg msg) {
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
GUID drawableId = GUID.valueOf(msg.getDrawableGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
if (zone == null) {
return;
}
@@ -393,7 +387,7 @@ private void handle(UpdateDrawingMsg msg) {
Pen p = Pen.fromDto(msg.getPen());
DrawnElement de = DrawnElement.fromDto(msg.getDrawing());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.updateDrawable(de, p);
MapTool.getFrame().refresh();
});
@@ -403,7 +397,7 @@ private void handle(UpdateTokenPropertyMsg msg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
var tokenGUID = GUID.valueOf(msg.getTokenGuid());
var token = zone.getToken(tokenGUID);
if (token != null) {
@@ -524,7 +518,7 @@ private void handle(SetZoneHasFowMsg msg) {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
boolean hasFog = msg.getHasFow();
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.setHasFog(hasFog);
// In case we're looking at the zone
@@ -541,14 +535,10 @@ private void handle(SetZoneGridSizeMsg msg) {
int size = msg.getSize();
int color = msg.getColor();
- var zone = client.getCampaign().getZone(zoneGUID);
- // Sometimes these messages can come in as a zone is being removed, so we can't rely on
- // its existence
- if (zone != null) {
- zone.getGrid().setSize(size);
- zone.getGrid().setOffset(xOffset, yOffset);
- zone.setGridColor(color);
- }
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
+ zone.getGrid().setSize(size);
+ zone.getGrid().setOffset(xOffset, yOffset);
+ zone.setGridColor(color);
MapTool.getFrame().refresh();
});
@@ -559,7 +549,7 @@ private void handle(SetVisionTypeMsg msg) {
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
VisionType visionType = VisionType.valueOf(msg.getVision().name());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
if (zone != null) {
zone.setVisionType(visionType);
if (MapTool.getFrame().getCurrentZoneRenderer() != null) {
@@ -575,7 +565,7 @@ private void handle(SetTokenLocationMsg msg) {
EventQueue.invokeLater(
() -> {
// Only the table should process this
- if (client.getPlayer().getName().equalsIgnoreCase("Table")) {
+ if (MapTool.getPlayer().getName().equalsIgnoreCase("Table")) {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
var keyToken = GUID.valueOf(msg.getTokenGuid());
@@ -586,7 +576,7 @@ private void handle(SetTokenLocationMsg msg) {
var y = msg.getLocation().getY();
// Get the zone
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
// Get the token
var token = zone.getToken(keyToken);
@@ -599,7 +589,7 @@ private void handle(SetTokenLocationMsg msg) {
token.setX(zp2.x);
token.setY(zp2.y);
- client.getServerCommand().putToken(zoneGUID, token);
+ MapTool.serverCommand().putToken(zoneGUID, token);
}
});
}
@@ -625,7 +615,7 @@ private void handle(SetFowMsg msg) {
var selectedTokens =
msg.getSelectedTokensList().stream().map(GUID::valueOf).collect(Collectors.toSet());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.setFogArea(area, selectedTokens);
MapTool.getFrame().refresh();
});
@@ -634,7 +624,7 @@ private void handle(SetFowMsg msg) {
private void handle(SetCampaignNameMsg msg) {
EventQueue.invokeLater(
() -> {
- client.getCampaign().setName(msg.getName());
+ MapTool.getCampaign().setName(msg.getName());
MapTool.getFrame().setTitle();
});
}
@@ -654,7 +644,7 @@ private void handle(SetBoardMsg msg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
Point boardXY = Mapper.map(msg.getPoint());
var assetId = new MD5Key(msg.getAssetId());
@@ -676,7 +666,7 @@ private void handle(RenameZoneMsg msg) {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
String name = msg.getName();
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
if (zone != null) {
zone.setName(name);
}
@@ -690,7 +680,7 @@ private void handle(RemoveZoneMsg msg) {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
final var renderer = MapTool.getFrame().getZoneRenderer(zoneGUID);
final var zone = renderer.getZone();
- client.getCampaign().removeZone(zoneGUID);
+ MapTool.getCampaign().removeZone(zoneGUID);
MapTool.getFrame().removeZoneRenderer(renderer);
// Now we have fire off adding the tokens in the zone
@@ -708,7 +698,7 @@ private void handle(RemoveTopologyMsg msg) {
var area = Mapper.map(msg.getArea());
var topologyType = Zone.TopologyType.valueOf(msg.getType().name());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.removeTopology(area, topologyType);
MapTool.getFrame().getZoneRenderer(zoneGUID).repaint();
@@ -719,7 +709,7 @@ private void handle(RemoveTokensMsg msg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
var tokenGUIDs =
msg.getTokenGuidList().stream().map(GUID::valueOf).collect(Collectors.toList());
zone.removeTokens(tokenGUIDs);
@@ -731,7 +721,7 @@ private void handle(RemoveTokenMsg msg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
var tokenGUID = GUID.valueOf(msg.getTokenGuid());
zone.removeToken(tokenGUID);
MapTool.getFrame().refresh();
@@ -742,7 +732,7 @@ private void handle(RemoveLabelMsg msg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
GUID labelGUID = GUID.valueOf(msg.getLabelGuid());
zone.removeLabel(labelGUID);
MapTool.getFrame().refresh();
@@ -753,7 +743,7 @@ private void handle(PutZoneMsg msg) {
EventQueue.invokeLater(
() -> {
Zone zone = Zone.fromDto(msg.getZone());
- client.getCampaign().putZone(zone);
+ MapTool.getCampaign().putZone(zone);
// TODO: combine this with MapTool.addZone()
var renderer = ZoneRendererFactory.newRenderer(zone);
@@ -772,7 +762,7 @@ private void handle(PutLabelMsg msg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(msg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
Label label = Label.fromDto(msg.getLabel());
zone.putLabel(label);
MapTool.getFrame().refresh();
@@ -791,16 +781,7 @@ private void handle(PutAssetMsg msg) {
private void handle(PlayerDisconnectedMsg msg) {
EventQueue.invokeLater(
() -> {
- var player = Player.fromDto(msg.getPlayer());
- client.removePlayer(player);
-
- if (!player.equals(client.getPlayer())) {
- MapTool.addLocalMessage(
- MessageUtil.getFormattedSystemMsg(
- MessageFormat.format(
- I18N.getText("msg.info.playerDisconnected"), player.getName())));
- }
-
+ MapTool.removePlayer(Player.fromDto(msg.getPlayer()));
MapTool.getFrame().refresh();
});
}
@@ -808,16 +789,7 @@ private void handle(PlayerDisconnectedMsg msg) {
private void handle(PlayerConnectedMsg msg) {
EventQueue.invokeLater(
() -> {
- var player = Player.fromDto(msg.getPlayer());
- client.addPlayer(player);
-
- if (!player.equals(client.getPlayer())) {
- MapTool.addLocalMessage(
- MessageUtil.getFormattedSystemMsg(
- MessageFormat.format(
- I18N.getText("msg.info.playerConnected"), player.getName())));
- }
-
+ MapTool.addPlayer(Player.fromDto(msg.getPlayer()));
MapTool.getFrame().refresh();
});
}
@@ -860,7 +832,7 @@ private void handle(HideFowMsg msg) {
var selectedTokens =
msg.getTokenGuidList().stream().map(GUID::valueOf).collect(Collectors.toSet());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.hideArea(area, selectedTokens);
MapTool.getFrame().refresh();
});
@@ -882,7 +854,7 @@ private void handle(ExposeFowMsg msg) {
Area area = Mapper.map(msg.getArea());
var selectedTokens =
msg.getTokenGuidList().stream().map(GUID::valueOf).collect(Collectors.toSet());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.exposeArea(area, selectedTokens);
MapTool.getFrame().refresh();
});
@@ -934,7 +906,7 @@ private void handle(EnforceZoneMsg msg) {
if (renderer != null
&& renderer != MapTool.getFrame().getCurrentZoneRenderer()
- && (renderer.getZone().isVisible() || client.getPlayer().isGM())) {
+ && (renderer.getZone().isVisible() || MapTool.getPlayer().isGM())) {
MapTool.getFrame().setCurrentZoneRenderer(renderer);
}
});
@@ -949,7 +921,7 @@ private void handle(PutTokenMsg putTokenMsg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(putTokenMsg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
var token = Token.fromDto(putTokenMsg.getToken());
zone.putToken(token);
MapTool.getFrame().refresh();
@@ -960,7 +932,7 @@ private void handle(EditTokenMsg editTokenMsg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(editTokenMsg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
var token = Token.fromDto(editTokenMsg.getToken());
zone.editToken(token);
MapTool.getFrame().refresh();
@@ -974,7 +946,7 @@ private void handle(DrawMsg drawMsg) {
Pen pen = Pen.fromDto(drawMsg.getPen());
Drawable drawable = Drawable.fromDto(drawMsg.getDrawable());
- var zone = client.getCampaign().getZone(zoneGuid);
+ var zone = MapTool.getCampaign().getZone(zoneGuid);
zone.addDrawable(new DrawnElement(drawable, pen));
MapTool.getFrame().refresh();
});
@@ -984,7 +956,7 @@ private void handle(ClearExposedAreaMsg clearExposedAreaMsg) {
EventQueue.invokeLater(
() -> {
var zoneGUID = GUID.valueOf(clearExposedAreaMsg.getZoneGuid());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.clearExposedArea(clearExposedAreaMsg.getGlobalOnly());
});
}
@@ -994,7 +966,7 @@ private void handle(ClearAllDrawingsMsg clearAllDrawingsMsg) {
() -> {
var zoneGUID = GUID.valueOf(clearAllDrawingsMsg.getZoneGuid());
var layer = Zone.Layer.valueOf(clearAllDrawingsMsg.getLayer());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.clearDrawables(layer);
MapTool.getFrame().refresh();
});
@@ -1006,7 +978,7 @@ private void handle(ChangeZoneDisplayNameMsg changeZoneDisplayNameMsg) {
var zoneGUID = GUID.valueOf(changeZoneDisplayNameMsg.getZoneGuid());
String displayName = changeZoneDisplayNameMsg.getName();
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
if (zone != null) {
zone.setPlayerAlias(displayName);
}
@@ -1025,7 +997,7 @@ private void handle(AddTopologyMsg addTopologyMsg) {
var area = Mapper.map(addTopologyMsg.getArea());
var topologyType = Zone.TopologyType.valueOf(addTopologyMsg.getType().name());
- var zone = client.getCampaign().getZone(zoneGUID);
+ var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.addTopology(area, topologyType);
MapTool.getFrame().getZoneRenderer(zoneGUID).repaint();
@@ -1034,9 +1006,10 @@ private void handle(AddTopologyMsg addTopologyMsg) {
private void handle(BootPlayerMsg bootPlayerMsg) {
String playerName = bootPlayerMsg.getPlayerName();
- if (client.getPlayer().getName().equals(playerName))
+ if (MapTool.getPlayer().getName().equals(playerName))
EventQueue.invokeLater(
() -> {
+ ServerDisconnectHandler.disconnectExpected = true;
AppActions.disconnectFromServer();
MapTool.showInformation("You have been booted from the server.");
});
@@ -1048,7 +1021,7 @@ private void handle(UpdatePlayerStatusMsg updatePlayerStatusMsg) {
var loaded = updatePlayerStatusMsg.getLoaded();
Player player =
- client.getPlayerList().stream()
+ MapTool.getPlayerList().stream()
.filter(x -> x.getName().equals(playerName))
.findFirst()
.orElse(null);
diff --git a/src/main/java/net/rptools/maptool/client/MapTool.java b/src/main/java/net/rptools/maptool/client/MapTool.java
index 55fb505a48..e0f3a378d7 100644
--- a/src/main/java/net/rptools/maptool/client/MapTool.java
+++ b/src/main/java/net/rptools/maptool/client/MapTool.java
@@ -14,6 +14,8 @@
*/
package net.rptools.maptool.client;
+import static net.rptools.maptool.model.player.PlayerDatabaseFactory.PlayerDatabaseType.PERSONAL_SERVER;
+
import com.jidesoft.plaf.LookAndFeelFactory;
import com.jidesoft.plaf.UIDefaultsLookup;
import com.jidesoft.plaf.basic.ThemePainter;
@@ -41,14 +43,12 @@
import java.net.URL;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
+import java.text.MessageFormat;
import java.util.*;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import java.util.concurrent.ExecutionException;
import javax.imageio.ImageIO;
import javax.swing.*;
import javax.swing.plaf.FontUIResource;
-import net.rptools.clientserver.ConnectionFactory;
-import net.rptools.clientserver.simple.connection.DirectConnection;
import net.rptools.lib.BackupManager;
import net.rptools.lib.DebugStream;
import net.rptools.lib.FileUtil;
@@ -56,9 +56,10 @@
import net.rptools.lib.image.ThumbnailManager;
import net.rptools.lib.net.RPTURLStreamHandlerFactory;
import net.rptools.lib.sound.SoundManager;
-import net.rptools.maptool.client.MapToolConnection.HandshakeCompletionObserver;
import net.rptools.maptool.client.events.ChatMessageAdded;
-import net.rptools.maptool.client.events.ServerDisconnected;
+import net.rptools.maptool.client.events.PlayerConnected;
+import net.rptools.maptool.client.events.PlayerDisconnected;
+import net.rptools.maptool.client.events.ServerStopped;
import net.rptools.maptool.client.functions.UserDefinedMacroFunctions;
import net.rptools.maptool.client.swing.MapToolEventQueue;
import net.rptools.maptool.client.swing.NoteFrame;
@@ -70,6 +71,7 @@
import net.rptools.maptool.client.ui.OSXAdapter;
import net.rptools.maptool.client.ui.logger.LogConsoleFrame;
import net.rptools.maptool.client.ui.sheet.stats.StatSheetListener;
+import net.rptools.maptool.client.ui.startserverdialog.StartServerDialogPreferences;
import net.rptools.maptool.client.ui.theme.Icons;
import net.rptools.maptool.client.ui.theme.RessourceManager;
import net.rptools.maptool.client.ui.theme.ThemeSupport;
@@ -87,14 +89,13 @@
import net.rptools.maptool.model.TextMessage;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZoneFactory;
-import net.rptools.maptool.model.library.LibraryManager;
import net.rptools.maptool.model.library.url.LibraryURLStreamHandler;
import net.rptools.maptool.model.player.LocalPlayer;
-import net.rptools.maptool.model.player.PersonalServerPlayerDatabase;
import net.rptools.maptool.model.player.Player;
+import net.rptools.maptool.model.player.PlayerDatabase;
import net.rptools.maptool.model.player.PlayerDatabaseFactory;
import net.rptools.maptool.model.player.PlayerZoneListener;
-import net.rptools.maptool.model.player.ServerSidePlayerDatabase;
+import net.rptools.maptool.model.player.Players;
import net.rptools.maptool.model.zones.TokensAdded;
import net.rptools.maptool.model.zones.TokensRemoved;
import net.rptools.maptool.model.zones.ZoneAdded;
@@ -107,8 +108,11 @@
import net.rptools.maptool.transfer.AssetTransferManager;
import net.rptools.maptool.util.MessageUtil;
import net.rptools.maptool.util.StringUtil;
+import net.rptools.maptool.util.UPnPUtil;
import net.rptools.maptool.util.UserJvmOptions;
+import net.rptools.maptool.webapi.MTWebAppServer;
import net.rptools.parser.ParserException;
+import net.tsc.servicediscovery.ServiceAnnouncer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
@@ -150,23 +154,33 @@ public class MapTool {
private static String vendor = "RPTools!"; // Default, will get from JAR Manifest during normal
// runtime
+ private static Campaign campaign;
+
+ private static List playerList;
+ private static LocalPlayer player;
private static PlayerZoneListener playerZoneListener;
private static ZoneLoadedListener zoneLoadedListener;
+ private static MapToolConnection conn;
+ private static ClientMessageHandler handler;
private static JMenuBar menuBar;
private static MapToolFrame clientFrame;
private static NoteFrame profilingNoteFrame;
private static LogConsoleFrame logConsoleFrame;
private static MapToolServer server;
- private static MapToolClient client;
+ private static ServerCommand serverCommand;
+ private static ServerPolicy serverPolicy;
private static BackupManager backupManager;
private static AssetTransferManager assetTransferManager;
+ private static ServiceAnnouncer announcer;
private static AutoSaveManager autoSaveManager;
private static TaskBarFlasher taskbarFlasher;
private static MapToolLineParser parser = new MapToolLineParser();
private static String lastWhisperer;
+ private static final MTWebAppServer webAppServer = new MTWebAppServer();
+
// Jamz: To support new command line parameters for multi-monitor support & enhanced PrintStream
private static boolean debug = false;
private static int graphicsMonitor = -1;
@@ -177,20 +191,6 @@ public class MapTool {
private static int windowY = -1;
private static String loadCampaignOnStartPath = "";
- static {
- try {
- var connections = DirectConnection.create("local");
- var playerDB = new PersonalServerPlayerDatabase(new LocalPlayer());
- var campaign = CampaignFactory.createBasicCampaign();
- var policy = new ServerPolicy();
-
- server = new MapToolServer("", new Campaign(campaign), null, false, policy, playerDB);
- client = new MapToolClient(server, campaign, playerDB.getPlayer(), connections.clientSide());
- } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
- throw new RuntimeException("Unable to create default personal server", e);
- }
- }
-
public static Dimension getThumbnailSize() {
return THUMBNAIL_SIZE;
}
@@ -536,6 +536,19 @@ public static void playSound(String eventId) {
}
}
+ public static void updateServerPolicy() {
+ updateServerPolicy(serverPolicy);
+ }
+
+ public static void updateServerPolicy(ServerPolicy policy) {
+ setServerPolicy(policy);
+
+ // Give everyone the new policy
+ if (serverCommand != null) {
+ serverCommand.setServerPolicy(policy);
+ }
+ }
+
public static boolean isInFocus() {
// TODO: This should probably also check owned windows
return getFrame().isFocused();
@@ -640,7 +653,6 @@ private static void moveToMonitor(JFrame frame, int monitor, boolean maximize) {
private static void initialize() {
// First time
AppSetup.install();
- LibraryManager.init();
// Clean up after ourselves
FileUtil.delete(AppUtil.getAppHome("tmp"), 2);
@@ -658,26 +670,22 @@ private static void initialize() {
assetTransferManager = new AssetTransferManager();
assetTransferManager.addConsumerListener(new AssetTransferHandler());
+ playerList = new ArrayList<>();
+
+ handler = new ClientMessageHandler();
+
setClientFrame(new MapToolFrame(menuBar));
- taskbarFlasher = new TaskBarFlasher(clientFrame);
- // Make sure the user sees something right away so that they aren't staring at a black screen.
- // Technically this call does too much, but since it is a blank campaign it's okay.
- setCampaign(client.getCampaign());
+ serverCommand = new ServerCommandClientImpl();
try {
+ player = new LocalPlayer("", Player.Role.GM, ServerConfig.getPersonalServerGMPassword());
playerZoneListener = new PlayerZoneListener();
zoneLoadedListener = new ZoneLoadedListener();
-
Campaign cmpgn = CampaignFactory.createBasicCampaign();
- // Set the Topology drawing mode to the last mode used for convenience
- // Should only be one zone, but let's cover our bases.
- cmpgn.getZones().forEach(zone -> zone.setTopologyTypes(AppPreferences.getTopologyTypes()));
-
- // Stop the pre-init client/server.
- disconnect();
- stopServer();
-
+ // This was previously being done in the server thread and didn't always get done
+ // before the campaign was accessed by the postInitialize() method below.
+ setCampaign(cmpgn);
startPersonalServer(cmpgn);
} catch (Exception e) {
MapTool.showError("While starting personal server", e);
@@ -737,11 +745,11 @@ public static boolean isDevelopment() {
}
public static ServerPolicy getServerPolicy() {
- return client.getServerPolicy();
+ return serverPolicy;
}
- public static @Nonnull ServerCommand serverCommand() {
- return client.getServerCommand();
+ public static ServerCommand serverCommand() {
+ return serverCommand;
}
/**
@@ -751,6 +759,39 @@ public static MapToolServer getServer() {
return server;
}
+ public static void addPlayer(Player player) {
+ if (!playerList.contains(player)) {
+ playerList.add(player);
+ new MapToolEventBus().getMainEventBus().post(new PlayerConnected(player));
+ new Players().playerSignedIn(player);
+
+ // LATER: Make this non-anonymous
+ playerList.sort((arg0, arg1) -> arg0.getName().compareToIgnoreCase(arg1.getName()));
+
+ if (!player.equals(MapTool.getPlayer())) {
+ String msg =
+ MessageFormat.format(I18N.getText("msg.info.playerConnected"), player.getName());
+ addLocalMessage(MessageUtil.getFormattedSystemMsg(msg));
+ }
+ }
+ }
+
+ public static void removePlayer(Player player) {
+ if (player == null) {
+ return;
+ }
+ playerList.remove(player);
+ new MapToolEventBus().getMainEventBus().post(new PlayerDisconnected(player));
+
+ new Players().playerSignedOut(player);
+
+ if (MapTool.getPlayer() != null && !player.equals(MapTool.getPlayer())) {
+ String msg =
+ MessageFormat.format(I18N.getText("msg.info.playerDisconnected"), player.getName());
+ addLocalMessage(MessageUtil.getFormattedSystemMsg(msg));
+ }
+ }
+
/**
* These are the messages that originate from the server
*
@@ -875,7 +916,10 @@ public static void addGlobalMessage(String message, List targets) {
}
public static Campaign getCampaign() {
- return client.getCampaign();
+ if (campaign == null) {
+ campaign = CampaignFactory.createBasicCampaign();
+ }
+ return campaign;
}
public static MapToolLineParser getParser() {
@@ -887,15 +931,17 @@ public static void setCampaign(Campaign campaign) {
}
public static void setCampaign(Campaign campaign, GUID defaultRendererId) {
- campaign = Objects.requireNonNullElseGet(campaign, Campaign::new);
-
// Load up the new
- client.setCampaign(campaign);
+ MapTool.campaign = campaign;
ZoneRenderer currRenderer = null;
clientFrame.clearZoneRendererList();
clientFrame.getInitiativePanel().setZone(null);
clientFrame.clearTokenTree();
+ if (campaign == null) {
+ clientFrame.setCurrentZoneRenderer(null);
+ return;
+ }
// Install new campaign
for (Zone zone : campaign.getZones()) {
@@ -924,6 +970,10 @@ public static void setCampaign(Campaign campaign, GUID defaultRendererId) {
UserDefinedMacroFunctions.getInstance().handleCampaignLoadMacroEvent();
}
+ public static void setServerPolicy(ServerPolicy policy) {
+ serverPolicy = policy;
+ }
+
public static AssetTransferManager getAssetTransferManager() {
return assetTransferManager;
}
@@ -932,80 +982,69 @@ public static AssetTransferManager getAssetTransferManager() {
* Start the server from a campaign file and various settings.
*
* @param id the id of the server for announcement.
- * @param config the server configuration. Set to null only for a personal server.
+ * @param config the server configuration.
* @param policy the server policy configuration to use.
* @param campaign the campaign.
* @param playerDatabase the player database to use for the connection.
- * @throws IOException if we fail to start the new server. In this case, the new client and server
- * will be available via {@link #getServer()} and {@link #getClient()}, but neither will be in
- * a started state.
+ * @param copyCampaign should the campaign be a copy of the one provided.
+ * @throws IOException if new MapToolServer fails.
*/
public static void startServer(
String id,
- @Nullable ServerConfig config,
- boolean useUPnP,
+ ServerConfig config,
ServerPolicy policy,
Campaign campaign,
- ServerSidePlayerDatabase playerDatabase,
- LocalPlayer player)
+ PlayerDatabase playerDatabase,
+ boolean copyCampaign)
throws IOException {
- if (server != null && server.getState() == MapToolServer.State.Started) {
- log.error("A server is already running.", new Exception());
+ if (server != null) {
+ Thread.dumpStack();
showError("msg.error.alreadyRunningServer");
return;
}
assetTransferManager.flush();
- var connections = DirectConnection.create("local");
- server = new MapToolServer(id, new Campaign(campaign), config, useUPnP, policy, playerDatabase);
- client = new MapToolClient(server, campaign, player, connections.clientSide());
+ // TODO: the client and server campaign MUST be different objects.
+ // Figure out a better init method
+ server = new MapToolServer(config, policy, playerDatabase);
- if (!server.isPersonalServer()) {
- getFrame().getConnectionPanel().startHosting();
+ serverPolicy = server.getPolicy();
+ if (copyCampaign) {
+ server.setCampaign(new Campaign(campaign)); // copy of FoW depends on server policies
+ } else {
+ server.setCampaign(campaign);
}
- setUpClient(client);
- client
- .getConnection()
- .onCompleted(
- (success) -> {
- if (success) {
- // connected
- EventQueue.invokeLater(
- () -> {
- MapTool.getFrame()
- .getConnectionStatusPanel()
- .setStatus(ConnectionStatusPanel.Status.server);
- });
- } else {
- // This should never happen. But if it does, just tear everything back down.
- server.stop();
- }
- });
-
- server.start();
- try {
- client.start();
- } catch (IOException e) {
- // Oof. Server started but client can't.
- server.stop();
- throw e;
+ if (announcer != null) {
+ announcer.stop();
}
- if (!server.isPersonalServer()) {
- MapTool.addLocalMessage(
- MessageUtil.getFormattedSystemMsg(I18N.getText("msg.info.startServer")));
+ // Don't announce personal servers
+ if (!config.isPersonalServer()) {
+ announcer =
+ new ServiceAnnouncer(id, server.getConfig().getPort(), AppConstants.SERVICE_GROUP);
+ announcer.start();
+ }
+
+ // Registered ?
+ if (config.isServerRegistered() && !config.isPersonalServer()) {
+ try {
+ MapToolRegistry.RegisterResponse result =
+ MapToolRegistry.getInstance()
+ .registerInstance(config.getServerName(), config.getPort(), config.getUseWebRTC());
+ if (result == MapToolRegistry.RegisterResponse.NAME_EXISTS) {
+ MapTool.showError("msg.error.alreadyRegistered");
+ }
+ // TODO: I don't like this
+ } catch (Exception e) {
+ MapTool.showError("msg.error.failedCannotRegisterServer", e);
+ }
}
- // Adopt the local connection, no handshake required.
- connections.serverSide().open();
- server.addLocalConnection(connections.serverSide(), player);
- // Update the client, including running onCampaignLoad.
- setCampaign(
- client.getCampaign(),
- Optional.ofNullable(clientFrame.getCurrentZoneRenderer())
- .map(zr -> zr.getZone().getId())
- .orElse(null));
+ if (MapTool.isHostingServer()) {
+ getFrame().getConnectionPanel().startHosting();
+ }
+ server.start();
}
public static ThumbnailManager getThumbnailManager() {
@@ -1016,27 +1055,23 @@ public static ThumbnailManager getThumbnailManager() {
return thumbnailManager;
}
- /**
- * Shutdown the current server.
- *
- * The client must have already been disconnected if necessary.
- */
public static void stopServer() {
if (server == null) {
return;
}
+ disconnect();
server.stop();
+ server = null;
getFrame().getConnectionPanel().stopHosting();
}
public static List getPlayerList() {
- return client.getPlayerList();
+ return playerList;
}
/** Returns the list of non-gm names. */
public static List getNonGMs() {
- var playerList = client.getPlayerList();
List nonGMs = new ArrayList<>(playerList.size());
playerList.forEach(
player -> {
@@ -1049,7 +1084,6 @@ public static List getNonGMs() {
/** Returns the list of gm names. */
public static List getGMs() {
- var playerList = client.getPlayerList();
List gms = new ArrayList<>(playerList.size());
playerList.forEach(
player -> {
@@ -1060,6 +1094,22 @@ public static List getGMs() {
return gms;
}
+ /**
+ * checks if a specific player is connected to the game.
+ *
+ * @param player The name of the player to check.
+ * @return {@code true} if the player is connected otherwise {@code false}.
+ */
+ public static boolean isPlayerConnected(String player) {
+ for (int i = 0; i < playerList.size(); i++) {
+ Player p = playerList.get(i);
+ if (p.getName().equalsIgnoreCase(player)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static void removeZone(Zone zone) {
MapTool.serverCommand().removeZone(zone.getId());
MapTool.getFrame().removeZoneRenderer(MapTool.getFrame().getZoneRenderer(zone.getId()));
@@ -1105,59 +1155,69 @@ public static void addZone(Zone zone, boolean changeZone) {
}
}
- public static MapToolClient getClient() {
- return client;
- }
-
public static LocalPlayer getPlayer() {
- return client.getPlayer();
+ return player;
}
public static void startPersonalServer(Campaign campaign)
- throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
- var player = new LocalPlayer();
- startServer(
- "",
- null,
- false,
- new ServerPolicy(),
- campaign,
- PlayerDatabaseFactory.getPersonalServerPlayerDatabase(player),
- player);
+ throws IOException,
+ NoSuchAlgorithmException,
+ InvalidKeySpecException,
+ ExecutionException,
+ InterruptedException {
+ ServerConfig config = ServerConfig.createPersonalServerConfig();
+
+ PlayerDatabaseFactory.setCurrentPlayerDatabase(PERSONAL_SERVER);
+ PlayerDatabase playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
+ MapTool.startServer(null, config, new ServerPolicy(), campaign, playerDatabase, false);
+
+ String username = AppPreferences.getDefaultUserName();
+ LocalPlayer localPlayer = (LocalPlayer) playerDatabase.getPlayer(username);
+ // Connect to server
+ MapTool.createConnection(
+ config,
+ localPlayer,
+ () -> {
+ // connecting
+ MapTool.getFrame()
+ .getConnectionStatusPanel()
+ .setStatus(ConnectionStatusPanel.Status.server);
+ });
}
- private static void setUpClient(MapToolClient client) {
+ public static void createConnection(ServerConfig config, LocalPlayer player, Runnable onCompleted)
+ throws IOException, ExecutionException, InterruptedException {
+ MapTool.player = player;
MapTool.getFrame().getCommandPanel().clearAllIdentities();
- MapToolConnection clientConn = client.getConnection();
+ MapToolConnection clientConn = new MapToolConnection(config, player);
+
clientConn.addActivityListener(clientFrame.getActivityMonitor());
- clientConn.onCompleted(
- (success) -> {
- EventQueue.invokeLater(
- () -> {
- clientFrame.getLookupTablePanel().updateView();
- clientFrame.getInitiativePanel().updateView();
- });
+ clientConn.addDisconnectHandler(new ServerDisconnectHandler());
+
+ clientConn.setOnCompleted(
+ () -> {
+ clientConn.addMessageHandler(handler);
+ // LATER: I really, really, really don't like this startup pattern
+ if (clientConn.isAlive()) {
+ conn = clientConn;
+ }
+ clientFrame.getLookupTablePanel().updateView();
+ clientFrame.getInitiativePanel().updateView();
+ onCompleted.run();
});
+
+ clientConn.start();
}
- public static void connectToRemoteServer(
- ServerConfig config, LocalPlayer player, HandshakeCompletionObserver onCompleted)
- throws IOException {
- if (server != null && server.getState() == MapToolServer.State.Started) {
- log.error("A local server is still running.", new Exception());
- showError("msg.error.stillRunningServer");
- return;
+ public static void closeConnection() throws IOException {
+ if (conn != null) {
+ conn.close();
}
+ }
- var connection = ConnectionFactory.getInstance().createConnection(player.getName(), config);
-
- server = null;
- client = new MapToolClient(player, connection);
- setUpClient(client);
- client.getConnection().onCompleted(onCompleted);
-
- client.start();
+ public static MapToolConnection getConnection() {
+ return conn;
}
/** returns the current locale code. */
@@ -1167,23 +1227,54 @@ public static String getLanguage() {
/** returns whether the player is using a personal server. */
public static boolean isPersonalServer() {
- return server != null && server.isPersonalServer();
+ return server != null && server.getConfig().isPersonalServer();
}
/** returns whether the player is hosting a server - personal servers do not count. */
public static boolean isHostingServer() {
- return server != null && !server.isPersonalServer();
+ return server != null && !server.getConfig().isPersonalServer();
}
public static void disconnect() {
- client.close();
- new MapToolEventBus().getMainEventBus().post(new ServerDisconnected());
+ // Close UPnP port mapping if used
+ StartServerDialogPreferences serverProps = new StartServerDialogPreferences();
+ if (serverProps.getUseUPnP()) {
+ int port = serverProps.getPort();
+ UPnPUtil.closePort(port);
+ }
+ boolean isPersonalServer = isPersonalServer();
+
+ if (announcer != null) {
+ announcer.stop();
+ announcer = null;
+ }
+
+ // Unregister ourselves
+ if (server != null && server.getConfig().isServerRegistered() && !isPersonalServer) {
+ try {
+ MapToolRegistry.getInstance().unregisterInstance();
+ } catch (Throwable t) {
+ MapTool.showError("While unregistering server instance", t);
+ }
+ }
+
+ try {
+ if (conn != null && conn.isAlive()) {
+ conn.close();
+ }
+ } catch (IOException ioe) {
+ // This isn't critical, we're closing it anyway
+ log.debug("While closing connection", ioe);
+ }
+
+ new MapToolEventBus().getMainEventBus().post(new ServerStopped());
+ playerList.clear();
MapTool.getFrame()
.getConnectionStatusPanel()
.setStatus(ConnectionStatusPanel.Status.disconnected);
- if (!isPersonalServer()) {
+ if (!isPersonalServer) {
addLocalMessage(MessageUtil.getFormattedSystemMsg(I18N.getText("msg.info.disconnected")));
}
}
@@ -1274,10 +1365,18 @@ private static void postInitialize() {
// fire up autosaves
getAutoSaveManager().start();
+ taskbarFlasher = new TaskBarFlasher(clientFrame);
+
// Jamz: After preferences are loaded, Asset Tree and ImagePanel are out of sync,
// so after frame is all done loading we sync them back up.
MapTool.getFrame().getAssetPanel().getAssetTree().initialize();
+ // Set the Topology drawing mode to the last mode used for convenience
+ MapTool.getFrame()
+ .getCurrentZoneRenderer()
+ .getZone()
+ .setTopologyTypes(AppPreferences.getTopologyTypes());
+
// Register the instance that will listen for token hover events and create a stat sheet.
new MapToolEventBus().getMainEventBus().register(new StatSheetListener());
new MapToolEventBus().getMainEventBus().register(new TokenHoverListener());
@@ -1343,6 +1442,26 @@ public static boolean useToolTipsForUnformatedRolls() {
}
}
+ public static MTWebAppServer getWebAppServer() {
+ return webAppServer;
+ }
+
+ public static void startWebAppServer(final int port) {
+ try {
+ Thread webAppThread =
+ new Thread(
+ () -> {
+ webAppServer.setPort(port);
+ webAppServer.startServer();
+ });
+
+ webAppThread.start();
+ } catch (Exception e) { // TODO: This needs to be logged
+ System.out.println("Unable to start web server");
+ e.printStackTrace();
+ }
+ }
+
public static String getClientId() {
return clientId;
}
@@ -1364,8 +1483,10 @@ public void run() {
e.printStackTrace();
}
- ServerCommand command = client.getServerCommand();
- command.heartbeat(getPlayer().getName());
+ ServerCommand command = serverCommand;
+ if (command != null) {
+ command.heartbeat(getPlayer().getName());
+ }
}
}
}
@@ -1717,7 +1838,6 @@ public static void main(String[] args) {
EventQueue.invokeLater(
() -> {
initialize();
-
EventQueue.invokeLater(
() -> {
clientFrame.setVisible(true);
diff --git a/src/main/java/net/rptools/maptool/client/MapToolClient.java b/src/main/java/net/rptools/maptool/client/MapToolClient.java
deleted file mode 100644
index 62c3e4a837..0000000000
--- a/src/main/java/net/rptools/maptool/client/MapToolClient.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * This software Copyright by the RPTools.net development team, and
- * licensed under the Affero GPL Version 3 or, at your option, any later
- * version.
- *
- * MapTool Source Code is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public
- * License * along with this source Code. If not, please visit
- * and specifically the Affero license
- * text at .
- */
-package net.rptools.maptool.client;
-
-import java.awt.EventQueue;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javax.annotation.Nullable;
-import net.rptools.clientserver.simple.connection.Connection;
-import net.rptools.maptool.client.events.PlayerConnected;
-import net.rptools.maptool.client.events.PlayerDisconnected;
-import net.rptools.maptool.events.MapToolEventBus;
-import net.rptools.maptool.language.I18N;
-import net.rptools.maptool.model.Campaign;
-import net.rptools.maptool.model.CampaignFactory;
-import net.rptools.maptool.model.campaign.CampaignManager;
-import net.rptools.maptool.model.player.LocalPlayer;
-import net.rptools.maptool.model.player.Player;
-import net.rptools.maptool.model.player.PlayerDatabase;
-import net.rptools.maptool.model.player.PlayerDatabaseFactory;
-import net.rptools.maptool.server.ClientHandshake;
-import net.rptools.maptool.server.MapToolServer;
-import net.rptools.maptool.server.ServerCommand;
-import net.rptools.maptool.server.ServerPolicy;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * The client side of a client-server channel.
- *
- * This has nothing to do with the GUI, but represents those parts of the client that are needed
- * to interact with a server. Most of this used to exist as global state in {@link
- * net.rptools.maptool.client.MapTool} and elsewhere.
- */
-public class MapToolClient {
- private static final Logger log = LogManager.getLogger(MapToolClient.class);
-
- public enum State {
- New,
- Started,
- Connected,
- Closed
- }
-
- private final MapToolServer localServer;
- private final LocalPlayer player;
- private final PlayerDatabase playerDatabase;
-
- /** Case-insensitive ordered set of player names. */
- private final List playerList;
-
- private final MapToolConnection conn;
- private Campaign campaign;
- private ServerPolicy serverPolicy;
- private final ServerCommand serverCommand;
- private State currentState = State.New;
-
- private MapToolClient(
- @Nullable MapToolServer localServer,
- Campaign campaign,
- LocalPlayer player,
- Connection connection,
- ServerPolicy policy,
- PlayerDatabase playerDatabase) {
- this.localServer = localServer;
- this.campaign = campaign;
- this.player = player;
- this.playerDatabase = playerDatabase;
- this.playerList = new ArrayList<>();
- this.serverPolicy = new ServerPolicy(policy);
-
- this.conn =
- new MapToolConnection(
- connection, player, localServer == null ? new ClientHandshake(this, connection) : null);
-
- this.serverCommand = new ServerCommandClientImpl(this);
-
- this.conn.addDisconnectHandler(this::onDisconnect);
- this.conn.onCompleted(
- (success) -> {
- if (!success) {
- // Failed handshake. Disconnect from the server, but treat it as unexpected.
- this.conn.close();
- return;
- }
-
- if (transitionToState(State.Started, State.Connected)) {
- this.conn.addMessageHandler(new ClientMessageHandler(this));
- }
- });
- }
-
- /** Creates a client for a local server, whether personal or hosted. */
- public MapToolClient(
- MapToolServer localServer, Campaign campaign, LocalPlayer player, Connection connection) {
- this(
- localServer,
- campaign,
- player,
- connection,
- localServer.getPolicy(),
- localServer.getPlayerDatabase());
- }
-
- /**
- * Creates a client for use with a remote hosted server.
- *
- * @param player The player connecting to the server.
- */
- public MapToolClient(LocalPlayer player, Connection connection) {
- this(
- null,
- new Campaign(),
- player,
- connection,
- new ServerPolicy(),
- PlayerDatabaseFactory.getLocalPlayerDatabase(player));
- }
-
- /**
- * Transition from any state except {@code newState} to {@code newState}.
- *
- * @param newState The new state to set.
- */
- private boolean transitionToState(State newState) {
- if (currentState == newState) {
- log.warn(
- "Failed to transition to state {} because that is already the current state", newState);
- return false;
- } else {
- currentState = newState;
- return true;
- }
- }
-
- /**
- * Transition from {@code expectedState} to {@code newState}.
- *
- * @param expectedState The state to transition from
- * @param newState The new state to set.
- */
- private boolean transitionToState(State expectedState, State newState) {
- if (currentState != expectedState) {
- log.warn(
- "Failed to transition from state {} to state {} because the current state is actually {}",
- expectedState,
- newState,
- currentState);
- return false;
- } else {
- currentState = newState;
- return true;
- }
- }
-
- public State getState() {
- return currentState;
- }
-
- public void start() throws IOException {
- if (transitionToState(State.New, State.Started)) {
- try {
- conn.start();
- } catch (IOException e) {
- // Make sure we're in a reasonable state before propagating.
- log.error("Failed to start client", e);
- transitionToState(State.Closed);
- throw e;
- }
- }
- }
-
- public void close() {
- if (transitionToState(State.Closed)) {
- if (conn.isAlive()) {
- conn.close();
- }
-
- playerList.clear();
- }
- }
-
- public ServerCommand getServerCommand() {
- return serverCommand;
- }
-
- public LocalPlayer getPlayer() {
- return player;
- }
-
- public List getPlayerList() {
- return Collections.unmodifiableList(playerList);
- }
-
- public void addPlayer(Player player) {
- if (!playerList.contains(player)) {
- playerList.add(player);
- new MapToolEventBus().getMainEventBus().post(new PlayerConnected(player));
- playerDatabase.playerSignedIn(player);
-
- playerList.sort((arg0, arg1) -> arg0.getName().compareToIgnoreCase(arg1.getName()));
- }
- }
-
- public void removePlayer(Player player) {
- playerList.remove(player);
- new MapToolEventBus().getMainEventBus().post(new PlayerDisconnected(player));
- playerDatabase.playerSignedOut(player);
- }
-
- public boolean isPlayerConnected(String playerName) {
- return playerList.stream().anyMatch(p -> p.getName().equalsIgnoreCase(playerName));
- }
-
- public PlayerDatabase getPlayerDatabase() {
- return playerDatabase;
- }
-
- public MapToolConnection getConnection() {
- return conn;
- }
-
- /**
- * @return A copy of the client's server policy.
- */
- public ServerPolicy getServerPolicy() {
- return new ServerPolicy(serverPolicy);
- }
-
- /**
- * Sets the client's server policy.
- *
- * If this also needs to be updated remotely, call {@link
- * net.rptools.maptool.server.ServerCommand#setServerPolicy(net.rptools.maptool.server.ServerPolicy)}
- * as well.
- *
- * @param serverPolicy The new policy to set.
- */
- public void setServerPolicy(ServerPolicy serverPolicy) {
- this.serverPolicy = new ServerPolicy(serverPolicy);
- }
-
- public Campaign getCampaign() {
- return this.campaign;
- }
-
- public void setCampaign(Campaign campaign) {
- this.campaign = campaign;
- }
-
- private void onDisconnect(Connection connection) {
- /*
- * Three main cases:
- * 1. Expected disconnect. This will be part of a broader shutdown sequence and we don't need to
- * do anything to clean up client or server state.
- * 2. Unexpected disconnect for remote server. Common case due to remote server shutdown or
- * other lost connection. We need to clean up the connection, show an error to the user, and
- * start a new personal server with a blank campaign.
- * 3. Unexpected disconnect for local server. A rare case where we lost connection without
- * shutting down the server. We need to clean up the connection, stop the server, show an
- * error to the user, and start a new personal server with the current campaign.
- */
- var disconnectExpected = currentState == State.Closed;
-
- if (!disconnectExpected) {
- // Keep any local server campaign around in the new personal server.
- final var newPersonalServerCampaign =
- localServer == null ? CampaignFactory.createBasicCampaign() : localServer.getCampaign();
-
- // Make sure the connection state is cleaned up since we can't count on it having been done.
- MapTool.disconnect();
- MapTool.stopServer();
-
- EventQueue.invokeLater(
- () -> {
- var errorText = I18N.getText("msg.error.server.disconnected");
- var connectionError = connection.getError();
- var errorMessage =
- errorText + (connectionError != null ? (": " + connectionError) : "");
- MapTool.showError(errorMessage);
-
- // hide map so player doesn't get a brief GM view
- MapTool.getFrame().setCurrentZoneRenderer(null);
- MapTool.getFrame().getToolbarPanel().getMapselect().setVisible(true);
- MapTool.getFrame().getAssetPanel().enableAssets();
- new CampaignManager().clearCampaignData();
- MapTool.getFrame().getToolbarPanel().setTokenSelectionGroupEnabled(true);
-
- try {
- MapTool.startPersonalServer(newPersonalServerCampaign);
- } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
- MapTool.showError(I18N.getText("msg.error.server.cantrestart"), e);
- }
- });
- }
- }
-}
diff --git a/src/main/java/net/rptools/maptool/client/MapToolConnection.java b/src/main/java/net/rptools/maptool/client/MapToolConnection.java
index f73ec26dd0..320f5a0369 100644
--- a/src/main/java/net/rptools/maptool/client/MapToolConnection.java
+++ b/src/main/java/net/rptools/maptool/client/MapToolConnection.java
@@ -15,13 +15,14 @@
package net.rptools.maptool.client;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import net.rptools.clientserver.simple.DisconnectHandler;
+import java.util.concurrent.ExecutionException;
+import net.rptools.clientserver.ConnectionFactory;
import net.rptools.clientserver.simple.connection.Connection;
import net.rptools.maptool.client.ui.ActivityMonitorPanel;
import net.rptools.maptool.model.player.LocalPlayer;
+import net.rptools.maptool.server.ClientHandshake;
import net.rptools.maptool.server.Handshake;
+import net.rptools.maptool.server.ServerConfig;
import net.rptools.maptool.server.proto.Message;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -30,59 +31,51 @@
* @author trevor
*/
public class MapToolConnection {
- public interface HandshakeCompletionObserver {
- void onComplete(boolean success);
- }
/** Instance used for log messages. */
private static final Logger log = LogManager.getLogger(MapToolConnection.class);
private final LocalPlayer player;
- private final Connection connection;
- private final Handshake handshake;
- private final List onCompleted;
+ private Connection connection;
+ private Handshake handshake;
+ private Runnable onCompleted;
+
+ public MapToolConnection(ServerConfig config, LocalPlayer player) throws IOException {
- public MapToolConnection(Connection connection, LocalPlayer player, Handshake handshake) {
- this.connection = connection;
+ this.connection = ConnectionFactory.getInstance().createConnection(player.getName(), config);
this.player = player;
- this.handshake = handshake;
- onCompleted = new ArrayList<>();
+ this.handshake = new ClientHandshake(connection, player);
+ onCompleted = () -> {};
}
- public void onCompleted(HandshakeCompletionObserver onCompleted) {
- this.onCompleted.add(onCompleted);
+ public void setOnCompleted(Runnable onCompleted) {
+ if (onCompleted == null) this.onCompleted = () -> {};
+ else this.onCompleted = onCompleted;
}
- public void start() throws IOException {
- if (handshake == null) {
- // No handshake required. Transition immediately to connected.
- connection.open();
- for (final var callback : onCompleted) {
- callback.onComplete(true);
- }
- } else {
- handshake.whenComplete(
- (result, exception) -> {
+ public void start() throws IOException, ExecutionException, InterruptedException {
+ connection.addMessageHandler(handshake);
+ handshake.addObserver(
+ (ignore) -> {
+ connection.removeMessageHandler(handshake);
+ if (handshake.isSuccessful()) {
+ onCompleted.run();
+ } else {
+ // For client side only show the error message as its more likely to make sense
+ // for players, the exception is logged just in case more info is required
+ var exception = handshake.getException();
if (exception != null) {
- // For client side only show the error message as its more likely to make sense
- // for players, the exception is logged just in case more info is required
log.warn(exception);
- MapTool.showError(exception.getMessage());
- connection.close();
- for (final var callback : onCompleted) {
- callback.onComplete(false);
- }
- } else {
- for (final var callback : onCompleted) {
- callback.onComplete(true);
- }
}
- });
-
- // this triggers the handshake from the server side
- connection.open();
- handshake.startHandshake();
- }
+ MapTool.showError(handshake.getErrorMessage());
+ connection.close();
+ onCompleted.run();
+ AppActions.disconnectFromServer();
+ }
+ });
+ // this triggers the handshake from the server side
+ connection.open();
+ handshake.startHandshake();
}
public void addMessageHandler(ClientMessageHandler handler) {
@@ -93,7 +86,7 @@ public void addActivityListener(ActivityMonitorPanel activityMonitor) {
connection.addActivityListener(activityMonitor);
}
- public void addDisconnectHandler(DisconnectHandler serverDisconnectHandler) {
+ public void addDisconnectHandler(ServerDisconnectHandler serverDisconnectHandler) {
connection.addDisconnectHandler(serverDisconnectHandler);
}
@@ -101,12 +94,12 @@ public boolean isAlive() {
return connection.isAlive();
}
- public void close() {
+ public void close() throws IOException {
connection.close();
}
public void sendMessage(Message msg) {
- log.debug("{} sent {}", player.getName(), msg.getMessageTypeCase());
+ log.debug(player.getName() + " sent " + msg.getMessageTypeCase());
connection.sendMessage(msg.toByteArray());
}
}
diff --git a/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java b/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java
index 3c93a0aedd..fc5c7d508a 100644
--- a/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java
+++ b/src/main/java/net/rptools/maptool/client/MapToolVariableResolver.java
@@ -343,8 +343,10 @@ public Set getVariables() {
protected void updateTokenProperty(Token token, String varname, String value) {
// this logic allows unit tests to execute MT script that changes token properties
// there should be no other context where we have no server of any kind
- MapTool.serverCommand()
- .updateTokenProperty(tokenInContext, Token.Update.setProperty, varname, value);
+ if (MapTool.serverCommand() != null)
+ MapTool.serverCommand()
+ .updateTokenProperty(tokenInContext, Token.Update.setProperty, varname, value);
+ else token.setProperty(varname, value);
}
@Override
diff --git a/src/main/java/net/rptools/maptool/client/ServerCommandClientImpl.java b/src/main/java/net/rptools/maptool/client/ServerCommandClientImpl.java
index e1dbb46f86..33722cd2e4 100644
--- a/src/main/java/net/rptools/maptool/client/ServerCommandClientImpl.java
+++ b/src/main/java/net/rptools/maptool/client/ServerCommandClientImpl.java
@@ -21,6 +21,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.LinkedBlockingQueue;
import java.util.stream.Collectors;
import net.rptools.lib.MD5Key;
import net.rptools.maptool.client.functions.ExecFunction;
@@ -50,14 +51,14 @@
* the {@link ServerMessageHandler ServerMessageHandler}
*/
public class ServerCommandClientImpl implements ServerCommand {
- private static final Logger log = LogManager.getLogger(ServerCommandClientImpl.class);
- private final MapToolClient client;
private final TimedEventQueue movementUpdateQueue = new TimedEventQueue(100);
+ private final LinkedBlockingQueue assetRetrieveQueue = new LinkedBlockingQueue();
+ private static final Logger log = LogManager.getLogger(ServerCommandClientImpl.class);
- public ServerCommandClientImpl(MapToolClient client) {
- this.client = client;
+ public ServerCommandClientImpl() {
movementUpdateQueue.start();
+ // new AssetRetrievalThread().start();
}
public void heartbeat(String data) {
@@ -87,7 +88,7 @@ public void setCampaign(Campaign campaign) {
}
public void setCampaignName(String name) {
- client.getCampaign().setName(name);
+ MapTool.getCampaign().setName(name);
MapTool.getFrame().setTitle();
var msg = SetCampaignNameMsg.newBuilder().setName(name);
makeServerCall(Message.newBuilder().setSetCampaignNameMsg(msg).build());
@@ -165,7 +166,7 @@ public void restoreZoneView(GUID zoneGUID) {
}
public void editToken(GUID zoneGUID, Token token) {
- client.getCampaign().getZone(zoneGUID).editToken(token);
+ MapTool.getCampaign().getZone(zoneGUID).editToken(token);
var msg = EditTokenMsg.newBuilder().setZoneGuid(zoneGUID.toString()).setToken(token.toDto());
makeServerCall(Message.newBuilder().setEditTokenMsg(msg).build());
}
@@ -174,7 +175,7 @@ public void putToken(GUID zoneGUID, Token token) {
// Hack to generate zone event. All functions that update tokens call this method
// after changing the token. But they don't tell the zone about it so classes
// waiting for the zone change event don't get it.
- client.getCampaign().getZone(zoneGUID).putToken(token);
+ MapTool.getCampaign().getZone(zoneGUID).putToken(token);
var msg = PutTokenMsg.newBuilder().setZoneGuid(zoneGUID.toString()).setToken(token.toDto());
makeServerCall(Message.newBuilder().setPutTokenMsg(msg).build());
}
@@ -182,7 +183,7 @@ public void putToken(GUID zoneGUID, Token token) {
@Override
public void removeToken(GUID zoneGUID, GUID tokenGUID) {
// delete local token immediately
- client.getCampaign().getZone(zoneGUID).removeToken(tokenGUID);
+ MapTool.getCampaign().getZone(zoneGUID).removeToken(tokenGUID);
var msg =
RemoveTokenMsg.newBuilder()
.setZoneGuid(zoneGUID.toString())
@@ -193,7 +194,7 @@ public void removeToken(GUID zoneGUID, GUID tokenGUID) {
@Override
public void removeTokens(GUID zoneGUID, List tokenGUIDs) {
// delete local tokens immediately
- client.getCampaign().getZone(zoneGUID).removeTokens(tokenGUIDs);
+ MapTool.getCampaign().getZone(zoneGUID).removeTokens(tokenGUIDs);
var msg = RemoveTokensMsg.newBuilder().setZoneGuid(zoneGUID.toString());
msg.addAllTokenGuid(tokenGUIDs.stream().map(t -> t.toString()).collect(Collectors.toList()));
makeServerCall(Message.newBuilder().setRemoveTokensMsg(msg).build());
@@ -418,7 +419,7 @@ public void exposePCArea(GUID zoneGUID) {
public void exposeFoW(GUID zoneGUID, Area area, Set selectedToks) {
// Expose locally right away.
- client.getCampaign().getZone(zoneGUID).exposeArea(area, selectedToks);
+ MapTool.getCampaign().getZone(zoneGUID).exposeArea(area, selectedToks);
var msg = ExposeFowMsg.newBuilder().setZoneGuid(zoneGUID.toString()).setArea(Mapper.map(area));
msg.addAllTokenGuid(selectedToks.stream().map(g -> g.toString()).collect(Collectors.toList()));
makeServerCall(Message.newBuilder().setExposeFowMsg(msg).build());
@@ -517,15 +518,9 @@ public void clearExposedArea(GUID zoneGUID, boolean globalOnly) {
makeServerCall(Message.newBuilder().setClearExposedAreaMsg(msg).build());
}
- private void makeServerCall(Message msg) {
- log.debug(
- "{} making server call {}; state is {}",
- client.getPlayer().getName(),
- msg.getMessageTypeCase(),
- client.getState());
-
- if (client.getState() == MapToolClient.State.Connected) {
- client.getConnection().sendMessage(msg);
+ private static void makeServerCall(Message msg) {
+ if (MapTool.getConnection() != null) {
+ MapTool.getConnection().sendMessage(msg);
}
}
@@ -802,7 +797,7 @@ public void updatePlayerStatus(Player player) {
* some time interval. If a new event arrives before the time interval elapses, it is replaced. In
* this way, only the most current version of the event is released.
*/
- private class TimedEventQueue extends Thread {
+ private static class TimedEventQueue extends Thread {
Message msg;
long delay;
diff --git a/src/main/java/net/rptools/maptool/client/ServerDisconnectHandler.java b/src/main/java/net/rptools/maptool/client/ServerDisconnectHandler.java
new file mode 100644
index 0000000000..a0345c0a35
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/client/ServerDisconnectHandler.java
@@ -0,0 +1,65 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.client;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.util.concurrent.ExecutionException;
+import net.rptools.clientserver.simple.DisconnectHandler;
+import net.rptools.clientserver.simple.connection.Connection;
+import net.rptools.maptool.language.I18N;
+import net.rptools.maptool.model.CampaignFactory;
+import net.rptools.maptool.model.campaign.CampaignManager;
+
+/** This class handles when the server inexplicably disconnects */
+public class ServerDisconnectHandler implements DisconnectHandler {
+ // TODO: This is a temporary hack until I can come up with a cleaner mechanism
+ public static boolean disconnectExpected;
+
+ public void handleDisconnect(Connection connection) {
+ // Update internal state
+ MapTool.disconnect();
+
+ // TODO: attempt to reconnect if this was unexpected
+ if (!disconnectExpected) {
+ var errorText = I18N.getText("msg.error.server.disconnected");
+ var connectionError = connection.getError();
+ var errorMessage = errorText + (connectionError != null ? (": " + connectionError) : "");
+ MapTool.showError(errorMessage);
+
+ // hide map so player doesn't get a brief GM view
+ MapTool.getFrame().setCurrentZoneRenderer(null);
+ MapTool.getFrame().getToolbarPanel().getMapselect().setVisible(true);
+ MapTool.getFrame().getAssetPanel().enableAssets();
+ new CampaignManager().clearCampaignData();
+ MapTool.getFrame().getToolbarPanel().setTokenSelectionGroupEnabled(true);
+ try {
+ MapTool.startPersonalServer(CampaignFactory.createBasicCampaign());
+ } catch (IOException
+ | NoSuchAlgorithmException
+ | InvalidKeySpecException
+ | ExecutionException
+ | InterruptedException e) {
+ MapTool.showError(I18N.getText("msg.error.server.cantrestart"), e);
+ }
+ } else if (!MapTool.isPersonalServer() && !MapTool.isHostingServer()) {
+ // expected disconnect from someone else's server
+ // hide map so player doesn't get a brief GM view
+ MapTool.getFrame().setCurrentZoneRenderer(null);
+ }
+ disconnectExpected = false;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/client/events/ServerDisconnected.java b/src/main/java/net/rptools/maptool/client/events/ServerStopped.java
similarity index 94%
rename from src/main/java/net/rptools/maptool/client/events/ServerDisconnected.java
rename to src/main/java/net/rptools/maptool/client/events/ServerStopped.java
index 65eb33514a..1b21cdb367 100644
--- a/src/main/java/net/rptools/maptool/client/events/ServerDisconnected.java
+++ b/src/main/java/net/rptools/maptool/client/events/ServerStopped.java
@@ -14,4 +14,4 @@
*/
package net.rptools.maptool.client.events;
-public record ServerDisconnected() {}
+public record ServerStopped() {}
diff --git a/src/main/java/net/rptools/maptool/client/functions/DrawingFunctions.java b/src/main/java/net/rptools/maptool/client/functions/DrawingFunctions.java
index f60cfafb37..ce14761020 100644
--- a/src/main/java/net/rptools/maptool/client/functions/DrawingFunctions.java
+++ b/src/main/java/net/rptools/maptool/client/functions/DrawingFunctions.java
@@ -251,7 +251,7 @@ protected JsonObject getDrawingJSONInfo(String functionName, Zone map, GUID guid
dinfo.addProperty("name", d.getName());
dinfo.addProperty("layer", el.getDrawable().getLayer().name());
dinfo.addProperty("type", getDrawbleType(d));
- dinfo.add("bounds", boundsToJSON(map, d));
+ dinfo.add("bounds", boundsToJSON(d));
dinfo.addProperty("penColor", paintToString(el.getPen().getPaint()));
dinfo.addProperty("fillColor", paintToString(el.getPen().getBackgroundPaint()));
dinfo.addProperty("opacity", el.getPen().getOpacity());
@@ -262,12 +262,12 @@ protected JsonObject getDrawingJSONInfo(String functionName, Zone map, GUID guid
return dinfo;
}
- private JsonObject boundsToJSON(Zone map, AbstractDrawing d) {
+ private JsonObject boundsToJSON(AbstractDrawing d) {
JsonObject binfo = new JsonObject();
- binfo.addProperty("x", d.getBounds(map).x);
- binfo.addProperty("y", d.getBounds(map).y);
- binfo.addProperty("width", d.getBounds(map).width);
- binfo.addProperty("height", d.getBounds(map).height);
+ binfo.addProperty("x", d.getBounds().x);
+ binfo.addProperty("y", d.getBounds().y);
+ binfo.addProperty("width", d.getBounds().width);
+ binfo.addProperty("height", d.getBounds().height);
return binfo;
}
diff --git a/src/main/java/net/rptools/maptool/client/functions/DrawingMiscFunctions.java b/src/main/java/net/rptools/maptool/client/functions/DrawingMiscFunctions.java
index 03dfee4c3e..2312355706 100644
--- a/src/main/java/net/rptools/maptool/client/functions/DrawingMiscFunctions.java
+++ b/src/main/java/net/rptools/maptool/client/functions/DrawingMiscFunctions.java
@@ -108,7 +108,7 @@ public Object childEvaluate(
private JsonArray getCrossedPoints(final Zone map, final DrawnElement de, final String pathStr) {
List> pathPoints = convertJSONStringToList(pathStr);
JsonArray returnPoints = new JsonArray();
- Area a = de.getDrawable().getArea(map);
+ Area a = de.getDrawable().getArea();
int cnt = 0;
Point previousPoint = new Point();
for (Map entry : pathPoints) {
diff --git a/src/main/java/net/rptools/maptool/client/functions/MacroLinkFunction.java b/src/main/java/net/rptools/maptool/client/functions/MacroLinkFunction.java
index a332758e50..005021c779 100644
--- a/src/main/java/net/rptools/maptool/client/functions/MacroLinkFunction.java
+++ b/src/main/java/net/rptools/maptool/client/functions/MacroLinkFunction.java
@@ -599,7 +599,7 @@ private static void doWhisper(String message, Token token, String playerName) {
playerName = (!playerNameMatch.equals("")) ? playerNameMatch : playerName;
// Validate
- if (!MapTool.getClient().isPlayerConnected(playerName)) {
+ if (!MapTool.isPlayerConnected(playerName)) {
MapTool.addLocalMessage(I18N.getText("msg.error.playerNotConnected", playerName));
return;
}
diff --git a/src/main/java/net/rptools/maptool/client/functions/PlayerFunctions.java b/src/main/java/net/rptools/maptool/client/functions/PlayerFunctions.java
index 6b8bdc9d16..04be7090e0 100644
--- a/src/main/java/net/rptools/maptool/client/functions/PlayerFunctions.java
+++ b/src/main/java/net/rptools/maptool/client/functions/PlayerFunctions.java
@@ -19,7 +19,6 @@
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.language.I18N;
import net.rptools.maptool.model.player.PlayerInfo;
import net.rptools.maptool.model.player.Players;
@@ -49,7 +48,7 @@ public Object childEvaluate(
throws ParserException {
try {
- Players players = new Players(MapTool.getClient().getPlayerDatabase());
+ Players players = new Players();
return switch (functionName) {
case "player.getName" -> players.getPlayer().get().name();
case "player.getInfo" -> {
diff --git a/src/main/java/net/rptools/maptool/client/functions/ServerFunctions.java b/src/main/java/net/rptools/maptool/client/functions/ServerFunctions.java
index 7639f45b28..5c11e92600 100644
--- a/src/main/java/net/rptools/maptool/client/functions/ServerFunctions.java
+++ b/src/main/java/net/rptools/maptool/client/functions/ServerFunctions.java
@@ -17,7 +17,6 @@
import java.math.BigDecimal;
import java.util.List;
import net.rptools.maptool.client.MapTool;
-import net.rptools.maptool.client.MapToolClient;
import net.rptools.maptool.language.I18N;
import net.rptools.maptool.server.ServerPolicy;
import net.rptools.parser.Parser;
@@ -57,11 +56,9 @@ public Object childEvaluate(
if (parameters.size() == 1) {
BigDecimal ml = (BigDecimal) parameters.get(0);
if (ml.intValue() == 0 || ml.intValue() == 1) {
- MapToolClient client = MapTool.getClient();
- ServerPolicy policy = client.getServerPolicy();
+ ServerPolicy policy = MapTool.getServerPolicy();
policy.setIsMovementLocked(ml.intValue() != 0);
- client.setServerPolicy(policy);
- client.getServerCommand().setServerPolicy(policy);
+ MapTool.updateServerPolicy(policy);
} else {
throw new ParserException(
I18N.getText("macro.function.general.argumentTypeInvalid", "setmovelock"));
diff --git a/src/main/java/net/rptools/maptool/client/macro/MacroManager.java b/src/main/java/net/rptools/maptool/client/macro/MacroManager.java
index 3163049832..314be2fc0d 100644
--- a/src/main/java/net/rptools/maptool/client/macro/MacroManager.java
+++ b/src/main/java/net/rptools/maptool/client/macro/MacroManager.java
@@ -113,6 +113,7 @@ public record MacroDetails(
registerMacro(new ChangeColorMacro());
registerMacro(new WhisperReplyMacro());
registerMacro(new EmotePluralMacro());
+ registerMacro(new ExperimentsMacro());
registerMacro(new TextureNoise());
registerMacro(new VersionMacro());
registerMacro(new AboutMacro());
diff --git a/src/main/java/net/rptools/maptool/client/macro/impl/ExperimentsMacro.java b/src/main/java/net/rptools/maptool/client/macro/impl/ExperimentsMacro.java
new file mode 100644
index 0000000000..976831d76d
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/client/macro/impl/ExperimentsMacro.java
@@ -0,0 +1,101 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.client.macro.impl;
+
+import javax.swing.JOptionPane;
+import net.rptools.maptool.client.MapTool;
+import net.rptools.maptool.client.MapToolMacroContext;
+import net.rptools.maptool.client.macro.Macro;
+import net.rptools.maptool.client.macro.MacroContext;
+import net.rptools.maptool.client.macro.MacroDefinition;
+import net.rptools.maptool.language.I18N;
+
+@MacroDefinition(
+ name = "experiments",
+ aliases = {"exp", "exper"},
+ description = "experiments.description")
+public class ExperimentsMacro implements Macro {
+ @Override
+ public void execute(MacroContext context, String macro, MapToolMacroContext executionContext) {
+ // There is only one at the moment, if more are added this will need to be more flexible.
+ System.err.println("here!");
+ macro = macro.trim();
+ if (macro.length() == 0) {
+ displayUsage();
+ } else {
+ String[] args = macro.split("\\s+");
+ if ("webapp".equalsIgnoreCase(args[0])) {
+ if (args.length < 2) {
+ displayUsage();
+ } else {
+ if (!confirmWebServerStart()) {
+ return;
+ }
+
+ if (args.length > 2) {
+ for (int i = 2; i < args.length; i++) {
+ String[] dirArgs = args[i].split("=");
+ if (dirArgs.length != 2) {
+ displayUsage();
+ return;
+ }
+ MapTool.getWebAppServer().addResourceDir(dirArgs[0], dirArgs[1]);
+ }
+ }
+ try {
+ int port = Integer.parseInt(args[1]);
+ if (MapTool.getWebAppServer().hasStarted()) {
+ MapTool.addLocalMessage(I18N.getText("webapp.serverAlreadyRunning"));
+ } else {
+ MapTool.startWebAppServer(port);
+ }
+ } catch (NumberFormatException e) {
+ displayUsage();
+ return;
+ }
+ }
+ }
+ }
+ }
+
+ private boolean confirmWebServerStart() {
+ String msg = I18N.getText("msg.confirm.webServerStart");
+ Object[] options = {
+ I18N.getText("msg.title.messageDialog.continue"),
+ I18N.getText("msg.title.messageDialog.cancel")
+ };
+ String title = I18N.getText("msg.confirm.webServerStartTitle");
+ int val =
+ JOptionPane.showOptionDialog(
+ MapTool.getFrame(),
+ msg,
+ title,
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.WARNING_MESSAGE,
+ null,
+ options,
+ options[1]);
+ return val == 0;
+ }
+
+ private void displayUsage() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("| ")
+ .append(I18N.getText("experiments.listTitle"))
+ .append(" |
");
+ sb.append("| webapp <port> |
");
+ MapTool.addLocalMessage(I18N.getText(sb.toString()));
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/client/macro/impl/WhisperMacro.java b/src/main/java/net/rptools/maptool/client/macro/impl/WhisperMacro.java
index ecbed273f3..273f9c6175 100644
--- a/src/main/java/net/rptools/maptool/client/macro/impl/WhisperMacro.java
+++ b/src/main/java/net/rptools/maptool/client/macro/impl/WhisperMacro.java
@@ -55,7 +55,7 @@ public void execute(MacroContext context, String macro, MapToolMacroContext exec
playerName = (!playerNameMatch.equals("")) ? playerNameMatch : playerName;
// Validate
- if (!MapTool.getClient().isPlayerConnected(playerName)) {
+ if (!MapTool.isPlayerConnected(playerName)) {
MapTool.addMessage(
TextMessage.me(
context.getTransformationHistory(),
diff --git a/src/main/java/net/rptools/maptool/client/macro/impl/WhisperReplyMacro.java b/src/main/java/net/rptools/maptool/client/macro/impl/WhisperReplyMacro.java
index 5d3b3d41ef..f0f22f5ff7 100644
--- a/src/main/java/net/rptools/maptool/client/macro/impl/WhisperReplyMacro.java
+++ b/src/main/java/net/rptools/maptool/client/macro/impl/WhisperReplyMacro.java
@@ -36,7 +36,7 @@ public void execute(MacroContext context, String message, MapToolMacroContext ex
return;
}
// Validate
- if (!MapTool.getClient().isPlayerConnected(playerName)) {
+ if (!MapTool.isPlayerConnected(playerName)) {
MapTool.addMessage(
TextMessage.me(
context.getTransformationHistory(),
diff --git a/src/main/java/net/rptools/maptool/client/swing/PlayersLoadingStatusBar.java b/src/main/java/net/rptools/maptool/client/swing/PlayersLoadingStatusBar.java
index 7416db36b4..70ddb6e92e 100644
--- a/src/main/java/net/rptools/maptool/client/swing/PlayersLoadingStatusBar.java
+++ b/src/main/java/net/rptools/maptool/client/swing/PlayersLoadingStatusBar.java
@@ -22,7 +22,7 @@
import net.rptools.maptool.client.events.PlayerConnected;
import net.rptools.maptool.client.events.PlayerDisconnected;
import net.rptools.maptool.client.events.PlayerStatusChanged;
-import net.rptools.maptool.client.events.ServerDisconnected;
+import net.rptools.maptool.client.events.ServerStopped;
import net.rptools.maptool.client.ui.theme.Icons;
import net.rptools.maptool.client.ui.theme.RessourceManager;
import net.rptools.maptool.events.MapToolEventBus;
@@ -118,7 +118,7 @@ private void onPlayerDisconnected(PlayerDisconnected event) {
}
@Subscribe
- private void onServerDisconnected(ServerDisconnected event) {
+ private void onServerStopped(ServerStopped event) {
refreshCount();
}
}
diff --git a/src/main/java/net/rptools/maptool/client/swing/ZoomStatusBar.java b/src/main/java/net/rptools/maptool/client/swing/ZoomStatusBar.java
index 5e9f04ba7a..804a6aaa81 100644
--- a/src/main/java/net/rptools/maptool/client/swing/ZoomStatusBar.java
+++ b/src/main/java/net/rptools/maptool/client/swing/ZoomStatusBar.java
@@ -14,6 +14,7 @@
*/
package net.rptools.maptool.client.swing;
+import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.ParseException;
@@ -30,9 +31,10 @@
* and changing the zoom level to that amount.
*/
public class ZoomStatusBar extends JTextField implements ActionListener {
+ private static final Dimension minSize = new Dimension(50, 10);
+
public ZoomStatusBar() {
- super("", 9);
- setHorizontalAlignment(RIGHT);
+ super("", RIGHT);
setToolTipText(I18N.getString("ZoomStatusBar.tooltip"));
addActionListener(this);
}
@@ -59,6 +61,26 @@ public void actionPerformed(ActionEvent e) {
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.swing.JComponent#getMinimumSize()
+ */
+ @Override
+ public Dimension getMinimumSize() {
+ return minSize;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.swing.JComponent#getPreferredSize()
+ */
+ @Override
+ public Dimension getPreferredSize() {
+ return getMinimumSize();
+ }
+
public void clear() {
setText("");
}
@@ -68,18 +90,7 @@ public void update() {
if (MapTool.getFrame().getCurrentZoneRenderer() != null) {
double scale = MapTool.getFrame().getCurrentZoneRenderer().getZoneScale().getScale();
scale *= 100;
-
- if (scale < 10) {
- zoom = String.format("%.4f%%", scale);
- } else if (scale < 100) {
- zoom = String.format("%.3f%%", scale);
- } else if (scale < 1000) {
- zoom = String.format("%.2f%%", scale);
- } else if (scale < 10000) {
- zoom = String.format("%.1f%%", scale);
- } else {
- zoom = String.format("%.0f%%", scale);
- }
+ zoom = String.format("%d%%", (int) scale);
}
setText(zoom);
}
diff --git a/src/main/java/net/rptools/maptool/client/tool/AI_Tool.java b/src/main/java/net/rptools/maptool/client/tool/AI_Tool.java
index 73b71af248..15aaaa33a4 100644
--- a/src/main/java/net/rptools/maptool/client/tool/AI_Tool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/AI_Tool.java
@@ -30,12 +30,8 @@ public AI_Tool() {
@Override
public void actionPerformed(ActionEvent e) {
AppPreferences.setUseAstarPathfinding(isSelected());
-
- var client = MapTool.getClient();
- var policy = client.getServerPolicy();
- policy.setUsingAstarPathfinding(isSelected());
- client.setServerPolicy(policy);
- client.getServerCommand().setServerPolicy(policy);
+ MapTool.getServerPolicy().setUsingAstarPathfinding(isSelected());
+ MapTool.updateServerPolicy();
// Trigger AI_UseVblTool's isAvailable
MapTool.getFrame().getToolbox().updateTools();
diff --git a/src/main/java/net/rptools/maptool/client/tool/AI_UseVblTool.java b/src/main/java/net/rptools/maptool/client/tool/AI_UseVblTool.java
index 57f4ad6285..7714e04fce 100644
--- a/src/main/java/net/rptools/maptool/client/tool/AI_UseVblTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/AI_UseVblTool.java
@@ -30,12 +30,8 @@ public AI_UseVblTool() {
@Override
public void actionPerformed(ActionEvent e) {
AppPreferences.setVblBlocksMove(isSelected());
-
- var client = MapTool.getClient();
- var policy = client.getServerPolicy();
- policy.setVblBlocksMove(isSelected());
- client.setServerPolicy(policy);
- client.getServerCommand().setServerPolicy(policy);
+ MapTool.getServerPolicy().setVblBlocksMove(isSelected());
+ MapTool.updateServerPolicy();
}
@Override
diff --git a/src/main/java/net/rptools/maptool/client/tool/PointerTool.java b/src/main/java/net/rptools/maptool/client/tool/PointerTool.java
index f952e118c2..091741f7ec 100644
--- a/src/main/java/net/rptools/maptool/client/tool/PointerTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/PointerTool.java
@@ -662,12 +662,13 @@ public void mouseReleased(MouseEvent e) {
// MouseMotion
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
if (renderer == null) {
return;
}
+ super.mouseMoved(e);
+ // mouseX = e.getX(); // done by super.mouseMoved()
+ // mouseY = e.getY();
if (isShowingPointer) {
ZonePoint zp = new ScreenPoint(mouseX, mouseY).convertToZone(renderer);
Pointer pointer =
diff --git a/src/main/java/net/rptools/maptool/client/tool/StampTool.java b/src/main/java/net/rptools/maptool/client/tool/StampTool.java
index c85b374f20..74d1c6cb77 100644
--- a/src/main/java/net/rptools/maptool/client/tool/StampTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/StampTool.java
@@ -496,11 +496,10 @@ public void mouseReleased(MouseEvent e) {
*/
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
if (renderer == null) {
return;
}
+ super.mouseMoved(e);
if (isShowingTokenStackPopup) {
if (tokenStackPanel.contains(e.getX(), e.getY())) {
diff --git a/src/main/java/net/rptools/maptool/client/tool/boardtool/BoardTool.java b/src/main/java/net/rptools/maptool/client/tool/boardtool/BoardTool.java
index a25560d39a..3952420334 100644
--- a/src/main/java/net/rptools/maptool/client/tool/boardtool/BoardTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/boardtool/BoardTool.java
@@ -280,6 +280,12 @@ public void mouseDragged(java.awt.event.MouseEvent e) {
}
}
+ @Override
+ public void mouseMoved(java.awt.event.MouseEvent e) {
+ mouseX = e.getX();
+ mouseY = e.getY();
+ }
+
/** A simple enum for correlating keys with directions */
private enum Direction {
Left,
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractDrawingTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractDrawingTool.java
index c98aab2875..28529667bd 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractDrawingTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractDrawingTool.java
@@ -34,6 +34,7 @@
import net.rptools.maptool.client.tool.DefaultTool;
import net.rptools.maptool.client.ui.zone.ZoneOverlay;
import net.rptools.maptool.client.ui.zone.renderer.ZoneRenderer;
+import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Token;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.Zone.Layer;
@@ -116,7 +117,7 @@ protected void paintTransformed(Graphics2D g, ZoneRenderer renderer, Drawable dr
AffineTransform transform = getPaintTransform(renderer);
AffineTransform oldTransform = g.getTransform();
g.transform(transform);
- drawing.draw(renderer.getZone(), g, pen);
+ drawing.draw(g, pen);
g.setTransform(oldTransform);
}
@@ -219,7 +220,8 @@ protected ZonePoint getPoint(MouseEvent e) {
}
protected Area getTokenTopology(Zone.TopologyType topologyType) {
- List topologyTokens = getZone().getTokensWithTopology(topologyType);
+ List topologyTokens =
+ MapTool.getFrame().getCurrentZoneRenderer().getZone().getTokensWithTopology(topologyType);
Area tokenTopology = new Area();
for (Token topologyToken : topologyTokens) {
@@ -324,16 +326,15 @@ protected void paintTopologyOverlay(Graphics2D g, Drawable drawable, int penMode
* Render a drawable on a zone. This method consolidates all of the calls to the server in one
* place so that it is easier to keep them in sync.
*
+ * @param zoneId Id of the zone where the drawable is being drawn.
* @param pen The pen used to draw.
* @param drawable What is being drawn.
*/
- protected void completeDrawable(Pen pen, Drawable drawable) {
- var zone = getZone();
-
+ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {
if (!hasPaint(pen)) {
return;
}
- if (drawable.getBounds(zone) == null) {
+ if (drawable.getBounds() == null) {
return;
}
if (MapTool.getPlayer().isGM()) {
@@ -347,10 +348,11 @@ protected void completeDrawable(Pen pen, Drawable drawable) {
MapToolUtil.uploadTexture(pen.getBackgroundPaint());
// Tell the local/server to render the drawable.
- MapTool.serverCommand().draw(zone.getId(), pen, drawable);
+ MapTool.serverCommand().draw(zoneId, pen, drawable);
// Allow it to be undone
- zone.addDrawable(pen, drawable);
+ Zone z = MapTool.getFrame().getCurrentZoneRenderer().getZone();
+ z.addDrawable(pen, drawable);
}
private boolean hasPaint(Pen pen) {
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractLineTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractLineTool.java
index 30b15fe03b..9cf10e40bd 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractLineTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/AbstractLineTool.java
@@ -95,7 +95,7 @@ protected void stopLine(MouseEvent e) {
if (isBackgroundFill(e) && line.getPoints().size() > 2) {
drawable = new ShapeDrawable(getPolygon(trimLine));
}
- completeDrawable(getPen(), drawable);
+ completeDrawable(renderer.getZone().getId(), getPen(), drawable);
line = null;
currentX = -1;
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/CrossTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/CrossTopologyTool.java
index 226c75fe81..b9f508c62e 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/CrossTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/CrossTopologyTool.java
@@ -119,8 +119,6 @@ public void mouseDragged(MouseEvent e) {
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
setIsEraser(isEraser(e));
ZonePoint p = getPoint(e);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/DeleteDrawingTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/DeleteDrawingTool.java
index 3df29aa5db..016aa83202 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/DeleteDrawingTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/DeleteDrawingTool.java
@@ -93,7 +93,7 @@ public void mouseClicked(MouseEvent e) {
var drawable = element.getDrawable();
var id = drawable.getId();
ZonePoint pos = new ScreenPoint(e.getX(), e.getY()).convertToZone(renderer);
- if (drawable.getBounds(zone).contains(pos.x, pos.y)) {
+ if (drawable.getBounds().contains(pos.x, pos.y)) {
if (!selectedDrawings.contains(id)) selectedDrawings.add(id);
else selectedDrawings.remove(id);
break;
@@ -116,7 +116,7 @@ public void paintOverlay(ZoneRenderer renderer, Graphics2D g) {
}
private void drawBox(Graphics2D g, DrawnElement element) {
- var box = element.getDrawable().getBounds(getZone());
+ var box = element.getDrawable().getBounds();
var pen = element.getPen();
var scale = renderer.getScale();
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondExposeTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondExposeTool.java
index ee70cf3314..925f4150c5 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondExposeTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondExposeTool.java
@@ -63,15 +63,15 @@ protected Pen getPen() {
}
@Override
- protected void completeDrawable(Pen pen, Drawable drawable) {
+ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {
if (!MapTool.getPlayer().isGM()) {
MapTool.showError("msg.error.fogexpose");
MapTool.getFrame().refresh();
return;
}
- Zone zone = getZone();
- Area area = new Area(drawable.getArea(zone));
- Set selectedToks = renderer.getSelectedTokenSet();
+ Zone zone = MapTool.getCampaign().getZone(zoneId);
+ Area area = new Area(drawable.getArea());
+ Set selectedToks = MapTool.getFrame().getCurrentZoneRenderer().getSelectedTokenSet();
if (pen.isEraser()) {
zone.hideArea(area, selectedToks);
MapTool.serverCommand().hideFoW(zone.getId(), area, selectedToks);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTool.java
index 970ae65f30..5ef2fa455e 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTool.java
@@ -76,7 +76,7 @@ public void mousePressed(MouseEvent e) {
return;
}
// ToolHelper.drawDiamondMeasurement(renderer, null, diamond);
- completeDrawable(getPen(), new ShapeDrawable(diamond, false));
+ completeDrawable(renderer.getZone().getId(), getPen(), new ShapeDrawable(diamond, false));
diamond = null;
}
setIsEraser(isEraser(e));
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTopologyTool.java
index f8c77dc832..2d6ed9d5a2 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/DiamondTopologyTool.java
@@ -78,7 +78,7 @@ public void mousePressed(MouseEvent e) {
renderer.repaint();
return;
}
- Area area = new ShapeDrawable(diamond, false).getArea(getZone());
+ Area area = new ShapeDrawable(diamond, false).getArea();
if (isEraser(e)) {
getZone().removeTopology(area);
MapTool.serverCommand()
@@ -107,8 +107,6 @@ public void mouseDragged(MouseEvent e) {
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
setIsEraser(isEraser(e));
ZonePoint zp = getPoint(e);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/DrawnTextTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/DrawnTextTool.java
new file mode 100644
index 0000000000..7e2b2f0b99
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/DrawnTextTool.java
@@ -0,0 +1,269 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.client.tool.drawing;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.util.Map;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+import javax.swing.text.Style;
+import net.rptools.maptool.client.swing.TwoToneTextPane;
+import net.rptools.maptool.client.tool.Tool;
+import net.rptools.maptool.client.ui.zone.renderer.ZoneRenderer;
+import net.rptools.maptool.model.drawing.DrawnLabel;
+import net.rptools.maptool.model.drawing.Pen;
+
+/**
+ * A text tool that uses a text component to allow text to be entered on the display and then
+ * renders it as an image.
+ *
+ * @author jgorrell
+ * @version $Revision: 5945 $ $Date: 2006-03-11 02:57:18 -0600 (Sat, 11 Mar 2006) $ $Author:
+ * azhrei_fje $
+ */
+public class DrawnTextTool extends AbstractDrawingTool implements MouseMotionListener {
+
+ /*---------------------------------------------------------------------------------------------
+ * Instance Variables
+ *-------------------------------------------------------------------------------------------*/
+
+ /** Flag used to indicate that the anchor has been set. */
+ private boolean anchorSet;
+
+ /** The anchor point originally selected */
+ private Point anchor = new Point();
+
+ /** The bounds of the display rectangle */
+ private Rectangle bounds = new Rectangle();
+
+ /** The text pane used to paint the text. */
+ private TwoToneTextPane textPane;
+
+ /*---------------------------------------------------------------------------------------------
+ * Constructors
+ *-------------------------------------------------------------------------------------------*/
+
+ /** A transparent color used in the background */
+ private static final Color TRANSPARENT = new Color(0, 0, 0, 0);
+
+ /*---------------------------------------------------------------------------------------------
+ * Constructors
+ *-------------------------------------------------------------------------------------------*/
+
+ /** Initialize the tool icon */
+ public DrawnTextTool() {}
+
+ /*---------------------------------------------------------------------------------------------
+ * Tool & AbstractDrawingTool Abstract Methods
+ *-------------------------------------------------------------------------------------------*/
+
+ /**
+ * @see net.rptools.maptool.client.tool.drawing.AbstractDrawingTool#paintOverlay(ZoneRenderer,
+ * java.awt.Graphics2D)
+ */
+ @Override
+ public void paintOverlay(ZoneRenderer aRenderer, Graphics2D aG) {
+ if (!anchorSet) return;
+ aG.setColor(Color.BLACK);
+ aG.drawRect(bounds.x, bounds.y, bounds.width, bounds.height);
+ }
+
+ /**
+ * @see Tool#getTooltip()
+ */
+ @Override
+ public String getTooltip() {
+ return "tool.text.tooltip";
+ }
+
+ /**
+ * @see Tool#getInstructions()
+ */
+ @Override
+ public String getInstructions() {
+ return "tool.text.instructions";
+ }
+
+ /**
+ * @see Tool#resetTool()
+ */
+ @Override
+ protected void resetTool() {
+ anchorSet = false;
+ if (textPane != null) renderer.remove(textPane);
+ textPane = null;
+ renderer.repaint();
+ }
+
+ /*---------------------------------------------------------------------------------------------
+ * MouseListener Interface Methods
+ *-------------------------------------------------------------------------------------------*/
+
+ /**
+ * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
+ */
+ public void mouseClicked(MouseEvent event) {
+ // Do nothing
+ }
+
+ /**
+ * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
+ */
+ public void mousePressed(MouseEvent event) {
+ if (!anchorSet) {
+ anchor.x = event.getX();
+ anchor.y = event.getY();
+ anchorSet = true;
+ } else {
+ setBounds(event);
+
+ // Create a text component and place it on the renderer's component
+ textPane = createTextPane(bounds, getPen(), "sanserif-BOLD-20");
+ renderer.add(textPane);
+ textPane.requestFocusInWindow();
+
+ // Make the enter key addthe text
+ KeyStroke k = KeyStroke.getKeyStroke("ENTER");
+ textPane.getKeymap().removeKeyStrokeBinding(k);
+ textPane
+ .getKeymap()
+ .addActionForKeyStroke(
+ k,
+ new AbstractAction() {
+ public void actionPerformed(ActionEvent aE) {
+ completeDrawable();
+ }
+ });
+ }
+ }
+
+ /**
+ * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
+ */
+ public void mouseReleased(MouseEvent aE) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent)
+ */
+ public void mouseEntered(MouseEvent aE) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent)
+ */
+ public void mouseExited(MouseEvent aE) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /*---------------------------------------------------------------------------------------------
+ * MouseMotionListener Interface Methods
+ *-------------------------------------------------------------------------------------------*/
+
+ /**
+ * @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent)
+ */
+ public void mouseMoved(MouseEvent event) {
+ if (!anchorSet) return;
+ if (textPane != null) return;
+ setBounds(event);
+ renderer.repaint();
+ }
+
+ /**
+ * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent)
+ */
+ public void mouseDragged(MouseEvent aE) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void installKeystrokes(Map actionMap) {
+ super.installKeystrokes(actionMap);
+ actionMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0, true), null);
+ actionMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0, false), null);
+ }
+
+ /*---------------------------------------------------------------------------------------------
+ * Instance Methods
+ *-------------------------------------------------------------------------------------------*/
+
+ /**
+ * Set the bounds for the text area.
+ *
+ * @param event The mouse event used in the calculation.
+ */
+ private void setBounds(MouseEvent event) {
+ bounds.x = Math.min(anchor.x, event.getX());
+ bounds.y = Math.min(anchor.y, event.getY());
+ bounds.width = Math.abs(anchor.x - event.getX());
+ bounds.height = Math.abs(anchor.y - event.getY());
+ }
+
+ /** Finish drawing the text. */
+ private void completeDrawable() {
+
+ // Create a drawable from the data and clean up the component.
+ DrawnLabel label =
+ new DrawnLabel(
+ textPane.getText(), bounds, TwoToneTextPane.getFontString(textPane.getLogicalStyle()));
+ textPane.setVisible(false);
+ textPane.getParent().remove(textPane);
+ textPane = null;
+
+ // Tell everybody else
+ completeDrawable(renderer.getZone().getId(), getPen(), label);
+ resetTool();
+ }
+
+ /**
+ * Create a text pane with the passed bounds, pen, and font data
+ *
+ * @param bounds Bounds of the new text pane
+ * @param pen Pen used for foreground and background text colors.
+ * @param font Font used to pain the text
+ * @return A text pane used to draw text
+ */
+ public static TwoToneTextPane createTextPane(Rectangle bounds, Pen pen, String font) {
+ // Create a text component and place it on the renderer's component
+ TwoToneTextPane textPane = new TwoToneTextPane();
+ textPane.setBounds(bounds);
+ textPane.setOpaque(false);
+ textPane.setBackground(TRANSPARENT);
+
+ // Create a style for the component
+ Style style = textPane.addStyle("default", null);
+ TwoToneTextPane.setFont(style, Font.decode(font));
+ // style.addAttribute(StyleConstants.Foreground, new Color(pen.getColor()));
+ // style.addAttribute(StyleConstants.Background, new Color(pen.getBackgroundColor()));
+ textPane.setLogicalStyle(style);
+ return textPane;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/FreehandExposeTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/FreehandExposeTool.java
index 059edb246d..578b2d3b36 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/FreehandExposeTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/FreehandExposeTool.java
@@ -76,18 +76,18 @@ protected void stopLine(MouseEvent e) {
if (line == null) return; // Escape has been pressed
addPoint(e);
- completeDrawable(getPen(), line);
+ completeDrawable(renderer.getZone().getId(), getPen(), line);
resetTool();
}
@Override
- protected void completeDrawable(Pen pen, Drawable drawable) {
+ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {
if (!MapTool.getPlayer().isGM()) {
MapTool.showError("msg.error.fogexpose");
MapTool.getFrame().refresh();
return;
}
- Zone zone = getZone();
+ Zone zone = MapTool.getCampaign().getZone(zoneId);
Area area = null;
if (drawable instanceof LineSegment) {
@@ -96,7 +96,7 @@ protected void completeDrawable(Pen pen, Drawable drawable) {
if (drawable instanceof ShapeDrawable) {
area = new Area(((ShapeDrawable) drawable).getShape());
}
- Set selectedToks = renderer.getSelectedTokenSet();
+ Set selectedToks = MapTool.getFrame().getCurrentZoneRenderer().getSelectedTokenSet();
if (pen.isEraser()) {
zone.hideArea(area, selectedToks);
MapTool.serverCommand().hideFoW(zone.getId(), area, selectedToks);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/HollowDiamondTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/HollowDiamondTopologyTool.java
index 2b56df06c8..ccfe55cdc4 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/HollowDiamondTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/HollowDiamondTopologyTool.java
@@ -106,8 +106,6 @@ public void mouseDragged(MouseEvent e) {
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
setIsEraser(isEraser(e));
ZonePoint zp = getPoint(e);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/HollowOvalTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/HollowOvalTopologyTool.java
index 722e1cd1a3..84504a1702 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/HollowOvalTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/HollowOvalTopologyTool.java
@@ -124,7 +124,6 @@ public void mouseDragged(MouseEvent e) {
}
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
setIsEraser(isEraser(e));
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/HollowRectangleTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/HollowRectangleTopologyTool.java
index eff224ca08..6248b45452 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/HollowRectangleTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/HollowRectangleTopologyTool.java
@@ -116,8 +116,6 @@ public void mouseDragged(MouseEvent e) {
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
setIsEraser(isEraser(e));
ZonePoint p = getPoint(e);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/LineCellTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/LineCellTemplateTool.java
index 37604101c9..3223c5f634 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/LineCellTemplateTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/LineCellTemplateTool.java
@@ -19,11 +19,13 @@
import java.awt.event.MouseEvent;
import java.awt.geom.AffineTransform;
import javax.swing.SwingUtilities;
+import net.rptools.maptool.client.ScreenPoint;
import net.rptools.maptool.client.swing.SwingUtil;
import net.rptools.maptool.client.tool.Tool;
import net.rptools.maptool.client.ui.zone.renderer.ZoneRenderer;
import net.rptools.maptool.model.ZonePoint;
import net.rptools.maptool.model.drawing.AbstractTemplate;
+import net.rptools.maptool.model.drawing.AbstractTemplate.Quadrant;
import net.rptools.maptool.model.drawing.LineCellTemplate;
import net.rptools.maptool.model.drawing.Pen;
@@ -107,7 +109,7 @@ public void paintOverlay(ZoneRenderer renderer, Graphics2D g) {
g.setTransform(newTransform);
ZonePoint vertex = template.getVertex();
ZonePoint pathVertex = ((LineCellTemplate) template).getPathVertex();
- template.draw(renderer.getZone(), g, pen);
+ template.draw(g, pen);
Paint paint = pen.getPaint() != null ? pen.getPaint().getPaint() : null;
paintCursor(g, paint, pen.getThickness(), vertex);
if (pathVertex != null) {
@@ -171,6 +173,7 @@ public void mousePressed(MouseEvent aE) {
protected void handleMouseMovement(MouseEvent e) {
// Setting anchor point?
LineCellTemplate lt = (LineCellTemplate) template;
+ ZonePoint pathVertex = lt.getPathVertex();
ZonePoint vertex = lt.getVertex();
if (!anchorSet) {
@@ -186,21 +189,58 @@ protected void handleMouseMovement(MouseEvent e) {
template.setRadius(getRadiusAtMouse(e));
controlOffset = null;
- ZonePoint pathVertex = getCellAtMouse(e);
- lt.setPathVertex(pathVertex);
- renderer.repaint();
+ // The path vertex remains null until it is set the first time.
+ if (pathVertex == null) {
+ pathVertex = new ZonePoint(vertex.x, vertex.y);
+ lt.setPathVertex(pathVertex);
+ } // endif
+ if (setCellAtMouse(e, pathVertex)) lt.clearPath();
+
+ // Determine which of the extra squares are used on diagonals
+ double dx = pathVertex.x - vertex.x;
+ double dy = pathVertex.y - vertex.y;
+ if (dx != 0 && dy != 0) { // Ignore straight lines
+ boolean mouseSlopeGreater = false;
+ double m = Math.abs(dy / dx);
+ double edx = e.getX() - vertex.x;
+ double edy = e.getY() - vertex.y;
+ if (edx != 0 && edy != 0) { // Handle straight lines differently
+ double em = Math.abs(edy / edx);
+ mouseSlopeGreater = em > m;
+ } else if (edx == 0) {
+ mouseSlopeGreater = true;
+ } // endif
+ if (mouseSlopeGreater != lt.isMouseSlopeGreater()) {
+ lt.setMouseSlopeGreater(mouseSlopeGreater);
+ renderer.repaint();
+ } // endif
+ } // endif
// Let control move the path anchor
} else if (SwingUtil.isControlDown(e)) {
- ZonePoint pathVertex = lt.getPathVertex();
handleControlOffset(e, pathVertex);
- lt.setPathVertex(pathVertex);
// Set the final radius
} else {
template.setRadius(getRadiusAtMouse(e));
renderer.repaint();
controlOffset = null;
+ return;
+ } // endif
+
+ // Quadrant change?
+ if (pathVertex != null) {
+ ZonePoint mouse = new ScreenPoint(e.getX(), e.getY()).convertToZone(renderer);
+ int dx = mouse.x - vertex.x;
+ int dy = mouse.y - vertex.y;
+ AbstractTemplate.Quadrant quadrant =
+ (dx < 0)
+ ? (dy < 0 ? Quadrant.NORTH_WEST : Quadrant.SOUTH_WEST)
+ : (dy < 0 ? Quadrant.NORTH_EAST : Quadrant.SOUTH_EAST);
+ if (quadrant != lt.getQuadrant()) {
+ lt.setQuadrant(quadrant);
+ renderer.repaint();
+ } // endif
} // endif
}
}
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/LineTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/LineTemplateTool.java
index 1bda1775ff..73ac10dc2a 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/LineTemplateTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/LineTemplateTool.java
@@ -116,7 +116,7 @@ public void paintOverlay(ZoneRenderer renderer, Graphics2D g) {
g.setTransform(newTransform);
ZonePoint vertex = template.getVertex();
ZonePoint pathVertex = ((LineTemplate) template).getPathVertex();
- template.draw(renderer.getZone(), g, pen);
+ template.draw(g, pen);
Paint paint = pen.getPaint() != null ? pen.getPaint().getPaint() : null;
paintCursor(g, paint, pen.getThickness(), vertex);
if (pathVertex != null) {
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/LineTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/LineTool.java
index 6de6cd9cc0..bc88330a9f 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/LineTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/LineTool.java
@@ -65,13 +65,12 @@ public void mouseDragged(MouseEvent e) {
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
if (getLine() != null) {
if (tempPoint != null) {
removePoint(tempPoint);
}
tempPoint = addPoint(e);
}
+ super.mouseMoved(e);
}
}
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/OvalExposeTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/OvalExposeTool.java
index 6f8d6f72f0..9880cfdfbf 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/OvalExposeTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/OvalExposeTool.java
@@ -70,17 +70,17 @@ public String getInstructions() {
}
@Override
- protected void completeDrawable(Pen pen, Drawable drawable) {
+ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {
if (!MapTool.getPlayer().isGM()) {
MapTool.showError("msg.error.fogexpose");
MapTool.getFrame().refresh();
return;
}
- Zone zone = getZone();
+ Zone zone = MapTool.getCampaign().getZone(zoneId);
- Rectangle bounds = drawable.getBounds(zone);
+ Rectangle bounds = drawable.getBounds();
Area area = new Area(new Ellipse2D.Double(bounds.x, bounds.y, bounds.width, bounds.height));
- Set selectedToks = renderer.getSelectedTokenSet();
+ Set selectedToks = MapTool.getFrame().getCurrentZoneRenderer().getSelectedTokenSet();
if (pen.isEraser()) {
zone.hideArea(area, selectedToks);
MapTool.serverCommand().hideFoW(zone.getId(), area, selectedToks);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTool.java
index e99f99a48e..b29622b2f0 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTool.java
@@ -100,6 +100,7 @@ public void mousePressed(MouseEvent e) {
}
completeDrawable(
+ renderer.getZone().getId(),
getPen(),
new ShapeDrawable(new Ellipse2D.Float(oval.x, oval.y, oval.width, oval.height), true));
oval = null;
@@ -126,8 +127,6 @@ public void mouseDragged(MouseEvent e) {
*/
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
if (oval != null) {
ZonePoint sp = getPoint(e);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTopologyTool.java
index 32b994ac70..69d410c574 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/OvalTopologyTool.java
@@ -109,8 +109,6 @@ public void mouseDragged(MouseEvent e) {
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
setIsEraser(isEraser(e));
if (oval != null) {
ZonePoint sp = getPoint(e);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonExposeTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonExposeTool.java
index 1c7e9d059f..f4e3711ca1 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonExposeTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonExposeTool.java
@@ -77,22 +77,22 @@ protected void stopLine(MouseEvent e) {
if (line == null) return; // Escape has been pressed
addPoint(e);
- completeDrawable(getPen(), line);
+ completeDrawable(renderer.getZone().getId(), getPen(), line);
resetTool();
}
@Override
- protected void completeDrawable(Pen pen, Drawable drawable) {
+ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {
if (!MapTool.getPlayer().isGM()) {
MapTool.showError("msg.error.fogexpose");
MapTool.getFrame().refresh();
return;
}
- Zone zone = getZone();
+ Zone zone = MapTool.getCampaign().getZone(zoneId);
Polygon polygon = getPolygon((LineSegment) drawable);
Area area = new Area(polygon);
- Set selectedToks = renderer.getSelectedTokenSet();
+ Set selectedToks = MapTool.getFrame().getCurrentZoneRenderer().getSelectedTokenSet();
if (pen.isEraser()) {
zone.hideArea(area, selectedToks);
MapTool.serverCommand().hideFoW(zone.getId(), area, selectedToks);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTool.java
index d7f3156669..ca6ba764a7 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTool.java
@@ -17,6 +17,7 @@
import java.awt.Point;
import java.awt.Polygon;
import java.awt.event.MouseMotionListener;
+import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.drawing.Drawable;
import net.rptools.maptool.model.drawing.LineSegment;
import net.rptools.maptool.model.drawing.Pen;
@@ -39,9 +40,9 @@ public String getInstructions() {
}
@Override
- protected void completeDrawable(Pen pen, Drawable drawable) {
+ protected void completeDrawable(GUID zoneGUID, Pen pen, Drawable drawable) {
LineSegment line = (LineSegment) drawable;
- super.completeDrawable(pen, new ShapeDrawable(getPolygon(line)));
+ super.completeDrawable(zoneGUID, pen, new ShapeDrawable(getPolygon(line)));
}
@Override
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTopologyTool.java
index 463d78e6c0..515e966fe3 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/PolygonTopologyTool.java
@@ -25,6 +25,7 @@
import net.rptools.maptool.client.AppStyle;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.ui.zone.renderer.ZoneRenderer;
+import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.drawing.Drawable;
import net.rptools.maptool.model.drawing.DrawableColorPaint;
import net.rptools.maptool.model.drawing.LineSegment;
@@ -73,7 +74,7 @@ protected boolean isBackgroundFill(MouseEvent e) {
}
@Override
- protected void completeDrawable(Pen pen, Drawable drawable) {
+ protected void completeDrawable(GUID zoneGUID, Pen pen, Drawable drawable) {
Area area = new Area();
if (drawable instanceof LineSegment) {
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusCellTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusCellTemplateTool.java
index 1a0036ef85..9cd5a51468 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusCellTemplateTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusCellTemplateTool.java
@@ -217,6 +217,7 @@ protected void resetTool(ZonePoint vertex) {
} // endif
template = createBaseTemplate();
template.setVertex(vertex);
+ template.setZoneId(renderer.getZone().getId());
controlOffset = null;
renderer.repaint();
}
@@ -312,7 +313,7 @@ public void paintOverlay(ZoneRenderer renderer, Graphics2D g) {
AffineTransform newTransform = g.getTransform();
newTransform.concatenate(getPaintTransform(renderer));
g.setTransform(newTransform);
- template.draw(renderer.getZone(), g, pen);
+ template.draw(g, pen);
Paint paint = pen.getPaint() != null ? pen.getPaint().getPaint() : null;
paintCursor(g, paint, pen.getThickness(), template.getVertex());
g.setTransform(old);
@@ -353,6 +354,7 @@ protected Pen getPen() {
@Override
protected void detachFrom(ZoneRenderer renderer) {
super.detachFrom(renderer);
+ template.setZoneId(null);
renderer.repaint();
}
@@ -361,6 +363,7 @@ protected void detachFrom(ZoneRenderer renderer) {
*/
@Override
protected void attachTo(ZoneRenderer renderer) {
+ template.setZoneId(renderer.getZone().getId());
renderer.repaint();
super.attachTo(renderer);
}
@@ -409,7 +412,7 @@ public void mousePressed(MouseEvent e) {
template.setRadius(getRadiusAtMouse(e));
ZonePoint vertex = template.getVertex();
ZonePoint newPoint = new ZonePoint(vertex.x, vertex.y);
- completeDrawable(getPen(), template);
+ completeDrawable(renderer.getZone().getId(), getPen(), template);
setIsEraser(false);
resetTool(newPoint);
}
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusTemplateTool.java
index a5c84ff856..b9c724a3d3 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusTemplateTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/RadiusTemplateTool.java
@@ -220,6 +220,7 @@ protected void resetTool(ZonePoint vertex) {
} // endif
template = createBaseTemplate();
template.setVertex(vertex);
+ template.setZoneId(renderer.getZone().getId());
controlOffset = null;
renderer.repaint();
}
@@ -315,7 +316,7 @@ public void paintOverlay(ZoneRenderer renderer, Graphics2D g) {
AffineTransform newTransform = g.getTransform();
newTransform.concatenate(getPaintTransform(renderer));
g.setTransform(newTransform);
- template.draw(renderer.getZone(), g, pen);
+ template.draw(g, pen);
Paint paint = pen.getPaint() != null ? pen.getPaint().getPaint() : null;
paintCursor(g, paint, pen.getThickness(), template.getVertex());
g.setTransform(old);
@@ -356,6 +357,7 @@ protected Pen getPen() {
@Override
protected void detachFrom(ZoneRenderer renderer) {
super.detachFrom(renderer);
+ template.setZoneId(null);
renderer.repaint();
}
@@ -364,6 +366,7 @@ protected void detachFrom(ZoneRenderer renderer) {
*/
@Override
protected void attachTo(ZoneRenderer renderer) {
+ template.setZoneId(renderer.getZone().getId());
renderer.repaint();
super.attachTo(renderer);
}
@@ -412,7 +415,7 @@ public void mousePressed(MouseEvent e) {
template.setRadius(getRadiusAtMouse(e));
ZonePoint vertex = template.getVertex();
ZonePoint newPoint = new ZonePoint(vertex.x, vertex.y);
- completeDrawable(getPen(), template);
+ completeDrawable(renderer.getZone().getId(), getPen(), template);
setIsEraser(false);
resetTool(newPoint);
}
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleExposeTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleExposeTool.java
index 7a1336b0bb..4b8dc89145 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleExposeTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleExposeTool.java
@@ -64,17 +64,17 @@ protected Pen getPen() {
}
@Override
- protected void completeDrawable(Pen pen, Drawable drawable) {
+ protected void completeDrawable(GUID zoneId, Pen pen, Drawable drawable) {
if (!MapTool.getPlayer().isGM()) {
MapTool.showError("msg.error.fogexpose");
MapTool.getFrame().refresh();
return;
}
- Zone zone = getZone();
+ Zone zone = MapTool.getCampaign().getZone(zoneId);
- Rectangle bounds = drawable.getBounds(zone);
+ Rectangle bounds = drawable.getBounds();
Area area = new Area(bounds);
- Set selectedToks = renderer.getSelectedTokenSet();
+ Set selectedToks = MapTool.getFrame().getCurrentZoneRenderer().getSelectedTokenSet();
if (pen.isEraser()) {
zone.hideArea(area, selectedToks);
MapTool.serverCommand().hideFoW(zone.getId(), area, selectedToks);
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTool.java
index aa68e050a2..8b8d9777dd 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTool.java
@@ -94,7 +94,7 @@ public void mousePressed(MouseEvent e) {
rectangle.height *= 2;
}
// System.out.println("Adding Rectangle to zone: " + rectangle);
- completeDrawable(getPen(), new ShapeDrawable(rectangle, false));
+ completeDrawable(renderer.getZone().getId(), getPen(), new ShapeDrawable(rectangle, false));
rectangle = null;
}
setIsEraser(isEraser(e));
diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTopologyTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTopologyTool.java
index 8bf5a95d39..ce75e04439 100644
--- a/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTopologyTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/drawing/RectangleTopologyTool.java
@@ -108,8 +108,6 @@ public void mouseDragged(MouseEvent e) {
@Override
public void mouseMoved(MouseEvent e) {
- super.mouseMoved(e);
-
setIsEraser(isEraser(e));
ZonePoint p = getPoint(e);
diff --git a/src/main/java/net/rptools/maptool/client/tool/gridtool/GridTool.java b/src/main/java/net/rptools/maptool/client/tool/gridtool/GridTool.java
index fa4a0bfcd2..aac0cfc007 100644
--- a/src/main/java/net/rptools/maptool/client/tool/gridtool/GridTool.java
+++ b/src/main/java/net/rptools/maptool/client/tool/gridtool/GridTool.java
@@ -37,12 +37,10 @@
import net.rptools.maptool.client.swing.SwingUtil;
import net.rptools.maptool.client.tool.DefaultTool;
import net.rptools.maptool.client.ui.zone.renderer.ZoneRenderer;
-import net.rptools.maptool.events.MapToolEventBus;
import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.Grid;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
-import net.rptools.maptool.model.zones.GridChanged;
/** */
public class GridTool extends DefaultTool {
@@ -77,8 +75,7 @@ public GridTool() {
controlPanel = new AbeillePanel(new AdjustGridControlPanelView().getRootComponent());
gridSizeSpinner = (JSpinner) controlPanel.getComponent("gridSize");
- gridSizeSpinner.setModel(
- new SpinnerNumberModel(100, Grid.MIN_GRID_SIZE, Grid.MAX_GRID_SIZE, 1));
+ gridSizeSpinner.setModel(new SpinnerNumberModel());
gridSizeSpinner.addChangeListener(new UpdateGridListener());
gridOffsetXTextField = (JTextField) controlPanel.getComponent("offsetX");
@@ -178,8 +175,6 @@ private void copyControlPanelToGrid() {
grid.setOffset(getInt(gridOffsetXTextField, 0), getInt(gridOffsetYTextField, 0));
zone.setGridColor(colorWell.getColor().getRGB());
grid.setSize(Math.max((Integer) gridSizeSpinner.getValue(), Grid.MIN_GRID_SIZE));
-
- new MapToolEventBus().getMainEventBus().post(new GridChanged(zone));
}
@Override
@@ -302,6 +297,12 @@ public void mouseDragged(java.awt.event.MouseEvent e) {
}
}
+ @Override
+ public void mouseMoved(java.awt.event.MouseEvent e) {
+ mouseX = e.getX();
+ mouseY = e.getY();
+ }
+
////
// MOUSE WHEEL LISTENER
/*
diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
index b23b3e53d0..60adb19071 100644
--- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
+++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
@@ -228,8 +228,6 @@ public class MapToolFrame extends DefaultDockableHolder implements WindowListene
private final DragImageGlassPane dragImageGlassPane = new DragImageGlassPane();
- private boolean dockingConfigured = false;
-
private final class KeyListenerDeleteDraw implements KeyListener {
private final JTree tree;
@@ -457,7 +455,8 @@ public MapToolFrame(JMenuBar menuBar) {
restorePreferences();
updateKeyStrokes();
- initializeFrames();
+ // This will cause the frame to be set to visible (BAD jide, BAD! No cookie for you!)
+ configureDocking();
new WindowPreferences(AppConstants.APP_NAME, "mainFrame", this);
chatTyperTimers = new ChatNotificationTimers();
@@ -546,6 +545,8 @@ public String getPropertyName() {
}
private void configureDocking() {
+ initializeFrames();
+
getDockingManager().setProfileKey(DOCKING_PROFILE_NAME);
getDockingManager().setOutlineMode(com.jidesoft.docking.DockingManager.PARTIAL_OUTLINE_MODE);
getDockingManager().setUsePref(false);
@@ -618,16 +619,6 @@ private void configureDocking() {
/* /Issue #2485 */
}
- @Override
- public void setVisible(boolean b) {
- if (!dockingConfigured) {
- dockingConfigured = true;
- configureDocking();
- }
-
- super.setVisible(b);
- }
-
public DockableFrame getFrame(MTFrame frame) {
return frameMap.get(frame);
}
@@ -1190,13 +1181,11 @@ public void mousePressed(MouseEvent e) {
tree.addSelectionInterval(rowIndex, rowIndex);
if (row instanceof DrawnElement && e.getClickCount() == 2) {
DrawnElement de = (DrawnElement) row;
- var renderer = getCurrentZoneRenderer();
- var zone = renderer.getZone();
getCurrentZoneRenderer()
.centerOn(
new ZonePoint(
- (int) de.getDrawable().getBounds(zone).getCenterX(),
- (int) de.getDrawable().getBounds(zone).getCenterY()));
+ (int) de.getDrawable().getBounds().getCenterX(),
+ (int) de.getDrawable().getBounds().getCenterY()));
}
/*
* int[] treeRows = tree.getSelectionRows(); java.util.Arrays.sort(treeRows); drawablesPanel.clearSelectedIds(); for (int i = 0; i < treeRows.length; i++) { TreePath p =
@@ -1960,8 +1949,8 @@ public void closingMaintenance() {
}
public void close() {
+ ServerDisconnectHandler.disconnectExpected = true;
MapTool.disconnect();
- MapTool.stopServer();
getDockingManager()
.saveLayoutDataToFile(AppUtil.getAppHome("config").getAbsolutePath() + "/layout.dat");
diff --git a/src/main/java/net/rptools/maptool/client/ui/Scale.java b/src/main/java/net/rptools/maptool/client/ui/Scale.java
index 10cdefac9e..cb19392ccd 100644
--- a/src/main/java/net/rptools/maptool/client/ui/Scale.java
+++ b/src/main/java/net/rptools/maptool/client/ui/Scale.java
@@ -17,50 +17,69 @@
import java.awt.Point;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.io.Serial;
import java.io.Serializable;
public class Scale implements Serializable {
- public static final String PROPERTY_SCALE = "scale";
- public static final String PROPERTY_OFFSET = "offset";
- private static final int MIN_ZOOM_LEVEL = -175;
- private static final int MAX_ZOOM_LEVEL = 175;
private final double oneToOneScale = 1; // Let this be configurable at some point
private double scale = oneToOneScale;
private final double scaleIncrement = .075;
private int zoomLevel = 0;
+
+ public static final String PROPERTY_SCALE = "scale";
+ public static final String PROPERTY_OFFSET = "offset";
+
+ private transient PropertyChangeSupport propertyChangeSupport;
+
private int offsetX;
private int offsetY;
- private transient PropertyChangeSupport propertyChangeSupport;
+
+ private final int width;
+ private final int height;
+
+ private boolean initialized;
+
+ // LEGACY for 1.3b31 and earlier
+ private transient int scaleIndex; // 'transient' prevents serialization; prep for 1.4
public Scale() {
- this.offsetX = 0;
- this.offsetY = 0;
+ this(0, 0);
+ }
+
+ public Scale(int width, int height) {
+ this.width = width;
+ this.height = height;
}
public Scale(Scale copy) {
+ this.width = copy.width;
+ this.height = copy.height;
this.offsetX = copy.offsetX;
this.offsetY = copy.offsetY;
- setScale(copy.scale);
- }
-
- @Serial
- private Object readResolve() {
- // Make sure the zoom level is correct.
- setScale(this.scale);
- return this;
+ this.zoomLevel = copy.zoomLevel;
+ this.initialized = copy.initialized;
+ this.scale = copy.scale;
+ // this.oneToOneScale = copy.oneToOneScale;
+ // this.scaleIncrement = copy.scaleIncrement;
}
public void addPropertyChangeListener(PropertyChangeListener listener) {
getPropertyChangeSupport().addPropertyChangeListener(listener);
}
+ public void addPropertyChangeListener(String property, PropertyChangeListener listener) {
+ getPropertyChangeSupport().addPropertyChangeListener(property, listener);
+ }
+
public void removePropertyChangeListener(PropertyChangeListener listener) {
getPropertyChangeSupport().removePropertyChangeListener(listener);
}
+ public void removePropertyChangeListener(String property, PropertyChangeListener listener) {
+ getPropertyChangeSupport().removePropertyChangeListener(property, listener);
+ }
+
public int getOffsetX() {
return offsetX;
}
@@ -91,28 +110,14 @@ public void setScale(double scale) {
}
// Determine zoomLevel appropriate for given scale
- var zoomLevel =
- (int) Math.round(Math.log(scale / oneToOneScale) / Math.log(1 + scaleIncrement));
- // Check that we haven't gone out of bounds with our zooming.
- if (zoomLevel < MIN_ZOOM_LEVEL) {
- setZoomLevel(MIN_ZOOM_LEVEL);
- } else if (zoomLevel > MAX_ZOOM_LEVEL) {
- setZoomLevel(MAX_ZOOM_LEVEL);
- } else {
- // Acceptable scale. Use it.
- var oldScale = this.scale;
- this.scale = scale;
- this.zoomLevel = zoomLevel;
- getPropertyChangeSupport().firePropertyChange(PROPERTY_SCALE, oldScale, this.scale);
- }
+ zoomLevel = (int) Math.round(Math.log(scale / oneToOneScale) / Math.log(1 + scaleIncrement));
+
+ setScaleNoZoomLevel(scale);
}
- private void setScaleFromZoomLevel() {
+ private void setScaleNoZoomLevel(double scale) {
double oldScale = this.scale;
-
- // Check for zero just to avoid any possible imprecision.
- this.scale =
- zoomLevel == 0 ? oneToOneScale : oneToOneScale * Math.pow(1 + scaleIncrement, zoomLevel);
+ this.scale = scale;
getPropertyChangeSupport().firePropertyChange(PROPERTY_SCALE, oldScale, scale);
}
@@ -121,28 +126,29 @@ public double getOneToOneScale() {
return oneToOneScale;
}
- public void reset() {
- setZoomLevel(0);
- }
+ public double reset() {
+ double oldScale = this.scale;
+ scale = oneToOneScale;
+ zoomLevel = 0;
- private void setZoomLevel(int zoomLevel) {
- this.zoomLevel = Math.clamp(zoomLevel, MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL);
- System.out.println(this.zoomLevel);
- setScaleFromZoomLevel();
+ getPropertyChangeSupport().firePropertyChange(PROPERTY_SCALE, oldScale, scale);
+ return oldScale;
}
- private void scaleUp() {
- setZoomLevel(zoomLevel + 1);
+ public double scaleUp() {
+ zoomLevel++;
+ setScaleNoZoomLevel(oneToOneScale * Math.pow(1 + scaleIncrement, zoomLevel));
+ return scale;
}
- private void scaleDown() {
- setZoomLevel(zoomLevel - 1);
+ public double scaleDown() {
+ zoomLevel--;
+ setScaleNoZoomLevel(oneToOneScale * Math.pow(1 + scaleIncrement, zoomLevel));
+ return scale;
}
public void zoomReset(int x, int y) {
- var oldScale = scale;
- reset();
- zoomTo(x, y, oldScale);
+ zoomTo(x, y, reset());
}
public void zoomIn(int x, int y) {
@@ -163,6 +169,10 @@ public void zoomScale(int x, int y, double scale) {
zoomTo(x, y, oldScale);
}
+ public boolean isInitialized() {
+ return initialized;
+ }
+
private PropertyChangeSupport getPropertyChangeSupport() {
if (propertyChangeSupport == null) {
propertyChangeSupport = new PropertyChangeSupport(this);
@@ -170,6 +180,37 @@ private PropertyChangeSupport getPropertyChangeSupport() {
return propertyChangeSupport;
}
+ /**
+ * Fit the image into the given space by finding the zoom level that allows the image to fit. Then
+ * center the image.
+ *
+ * @param width width of the image
+ * @param height height of the image
+ * @return true if this call did something, false if the init has already been called
+ */
+ public boolean initialize(int width, int height) {
+
+ if (initialized) {
+ return false;
+ }
+
+ centerIn(width, height);
+
+ initialized = true;
+ return true;
+ }
+
+ public void centerIn(int width, int height) {
+
+ int currWidth = (int) (this.width * getScale());
+ int currHeight = (int) (this.height * getScale());
+
+ int x = (width - currWidth) / 2;
+ int y = (height - currHeight) / 2;
+
+ setOffset(x, y);
+ }
+
private void zoomTo(int x, int y, double oldScale) {
// Keep the current pixel centered
diff --git a/src/main/java/net/rptools/maptool/client/ui/adjustgrid/AdjustGridPanel.java b/src/main/java/net/rptools/maptool/client/ui/adjustgrid/AdjustGridPanel.java
new file mode 100644
index 0000000000..722de0ce69
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/client/ui/adjustgrid/AdjustGridPanel.java
@@ -0,0 +1,467 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.client.ui.adjustgrid;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import javax.swing.AbstractAction;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import net.rptools.maptool.client.AppActions;
+import net.rptools.maptool.client.swing.SwingUtil;
+import net.rptools.maptool.client.ui.Scale;
+
+public class AdjustGridPanel extends JComponent
+ implements MouseListener, MouseMotionListener, MouseWheelListener {
+
+ private static final int MINIMUM_GRID_SIZE = 5;
+
+ private enum Direction {
+ Increase,
+ Decrease
+ }
+
+ public static final String PROPERTY_GRID_OFFSET_X = "gridOffsetX";
+ public static final String PROPERTY_GRID_OFFSET_Y = "gridOffsetY";
+ public static final String PROPERTY_GRID_SIZE = "gridSize";
+ public static final String PROPERTY_ZOOM = "zoom";
+
+ private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+
+ private int gridOffsetX = 0;
+ private int gridOffsetY = 0;
+ private int gridSize = 40;
+ private boolean showGrid = true;
+
+ private int mouseX;
+ private int mouseY;
+
+ private int dragStartX;
+ private int dragStartY;
+ private int dragOffsetX;
+ private int dragOffsetY;
+
+ private Color gridColor = Color.darkGray;
+
+ private BufferedImage image;
+
+ private Scale scale;
+
+ public AdjustGridPanel() {
+ setOpaque(false);
+ addMouseListener(this);
+ addMouseMotionListener(this);
+ addMouseWheelListener(this);
+
+ getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+ .put(AppActions.ZOOM_OUT.getKeyStroke(), "zoomOut");
+ getActionMap()
+ .put(
+ "zoomOut",
+ new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ zoomOut();
+ }
+ });
+
+ getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(AppActions.ZOOM_IN.getKeyStroke(), "zoomIn");
+ getActionMap()
+ .put(
+ "zoomIn",
+ new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ zoomIn();
+ }
+ });
+
+ getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+ .put(AppActions.ZOOM_RESET.getKeyStroke(), "zoomReset");
+ getActionMap()
+ .put(
+ "zoomReset",
+ new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ zoomReset();
+ }
+ });
+ }
+
+ public void setZoneImage(BufferedImage image) {
+ this.image = image;
+
+ scale = new Scale(image.getWidth(), image.getHeight());
+ }
+
+ public void setZoomIndex(int index) {
+ scale.setScale(index);
+ repaint();
+ }
+
+ @Override
+ protected void paintComponent(Graphics g) {
+
+ if (image == null) {
+ return;
+ }
+
+ Dimension size = getSize();
+
+ if (scale.initialize(size.width, size.height)) {
+ propertyChangeSupport.firePropertyChange(PROPERTY_ZOOM, 0, (int) scale.getScale());
+ }
+
+ // CALCULATIONS
+ Dimension imageSize = getScaledImageSize();
+ Point imagePosition = getScaledImagePosition();
+
+ double imgRatio = scale.getScale();
+
+ // SETUP
+ Graphics2D g2d = (Graphics2D) g;
+
+ // BG FILL
+ g2d.setColor(getBackground());
+ g2d.fillRect(0, 0, size.width, size.height);
+
+ // IMAGE
+ g2d.drawImage(image, imagePosition.x, imagePosition.y, imageSize.width, imageSize.height, null);
+ g2d.setColor(Color.black);
+ g2d.drawRect(imagePosition.x, imagePosition.y, imageSize.width, imageSize.height);
+
+ // GRID
+ g2d.setColor(gridColor);
+ double gridSize = this.gridSize * imgRatio;
+
+ // across
+ int x = imagePosition.x + (int) (gridOffsetX * imgRatio);
+ for (double i = gridSize; i <= imageSize.width; i += gridSize) {
+ g2d.drawLine(
+ x + (int) i, imagePosition.y, x + (int) i, imagePosition.y + imageSize.height - 1);
+ }
+
+ // down
+ int y = imagePosition.y + (int) (gridOffsetY * imgRatio);
+ for (double i = gridSize; i <= imageSize.height; i += gridSize) {
+ g2d.drawLine(
+ imagePosition.x, y + (int) i, imagePosition.x + imageSize.width - 1, y + (int) i);
+ }
+ }
+
+ public void setGridColor(Color color) {
+ gridColor = color;
+ }
+
+ @Override
+ public boolean isFocusable() {
+ return true;
+ }
+
+ public void setGridOffset(int offsetX, int offsetY) {
+ gridOffsetX = offsetX;
+ gridOffsetY = offsetY;
+
+ repaint();
+ }
+
+ public int getGridSize() {
+ return gridSize;
+ }
+
+ public int getGridOffsetX() {
+ return gridOffsetX;
+ }
+
+ public int getGridOffsetY() {
+ return gridOffsetY;
+ }
+
+ public void setGridSize(int size) {
+ gridSize = Math.max(MINIMUM_GRID_SIZE, size);
+ repaint();
+ }
+
+ private Dimension getScaledImageSize() {
+
+ Dimension imageSize = new Dimension(image.getWidth(), image.getHeight());
+ imageSize.width *= scale.getScale();
+ imageSize.height *= scale.getScale();
+
+ return imageSize;
+ }
+
+ private Point getScaledImagePosition() {
+
+ int imgX = scale.getOffsetX();
+ int imgY = scale.getOffsetY();
+
+ return new Point(imgX, imgY);
+ }
+
+ public void zoomIn() {
+ scale.zoomIn(mouseX, mouseY);
+ repaint();
+ }
+
+ public void zoomOut() {
+ scale.zoomOut(mouseX, mouseY);
+ repaint();
+ }
+
+ public void zoomReset() {
+ scale.reset();
+ repaint();
+ }
+
+ public void moveGridBy(int dx, int dy) {
+
+ int oldOffsetX = gridOffsetX;
+ int oldOffsetY = gridOffsetY;
+
+ gridOffsetX += dx;
+ gridOffsetY += dy;
+
+ gridOffsetX %= gridSize;
+ gridOffsetY %= gridSize;
+
+ if (gridOffsetY > 0) {
+ gridOffsetY = gridOffsetY - gridSize;
+ }
+
+ if (gridOffsetX > 0) {
+ gridOffsetX = gridOffsetX - gridSize;
+ }
+
+ repaint();
+
+ propertyChangeSupport.firePropertyChange(PROPERTY_GRID_OFFSET_X, oldOffsetX, gridOffsetX);
+ propertyChangeSupport.firePropertyChange(PROPERTY_GRID_OFFSET_Y, oldOffsetY, gridOffsetY);
+ }
+
+ public void adjustGridSize(int delta) {
+
+ int oldSize = gridSize;
+ gridSize = Math.max(MINIMUM_GRID_SIZE, gridSize + delta);
+
+ repaint();
+ propertyChangeSupport.firePropertyChange(PROPERTY_GRID_SIZE, oldSize, gridSize);
+ }
+
+ private void adjustGridSize(Direction direction) {
+
+ Point imagePosition = getScaledImagePosition();
+
+ double gridSize = this.gridSize * scale.getScale();
+
+ int cellX = (int) ((mouseX - imagePosition.x - gridOffsetX) / gridSize);
+ int cellY = (int) ((mouseY - imagePosition.y - gridOffsetY) / gridSize);
+
+ switch (direction) {
+ case Increase:
+ adjustGridSize(1);
+
+ if (this.gridSize != gridSize) {
+ moveGridBy(-cellX, -cellY);
+ }
+ break;
+ case Decrease:
+ adjustGridSize(-1);
+
+ if (this.gridSize != gridSize) {
+ moveGridBy(cellX, cellY);
+ }
+ break;
+ }
+ }
+
+ ////
+ // MOUSE LISTENER
+ @Override
+ public void mouseClicked(MouseEvent e) {}
+
+ @Override
+ public void mouseEntered(MouseEvent e) {}
+
+ @Override
+ public void mouseExited(MouseEvent e) {}
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+
+ mouseX = e.getX();
+ mouseY = e.getY();
+
+ dragStartX = e.getX();
+ dragStartY = e.getY();
+
+ Point imagePosition = getScaledImagePosition();
+
+ int x = (int) ((e.getX() - imagePosition.x) / scale.getScale() - gridOffsetX);
+ int y = (int) ((e.getY() - imagePosition.y) / scale.getScale() - gridOffsetY);
+
+ dragOffsetX = x % gridSize;
+ dragOffsetY = y % gridSize;
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {}
+
+ ////
+ // MOUSE MOTION LISTENER
+ @Override
+ public void mouseDragged(MouseEvent e) {
+
+ if (SwingUtilities.isLeftMouseButton(e)) {
+
+ Point imagePosition = getScaledImagePosition();
+
+ int x = (int) ((e.getX() - imagePosition.x) / scale.getScale() - dragOffsetX);
+ int y = (int) ((e.getY() - imagePosition.y) / scale.getScale() - dragOffsetY);
+
+ int oldOffsetX = gridOffsetX;
+ int oldOffsetY = gridOffsetY;
+
+ gridOffsetX = x % gridSize;
+ gridOffsetY = y % gridSize;
+
+ if (gridOffsetY > 0) {
+ gridOffsetY = gridOffsetY - gridSize;
+ }
+
+ if (gridOffsetX > 0) {
+ gridOffsetX = gridOffsetX - gridSize;
+ }
+
+ repaint();
+ propertyChangeSupport.firePropertyChange(PROPERTY_GRID_OFFSET_X, oldOffsetX, gridOffsetX);
+ propertyChangeSupport.firePropertyChange(PROPERTY_GRID_OFFSET_Y, oldOffsetY, gridOffsetY);
+ } else {
+ int offsetX = scale.getOffsetX() + e.getX() - dragStartX;
+ int offsetY = scale.getOffsetY() + e.getY() - dragStartY;
+
+ scale.setOffset(offsetX, offsetY);
+
+ dragStartX = e.getX();
+ dragStartY = e.getY();
+
+ repaint();
+ }
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e) {
+
+ Dimension imgSize = getScaledImageSize();
+ Point imgPos = getScaledImagePosition();
+
+ boolean insideMap =
+ e.getX() > imgPos.x
+ && e.getX() < imgPos.x + imgSize.width
+ && e.getY() > imgPos.y
+ && e.getY() < imgPos.y + imgSize.height;
+ if ((insideMap && showGrid) || (!insideMap && !showGrid)) {
+ showGrid = !insideMap;
+ repaint();
+ }
+
+ mouseX = e.getX();
+ mouseY = e.getY();
+ }
+
+ ////
+ // MOUSE WHEEL LISTENER
+ @Override
+ public void mouseWheelMoved(MouseWheelEvent e) {
+ // Fix for hi-res mice
+ if (e.getWheelRotation() == 0) {
+ return;
+ }
+ if (SwingUtil.isControlDown(e)) {
+
+ double oldScale = scale.getScale();
+ if (e.getWheelRotation() > 0) {
+ scale.zoomOut(e.getX(), e.getY());
+ } else {
+ scale.zoomIn(e.getX(), e.getY());
+ }
+ propertyChangeSupport.firePropertyChange(PROPERTY_ZOOM, oldScale, scale.getScale());
+ } else {
+
+ if (e.getWheelRotation() > 0) {
+
+ adjustGridSize(Direction.Increase);
+ } else {
+
+ adjustGridSize(Direction.Decrease);
+ }
+ }
+ repaint();
+ }
+
+ ////
+ // PROPERTY CHANGE SUPPORT
+ @Override
+ public void addPropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.addPropertyChangeListener(listener);
+ }
+
+ @Override
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.removePropertyChangeListener(listener);
+ }
+
+ @Override
+ public void addPropertyChangeListener(String name, PropertyChangeListener listener) {
+ propertyChangeSupport.addPropertyChangeListener(name, listener);
+ }
+
+ @Override
+ public void removePropertyChangeListener(String name, PropertyChangeListener listener) {
+ propertyChangeSupport.removePropertyChangeListener(name, listener);
+ }
+ /*
+ * private final Map KEYSTROKES = new HashMap() { { put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.SHIFT_DOWN_MASK), new GridSizeAction(Size.Decrease));
+ * put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.SHIFT_DOWN_MASK), new GridSizeAction(Size.Decrease)); put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_DOWN_MASK), new
+ * GridSizeAction(Size.Increase)); put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.SHIFT_DOWN_MASK), new GridSizeAction(Size.Increase)); put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0), new
+ * GridOffsetAction(GridOffsetAction.Direction.Up)); put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), new GridOffsetAction(GridOffsetAction.Direction.Left));
+ * put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0), new GridOffsetAction(GridOffsetAction.Direction.Down)); put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), new
+ * GridOffsetAction(GridOffsetAction.Direction.Right)); } }; protected Map getKeyActionMap() { return KEYSTROKES; }
+ *
+ * private final class GridSizeAction extends AbstractAction { private final Size size; public GridSizeAction(Size size) { this.size = size; }
+ *
+ * public void actionPerformed(ActionEvent e) { ZoneRenderer renderer = (ZoneRenderer) e.getSource(); adjustGridSize(renderer, size); } }
+ *
+ * private static final class GridOffsetAction extends AbstractAction { private static enum Direction { Left, Right, Up, Down }; private final Direction direction;
+ *
+ * public GridOffsetAction(Direction direction) { this.direction = direction; }
+ *
+ * public void actionPerformed(ActionEvent e) { ZoneRenderer renderer = (ZoneRenderer) e.getSource(); switch (direction) { case Left: renderer.moveGridBy(-1, 0); break; case Right:
+ * renderer.moveGridBy(1, 0); break; case Up: renderer.moveGridBy(0, -1); break; case Down: renderer.moveGridBy(0, 1); break; } } }
+ */
+}
diff --git a/src/main/java/net/rptools/maptool/client/ui/adjustgrid/AdvancedAdjustGridPanel.java b/src/main/java/net/rptools/maptool/client/ui/adjustgrid/AdvancedAdjustGridPanel.java
new file mode 100644
index 0000000000..d8a89beef0
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/client/ui/adjustgrid/AdvancedAdjustGridPanel.java
@@ -0,0 +1,468 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.client.ui.adjustgrid;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.awt.image.BufferedImage;
+import javax.swing.AbstractAction;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import net.rptools.maptool.client.AppActions;
+import net.rptools.maptool.client.ui.Scale;
+
+public class AdvancedAdjustGridPanel extends JComponent
+ implements MouseListener, MouseMotionListener, MouseWheelListener {
+
+ private static final int MINIMUM_GRID_SIZE = 5;
+
+ private int gridCountX = 10;
+ private int gridCountY = 10;
+ private boolean showGrid = true;
+
+ private int mouseX;
+ private int mouseY;
+
+ private BufferedImage image;
+
+ private Scale scale;
+
+ private enum Handle {
+ TOP,
+ BOTTOM,
+ LEFT,
+ RIGHT
+ }
+
+ private int topGrid;
+ private int bottomGrid;
+ private int leftGrid;
+ private int rightGrid;
+
+ private boolean showRows = true;
+ private boolean showCols = true;
+
+ private Handle draggingHandle;
+
+ public AdvancedAdjustGridPanel() {
+ setOpaque(false);
+ addMouseListener(this);
+ addMouseMotionListener(this);
+ addMouseWheelListener(this);
+
+ getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+ .put(AppActions.ZOOM_OUT.getKeyStroke(), "zoomOut");
+ getActionMap()
+ .put(
+ "zoomOut",
+ new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ zoomOut();
+ }
+ });
+
+ getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(AppActions.ZOOM_IN.getKeyStroke(), "zoomIn");
+ getActionMap()
+ .put(
+ "zoomIn",
+ new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ zoomIn();
+ }
+ });
+
+ getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+ .put(AppActions.ZOOM_RESET.getKeyStroke(), "zoomReset");
+ getActionMap()
+ .put(
+ "zoomReset",
+ new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ zoomReset();
+ }
+ });
+ }
+
+ public Rectangle getGridBounds() {
+ return new Rectangle(topGrid, leftGrid, rightGrid - leftGrid, bottomGrid - topGrid);
+ }
+
+ public void setZoneImage(BufferedImage image) {
+ this.image = image;
+
+ topGrid = 0;
+ bottomGrid = image.getHeight();
+ leftGrid = 0;
+ rightGrid = image.getWidth();
+
+ scale = new Scale(image.getWidth(), image.getHeight());
+ }
+
+ public void setShowRows(boolean show) {
+ showRows = show;
+ }
+
+ public void setShowCols(boolean show) {
+ showCols = show;
+ }
+
+ @Override
+ protected void paintComponent(Graphics g) {
+
+ if (image == null) {
+ return;
+ }
+
+ Dimension size = getSize();
+
+ scale.initialize(size.width, size.height);
+
+ // CALCULATIONS
+ Dimension imageSize = getScaledImageSize();
+ Point imagePosition = getScaledImagePosition();
+
+ double imgRatio = scale.getScale();
+
+ // handles
+ int top = (int) (topGrid * imgRatio);
+ int bottom = (int) (bottomGrid * imgRatio);
+ int left = (int) (leftGrid * imgRatio);
+ int right = (int) (rightGrid * imgRatio);
+
+ // SETUP
+ Graphics2D g2d = (Graphics2D) g;
+
+ // BG FILL
+ g2d.setColor(getBackground());
+ g2d.fillRect(0, 0, size.width, size.height);
+
+ // IMAGE
+ g2d.drawImage(image, imagePosition.x, imagePosition.y, imageSize.width, imageSize.height, null);
+
+ // GRID
+ g2d.setColor(Color.blue);
+ double dx = ((rightGrid - leftGrid) / (float) gridCountX) * imgRatio;
+ double dy = ((bottomGrid - topGrid) / (float) gridCountY) * imgRatio;
+
+ // across
+ if (showCols) {
+ int x = imagePosition.x + left;
+ for (int i = 0; i < gridCountX; i++) {
+ g2d.drawLine(
+ x + (int) (i * dx),
+ imagePosition.y + top,
+ x + (int) (i * dx),
+ imagePosition.y + bottom);
+ }
+ }
+
+ // down
+ if (showRows) {
+ int y = imagePosition.y + top;
+ for (int i = 0; i < gridCountY; i++) {
+ g2d.drawLine(
+ imagePosition.x + left,
+ y + (int) (i * dy),
+ imagePosition.x + right,
+ y + (int) (i * dy));
+ }
+ }
+
+ // HANDLES
+ int handleSize = 10;
+
+ Object oldValue = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+ g2d.setColor(Color.red);
+
+ // Top
+ int halfHandleX = imagePosition.x + imageSize.width / 2;
+ g2d.fillRect(halfHandleX - handleSize, top + imagePosition.y - 3, handleSize * 2, 3);
+ g2d.drawLine(
+ imagePosition.x - handleSize,
+ top + imagePosition.y,
+ imagePosition.x + imageSize.width + handleSize,
+ top + imagePosition.y);
+
+ // Bottom
+ g2d.fillRect(halfHandleX - handleSize, bottom + imagePosition.y + 1, handleSize * 2, 3);
+ g2d.drawLine(
+ imagePosition.x - handleSize,
+ bottom + imagePosition.y,
+ imagePosition.x + imageSize.width + handleSize,
+ bottom + imagePosition.y);
+
+ // Left
+ int halfHandleY = imagePosition.y + imageSize.height / 2;
+ g2d.fillRect(left + imagePosition.x - 3, halfHandleY - handleSize, 3, handleSize * 2);
+ g2d.drawLine(
+ left + imagePosition.x,
+ imagePosition.y - handleSize,
+ left + imagePosition.x,
+ imagePosition.y + imageSize.height + handleSize);
+
+ // Right
+ g2d.fillRect(right + 1 + imagePosition.x, halfHandleY - handleSize, 3, handleSize * 2);
+ g2d.drawLine(
+ right + imagePosition.x,
+ imagePosition.y - handleSize,
+ right + imagePosition.x,
+ imagePosition.y + imageSize.height + handleSize);
+
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldValue);
+ }
+
+ @Override
+ public boolean isFocusable() {
+ return true;
+ }
+
+ public void setGridCountX(int count) {
+ gridCountX = count;
+ repaint();
+ }
+
+ public void setGridCountY(int count) {
+ gridCountY = count;
+ repaint();
+ }
+
+ private float getScaledImageRatio() {
+ return getScaledImageSize().width / (float) image.getWidth();
+ }
+
+ private Dimension getScaledImageSize() {
+
+ Dimension imageSize = new Dimension(image.getWidth(), image.getHeight());
+ imageSize.width *= scale.getScale();
+ imageSize.height *= scale.getScale();
+
+ return imageSize;
+ }
+
+ private Point getScaledImagePosition() {
+ Dimension size = getSize();
+ Dimension imageSize = getScaledImageSize();
+
+ int imgX = scale.getOffsetX();
+ int imgY = scale.getOffsetY();
+
+ return new Point(imgX, imgY);
+ }
+
+ private void updateHandles(MouseEvent e) {
+ // Convert
+ float imgRatio = getScaledImageRatio();
+ Point imgPosition = getScaledImagePosition();
+
+ Point location = e.getPoint();
+ location.translate(-imgPosition.x, -imgPosition.y);
+
+ location = new Point((int) (location.x / imgRatio), (int) (location.y / imgRatio));
+
+ switch (draggingHandle) {
+ case TOP:
+ {
+ if (location.y < 0) {
+ location.y = 0;
+ }
+ if (location.y > bottomGrid - MINIMUM_GRID_SIZE) {
+ location.y = bottomGrid - MINIMUM_GRID_SIZE;
+ }
+
+ topGrid = location.y;
+ break;
+ }
+ case BOTTOM:
+ {
+ if (location.y < topGrid + MINIMUM_GRID_SIZE) {
+ location.y = topGrid + MINIMUM_GRID_SIZE;
+ }
+ if (location.y > image.getHeight()) {
+ location.y = image.getHeight();
+ }
+
+ bottomGrid = location.y;
+ break;
+ }
+ case LEFT:
+ {
+ if (location.x < 0) {
+ location.x = 0;
+ }
+ if (location.x > rightGrid - MINIMUM_GRID_SIZE) {
+ location.x = rightGrid - MINIMUM_GRID_SIZE;
+ }
+
+ leftGrid = location.x;
+ break;
+ }
+ case RIGHT:
+ {
+ if (location.x < leftGrid + MINIMUM_GRID_SIZE) {
+ location.x = leftGrid + MINIMUM_GRID_SIZE;
+ }
+ if (location.x > image.getWidth()) {
+ location.x = image.getWidth();
+ }
+
+ rightGrid = location.x;
+ break;
+ }
+ }
+ repaint();
+ }
+
+ public void zoomIn() {
+ scale.zoomIn(mouseX, mouseY);
+ repaint();
+ }
+
+ public void zoomOut() {
+ scale.zoomOut(mouseX, mouseY);
+ repaint();
+ }
+
+ public void zoomReset() {
+ scale.reset();
+ repaint();
+ }
+
+ ////
+ // MOUSE LISTENER
+ @Override
+ public void mouseClicked(MouseEvent e) {}
+
+ @Override
+ public void mouseEntered(MouseEvent e) {}
+
+ @Override
+ public void mouseExited(MouseEvent e) {}
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+
+ if (SwingUtilities.isLeftMouseButton(e)) {
+ float imgRatio = getScaledImageRatio();
+ Point imgPos = getScaledImagePosition();
+
+ int top = (int) (topGrid * imgRatio) + imgPos.y;
+ int bottom = (int) (bottomGrid * imgRatio) + imgPos.y;
+ int left = (int) (leftGrid * imgRatio) + imgPos.x;
+ int right = (int) (rightGrid * imgRatio) + imgPos.x;
+
+ int distTop = Math.abs(e.getY() - top);
+ int distBottom = Math.abs(e.getY() - bottom);
+ int distLeft = Math.abs(e.getX() - left);
+ int distRight = Math.abs(e.getX() - right);
+
+ int dist = distTop;
+ draggingHandle = Handle.TOP;
+
+ if (distBottom < dist) {
+ dist = distBottom;
+ draggingHandle = Handle.BOTTOM;
+ }
+ if (distLeft < dist) {
+ dist = distLeft;
+ draggingHandle = Handle.LEFT;
+ }
+ if (distRight < dist) {
+ dist = distRight;
+ draggingHandle = Handle.RIGHT;
+ }
+
+ updateHandles(e);
+ } else {
+ mouseX = e.getX();
+ mouseY = e.getY();
+ }
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ draggingHandle = null;
+
+ repaint();
+ }
+
+ ////
+ // MOUSE MOTION LISTENER
+ @Override
+ public void mouseDragged(MouseEvent e) {
+
+ if (SwingUtilities.isLeftMouseButton(e)) {
+ updateHandles(e);
+ } else {
+ int offsetX = scale.getOffsetX() + e.getX() - mouseX;
+ int offsetY = scale.getOffsetY() + e.getY() - mouseY;
+
+ scale.setOffset(offsetX, offsetY);
+
+ mouseX = e.getX();
+ mouseY = e.getY();
+ }
+
+ repaint();
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e) {
+
+ Dimension imgSize = getScaledImageSize();
+ Point imgPos = getScaledImagePosition();
+
+ boolean insideMap =
+ e.getX() > imgPos.x
+ && e.getX() < imgPos.x + imgSize.width
+ && e.getY() > imgPos.y
+ && e.getY() < imgPos.y + imgSize.height;
+ if ((insideMap && showGrid) || (!insideMap && !showGrid)) {
+ showGrid = !insideMap;
+ repaint();
+ }
+
+ mouseX = e.getX();
+ mouseY = e.getY();
+ }
+
+ ////
+ // MOUSE WHEEL LISTENER
+ @Override
+ public void mouseWheelMoved(MouseWheelEvent e) {
+ if (e.getWheelRotation() < 0) {
+ scale.zoomIn(e.getX(), e.getY());
+ } else if (e.getWheelRotation() > 0) {
+ scale.zoomOut(e.getX(), e.getY());
+ }
+
+ repaint();
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/client/ui/connectioninfodialog/ConnectionInfoDialog.java b/src/main/java/net/rptools/maptool/client/ui/connectioninfodialog/ConnectionInfoDialog.java
index 8ab2d5f611..d966c4a8a4 100644
--- a/src/main/java/net/rptools/maptool/client/ui/connectioninfodialog/ConnectionInfoDialog.java
+++ b/src/main/java/net/rptools/maptool/client/ui/connectioninfodialog/ConnectionInfoDialog.java
@@ -103,8 +103,8 @@ public ConnectionInfoDialog(MapToolServer server) {
JTextField portLabel = panel.getTextField("port");
externalAddressLabel = panel.getTextField("externalAddress");
- String name = server.getName();
- if (name == null || name.isEmpty()) {
+ String name = server.getConfig().getServerName();
+ if (name == null) {
name = "---";
}
@@ -122,14 +122,14 @@ public ConnectionInfoDialog(MapToolServer server) {
log.warn("Can't resolve our own IPv6 address!?", e);
}
- int port = server.getPort();
- String portString = port < 0 ? "---" : Integer.toString(port);
+ String port =
+ MapTool.isPersonalServer() ? "---" : Integer.toString(server.getConfig().getPort());
nameLabel.setText(name);
localv4AddressLabel.setText(localv4Address);
localv6AddressLabel.setText(localv6Address);
externalAddressLabel.setText(I18N.getText("ConnectionInfoDialog.discovering"));
- portLabel.setText(portString);
+ portLabel.setText(port);
JButton okButton = (JButton) panel.getButton("okButton");
bindOKButtonActions(okButton);
diff --git a/src/main/java/net/rptools/maptool/client/ui/connections/ClientConnectionPanel.java b/src/main/java/net/rptools/maptool/client/ui/connections/ClientConnectionPanel.java
index f2a5d95fa1..ef6771b347 100644
--- a/src/main/java/net/rptools/maptool/client/ui/connections/ClientConnectionPanel.java
+++ b/src/main/java/net/rptools/maptool/client/ui/connections/ClientConnectionPanel.java
@@ -33,7 +33,7 @@
import net.rptools.maptool.client.events.PlayerConnected;
import net.rptools.maptool.client.events.PlayerDisconnected;
import net.rptools.maptool.client.events.PlayerStatusChanged;
-import net.rptools.maptool.client.events.ServerDisconnected;
+import net.rptools.maptool.client.events.ServerStopped;
import net.rptools.maptool.client.swing.PopupListener;
import net.rptools.maptool.events.MapToolEventBus;
import net.rptools.maptool.language.I18N;
@@ -128,7 +128,7 @@ private void onPlayerDisconnected(PlayerDisconnected event) {
}
@Subscribe
- private void onServerDisconnected(ServerDisconnected event) {
+ private void onServerStopped(ServerStopped event) {
listModel.clear();
}
diff --git a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelPopupMenu.java b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelPopupMenu.java
index 671e9a5e3a..520271eb8c 100644
--- a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelPopupMenu.java
+++ b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelPopupMenu.java
@@ -279,14 +279,14 @@ public void actionPerformed(ActionEvent e) {
// only bother doing stuff if more than one selected
List drawableList = renderer.getZone().getAllDrawnElements();
Iterator iter = drawableList.iterator();
- Area a = elementUnderMouse.getDrawable().getArea(renderer.getZone());
+ Area a = elementUnderMouse.getDrawable().getArea();
while (iter.hasNext()) {
DrawnElement de = iter.next();
if (selectedDrawSet.contains(de.getDrawable().getId())) {
renderer.getZone().removeDrawable(de.getDrawable().getId());
MapTool.serverCommand().undoDraw(renderer.getZone().getId(), de.getDrawable().getId());
de.getDrawable().setLayer(elementUnderMouse.getDrawable().getLayer());
- if (!de.equals(elementUnderMouse)) a.add(de.getDrawable().getArea(renderer.getZone()));
+ if (!de.equals(elementUnderMouse)) a.add(de.getDrawable().getArea());
}
}
Shape s = a;
diff --git a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java
index b0c4c3747c..296bf97335 100644
--- a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java
+++ b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java
@@ -29,6 +29,7 @@
import javax.swing.tree.TreePath;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.events.MapToolEventBus;
+import net.rptools.maptool.language.I18N;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.drawing.AbstractTemplate;
import net.rptools.maptool.model.drawing.DrawablesGroup;
@@ -55,12 +56,18 @@ public static View getByLayer(Zone.Layer layer) {
return byLayer.get(layer);
}
+ private final String displayName;
private final Zone.Layer layer;
private View(Zone.Layer layer) {
+ this.displayName = I18N.getText("panel.DrawExplorer.View." + layer.name());
this.layer = layer;
}
+ public String getDisplayName() {
+ return displayName;
+ }
+
public Zone.Layer getLayer() {
return layer;
}
diff --git a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawablesPanel.java b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawablesPanel.java
index de27f8cf96..6c80cb4b2a 100644
--- a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawablesPanel.java
+++ b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawablesPanel.java
@@ -80,12 +80,12 @@ protected void paintComponent(Graphics g) {
}
if (drawableList.size() > 0) {
Collections.reverse(drawableList);
- Rectangle bounds = getBounds(zone, drawableList);
+ Rectangle bounds = getBounds(drawableList);
double scale =
(double) Math.min(MAX_PANEL_SIZE, getSize().width) / (double) bounds.width;
if ((bounds.height * scale) > MAX_PANEL_SIZE)
scale = (double) Math.min(MAX_PANEL_SIZE, getSize().height) / (double) bounds.height;
- g.drawImage(drawDrawables(zone, drawableList, bounds, scale, onlyCuts), 0, 0, null);
+ g.drawImage(drawDrawables(drawableList, bounds, scale, onlyCuts), 0, 0, null);
}
}
}
@@ -93,11 +93,7 @@ protected void paintComponent(Graphics g) {
}
private BufferedImage drawDrawables(
- Zone zone,
- List drawableList,
- Rectangle viewport,
- double scale,
- boolean showEraser) {
+ List drawableList, Rectangle viewport, double scale, boolean showEraser) {
BufferedImage backBuffer =
new BufferedImage(
(int) (viewport.width * scale),
@@ -130,33 +126,24 @@ private BufferedImage drawDrawables(
if (drawable instanceof DrawablesGroup) {
g.drawImage(
drawDrawables(
- zone,
- ((DrawablesGroup) drawable).getDrawableList(),
- new Rectangle(viewport),
- 1,
- false),
+ ((DrawablesGroup) drawable).getDrawableList(), new Rectangle(viewport), 1, false),
viewport.x,
viewport.y,
null);
- } else {
- drawable.draw(zone, g, pen);
- }
+ } else drawable.draw(g, pen);
g.setComposite(oldComposite);
}
g.dispose();
return backBuffer;
}
- private Rectangle getBounds(Zone zone, List drawableList) {
+ private Rectangle getBounds(List drawableList) {
Rectangle bounds = null;
for (DrawnElement element : drawableList) {
// Empty drawables are created by right clicking during the draw process
// and need to be skipped.
- Rectangle drawnBounds = element.getDrawable().getBounds(zone);
- if (drawnBounds == null) {
- continue;
- }
- drawnBounds = new Rectangle(drawnBounds);
+ if (element.getDrawable().getBounds() == null) continue;
+ Rectangle drawnBounds = new Rectangle(element.getDrawable().getBounds());
// Handle pen size
Pen pen = element.getPen();
int penSize = pen.getForegroundMode() == Pen.MODE_TRANSPARENT ? 0 : (int) pen.getThickness();
diff --git a/src/main/java/net/rptools/maptool/client/ui/exportdialog/ExportDialog.java b/src/main/java/net/rptools/maptool/client/ui/exportdialog/ExportDialog.java
index cbf494e71c..4ec0f65da0 100644
--- a/src/main/java/net/rptools/maptool/client/ui/exportdialog/ExportDialog.java
+++ b/src/main/java/net/rptools/maptool/client/ui/exportdialog/ExportDialog.java
@@ -883,7 +883,7 @@ public Rectangle zoneExtents(PlayerView view) {
}
Drawable drawable = element.getDrawable();
- Rectangle drawnBounds = new Rectangle(drawable.getBounds(zone));
+ Rectangle drawnBounds = new Rectangle(drawable.getBounds());
// Handle pen size
// This slightly over-estimates the size of the pen, but we want to
diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLFrame.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLFrame.java
index a3b2ba9cbc..ce95f272b4 100644
--- a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLFrame.java
+++ b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLFrame.java
@@ -310,7 +310,7 @@ public void updateContents(
/** Run all callback macros for "onChangeSelection". */
public static void doSelectedChanged() {
for (HTMLFrame frame : frames.values()) {
- if (!frame.isHidden()) {
+ if (frame.isVisible()) {
HTMLPanelContainer.selectedChanged(frame.macroCallbacks);
}
}
@@ -319,7 +319,7 @@ public static void doSelectedChanged() {
/** Run all callback macros for "onChangeImpersonated". */
public static void doImpersonatedChanged() {
for (HTMLFrame frame : frames.values()) {
- if (!frame.isHidden()) {
+ if (frame.isVisible()) {
HTMLPanelContainer.impersonatedChanged(frame.macroCallbacks);
}
}
@@ -333,7 +333,7 @@ public static void doImpersonatedChanged() {
public static void doTokenChanged(Token token) {
if (token != null) {
for (HTMLFrame frame : frames.values()) {
- if (!frame.isHidden()) {
+ if (frame.isVisible()) {
HTMLPanelContainer.tokenChanged(token, frame.macroCallbacks);
}
}
diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLWebViewManager.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLWebViewManager.java
index 942e473cda..e6b16cd3dd 100644
--- a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLWebViewManager.java
+++ b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLWebViewManager.java
@@ -17,31 +17,21 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import com.sun.webkit.WebPage;
import com.sun.webkit.dom.HTMLSelectElementImpl;
import java.awt.*;
import java.awt.event.ActionListener;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.util.LinkedList;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.regex.Matcher;
import javafx.beans.value.ObservableValue;
import javafx.concurrent.Worker;
-import javafx.event.EventType;
import javafx.scene.Scene;
import javafx.scene.control.ButtonType;
import javafx.scene.control.TextInputDialog;
-import javafx.scene.input.DataFormat;
-import javafx.scene.input.DragEvent;
-import javafx.scene.input.Dragboard;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.TransferMode;
import javafx.scene.web.*;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
@@ -241,8 +231,6 @@ public void setupWebView(WebView webView) {
webEngine.setCreatePopupHandler(HTMLWebViewManager::showPopup);
webEngine.setOnError(HTMLWebViewManager::showError);
- addWorkaroundFor3679(this.webView);
-
// Workaround to load Java Bridge before everything else.
webEngine.onStatusChangedProperty().set(this::setBridge);
}
@@ -779,141 +767,4 @@ private int getHScrollValue() {
private void scrollTo(int x, int y) {
webEngine.executeScript("window.scrollTo(" + x + ", " + y + ")");
}
-
- // region Drag-and-drop workaround for [#3679](https://github.com/RPTools/maptool/issues/3679)
- // This is exactly what WebView itself does, except that we do not cache the mimes and values.
- // Doing so leads to more questions than answers and lacking invalidation causes the bug.
-
- private static void addWorkaroundFor3679(WebView webView) {
- final var webEngine = webView.getEngine();
- final WebPage page;
- try {
- MethodHandles.Lookup lookup = MethodHandles.lookup();
- lookup = MethodHandles.privateLookupIn(WebEngine.class, lookup);
- MethodHandle getPageHandle = lookup.findGetter(WebEngine.class, "page", WebPage.class);
-
- page = (WebPage) getPageHandle.invokeExact(webEngine);
- } catch (Throwable throwable) {
- log.error("Unable to access WebPage from WebEngine", throwable);
- return;
- }
-
- webView.setOnDragEntered(event -> dragHandler(page, event));
- webView.setOnDragExited(event -> dragHandler(page, event));
- webView.setOnDragOver(event -> dragHandler(page, event));
- webView.setOnDragDropped(event -> dragHandler(page, event));
- webView.setOnDragDetected(event -> onDragDetected(page, event));
- webView.setOnDragDone(event -> onDragDone(page, event));
- }
-
- private static int getWKDndEventType(EventType et) {
- int commandId = 0;
- if (et == DragEvent.DRAG_ENTERED) {
- commandId = WebPage.DND_DST_ENTER;
- } else if (et == DragEvent.DRAG_EXITED) {
- commandId = WebPage.DND_DST_EXIT;
- } else if (et == DragEvent.DRAG_OVER) {
- commandId = WebPage.DND_DST_OVER;
- } else if (et == DragEvent.DRAG_DROPPED) {
- commandId = WebPage.DND_DST_DROP;
- }
- return commandId;
- }
-
- private static final int WK_DND_ACTION_NONE = 0x0;
- private static final int WK_DND_ACTION_COPY = 0x1;
- private static final int WK_DND_ACTION_MOVE = 0x2;
- private static final int WK_DND_ACTION_LINK = 0x40000000;
-
- private static int getWKDndAction(TransferMode... tms) {
- int dndActionId = WK_DND_ACTION_NONE;
- for (TransferMode tm : tms) {
- if (tm == TransferMode.COPY) {
- dndActionId |= WK_DND_ACTION_COPY;
- } else if (tm == TransferMode.MOVE) {
- dndActionId |= WK_DND_ACTION_MOVE;
- } else if (tm == TransferMode.LINK) {
- dndActionId |= WK_DND_ACTION_LINK;
- }
- }
- return dndActionId;
- }
-
- private static TransferMode[] getFXDndAction(int wkDndAction) {
- LinkedList tms = new LinkedList<>();
- if ((wkDndAction & WK_DND_ACTION_COPY) != 0) {
- tms.add(TransferMode.COPY);
- }
- if ((wkDndAction & WK_DND_ACTION_MOVE) != 0) {
- tms.add(TransferMode.MOVE);
- }
- if ((wkDndAction & WK_DND_ACTION_LINK) != 0) {
- tms.add(TransferMode.LINK);
- }
- return tms.toArray(new TransferMode[0]);
- }
-
- // Drag target
-
- private static void dragHandler(WebPage page, DragEvent event) {
- try {
- Dragboard db = event.getDragboard();
- LinkedList mimes = new LinkedList<>();
- LinkedList values = new LinkedList<>();
- for (DataFormat df : db.getContentTypes()) {
- Object content = db.getContent(df);
- if (content != null) {
- for (String mime : df.getIdentifiers()) {
- mimes.add(mime);
- values.add(content.toString());
- }
- }
- }
-
- if (!mimes.isEmpty()) {
- int wkDndEventType = getWKDndEventType(event.getEventType());
- int wkDndAction =
- page.dispatchDragOperation(
- wkDndEventType,
- mimes.toArray(new String[0]),
- values.toArray(new String[0]),
- (int) event.getX(),
- (int) event.getY(),
- (int) event.getScreenX(),
- (int) event.getScreenY(),
- getWKDndAction(db.getTransferModes().toArray(new TransferMode[0])));
-
- if (!(wkDndEventType == WebPage.DND_DST_DROP && wkDndAction == WK_DND_ACTION_NONE)) {
- event.acceptTransferModes(getFXDndAction(wkDndAction));
- }
- event.consume();
- }
- } catch (SecurityException ex) {
- log.error("Security exception", ex);
- }
- }
-
- // Drag source
-
- private static void onDragDetected(WebPage page, MouseEvent event) {
- if (page.isDragConfirmed()) {
- page.confirmStartDrag();
- event.consume();
- }
- }
-
- private static void onDragDone(WebPage page, DragEvent event) {
- page.dispatchDragOperation(
- WebPage.DND_SRC_DROP,
- null,
- null,
- (int) event.getX(),
- (int) event.getY(),
- (int) event.getScreenX(),
- (int) event.getScreenY(),
- getWKDndAction(event.getAcceptedTransferMode()));
- event.consume();
- }
-
- // endregion
}
diff --git a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/buttongroups/ButtonGroupPopupMenu.java b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/buttongroups/ButtonGroupPopupMenu.java
index c231d33bd4..f113f32a02 100644
--- a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/buttongroups/ButtonGroupPopupMenu.java
+++ b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/buttongroups/ButtonGroupPopupMenu.java
@@ -40,7 +40,7 @@
import net.rptools.maptool.model.MacroButtonProperties;
import net.rptools.maptool.model.Token;
import net.rptools.maptool.util.PersistenceUtil;
-import org.apache.commons.lang.StringUtils;
+import org.eclipse.jetty.util.StringUtil;
@SuppressWarnings("serial")
public class ButtonGroupPopupMenu extends JPopupMenu {
@@ -278,7 +278,7 @@ public void actionPerformed(ActionEvent event) {
}
if (alreadyExists) {
String tokenName = token.getName();
- if (MapTool.getPlayer().isGM() && !StringUtils.isEmpty(token.getGMName())) {
+ if (MapTool.getPlayer().isGM() && !StringUtil.isEmpty(token.getGMName())) {
tokenName = tokenName + "(" + token.getGMName() + ")";
}
alreadyExists =
@@ -301,7 +301,7 @@ public void actionPerformed(ActionEvent event) {
}
if (alreadyExists) {
String tokenName = token.getName();
- if (MapTool.getPlayer().isGM() && !StringUtils.isEmpty(token.getGMName())) {
+ if (MapTool.getPlayer().isGM() && !StringUtil.isEmpty(token.getGMName())) {
tokenName += "(" + token.getGMName() + ")";
}
alreadyExists =
@@ -358,7 +358,7 @@ public void addMacrosToToken(List newButtonProps, Token t
List toAdd = new ArrayList<>(newButtonProps.size());
int nextIndex = token.getMacroNextIndex();
String tokenName = token.getName();
- if (MapTool.getPlayer().isGM() && !StringUtils.isEmpty(token.getGMName())) {
+ if (MapTool.getPlayer().isGM() && !StringUtil.isEmpty(token.getGMName())) {
tokenName = tokenName + "(" + token.getGMName() + ")";
}
for (MacroButtonProperties nextProps : newButtonProps) {
diff --git a/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseDialogController.java b/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseDialogController.java
index c5bb3e0f67..a4b54edcd0 100644
--- a/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseDialogController.java
+++ b/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseDialogController.java
@@ -43,9 +43,7 @@
import net.rptools.maptool.client.ui.javfx.SwingJavaFXDialogController;
import net.rptools.maptool.language.I18N;
import net.rptools.maptool.model.player.PasswordDatabaseException;
-import net.rptools.maptool.model.player.PersistedPlayerDatabase;
import net.rptools.maptool.model.player.Player.Role;
-import net.rptools.maptool.model.player.PlayerDBPropertyChange;
import net.rptools.maptool.model.player.PlayerDatabase.AuthMethod;
import net.rptools.maptool.model.player.PlayerInfo;
import net.rptools.maptool.model.player.Players;
@@ -73,20 +71,20 @@ public class PlayerDatabaseDialogController extends AbstractSwingJavaFXDialogCon
Platform.runLater(
() -> {
switch (e.getPropertyName()) {
- case PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_CHANGED -> {
+ case Players.PROPERTY_CHANGE_PLAYER_CHANGED -> {
removePlayer(e.getNewValue().toString());
addPlayer(e.getNewValue().toString());
playersTable.sort();
}
- case PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_ADDED -> {
+ case Players.PROPERTY_CHANGE_PLAYER_ADDED -> {
addPlayer(e.getNewValue().toString());
playersTable.sort();
}
- case PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_REMOVED -> {
+ case Players.PROPERTY_CHANGE_PLAYER_REMOVED -> {
removePlayer(e.getOldValue().toString());
playersTable.sort();
}
- case PlayerDBPropertyChange.PROPERTY_CHANGE_DATABASE_CHANGED -> {
+ case Players.PROPERTY_CHANGE_DATABASE_CHANGED -> {
addPlayers();
}
}
@@ -94,8 +92,6 @@ public class PlayerDatabaseDialogController extends AbstractSwingJavaFXDialogCon
};
ObservableList playerInfoList = FXCollections.observableArrayList();
- private PersistedPlayerDatabase playerDatabase;
- private Players players;
@FXML // This method is called by the FXMLLoader when initialization is complete
void initialize() {
@@ -109,14 +105,8 @@ void initialize() {
@Override
public void init() {
- var currentDb = MapTool.getClient().getPlayerDatabase();
- if (!(currentDb instanceof PersistedPlayerDatabase persistedPlayerDatabase)) {
- throw new RuntimeException(
- "Player database dialog is only valid for persisted player databases");
- }
- playerDatabase = persistedPlayerDatabase;
- playerDatabase.addPropertyChangeListener(changeListener);
- players = new Players(currentDb);
+
+ Players.addPropertyChangeListener(changeListener);
String gmI81n = I18N.getString("userTerm.GM");
String playerI81n = I18N.getString("userTerm.Player");
@@ -163,10 +153,11 @@ public void init() {
createButtonCellFactory(
I18N.getText("playerDB.dialog.delete"),
p -> {
+ String playerName = p.name();
SwingUtilities.invokeLater(
() -> {
if (MapTool.confirm("playerDB.dialog.deleteConfirm", p.name())) {
- Platform.runLater(() -> playerDatabase.deletePlayer(p.name()));
+ Platform.runLater(() -> new Players().removePlayer(p.name()));
}
});
});
@@ -197,7 +188,7 @@ public void init() {
@Override
public void close() {
try {
- playerDatabase.commitChanges();
+ new Players().commitChanges();
} catch (NoSuchPaddingException
| NoSuchAlgorithmException
| InvalidKeySpecException
@@ -205,13 +196,13 @@ public void close() {
| InvalidKeyException e) {
MapTool.showError("playerDB.dialog.error.savingChanges", e);
}
-
- playerDatabase.removePropertyChangeListener(changeListener);
+ ;
+ Players.removePropertyChangeListener(changeListener);
}
private void addPlayer(String name) {
try {
- PlayerInfo playerInfo = players.getPlayer(name).get();
+ PlayerInfo playerInfo = new Players().getPlayer(name).get();
playerInfoList.add(playerInfo);
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
@@ -223,7 +214,7 @@ private void removePlayer(String name) {
}
private void addPlayers() {
- players
+ new Players()
.getDatabasePlayers()
.thenAccept(
p ->
diff --git a/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseEditController.java b/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseEditController.java
index ed44b230d9..b7fa4af08b 100644
--- a/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseEditController.java
+++ b/src/main/java/net/rptools/maptool/client/ui/players/PlayerDatabaseEditController.java
@@ -37,7 +37,6 @@
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javax.crypto.NoSuchPaddingException;
-import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.ui.javfx.SwingJavaFXDialogController;
import net.rptools.maptool.client.ui.javfx.SwingJavaFXDialogEventHandler;
import net.rptools.maptool.language.I18N;
@@ -319,7 +318,7 @@ private void validatePublicKey() {
/** Updates the values in the database based on the form values. */
private void updateDatabase() {
- Players players = new Players(MapTool.getClient().getPlayerDatabase());
+ Players players = new Players();
Role role =
roleCombo.getSelectionModel().getSelectedItem().equals(GM_ROLE_NAME)
? Role.GM
@@ -367,10 +366,7 @@ private void validatePlayerName() {
validationErrors.add(ValidationErrors.NAME_MISSING);
} else if (playerNameText.isEditable()) {
try {
- PlayerInfo playerInfo =
- new Players(MapTool.getClient().getPlayerDatabase())
- .getPlayer(playerNameText.getText())
- .get();
+ PlayerInfo playerInfo = new Players().getPlayer(playerNameText.getText()).get();
if (playerInfo != null) {
validationErrors.add(ValidationErrors.PLAYER_EXISTS);
}
diff --git a/src/main/java/net/rptools/maptool/client/ui/theme/ThemeSupport.java b/src/main/java/net/rptools/maptool/client/ui/theme/ThemeSupport.java
index 1cf6db45cc..e01dd7ac7a 100644
--- a/src/main/java/net/rptools/maptool/client/ui/theme/ThemeSupport.java
+++ b/src/main/java/net/rptools/maptool/client/ui/theme/ThemeSupport.java
@@ -461,7 +461,6 @@ public record ThemeDetails(
new ThemeDetails("Aah(Large Print)", AahLAF_LP.class, "Aah-LP.png", false),
new ThemeDetails("Aah(Small Print)", AahLAF_SP.class, "Aah-SP.png", false),
new ThemeDetails("Aah(Very Large Print)", AahLAF_VLP.class, "Aah-VLP.png", false),
- new ThemeDetails("Aark", AarkLaF.class, "Aark.png", true),
};
/** The current theme being used. */
diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/DiskBasedPartitionedDrawableRenderer.java b/src/main/java/net/rptools/maptool/client/ui/zone/DiskBasedPartitionedDrawableRenderer.java
index 10793c14fb..5276f96843 100644
--- a/src/main/java/net/rptools/maptool/client/ui/zone/DiskBasedPartitionedDrawableRenderer.java
+++ b/src/main/java/net/rptools/maptool/client/ui/zone/DiskBasedPartitionedDrawableRenderer.java
@@ -34,7 +34,6 @@
import javax.imageio.ImageIO;
import net.rptools.lib.FileUtil;
import net.rptools.maptool.client.AppUtil;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.drawing.Drawable;
import net.rptools.maptool.model.drawing.DrawnElement;
import net.rptools.maptool.model.drawing.Pen;
@@ -46,7 +45,6 @@ public class DiskBasedPartitionedDrawableRenderer implements DrawableRenderer {
private static final BufferedImage NO_IMAGE = new BufferedImage(1, 1, Transparency.OPAQUE);
private static final int CHUNK_SIZE = 256;
- private final Zone zone;
private final Map chunkMap = new HashMap();
private double lastScale;
@@ -69,8 +67,7 @@ public class DiskBasedPartitionedDrawableRenderer implements DrawableRenderer {
}
}
- public DiskBasedPartitionedDrawableRenderer(Zone zone) {
- this.zone = zone;
+ public DiskBasedPartitionedDrawableRenderer() {
flush();
}
@@ -196,7 +193,7 @@ private BufferedImage createChunk(
for (DrawnElement element : drawableList) {
Drawable drawable = element.getDrawable();
- Rectangle2D drawnBounds = drawable.getBounds(zone);
+ Rectangle2D drawnBounds = drawable.getBounds();
Rectangle2D chunkBounds =
new Rectangle(
(int) (gridx * (CHUNK_SIZE / scale)),
@@ -233,7 +230,7 @@ private BufferedImage createChunk(
// if (gridx == 0 && gridy == 1) {
// System.out.println("draw");
// }
- drawable.draw(zone, g, pen);
+ drawable.draw(g, pen);
g.setComposite(oldComposite);
}
diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/PartitionedDrawableRenderer.java b/src/main/java/net/rptools/maptool/client/ui/zone/PartitionedDrawableRenderer.java
index ba9e7ae199..72b33859b3 100644
--- a/src/main/java/net/rptools/maptool/client/ui/zone/PartitionedDrawableRenderer.java
+++ b/src/main/java/net/rptools/maptool/client/ui/zone/PartitionedDrawableRenderer.java
@@ -29,7 +29,6 @@
import net.rptools.lib.CodeTimer;
import net.rptools.lib.image.ImageUtil;
import net.rptools.maptool.client.DeveloperOptions;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.drawing.Drawable;
import net.rptools.maptool.model.drawing.DrawablesGroup;
import net.rptools.maptool.model.drawing.DrawnElement;
@@ -45,7 +44,6 @@ public class PartitionedDrawableRenderer implements DrawableRenderer {
private static final int CHUNK_SIZE = 256;
private static List unusedChunkList = new LinkedList();
- private final Zone zone;
private final Set noImageSet = new HashSet();
private final List chunkList = new LinkedList();
private int maxChunks;
@@ -58,10 +56,6 @@ public class PartitionedDrawableRenderer implements DrawableRenderer {
private boolean dirty = false;
- public PartitionedDrawableRenderer(Zone zone) {
- this.zone = zone;
- }
-
public void flush() {
int unusedSize = unusedChunkList.size();
for (Tuple tuple : chunkList) {
@@ -224,13 +218,12 @@ private BufferedImage createChunk(
for (DrawnElement element : drawableList) {
timer.start("createChunk:calculate");
Drawable drawable = element.getDrawable();
- Rectangle drawableBounds = drawable.getBounds(zone);
- if (drawableBounds == null) {
+ if (drawable.getBounds() == null) {
timer.stop("createChunk:calculate");
continue;
}
- Rectangle2D drawnBounds = new Rectangle(drawableBounds);
+ Rectangle2D drawnBounds = new Rectangle(drawable.getBounds());
Rectangle2D chunkBounds =
new Rectangle(
(int) (gridx * (CHUNK_SIZE / scale)),
@@ -287,7 +280,7 @@ private BufferedImage createChunk(
Graphics2D g2 = image.createGraphics();
g2.drawImage(groupImage, 0, 0, CHUNK_SIZE, CHUNK_SIZE, null);
g2.dispose();
- } else drawable.draw(zone, g, pen);
+ } else drawable.draw(g, pen);
g.setComposite(oldComposite);
timer.stop("createChunk:Draw");
}
diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/ZoneView.java b/src/main/java/net/rptools/maptool/client/ui/zone/ZoneView.java
index afc56902f6..00cad9fda9 100644
--- a/src/main/java/net/rptools/maptool/client/ui/zone/ZoneView.java
+++ b/src/main/java/net/rptools/maptool/client/ui/zone/ZoneView.java
@@ -336,9 +336,14 @@ private List calculateLitAreaForLightSource(
final var p = FogUtil.calculateVisionCenter(lightSourceToken, zone);
final var translateTransform = AffineTransform.getTranslateInstance(p.x, p.y);
+ final var magnifyTransform = AffineTransform.getScaleInstance(multiplier, multiplier);
+ final var lightSourceArea = lightSource.getArea(lightSourceToken, zone);
// Calculate exposed area
- final var lightSourceArea = lightSource.getArea(lightSourceToken, zone, multiplier);
+ // Jamz: OK, let not have lowlight vision type multiply darkness radius
+ if (multiplier != 1 && lightSource.getType() == LightSource.Type.NORMAL) {
+ lightSourceArea.transform(magnifyTransform);
+ }
lightSourceArea.transform(translateTransform);
Area lightSourceVisibleArea = lightSourceArea;
@@ -360,16 +365,35 @@ private List calculateLitAreaForLightSource(
final var litAreas = new ArrayList();
- for (final var lightArea : lightSource.getLightAreas(lightSourceToken, zone, multiplier)) {
- var area = lightArea.area();
- var light = lightArea.light();
+ // Tracks the cummulative inner ranges of light sources so that we can cut them out of the
+ // outer ranges and end up with disjoint sets, even when magnifying.
+ // Note that this "hole punching" has nothing to do with lumen strength, it's just a way of
+ // making smaller ranges act as lower bounds for larger ranges.
+ final var cummulativeNotTransformedArea = new Area();
+ for (final var light : lightSource.getLightList()) {
+ final var notScaledLightArea =
+ light.getArea(lightSourceToken, zone, lightSource.isScaleWithToken());
+ if (notScaledLightArea == null) {
+ continue;
+ }
+ final var lightArea = new Area(notScaledLightArea);
+
+ // Lowlight vision does not magnify darkness.
+ if (multiplier != 1
+ && lightSource.getType() == LightSource.Type.NORMAL
+ && light.getLumens() >= 0) {
+ lightArea.transform(magnifyTransform);
+ }
- area.transform(translateTransform);
- area.intersect(lightSourceVisibleArea);
+ lightArea.subtract(cummulativeNotTransformedArea);
+ lightArea.transform(translateTransform);
+ lightArea.intersect(lightSourceVisibleArea);
litAreas.add(
new ContributedLight(
- new LitArea(light.getLumens(), area), new LightInfo(lightSource, light)));
+ new LitArea(light.getLumens(), lightArea), new LightInfo(lightSource, light)));
+
+ cummulativeNotTransformedArea.add(notScaledLightArea);
}
// Magnification can cause different ranges for a single light source to overlap. This is not
diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/renderer/VisionOverlayRenderer.java b/src/main/java/net/rptools/maptool/client/ui/zone/renderer/VisionOverlayRenderer.java
index 6b537da5ee..c121d5695a 100644
--- a/src/main/java/net/rptools/maptool/client/ui/zone/renderer/VisionOverlayRenderer.java
+++ b/src/main/java/net/rptools/maptool/client/ui/zone/renderer/VisionOverlayRenderer.java
@@ -68,6 +68,7 @@ public void render(Graphics2D g, PlayerView view, Token tokenUnderMouse) {
private void renderWorld(Graphics2D worldG, PlayerView view, Token token) {
// The vision of the token is not necessarily related to the current view.
+ // final var tokenView = view.derive(Collections.singleton(token));
final var tokenView = new PlayerView(view.getRole(), List.of(token));
Area currentTokenVisionArea = zoneView.getVisibleArea(token, tokenView);
diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java b/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
index e4040b318c..23f7e91ed4 100644
--- a/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
+++ b/src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
@@ -77,9 +77,11 @@
import net.rptools.parser.ParserException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
/** */
-public class ZoneRenderer extends JComponent implements DropTargetListener {
+public class ZoneRenderer extends JComponent
+ implements DropTargetListener, Comparable {
private static final long serialVersionUID = 3832897780066104884L;
private static final Logger log = LogManager.getLogger(ZoneRenderer.class);
@@ -105,7 +107,8 @@ public class ZoneRenderer extends JComponent implements DropTargetListener {
private final SelectionModel selectionModel;
private Scale zoneScale;
- private final Map drawableRenderers;
+ private final Map drawableRenderers =
+ CollectionUtil.newFilledEnumMap(Zone.Layer.class, layer -> new PartitionedDrawableRenderer());
private final List overlayList = new ArrayList();
private final Map> tokenLocationMap =
new HashMap>();
@@ -170,10 +173,6 @@ public ZoneRenderer(Zone zone) {
zoneView = new ZoneView(zone);
setZoneScale(new Scale());
- drawableRenderers =
- CollectionUtil.newFilledEnumMap(
- Zone.Layer.class, layer -> new PartitionedDrawableRenderer(zone));
-
var renderHelper = new RenderHelper(this, tempBufferPool);
this.compositor = new ZoneCompositor();
this.gridRenderer = new GridRenderer();
@@ -3558,12 +3557,18 @@ private void onGridChanged(GridChanged event) {
if (event.zone() != this.zone) {
return;
}
-
- // A change in grid can change the size of templates.
- flushDrawableRenderer();
repaintDebouncer.dispatch();
}
+ //
+ // COMPARABLE
+ public int compareTo(@NotNull ZoneRenderer o) {
+ if (o != this) {
+ return (int) (zone.getCreationTime() - o.zone.getCreationTime());
+ }
+ return 0;
+ }
+
// Begin token common macro identification
private List highlightCommonMacros = new ArrayList();
diff --git a/src/main/java/net/rptools/maptool/model/AssetLoader.java b/src/main/java/net/rptools/maptool/model/AssetLoader.java
index d787c925db..c04872b96b 100644
--- a/src/main/java/net/rptools/maptool/model/AssetLoader.java
+++ b/src/main/java/net/rptools/maptool/model/AssetLoader.java
@@ -318,10 +318,18 @@ public void run() {
}
}
+ // System.out.println("Got " + id + " from MT");
// Last resort, ask the MT server
- // We can drop off the end of this runnable because it'll background load the
- // image from the server
- MapTool.serverCommand().getAsset(id);
+ final var serverCommand = MapTool.serverCommand();
+ if (serverCommand != null) {
+ // We can drop off the end of this runnable because it'll background load the
+ // image from the server
+ serverCommand.getAsset(id);
+ } else {
+ // This could be too early in the loading process for a server command to be set.
+ AssetManager.putAsset(Asset.createBrokenImageAsset(id));
+ completeRequest(id);
+ }
}
}
}
diff --git a/src/main/java/net/rptools/maptool/model/CellPoint.java b/src/main/java/net/rptools/maptool/model/CellPoint.java
index cfdcdf1f86..a49c2710df 100644
--- a/src/main/java/net/rptools/maptool/model/CellPoint.java
+++ b/src/main/java/net/rptools/maptool/model/CellPoint.java
@@ -43,10 +43,6 @@ public CellPoint(int x, int y, double distanceTraveled, double distanceTraveledW
this.distanceTraveledWithoutTerrain = distanceTraveledWithoutTerrain;
}
- public CellPoint(CellPoint other) {
- this(other.x, other.y);
- }
-
@Override
public String toString() {
return "CellPoint" + super.toString();
diff --git a/src/main/java/net/rptools/maptool/model/Grid.java b/src/main/java/net/rptools/maptool/model/Grid.java
index 087161543e..1f7b1090d0 100644
--- a/src/main/java/net/rptools/maptool/model/Grid.java
+++ b/src/main/java/net/rptools/maptool/model/Grid.java
@@ -25,7 +25,6 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
import javax.swing.Action;
import javax.swing.KeyStroke;
import net.rptools.lib.FileUtil;
@@ -353,7 +352,7 @@ public void setSize(int size) {
* @param scaleWithToken used to increase the area based on token footprint
* @return Area
*/
- public @Nonnull Area getShapedArea(
+ public Area getShapedArea(
ShapeType shape,
Token token,
double range,
diff --git a/src/main/java/net/rptools/maptool/model/Light.java b/src/main/java/net/rptools/maptool/model/Light.java
index f195fc8063..878e85bbae 100644
--- a/src/main/java/net/rptools/maptool/model/Light.java
+++ b/src/main/java/net/rptools/maptool/model/Light.java
@@ -100,28 +100,18 @@ public double getArcAngle() {
return shape;
}
- public @Nonnull Area getArea(
- @Nonnull Token token, @Nonnull Zone zone, double multiplier, boolean scaleWithToken) {
- var radius = getRadius();
- // Darkness does not get magnified.
- if (lumens >= 0) {
- radius *= multiplier;
- }
+ public @Nonnull Area getArea(@Nonnull Token token, @Nonnull Zone zone, boolean scaleWithToken) {
return zone.getGrid()
.getShapedArea(
getShape(),
token,
- radius,
+ getRadius(),
getWidth(),
getArcAngle(),
(int) getFacingOffset(),
scaleWithToken);
}
- public @Nonnull Area getArea(@Nonnull Token token, @Nonnull Zone zone, boolean scaleWithToken) {
- return getArea(token, zone, 1.0, scaleWithToken);
- }
-
public boolean isGM() {
return isGM;
}
diff --git a/src/main/java/net/rptools/maptool/model/LightSource.java b/src/main/java/net/rptools/maptool/model/LightSource.java
index 619494ecbe..0c7830644a 100644
--- a/src/main/java/net/rptools/maptool/model/LightSource.java
+++ b/src/main/java/net/rptools/maptool/model/LightSource.java
@@ -216,50 +216,6 @@ public boolean isIgnoresVBL() {
return ignoresVBL;
}
- public record LightArea(Light light, Area area) {}
-
- public @Nonnull List getLightAreas(
- @Nonnull Token token, @Nonnull Zone zone, double multiplier) {
- // Tracks the cumulative inner ranges of light sources so that we can cut them out of the
- // outer ranges and end up with disjoint sets, even when magnifying.
- // Note that this "hole punching" has nothing to do with lumen strength, it's just a way of
- // making smaller ranges act as lower bounds for larger ranges.
-
- // Auras do not get magnified.
- if (type != Type.NORMAL) {
- multiplier = 1.0;
- }
-
- final var result = new ArrayList();
- final var cummulativeNotTransformedArea = new Area();
-
- for (final var light : lightList) {
- final var notScaledLightArea = light.getArea(token, zone, scaleWithToken);
-
- final var lightArea = light.getArea(token, zone, multiplier, scaleWithToken);
- lightArea.subtract(cummulativeNotTransformedArea);
- result.add(new LightArea(light, lightArea));
-
- cummulativeNotTransformedArea.add(notScaledLightArea);
- }
- return result;
- }
-
- /* Area for all lights combined */
- public @Nonnull Area getArea(@Nonnull Token token, @Nonnull Zone zone, double multiplier) {
- // Auras do not get magnified.
- if (type != Type.NORMAL) {
- multiplier = 1.0;
- }
-
- Area area = new Area();
- for (Light light : lightList) {
- area.add(light.getArea(token, zone, multiplier, isScaleWithToken()));
- }
-
- return area;
- }
-
/*
* Area for a single light, subtracting any previous lights
*/
@@ -276,7 +232,12 @@ public record LightArea(Light light, Area area) {}
/* Area for all lights combined */
public @Nonnull Area getArea(@Nonnull Token token, @Nonnull Zone zone) {
- return getArea(token, zone, 1.0);
+ Area area = new Area();
+ for (Light light : lightList) {
+ area.add(light.getArea(token, zone, isScaleWithToken()));
+ }
+
+ return area;
}
@SuppressWarnings("unchecked")
diff --git a/src/main/java/net/rptools/maptool/model/Zone.java b/src/main/java/net/rptools/maptool/model/Zone.java
index 74e409bac3..c468e51f36 100644
--- a/src/main/java/net/rptools/maptool/model/Zone.java
+++ b/src/main/java/net/rptools/maptool/model/Zone.java
@@ -37,6 +37,7 @@
import net.rptools.maptool.language.I18N;
import net.rptools.maptool.model.InitiativeList.TokenInitiative;
import net.rptools.maptool.model.Token.TerrainModifierOperation;
+import net.rptools.maptool.model.drawing.AbstractTemplate;
import net.rptools.maptool.model.drawing.Drawable;
import net.rptools.maptool.model.drawing.DrawableColorPaint;
import net.rptools.maptool.model.drawing.DrawablePaint;
@@ -363,6 +364,12 @@ public String toString() {
public static final DrawablePaint DEFAULT_FOG = new DrawableColorPaint(Color.black);
+ // The zones should be ordered. We could have the server assign each zone
+ // an incrementing number as new zones are created, but that would take a lot
+ // more elegance than we really need. Instead, let's just keep track of the
+ // time when it was created. This should give us sufficient granularity, because
+ // seriously -- what's the likelihood of two GMs separately creating a new zone at exactly
+ // the same millisecond since the epoch?
private long creationTime = System.currentTimeMillis();
private GUID id = new GUID(); // Ideally would be 'final', but that complicates imported()
@@ -472,6 +479,10 @@ public String toString() {
drawablesByLayer.put(Layer.BACKGROUND, backgroundDrawables);
}
+ /**
+ * Note: When adding new fields to this class, make sure to update all constructors, {@link
+ * #imported()}, {@link #readResolve()}, and potentially {@link #optimize()}.
+ */
public Zone() {
// TODO: Was this needed?
// setGrid(new SquareGrid());
@@ -601,11 +612,16 @@ public DrawablePaint getFogPaint() {
}
/**
- * Create a new zone with old zone's properties and with new token ids.
+ * Note: When adding new fields to this class, make sure to update all constructors, {@link
+ * #imported()}, {@link #readResolve()}, and potentially {@link #optimize()}.
*
* JFJ 2010-10-27 Don't forget that since there are new zones AND new tokens created here from
* the old one being passed in, if you have any data that needs to transfer over, you will need to
* manually copy it as is done below for various items.
+ */
+
+ /**
+ * Create a new zone with old zone's properties and with new token ids.
*
* @param zone The zone to copy.
*/
@@ -622,7 +638,6 @@ public Zone(Zone zone) {
public Zone(Zone zone, boolean keepIds) {
if (keepIds) {
this.id = zone.getId();
- this.creationTime = zone.creationTime;
}
backgroundPaint = zone.backgroundPaint;
@@ -648,17 +663,9 @@ public Zone(Zone zone, boolean keepIds) {
playerAlias = zone.playerAlias;
for (final var entry : drawablesByLayer.entrySet()) {
- final var otherDrawables = zone.drawablesByLayer.get(entry.getKey());
- final var thisDrawables = entry.getValue();
-
- for (final var element : otherDrawables) {
- final var copy = new DrawnElement(element);
- if (!keepIds) {
- copy.getDrawable().setId(new GUID());
- }
- thisDrawables.add(copy);
- }
+ entry.getValue().addAll(zone.drawablesByLayer.get(entry.getKey()));
}
+ validateTemplateZoneIds();
if (!zone.labels.isEmpty()) {
for (GUID guid : zone.labels.keySet()) {
@@ -741,9 +748,14 @@ public GUID getId() {
/**
* Should be invoked only when a Zone has been imported from an external source and needs to be
- * cleaned up before being used.
+ * cleaned up before being used. Currently this cleanup consists of allocating a new GUID, setting
+ * the creation time to `now', and resetting the initiative list (setting the related zone and
+ * clearing the model).
*/
public void imported() {
+ id = new GUID();
+ creationTime = System.currentTimeMillis();
+ initiativeList.setZone(this);
initiativeList.clearModel();
}
@@ -1495,6 +1507,17 @@ public void addDrawable(Pen pen, Drawable drawable) {
undo.addDrawable(pen, drawable);
}
+ private void validateTemplateZoneIds() {
+ // Classes that extend Abstract template have a zone id so we need to make sure to update it
+ for (var list : drawablesByLayer.values()) {
+ for (var de : list) {
+ if (de.getDrawable() instanceof AbstractTemplate at) {
+ at.setZoneId(id);
+ }
+ }
+ }
+ }
+
public boolean canUndo() {
return undo.canUndo();
}
@@ -2064,8 +2087,8 @@ private void collapseDrawableLayer(List layer) {
for (ListIterator drawnIter = list.listIterator(); drawnIter.hasNext(); ) {
DrawnElement drawn = drawnIter.next();
// Are we covered ourselves ?
- Area drawnArea = drawn.getDrawable().getArea(this);
- if (drawnArea.isEmpty()) {
+ Area drawnArea = drawn.getDrawable().getArea();
+ if (drawnArea == null) {
continue;
}
// The following is over-zealous optimization. Lines (1-dimensional) should be kept.
@@ -2197,6 +2220,7 @@ protected Object readResolve() {
drawablesByLayer.put(Layer.GM, gmDrawables);
drawablesByLayer.put(Layer.OBJECT, objectDrawables);
drawablesByLayer.put(Layer.BACKGROUND, backgroundDrawables);
+ validateTemplateZoneIds();
return this;
}
@@ -2324,6 +2348,8 @@ public static Zone fromDto(ZoneDto dto) {
zone.height = dto.getHeight();
zone.width = dto.getWidth();
+ zone.validateTemplateZoneIds();
+
return zone;
}
diff --git a/src/main/java/net/rptools/maptool/model/ZonePoint.java b/src/main/java/net/rptools/maptool/model/ZonePoint.java
index 3b89a26244..2e79710d82 100644
--- a/src/main/java/net/rptools/maptool/model/ZonePoint.java
+++ b/src/main/java/net/rptools/maptool/model/ZonePoint.java
@@ -19,10 +19,6 @@ public ZonePoint(int x, int y) {
super(x, y);
}
- public ZonePoint(ZonePoint other) {
- this(other.x, other.y);
- }
-
@Override
public String toString() {
return "ZonePoint" + super.toString();
diff --git a/src/main/java/net/rptools/maptool/model/drawing/AbstractDrawing.java b/src/main/java/net/rptools/maptool/model/drawing/AbstractDrawing.java
index 6db6d4f4fe..39efe3bd35 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/AbstractDrawing.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/AbstractDrawing.java
@@ -33,12 +33,8 @@
* implementing classes.
*/
public abstract class AbstractDrawing implements Drawable, ImageObserver {
- /**
- * The unique identifier for this drawable.
- *
- * It should not typically be changed except to give copies a new ID.
- */
- private GUID id;
+ /** The unique identifier for this drawable. It is immutable. */
+ private final GUID id;
private String layer;
private String name;
@@ -51,15 +47,12 @@ protected AbstractDrawing(GUID id) {
this.id = id;
}
- protected AbstractDrawing(AbstractDrawing other) {
- // The only thing we don't preserve is the ID.
- this.id = other.id;
- this.layer = other.layer;
- this.name = other.name;
- }
-
- @Override
- public void draw(Zone zone, Graphics2D g, Pen pen) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see maptool.model.drawing.Drawable#draw(java.awt.Graphics2D, maptool.model.drawing.Pen)
+ */
+ public void draw(Graphics2D g, Pen pen) {
if (pen == null) {
pen = Pen.DEFAULT;
}
@@ -79,7 +72,7 @@ public void draw(Zone zone, Graphics2D g, Pen pen) {
// **** Legacy support for 1.1
g.setColor(new Color(pen.getBackgroundColor()));
}
- drawBackground(zone, g);
+ drawBackground(g);
}
if (pen.getForegroundMode() == Pen.MODE_SOLID) {
if (pen.getPaint() != null) {
@@ -88,15 +81,15 @@ public void draw(Zone zone, Graphics2D g, Pen pen) {
// **** Legacy support for 1.1
g.setColor(new Color(pen.getColor()));
}
- draw(zone, g);
+ draw(g);
}
g.setComposite(oldComposite);
g.setStroke(oldStroke);
}
- protected abstract void draw(Zone zone, Graphics2D g);
+ protected abstract void draw(Graphics2D g);
- protected abstract void drawBackground(Zone zone, Graphics2D g);
+ protected abstract void drawBackground(Graphics2D g);
@VisibleForTesting
protected Campaign getCampaign() {
@@ -112,11 +105,6 @@ public GUID getId() {
return id;
}
- @Override
- public void setId(GUID guid) {
- this.id = guid;
- }
-
public void setLayer(Zone.Layer layer) {
this.layer = layer != null ? layer.name() : null;
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/AbstractTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/AbstractTemplate.java
index fd1500a148..b15bf75782 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/AbstractTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/AbstractTemplate.java
@@ -19,6 +19,7 @@
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.Line2D;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
@@ -41,18 +42,15 @@ public abstract class AbstractTemplate extends AbstractDrawing {
/** The location of the vertex where painting starts. */
private ZonePoint vertex = new ZonePoint(0, 0);
+ /** The id of the zone where this drawable is painted. */
+ private GUID zoneId;
+
protected AbstractTemplate() {}
protected AbstractTemplate(GUID id) {
super(id);
}
- protected AbstractTemplate(AbstractTemplate other) {
- super(other);
- this.radius = other.radius;
- this.vertex = new ZonePoint(other.vertex);
- }
-
/*---------------------------------------------------------------------------------------------
* Class Variables
*-------------------------------------------------------------------------------------------*/
@@ -164,18 +162,36 @@ public void setVertex(ZonePoint vertex) {
this.vertex = vertex;
}
+ /**
+ * Get the zoneId for this RadiusTemplate.
+ *
+ * @return Returns the current value of zoneId.
+ */
+ public GUID getZoneId() {
+ return zoneId;
+ }
+
+ /**
+ * Set the value of zoneId for this RadiusTemplate.
+ *
+ * @param zoneId The zoneId to set.
+ */
+ public void setZoneId(GUID zoneId) {
+ this.zoneId = zoneId;
+ }
+
/**
* Paint the border or area of the template
*
- * @param zone The zone that is being painted
* @param g Where to paint
* @param border Paint the border?
* @param area Paint the area?
*/
- protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
+ protected void paint(Graphics2D g, boolean border, boolean area) {
if (radius == 0) {
return;
}
+ Zone zone = MapTool.getCampaign().getZone(zoneId);
if (zone == null) {
return;
}
@@ -315,20 +331,25 @@ public int getDistance(int x, int y) {
* Overridden AbstractDrawing Methods
*-------------------------------------------------------------------------------------------*/
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D)
+ */
@Override
- protected void draw(Zone zone, Graphics2D g) {
- paint(zone, g, true, false);
+ protected void draw(Graphics2D g) {
+ paint(g, true, false);
}
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D)
+ */
@Override
- protected void drawBackground(Zone zone, Graphics2D g) {
+ protected void drawBackground(Graphics2D g) {
// Adjust alpha automatically
Composite old = g.getComposite();
- if (old != AlphaComposite.Clear) {
+ if (old != AlphaComposite.Clear)
g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, DEFAULT_BG_ALPHA));
- }
- paint(zone, g, false, true);
+ paint(g, false, true);
g.setComposite(old);
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/BlastTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/BlastTemplate.java
index 7464cde575..7398001059 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/BlastTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/BlastTemplate.java
@@ -15,11 +15,13 @@
package net.rptools.maptool.model.drawing;
import com.google.protobuf.StringValue;
+import java.awt.AlphaComposite;
+import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
-import java.awt.RenderingHints;
+import java.awt.Shape;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
@@ -38,6 +40,9 @@ public class BlastTemplate extends ConeTemplate {
* Instance Variables
*-------------------------------------------------------------------------------------------*/
+ /** Renderer for the blast. The {@link Shape} is just a rectangle. */
+ private ShapeDrawable renderer = new ShapeDrawable(new Rectangle());
+
private int offsetX;
private int offsetY;
@@ -49,31 +54,32 @@ public BlastTemplate(GUID id, int offsetX, int offsetY) {
this.offsetY = offsetY;
}
- public BlastTemplate(BlastTemplate other) {
- super(other);
- this.offsetX = other.offsetX;
- this.offsetY = other.offsetY;
- }
-
/*---------------------------------------------------------------------------------------------
* Instance Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Drawable copy() {
- return new BlastTemplate(this);
- }
-
- private Rectangle makeShape(Zone zone) {
- if (zone == null) {
- return new Rectangle();
+ /**
+ * This methods adjusts the rectangle in the renderer to match the new radius, vertex, or
+ * location.
+ */
+ private void adjustRectangle() {
+ if (getZoneId() == null) return;
+ Zone zone;
+ if (MapTool.isHostingServer()) {
+ zone = MapTool.getServer().getCampaign().getZone(getZoneId());
+ } else {
+ zone = MapTool.getCampaign().getZone(getZoneId());
}
+ if (zone == null) return;
int gridSize = zone.getGrid().getSize();
int size = getRadius() * gridSize;
- return new Rectangle(
- getVertex().x + offsetX * gridSize, getVertex().y + offsetY * gridSize, size, size);
+ Rectangle r = (Rectangle) renderer.getShape();
+ r.setBounds(getVertex().x, getVertex().y, size, size);
+
+ r.x += offsetX * gridSize;
+ r.y += offsetY * gridSize;
}
/*---------------------------------------------------------------------------------------------
@@ -81,8 +87,8 @@ private Rectangle makeShape(Zone zone) {
*-------------------------------------------------------------------------------------------*/
@Override
- public Rectangle getBounds(Zone zone) {
- Rectangle r = makeShape(zone);
+ public Rectangle getBounds() {
+ Rectangle r = new Rectangle(renderer.getShape().getBounds());
// We don't know pen width, so add some padding to account for it
r.x -= 5;
r.y -= 5;
@@ -129,6 +135,17 @@ public void setControlCellRelative(int relX, int relY) {
}
offsetX = centerOffset + Math.min(Math.max(lowerBound, relX), upperBound);
}
+ adjustRectangle();
+ }
+
+ /**
+ * @see
+ * net.rptools.maptool.model.drawing.AbstractTemplate#setVertex(net.rptools.maptool.model.ZonePoint)
+ */
+ @Override
+ public void setVertex(ZonePoint vertex) {
+ super.setVertex(vertex);
+ adjustRectangle();
}
/**
@@ -143,27 +160,29 @@ public int getDistance(int x, int y) {
* Overridden AbstractDrawing Methods
*-------------------------------------------------------------------------------------------*/
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D)
+ */
@Override
- protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
- Object oldAA = g.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
- try {
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-
- var shape = makeShape(zone);
- if (area) {
- g.fill(shape);
- }
- if (border) {
- g.draw(shape);
- }
- } finally {
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldAA);
- }
+ protected void draw(Graphics2D g) {
+ renderer.draw(g);
+ }
+
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D)
+ */
+ @Override
+ protected void drawBackground(Graphics2D g) {
+ Composite old = g.getComposite();
+ if (old != AlphaComposite.Clear)
+ g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, DEFAULT_BG_ALPHA));
+ renderer.drawBackground(g);
+ g.setComposite(old);
}
@Override
- public @Nonnull Area getArea(Zone zone) {
- return new Area(makeShape(zone));
+ public Area getArea() {
+ return renderer.getArea();
}
public int getOffsetX() {
@@ -179,6 +198,7 @@ public DrawableDto toDto() {
var dto = BlastTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
.setVertex(getVertex().toDto())
.setDirection(getDirection().name())
@@ -189,18 +209,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setBlastTemplate(dto).build();
}
-
- public static BlastTemplate fromDto(BlastTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new BlastTemplate(id, dto.getOffsetX(), dto.getOffsetY());
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- drawable.setDirection(AbstractTemplate.Direction.valueOf(dto.getDirection()));
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/BurstTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/BurstTemplate.java
index c0943d056d..8217a3a5e3 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/BurstTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/BurstTemplate.java
@@ -15,11 +15,13 @@
package net.rptools.maptool.model.drawing;
import com.google.protobuf.StringValue;
+import java.awt.AlphaComposite;
+import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
-import java.awt.RenderingHints;
+import java.awt.Shape;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
@@ -36,43 +38,70 @@ public class BurstTemplate extends RadiusTemplate {
* Instance Variables
*-------------------------------------------------------------------------------------------*/
+ /** Renderer for the blast. The {@link Shape} is just a rectangle. */
+ private final ShapeDrawable renderer = new ShapeDrawable(new Rectangle());
+
+ /** Renderer for the blast. The {@link Shape} is just a rectangle. */
+ private final ShapeDrawable vertexRenderer = new ShapeDrawable(new Rectangle());
+
public BurstTemplate() {}
public BurstTemplate(GUID id) {
super(id);
}
- public BurstTemplate(BurstTemplate other) {
- super(other);
- }
-
/*---------------------------------------------------------------------------------------------
* Instance Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Drawable copy() {
- return new BurstTemplate(this);
- }
-
- private Rectangle makeVertexShape(Zone zone) {
- int gridSize = zone.getGrid().getSize();
- return new Rectangle(getVertex().x, getVertex().y, gridSize, gridSize);
- }
+ /**
+ * This methods adjusts the rectangle in the renderer to match the new radius, vertex, or
+ * direction. Due to the fact that it is impossible to draw to the cardinal directions evenly when
+ * the radius is an even number and still stay in the squares, that case isn't allowed.
+ */
+ private void adjustShape() {
+ if (getZoneId() == null) return;
+ Zone zone;
+ if (MapTool.isHostingServer()) {
+ zone = MapTool.getServer().getCampaign().getZone(getZoneId());
+ } else {
+ zone = MapTool.getCampaign().getZone(getZoneId());
+ }
+ if (zone == null) return;
- private Rectangle makeShape(Zone zone) {
int gridSize = zone.getGrid().getSize();
- return new Rectangle(
- getVertex().x - getRadius() * gridSize,
- getVertex().y - getRadius() * gridSize,
- (getRadius() * 2 + 1) * gridSize,
- (getRadius() * 2 + 1) * gridSize);
+ Rectangle r = (Rectangle) vertexRenderer.getShape();
+ r.setBounds(getVertex().x, getVertex().y, gridSize, gridSize);
+ r = (Rectangle) renderer.getShape();
+ r.setBounds(getVertex().x, getVertex().y, gridSize, gridSize);
+ r.x -= getRadius() * gridSize;
+ r.y -= getRadius() * gridSize;
+ r.width = r.height = (getRadius() * 2 + 1) * gridSize;
}
/*---------------------------------------------------------------------------------------------
* Overridden *Template Methods
*-------------------------------------------------------------------------------------------*/
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int)
+ */
+ @Override
+ public void setRadius(int squares) {
+ super.setRadius(squares);
+ adjustShape();
+ }
+
+ /**
+ * @see
+ * net.rptools.maptool.model.drawing.AbstractTemplate#setVertex(net.rptools.maptool.model.ZonePoint)
+ */
+ @Override
+ public void setVertex(ZonePoint vertex) {
+ super.setVertex(vertex);
+ adjustShape();
+ }
+
/**
* @see net.rptools.maptool.model.drawing.AbstractTemplate#getDistance(int, int)
*/
@@ -82,8 +111,8 @@ public int getDistance(int x, int y) {
}
@Override
- public Rectangle getBounds(Zone zone) {
- Rectangle r = makeShape(zone);
+ public Rectangle getBounds() {
+ Rectangle r = new Rectangle(renderer.getShape().getBounds());
// We don't know pen width, so add some padding to account for it
r.x -= 5;
r.y -= 5;
@@ -97,28 +126,30 @@ public Rectangle getBounds(Zone zone) {
* Overridden AbstractDrawing Methods
*-------------------------------------------------------------------------------------------*/
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D)
+ */
@Override
- protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
- Object oldAA = g.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
- try {
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-
- var shape = makeShape(zone);
- if (border) {
- g.draw(shape);
- g.draw(makeVertexShape(zone));
- }
- if (area) {
- g.fill(shape);
- }
- } finally {
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldAA);
- }
+ protected void draw(Graphics2D g) {
+ renderer.draw(g);
+ vertexRenderer.draw(g);
+ }
+
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D)
+ */
+ @Override
+ protected void drawBackground(Graphics2D g) {
+ Composite old = g.getComposite();
+ if (old != AlphaComposite.Clear)
+ g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, DEFAULT_BG_ALPHA));
+ renderer.drawBackground(g);
+ g.setComposite(old);
}
@Override
- public @Nonnull Area getArea(Zone zone) {
- return new Area(makeShape(zone));
+ public Area getArea() {
+ return renderer.getArea();
}
@Override
@@ -126,6 +157,7 @@ public DrawableDto toDto() {
var dto = BurstTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
.setVertex(getVertex().toDto());
@@ -133,17 +165,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setBurstTemplate(dto).build();
}
-
- public static BurstTemplate fromDto(BurstTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new BurstTemplate(id);
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/ConeTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/ConeTemplate.java
index 85d1288948..a475c7ea5d 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/ConeTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/ConeTemplate.java
@@ -18,7 +18,7 @@
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
@@ -35,33 +35,27 @@
*/
public class ConeTemplate extends RadiusTemplate {
- /**
- * The dirction to paint. The ne,se,nw,sw paint a quadrant and the n,w,e,w paint along the spine
- * of the selected vertex. Saved as a string as a hack to get around the hessian library's problem
- * w/ serializing enumerations.
- */
- private String direction = Direction.SOUTH_EAST.name();
-
public ConeTemplate() {}
public ConeTemplate(GUID id) {
super(id);
}
- public ConeTemplate(ConeTemplate other) {
- super(other);
- this.direction = other.direction;
- }
+ /*---------------------------------------------------------------------------------------------
+ * Instance Variables
+ *-------------------------------------------------------------------------------------------*/
+
+ /**
+ * The dirction to paint. The ne,se,nw,sw paint a quadrant and the n,w,e,w paint along the spine
+ * of the selected vertex. Saved as a string as a hack to get around the hessian library's problem
+ * w/ serializing enumerations.
+ */
+ private String direction = Direction.SOUTH_EAST.name();
/*---------------------------------------------------------------------------------------------
* Instance Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Drawable copy() {
- return new ConeTemplate(this);
- }
-
/**
* Get the direction for this ConeTemplate.
*
@@ -263,9 +257,21 @@ private boolean withinQuadrant(Quadrant q) {
* Drawable Interface Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Rectangle getBounds(Zone zone) {
- int gridSize = zone.getGrid().getSize();
+ /**
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public Rectangle getBounds() {
+ if (MapTool.getCampaign().getZone(getZoneId()) == null) {
+ // How does this happen ?! Anyway, try to use the current zone (since that's what we're
+ // drawing anyway, seems reasonable
+ if (MapTool.getFrame().getCurrentZoneRenderer() == null) {
+ // Wha?!
+ return new Rectangle();
+ }
+ setZoneId(MapTool.getFrame().getCurrentZoneRenderer().getZone().getId());
+ }
+
+ int gridSize = MapTool.getCampaign().getZone(getZoneId()).getGrid().getSize();
int quadrantSize = getRadius() * gridSize + BOUNDS_PADDING;
// Find the x,y loc
@@ -301,7 +307,11 @@ public Rectangle getBounds(Zone zone) {
}
@Override
- public @Nonnull Area getArea(Zone zone) {
+ public Area getArea() {
+ if (getZoneId() == null) {
+ return new Area();
+ }
+ Zone zone = getCampaign().getZone(getZoneId());
if (zone == null) {
return new Area();
}
@@ -342,6 +352,7 @@ public DrawableDto toDto() {
var dto = ConeTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
.setVertex(getVertex().toDto())
.setDirection(getDirection().name());
@@ -350,18 +361,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setConeTemplate(dto).build();
}
-
- public static ConeTemplate fromDto(ConeTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new ConeTemplate(id);
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- drawable.setDirection(AbstractTemplate.Direction.valueOf(dto.getDirection()));
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/Cross.java b/src/main/java/net/rptools/maptool/model/drawing/Cross.java
index 58ed13e4b4..2559cd9962 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/Cross.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/Cross.java
@@ -19,9 +19,7 @@
import java.awt.Point;
import java.awt.RenderingHints;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.server.Mapper;
import net.rptools.maptool.server.proto.drawing.CrossDrawableDto;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
@@ -43,21 +41,8 @@ public Cross(GUID id, int startX, int startY, int endX, int endY) {
endPoint = new Point(endX, endY);
}
- public Cross(Cross other) {
- super(other);
-
- this.startPoint = new Point(other.startPoint);
- this.endPoint = new Point(other.endPoint);
- }
-
- @Override
- public Drawable copy() {
- return new Cross(this);
- }
-
- @Override
- public @Nonnull Area getArea(Zone zone) {
- return new Area(getBounds(zone));
+ public Area getArea() {
+ return new Area(getBounds());
}
@Override
@@ -74,21 +59,13 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setCrossDrawable(dto).build();
}
- public static Cross fromDto(CrossDrawableDto dto) {
- var id = GUID.valueOf(dto.getId());
- var startPoint = dto.getStartPoint();
- var endPoint = dto.getEndPoint();
- var drawable =
- new Cross(id, startPoint.getX(), startPoint.getY(), endPoint.getX(), endPoint.getY());
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public java.awt.Rectangle getBounds() {
- @Override
- public java.awt.Rectangle getBounds(Zone zone) {
if (bounds == null) {
int x = Math.min(startPoint.x, endPoint.x);
int y = Math.min(startPoint.y, endPoint.y);
@@ -109,8 +86,7 @@ public Point getEndPoint() {
return endPoint;
}
- @Override
- protected void draw(Zone zone, Graphics2D g) {
+ protected void draw(Graphics2D g) {
int minX = Math.min(startPoint.x, endPoint.x);
int minY = Math.min(startPoint.y, endPoint.y);
@@ -128,8 +104,7 @@ protected void draw(Zone zone, Graphics2D g) {
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldAA);
}
- @Override
- protected void drawBackground(Zone zone, Graphics2D g) {
+ protected void drawBackground(Graphics2D g) {
int minX = Math.min(startPoint.x, endPoint.x);
int minY = Math.min(startPoint.y, endPoint.y);
diff --git a/src/main/java/net/rptools/maptool/model/drawing/Drawable.java b/src/main/java/net/rptools/maptool/model/drawing/Drawable.java
index 034fa9fcc2..2b10791b15 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/Drawable.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/Drawable.java
@@ -16,9 +16,12 @@
import java.awt.Graphics2D;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
+import net.rptools.maptool.model.ZonePoint;
+import net.rptools.maptool.server.Mapper;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import org.apache.logging.log4j.LogManager;
@@ -26,19 +29,15 @@
* @author drice
*/
public interface Drawable {
- Drawable copy();
- void draw(Zone zone, Graphics2D g, Pen pen);
+ void draw(Graphics2D g, Pen pen);
- java.awt.Rectangle getBounds(Zone zone);
+ java.awt.Rectangle getBounds();
- @Nonnull
- Area getArea(Zone zone);
+ Area getArea();
GUID getId();
- void setId(GUID guid);
-
Zone.Layer getLayer();
void setLayer(Zone.Layer layer);
@@ -46,27 +45,210 @@ public interface Drawable {
DrawableDto toDto();
static Drawable fromDto(DrawableDto drawableDto) {
- return switch (drawableDto.getDrawableTypeCase()) {
- case SHAPE_DRAWABLE -> ShapeDrawable.fromDto(drawableDto.getShapeDrawable());
- case RECTANGLE_DRAWABLE -> Rectangle.fromDto(drawableDto.getRectangleDrawable());
- case OVAL_DRAWABLE -> Oval.fromDto(drawableDto.getOvalDrawable());
- case CROSS_DRAWABLE -> Cross.fromDto(drawableDto.getCrossDrawable());
- case DRAWN_LABEL -> DrawnLabel.fromDto(drawableDto.getDrawnLabel());
- case LINE_SEGMENT -> LineSegment.fromDto(drawableDto.getLineSegment());
- case DRAWABLES_GROUP -> DrawablesGroup.fromDto(drawableDto.getDrawablesGroup());
- case RADIUS_CELL_TEMPLATE -> RadiusCellTemplate.fromDto(drawableDto.getRadiusCellTemplate());
- case LINE_CELL_TEMPLATE -> LineCellTemplate.fromDto(drawableDto.getLineCellTemplate());
- case RADIUS_TEMPLATE -> RadiusTemplate.fromDto(drawableDto.getRadiusTemplate());
- case BURST_TEMPLATE -> BurstTemplate.fromDto(drawableDto.getBurstTemplate());
- case CONE_TEMPLATE -> ConeTemplate.fromDto(drawableDto.getConeTemplate());
- case BLAST_TEMPLATE -> BlastTemplate.fromDto(drawableDto.getBlastTemplate());
- case LINE_TEMPLATE -> LineTemplate.fromDto(drawableDto.getLineTemplate());
- case WALL_TEMPLATE -> WallTemplate.fromDto(drawableDto.getWallTemplate());
+ switch (drawableDto.getDrawableTypeCase()) {
+ case SHAPE_DRAWABLE -> {
+ var dto = drawableDto.getShapeDrawable();
+ var shape = Mapper.map(dto.getShape());
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new ShapeDrawable(id, shape, dto.getUseAntiAliasing());
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case RECTANGLE_DRAWABLE -> {
+ var dto = drawableDto.getRectangleDrawable();
+ var id = GUID.valueOf(dto.getId());
+ var startPoint = dto.getStartPoint();
+ var endPoint = dto.getEndPoint();
+ var drawable =
+ new Rectangle(
+ id, startPoint.getX(), startPoint.getY(), endPoint.getX(), endPoint.getY());
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case OVAL_DRAWABLE -> {
+ var dto = drawableDto.getOvalDrawable();
+ var id = GUID.valueOf(dto.getId());
+ var startPoint = dto.getStartPoint();
+ var endPoint = dto.getEndPoint();
+ var drawable =
+ new Oval(id, startPoint.getX(), startPoint.getY(), endPoint.getX(), endPoint.getY());
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case CROSS_DRAWABLE -> {
+ var dto = drawableDto.getCrossDrawable();
+ var id = GUID.valueOf(dto.getId());
+ var startPoint = dto.getStartPoint();
+ var endPoint = dto.getEndPoint();
+ var drawable =
+ new Cross(id, startPoint.getX(), startPoint.getY(), endPoint.getX(), endPoint.getY());
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case DRAWN_LABEL -> {
+ var dto = drawableDto.getDrawnLabel();
+ var id = GUID.valueOf(dto.getId());
+ var bounds = dto.getBounds();
+ var drawable =
+ new DrawnLabel(id, dto.getText(), Mapper.map(dto.getBounds()), dto.getFont());
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case LINE_SEGMENT -> {
+ var dto = drawableDto.getLineSegment();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new LineSegment(id, dto.getWidth(), dto.getSquareCap());
+ var points = drawable.getPoints();
+ var pointDtos = dto.getPointsList();
+ pointDtos.forEach(p -> points.add(Mapper.map(p)));
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case DRAWABLES_GROUP -> {
+ var dto = drawableDto.getDrawablesGroup();
+ var id = GUID.valueOf(dto.getId());
+ var elements = new ArrayList();
+ var elementDtos = dto.getDrawnElementsList();
+ elementDtos.forEach(e -> elements.add(DrawnElement.fromDto(e)));
+ var drawable = new DrawablesGroup(id, elements);
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case RADIUS_CELL_TEMPLATE -> {
+ var dto = drawableDto.getRadiusCellTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new RadiusCellTemplate(id);
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case LINE_CELL_TEMPLATE -> {
+ var dto = drawableDto.getLineCellTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new LineCellTemplate(id);
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ if (!dto.getQuadrant().isEmpty()) {
+ drawable.setQuadrant(AbstractTemplate.Quadrant.valueOf(dto.getQuadrant()));
+ }
+ drawable.setMouseSlopeGreater(dto.getMouseSlopeGreater());
+ var pathVertex = dto.getPathVertex();
+ drawable.setPathVertex(new ZonePoint(pathVertex.getX(), pathVertex.getY()));
+ if (dto.hasName()) {
+ drawable.setName(dto.getName().getValue());
+ }
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case RADIUS_TEMPLATE -> {
+ var dto = drawableDto.getRadiusTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new RadiusTemplate(id);
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case BURST_TEMPLATE -> {
+ var dto = drawableDto.getBurstTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new BurstTemplate(id);
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case CONE_TEMPLATE -> {
+ var dto = drawableDto.getConeTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new ConeTemplate(id);
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ drawable.setDirection(AbstractTemplate.Direction.valueOf(dto.getDirection()));
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case BLAST_TEMPLATE -> {
+ var dto = drawableDto.getBlastTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new BlastTemplate(id, dto.getOffsetX(), dto.getOffsetY());
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ drawable.setDirection(AbstractTemplate.Direction.valueOf(dto.getDirection()));
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case LINE_TEMPLATE -> {
+ var dto = drawableDto.getLineTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new LineTemplate(id);
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ if (!dto.getQuadrant().isEmpty()) {
+ drawable.setQuadrant(AbstractTemplate.Quadrant.valueOf(dto.getQuadrant()));
+ }
+ drawable.setMouseSlopeGreater(dto.getMouseSlopeGreater());
+ var pathVertex = dto.getPathVertex();
+ drawable.setPathVertex(new ZonePoint(pathVertex.getX(), pathVertex.getY()));
+ drawable.setDoubleWide(dto.getDoubleWide());
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+ return drawable;
+ }
+ case WALL_TEMPLATE -> {
+ var dto = drawableDto.getWallTemplate();
+ var id = GUID.valueOf(dto.getId());
+ var drawable = new WallTemplate(id);
+ drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
+ drawable.setRadius(dto.getRadius());
+ var vertex = dto.getVertex();
+ drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
+ drawable.setMouseSlopeGreater(dto.getMouseSlopeGreater());
+ var pathVertex = dto.getPathVertex();
+ drawable.setPathVertex(new ZonePoint(pathVertex.getX(), pathVertex.getY()));
+ drawable.setDoubleWide(dto.getDoubleWide());
+ if (dto.hasName()) drawable.setName(dto.getName().getValue());
+ drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
+
+ var cellpoints = new ArrayList();
+ for (var point : dto.getPointsList())
+ cellpoints.add(new CellPoint(point.getX(), point.getY()));
+ drawable.setPath(cellpoints);
+
+ return drawable;
+ }
default -> {
LogManager.getLogger(Drawable.class)
.warn("unknown DrawableDto type: " + drawableDto.getDrawableTypeCase());
- yield null;
+ return null;
}
- };
+ }
}
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/DrawablesGroup.java b/src/main/java/net/rptools/maptool/model/drawing/DrawablesGroup.java
index 4065a5d74b..bd8eb4f018 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/DrawablesGroup.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/DrawablesGroup.java
@@ -18,11 +18,8 @@
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.Area;
-import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import net.rptools.maptool.server.proto.drawing.DrawablesGroupDto;
@@ -42,29 +39,15 @@ public DrawablesGroup(GUID id, List drawableList) {
this.drawableList = drawableList;
}
- public DrawablesGroup(DrawablesGroup other) {
- super(other);
-
- this.drawableList = new ArrayList<>(other.drawableList.size());
- for (final var element : other.drawableList) {
- this.drawableList.add(new DrawnElement(element));
- }
- }
-
- @Override
- public Drawable copy() {
- return new DrawablesGroup(this);
- }
-
public List getDrawableList() {
return drawableList;
}
@Override
- public Rectangle getBounds(Zone zone) {
+ public Rectangle getBounds() {
Rectangle bounds = null;
for (DrawnElement element : drawableList) {
- Rectangle drawnBounds = new Rectangle(element.getDrawable().getBounds(zone));
+ Rectangle drawnBounds = new Rectangle(element.getDrawable().getBounds());
// Handle pen size
Pen pen = element.getPen();
int penSize = (int) (pen.getThickness() / 2 + 1);
@@ -81,18 +64,18 @@ public Rectangle getBounds(Zone zone) {
}
@Override
- public @Nonnull Area getArea(Zone zone) {
- Area area = new Area();
+ public Area getArea() {
+ Area area = null;
for (DrawnElement element : drawableList) {
boolean isEraser = element.getPen().isEraser();
-
- if (isEraser) {
- // Optimization: erasing from nothing is a no-op.
- if (!area.isEmpty()) {
- area.subtract(element.getDrawable().getArea(zone));
- }
+ if (area == null) {
+ if (!isEraser) area = new Area(element.getDrawable().getArea());
} else {
- area.add(element.getDrawable().getArea(zone));
+ if (isEraser) {
+ area.subtract(element.getDrawable().getArea());
+ } else {
+ area.add(element.getDrawable().getArea());
+ }
}
}
return area;
@@ -109,29 +92,16 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setDrawablesGroup(dto).build();
}
- public static DrawablesGroup fromDto(DrawablesGroupDto dto) {
- var id = GUID.valueOf(dto.getId());
- var elements = new ArrayList();
- var elementDtos = dto.getDrawnElementsList();
- elementDtos.forEach(e -> elements.add(DrawnElement.fromDto(e)));
- var drawable = new DrawablesGroup(id, elements);
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
-
@Override
- protected void draw(Zone zone, Graphics2D g) {
+ protected void draw(Graphics2D g) {
// This should never be called
for (DrawnElement element : drawableList) {
- element.getDrawable().draw(zone, g, element.getPen());
+ element.getDrawable().draw(g, element.getPen());
}
}
@Override
- protected void drawBackground(Zone zone, Graphics2D g) {
+ protected void drawBackground(Graphics2D g) {
// This should never be called
}
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/DrawnElement.java b/src/main/java/net/rptools/maptool/model/drawing/DrawnElement.java
index c96197ebc0..3cbd9971f3 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/DrawnElement.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/DrawnElement.java
@@ -27,10 +27,6 @@ public DrawnElement(Drawable drawable, Pen pen) {
this.pen = pen;
}
- public DrawnElement(DrawnElement other) {
- this(other.drawable.copy(), new Pen(other.pen));
- }
-
public Drawable getDrawable() {
return drawable;
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/DrawnLabel.java b/src/main/java/net/rptools/maptool/model/drawing/DrawnLabel.java
index b1f246145d..7e33424dd5 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/DrawnLabel.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/DrawnLabel.java
@@ -15,17 +15,14 @@
package net.rptools.maptool.model.drawing;
import com.google.protobuf.StringValue;
-import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
import javax.swing.CellRendererPane;
-import javax.swing.text.Style;
import net.rptools.maptool.client.swing.TwoToneTextPane;
+import net.rptools.maptool.client.tool.drawing.DrawnTextTool;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.server.Mapper;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import net.rptools.maptool.server.proto.drawing.DrawnLabelDto;
@@ -38,13 +35,13 @@
public class DrawnLabel extends AbstractDrawing {
/** The bounds of the display rectangle */
- private final Rectangle bounds;
+ private Rectangle bounds = new Rectangle();
/** Text being painted. */
- private final String text;
+ private String text;
/** The font used to paint the text. */
- private final String font;
+ private String font;
/** The pane used to render the text */
private transient CellRendererPane renderer;
@@ -52,23 +49,25 @@ public class DrawnLabel extends AbstractDrawing {
/** The text pane used to paint the text. */
private transient TwoToneTextPane textPane;
- public DrawnLabel(GUID id, String theText, Rectangle theBounds, String aFont) {
- super(id);
+ /**
+ * Create a new drawn label.
+ *
+ * @param theText Text to be drawn
+ * @param theBounds The bounds containing the text.
+ * @param aFont The font used to draw the text as a string that can be passed to {@link
+ * Font#decode(java.lang.String)}.
+ */
+ public DrawnLabel(String theText, Rectangle theBounds, String aFont) {
text = theText;
bounds = theBounds;
font = aFont;
}
- public DrawnLabel(DrawnLabel other) {
- super(other);
- this.bounds = new Rectangle(other.bounds);
- this.text = other.text;
- this.font = other.font;
- }
-
- @Override
- public Drawable copy() {
- return new DrawnLabel(this);
+ public DrawnLabel(GUID id, String theText, Rectangle theBounds, String aFont) {
+ super(id);
+ text = theText;
+ bounds = theBounds;
+ font = aFont;
}
public String getText() {
@@ -79,26 +78,32 @@ public String getFont() {
return font;
}
- public void draw(Zone zone, Graphics2D aG) {
+ /**
+ * @see net.rptools.maptool.model.drawing.Drawable#draw(java.awt.Graphics2D,
+ * net.rptools.maptool.model.drawing.Pen)
+ */
+ public void draw(Graphics2D aG) {
if (renderer == null) {
renderer = new CellRendererPane();
- textPane = createTextPane(bounds, font);
+ textPane = DrawnTextTool.createTextPane(bounds, null, font);
textPane.setText(text);
}
renderer.paintComponent(aG, textPane, null, bounds);
}
@Override
- protected void drawBackground(Zone zone, Graphics2D g) {}
+ protected void drawBackground(Graphics2D g) {}
- @Override
- public Rectangle getBounds(Zone zone) {
+ /**
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public Rectangle getBounds() {
return bounds;
}
- @Override
- public @Nonnull Area getArea(Zone zone) {
- return new Area();
+ public Area getArea() {
+ // TODO Auto-generated method stub
+ return null;
}
@Override
@@ -106,7 +111,7 @@ public DrawableDto toDto() {
var dto = DrawnLabelDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
- .setBounds(Mapper.map(bounds))
+ .setBounds(Mapper.map(getBounds()))
.setText(getText())
.setFont(getFont());
@@ -114,35 +119,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setDrawnLabel(dto).build();
}
-
- public static DrawnLabel fromDto(DrawnLabelDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new DrawnLabel(id, dto.getText(), Mapper.map(dto.getBounds()), dto.getFont());
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
-
- /**
- * Create a text pane with the passed bounds, pen, and font data
- *
- * @param bounds Bounds of the new text pane
- * @param font Font used to pain the text
- * @return A text pane used to draw text
- */
- private static TwoToneTextPane createTextPane(Rectangle bounds, String font) {
- // Create a text component and place it on the renderer's component
- TwoToneTextPane textPane = new TwoToneTextPane();
- textPane.setBounds(bounds);
- textPane.setOpaque(false);
- textPane.setBackground(new Color(0, 0, 0, 0)); // Transparent
-
- // Create a style for the component
- Style style = textPane.addStyle("default", null);
- TwoToneTextPane.setFont(style, Font.decode(font));
- textPane.setLogicalStyle(style);
- return textPane;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/LineCellTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/LineCellTemplate.java
index fec9380ed0..1a5a5f87c7 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/LineCellTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/LineCellTemplate.java
@@ -18,11 +18,13 @@
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.Area;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
@@ -41,16 +43,22 @@ public class LineCellTemplate extends AbstractTemplate {
*-------------------------------------------------------------------------------------------*/
/** This vertex is used to determine the path. */
- private ZonePoint pathVertex = null;
+ private ZonePoint pathVertex;
/** The calculated path for this line. */
- private transient List path;
+ private List path;
/** The pool of points. */
- private transient List pool;
+ private List pool;
- /** The line is drawn in this quadrant. */
- private transient Quadrant quadrant = null;
+ /**
+ * The line is drawn in this quadrant. A string is used as a hack to get around the hessian
+ * library's problem w/ serialization of enums
+ */
+ private String quadrant = null;
+
+ /** Flag used to determine mouse position relative to vertex position */
+ private boolean mouseSlopeGreater;
public LineCellTemplate() {}
@@ -58,11 +66,6 @@ public LineCellTemplate(GUID id) {
super(id);
}
- public LineCellTemplate(LineCellTemplate other) {
- super(other);
- this.pathVertex = new ZonePoint(other.pathVertex);
- }
-
/*---------------------------------------------------------------------------------------------
* Overridden AbstractTemplate Methods
*-------------------------------------------------------------------------------------------*/
@@ -89,15 +92,8 @@ protected void paintBorder(
// Have to scan 3 points behind and ahead, since that is the maximum number of points
// that can be added to the path from any single intersection.
boolean[] noPaint = new boolean[4];
- final var path = getPath();
- if (path == null) {
- return;
- }
-
for (int i = pElement - 3; i < pElement + 3; i++) {
- if (i < 0 || i >= path.size() || i == pElement) {
- continue;
- }
+ if (i < 0 || i >= path.size() || i == pElement) continue;
CellPoint p = path.get(i);
// Ignore diagonal cells and cells that are not adjacent
@@ -116,18 +112,28 @@ protected void paintBorder(
if (!noPaint[3]) paintCloseHorizontalBorder(g, xOff, yOff, gridSize, getQuadrant());
}
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractTemplate#paint(java.awt.Graphics2D, boolean,
+ * boolean)
+ */
@Override
- protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
- if (zone == null) {
+ protected void paint(Graphics2D g, boolean border, boolean area) {
+ if (MapTool.getCampaign().getZone(getZoneId()) == null) {
return;
}
- final var path = getPath();
- if (path == null) {
+ // Need to paint? We need a line and to translate the painting
+ if (pathVertex == null) {
+ return;
+ }
+ if (getRadius() == 0) {
+ return;
+ }
+ if (calcPath() == null) {
return;
}
// Paint each element in the path
- int gridSize = zone.getGrid().getSize();
+ int gridSize = MapTool.getCampaign().getZone(getZoneId()).getGrid().getSize();
ListIterator i = path.listIterator();
while (i.hasNext()) {
CellPoint p = i.next();
@@ -135,20 +141,13 @@ protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
int yOff = p.y * gridSize;
int distance = getDistance(p.x, p.y);
- switch (getQuadrant()) {
- case NORTH_EAST -> {
- yOff = yOff - gridSize;
- }
- case SOUTH_WEST -> {
- xOff = xOff - gridSize;
- }
- case NORTH_WEST -> {
- xOff = xOff - gridSize;
- yOff = yOff - gridSize;
- }
- case SOUTH_EAST -> {
- // Nothing to do.
- }
+ if (quadrant.equals(Quadrant.NORTH_EAST.name())) {
+ yOff = yOff - gridSize;
+ } else if (quadrant.equals(Quadrant.SOUTH_WEST.name())) {
+ xOff = xOff - gridSize;
+ } else if (quadrant.equals(Quadrant.NORTH_WEST.name())) {
+ xOff = xOff - gridSize;
+ yOff = yOff - gridSize;
}
// Paint what is needed.
@@ -189,70 +188,86 @@ public void setRadius(int squares) {
/**
* Calculate the path
*
- * The path is always calculated as if it were in the south-east quadrant. I.e., the x and y
- * coordinates of the path points will never decrease.
- *
* @return The new path or null if there is no path.
*/
- protected @Nullable List calcPath() {
- int radius = getRadius();
- ZonePoint vertex = getVertex();
-
- if (radius == 0 || vertex == null || pathVertex == null) {
+ protected List calcPath() {
+ if (getRadius() == 0) {
return null;
}
+ if (pathVertex == null) {
+ return null;
+ }
+ int radius = getRadius();
+
// Is there a slope?
+ ZonePoint vertex = getVertex();
if (vertex.equals(pathVertex)) {
return null;
}
- double dx = Math.abs(pathVertex.x - vertex.x);
- double dy = Math.abs(pathVertex.y - vertex.y);
- final boolean isShallowSlope = dx >= dy;
+ double dx = pathVertex.x - vertex.x;
+ double dy = pathVertex.y - vertex.y;
+ setQuadrant(
+ (dx < 0)
+ ? (dy < 0 ? Quadrant.NORTH_WEST : Quadrant.SOUTH_WEST)
+ : (dy < 0 ? Quadrant.NORTH_EAST : Quadrant.SOUTH_EAST));
- // To start, a half cell deviation is enough to switch rows.
- double deviationInY = 0.5;
-
- final var path = new ArrayList();
// Start the line at 0,0
- CellPoint p = getPointFromPool(0, 0);
- path.add(p);
-
- // In this loop we pretend we have a shallow slope. If that's not true, we'll fix it afterward.
- double slope = isShallowSlope ? (dy / dx) : (dx / dy);
- assert slope >= 0;
- while (getDistance(p.x, p.y) < radius) {
- p = getPointFromPool(p.x, p.y);
-
- // Step to the next column.
- ++p.x;
-
- // Step to the next row if the ideal line has deviated enough.
- // y-value always goes up, so we don't need to check the < 0 case.
- deviationInY += slope;
- if (deviationInY >= 1) {
- ++p.y;
- deviationInY -= 1;
- }
-
- path.add(p);
- }
-
- if (!isShallowSlope) {
- // All our x-values should be y-values and vice versa. So swap them all.
- for (final var point : path) {
- final var tmp = point.x;
- point.x = point.y;
- point.y = tmp;
- }
- }
-
- // Clear out the last of the pool.
- if (pool != null) {
- pool.clear();
- pool = null;
- }
-
+ clearPath();
+ path = new ArrayList();
+ path.add(getPointFromPool(0, 0));
+
+ MathContext mc = MathContext.DECIMAL128;
+ MathContext rmc = new MathContext(MathContext.DECIMAL64.getPrecision(), RoundingMode.CEILING);
+ if (dx != 0 && dy != 0) {
+ BigDecimal m = BigDecimal.valueOf(dy).divide(BigDecimal.valueOf(dx), mc).abs();
+
+ // Find the path
+ CellPoint p = path.get(path.size() - 1);
+ while (getDistance(p.x, p.y) < radius) {
+ int x = p.x;
+ int y = p.y;
+
+ // Which border does the point exit the cell?
+ double xValue = BigDecimal.valueOf(y + 1).divide(m, mc).round(rmc).doubleValue();
+ double yValue = BigDecimal.valueOf(x + 1).multiply(m, mc).round(rmc).doubleValue();
+
+ if (xValue == x + 1 && yValue == y + 1) {
+ // Special case, right on the diagonal
+ path.add(getPointFromPool(x + 1, y + 1));
+ } else if (Math.round(xValue) == x + 1) {
+ path.add(getPointFromPool(x + 1, y + 1));
+ } else if (Math.round(xValue) == x) {
+ path.add(getPointFromPool(x, y + 1));
+ } else if (Math.round(yValue) == y + 1) {
+ path.add(getPointFromPool(x + 1, y + 1));
+ } else if (Math.round(yValue) == y) {
+ path.add(getPointFromPool(x + 1, y));
+ } else {
+ return path;
+ } // endif
+ p = path.get(path.size() - 1);
+ } // endwhile
+
+ // Clear the last of the pool
+ if (pool != null) {
+ pool.clear();
+ pool = null;
+ } // endif
+ } else {
+ // Straight line
+ int xInc = dx != 0 ? 1 : 0;
+ int yInc = dy != 0 ? 1 : 0;
+ int x = xInc;
+ int y = yInc;
+ int xTouch = (dx != 0) ? 0 : -1;
+ int yTouch = (dy != 0) ? 0 : -1;
+ while (getDistance(x, y) <= radius) {
+ path.add(getPointFromPool(x, y));
+ x += xInc;
+ y += yInc;
+ } // endwhile
+ } // endif
return path;
}
@@ -263,7 +278,7 @@ public void setRadius(int squares) {
* @param y The y coordinate of the new point.
* @return The new point.
*/
- private CellPoint getPointFromPool(int x, int y) {
+ public CellPoint getPointFromPool(int x, int y) {
CellPoint p = null;
if (pool != null) {
p = pool.remove(pool.size() - 1);
@@ -277,13 +292,22 @@ private CellPoint getPointFromPool(int x, int y) {
return p;
}
+ /**
+ * Add a point back to the pool.
+ *
+ * @param p Add this point back
+ */
+ public void addPointToPool(CellPoint p) {
+ if (pool != null) pool.add(p);
+ }
+
/**
* Get the pathVertex for this LineTemplate.
*
* @return Returns the current value of pathVertex.
*/
public ZonePoint getPathVertex() {
- return pathVertex == null ? null : new ZonePoint(pathVertex);
+ return pathVertex;
}
/**
@@ -300,8 +324,7 @@ public void setPathVertex(ZonePoint pathVertex) {
}
/** Clear the current path. This will cause it to be recalculated during the next draw. */
- private void clearPath() {
- quadrant = null;
+ public void clearPath() {
if (path != null) {
pool = path;
}
@@ -313,110 +336,134 @@ private void clearPath() {
*
* @return Returns the current value of quadrant.
*/
- private @Nonnull Quadrant getQuadrant() {
- if (quadrant == null) {
- final var vertex = getVertex();
- if (vertex == null || pathVertex == null || pathVertex.equals(vertex)) {
- // Not a valid line, so quadrant is meaningless. Just pick one.
- quadrant = Quadrant.NORTH_WEST;
- } else {
- double dx = pathVertex.x - vertex.x;
- double dy = pathVertex.y - vertex.y;
- quadrant =
- (dx < 0)
- ? (dy < 0 ? Quadrant.NORTH_WEST : Quadrant.SOUTH_WEST)
- : (dy < 0 ? Quadrant.NORTH_EAST : Quadrant.SOUTH_EAST);
- }
+ public Quadrant getQuadrant() {
+ if (quadrant != null) {
+ return Quadrant.valueOf(quadrant);
}
-
- return quadrant;
+ return null;
}
/**
- * @return Getter for path
+ * Set the value of quadrant for this LineTemplate.
+ *
+ * @param quadrant The quadrant to set.
*/
- private @Nullable List getPath() {
- if (path == null) {
- path = calcPath();
+ public void setQuadrant(Quadrant quadrant) {
+ if (quadrant != null) {
+ this.quadrant = quadrant.name();
+ } else {
+ this.quadrant = null;
}
+ }
+
+ /**
+ * Get the mouseSlopeGreater for this LineTemplate.
+ *
+ * @return Returns the current value of mouseSlopeGreater.
+ */
+ public boolean isMouseSlopeGreater() {
+ return mouseSlopeGreater;
+ }
+ /**
+ * Set the value of mouseSlopeGreater for this LineTemplate.
+ *
+ * @param aMouseSlopeGreater The mouseSlopeGreater to set.
+ */
+ public void setMouseSlopeGreater(boolean aMouseSlopeGreater) {
+ mouseSlopeGreater = aMouseSlopeGreater;
+ }
+
+ /**
+ * @return Getter for path
+ */
+ public List getPath() {
return path;
}
+ /**
+ * @param path Setter for the path to set
+ */
+ public void setPath(List path) {
+ this.path = path;
+ }
+
/*---------------------------------------------------------------------------------------------
* Drawable Interface Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Drawable copy() {
- return new LineCellTemplate(this);
- }
-
- @Override
- public Rectangle getBounds(Zone zone) {
+ /**
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public Rectangle getBounds() {
// Get all of the numbers needed for the calculation
- if (zone == null) {
+ if (MapTool.getCampaign().getZone(getZoneId()) == null) {
return new Rectangle();
}
- // The end of the path is the point further away from vertex.
- final var path = getPath();
+ int gridSize = MapTool.getCampaign().getZone(getZoneId()).getGrid().getSize();
+ ZonePoint vertex = getVertex();
+
+ // Find the point that is farthest away in the path, then adjust
+ ZonePoint minp = null;
+ ZonePoint maxp = null;
if (path == null) {
- // If the path is null, the line is invalid.
- return new Rectangle();
+ calcPath();
+ if (path == null) {
+ // If the calculated path is still null, then the line is invalid.
+ return new Rectangle();
+ }
}
+ for (CellPoint pt : path) {
+ ZonePoint p = MapTool.getCampaign().getZone(getZoneId()).getGrid().convert(pt);
+ p = new ZonePoint(vertex.x + p.x, vertex.y + p.y);
- var first = new CellPoint(path.getFirst());
- var last = new CellPoint(path.getLast());
-
- // `first` should be (0, 0), but let's not rely on that.
- final var quadrant = getQuadrant();
- first.x *= getXMult(quadrant);
- last.x *= getXMult(quadrant);
- first.y *= getYMult(quadrant);
- last.y *= getYMult(quadrant);
-
- // Now convert to zone points.
- ZonePoint firstZonePoint = zone.getGrid().convert(first);
- ZonePoint lastZonePoint = zone.getGrid().convert(last);
+ if (minp == null) {
+ minp = new ZonePoint(p.x, p.y);
+ maxp = new ZonePoint(p.x, p.y);
+ }
+ minp.x = Math.min(minp.x, p.x);
+ minp.y = Math.min(minp.y, p.y);
- ZonePoint vertex = getVertex();
- int gridSize = zone.getGrid().getSize();
- ZonePoint minZonePoint =
- new ZonePoint(
- vertex.x + Math.min(firstZonePoint.x, lastZonePoint.x),
- vertex.y + Math.min(firstZonePoint.y, lastZonePoint.y));
- ZonePoint maxZonePoint =
- new ZonePoint(
- vertex.x + Math.max(firstZonePoint.x, lastZonePoint.x) + gridSize,
- vertex.y + Math.max(firstZonePoint.y, lastZonePoint.y) + gridSize);
+ maxp.x = Math.max(maxp.x, p.x);
+ maxp.y = Math.max(maxp.y, p.y);
+ }
+ maxp.x += gridSize;
+ maxp.y += gridSize;
+
+ // The path is only calculated for the south-east quadrant, so
+ // appropriately reflect the bounding box around the starting vertex.
+ if (getXMult(getQuadrant()) < 0) {
+ minp.x -= gridSize;
+ maxp.x -= gridSize;
+ }
+ if (getYMult(getQuadrant()) < 0) {
+ minp.y -= gridSize;
+ maxp.y -= gridSize;
+ }
+ int width = (maxp.x - minp.x);
+ int height = (maxp.y - minp.y);
// Account for pen size
// We don't really know what the pen size will be, so give a very rough
// overestimate
// We'll have to figure this out someday
- minZonePoint.x -= 10;
- minZonePoint.y -= 10;
- maxZonePoint.x += 10;
- maxZonePoint.y += 10;
-
- return new Rectangle(
- minZonePoint.x,
- minZonePoint.y,
- maxZonePoint.x - minZonePoint.x,
- maxZonePoint.y - minZonePoint.y);
+ minp.x -= 10;
+ minp.y -= 10;
+ width += 20;
+ height += 20;
+
+ return new Rectangle(minp.x, minp.y, width, height);
}
@Override
- public @Nonnull Area getArea(Zone zone) {
- if (zone == null) {
- return new Area();
- }
-
- final var path = getPath();
+ public Area getArea() {
if (path == null) {
+ calcPath();
+ }
+ Zone zone = MapTool.getCampaign().getZone(getZoneId());
+ if (path == null || zone == null || getRadius() == 0 || pathVertex == null) {
return new Area();
}
-
// Create an area by merging all the squares along the path
Area result = new Area();
int gridSize = zone.getGrid().getSize();
@@ -429,20 +476,13 @@ public Rectangle getBounds(Zone zone) {
int xOff = p.x * gridSize;
int yOff = p.y * gridSize;
- switch (q) {
- case NORTH_EAST -> {
- yOff = yOff - gridSize;
- }
- case SOUTH_WEST -> {
- xOff = xOff - gridSize;
- }
- case NORTH_WEST -> {
- xOff = xOff - gridSize;
- yOff = yOff - gridSize;
- }
- case SOUTH_EAST -> {
- // Nothing to do.
- }
+ if (quadrant.equals(Quadrant.NORTH_EAST.name())) {
+ yOff = yOff - gridSize;
+ } else if (quadrant.equals(Quadrant.SOUTH_WEST.name())) {
+ xOff = xOff - gridSize;
+ } else if (quadrant.equals(Quadrant.NORTH_WEST.name())) {
+ xOff = xOff - gridSize;
+ yOff = yOff - gridSize;
}
int rx = getVertex().x + getXMult(q) * xOff + ((getXMult(q) - 1) / 2) * gridSize;
@@ -454,14 +494,24 @@ public Rectangle getBounds(Zone zone) {
@Override
public DrawableDto toDto() {
+
+ if (getQuadrant() == null) {
+ calcPath(); // force calculation of the quadrent
+ }
+
var dto = LineCellTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
- .setVertex(getVertex().toDto());
+ .setVertex(getVertex().toDto())
+ .setMouseSlopeGreater(isMouseSlopeGreater());
- if (pathVertex != null) {
- dto.setPathVertex(pathVertex.toDto());
+ if (getQuadrant() != null) {
+ dto.setQuadrant(getQuadrant().name());
+ }
+ if (getPathVertex() != null) {
+ dto.setPathVertex(getPathVertex().toDto());
}
if (getName() != null) {
@@ -470,19 +520,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setLineCellTemplate(dto).build();
}
-
- public static LineCellTemplate fromDto(LineCellTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new LineCellTemplate(id);
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- var pathVertex = dto.getPathVertex();
- drawable.setPathVertex(new ZonePoint(pathVertex.getX(), pathVertex.getY()));
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/LineSegment.java b/src/main/java/net/rptools/maptool/model/drawing/LineSegment.java
index 68c268e396..4b1faa9bc7 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/LineSegment.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/LineSegment.java
@@ -23,10 +23,8 @@
import java.awt.geom.GeneralPath;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import javax.annotation.Nonnull;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.server.Mapper;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import net.rptools.maptool.server.proto.drawing.LineSegmentDrawableDto;
@@ -53,21 +51,6 @@ public LineSegment(GUID id, float width, boolean squareCap) {
this.squareCap = squareCap;
}
- public LineSegment(LineSegment other) {
- super(other);
- this.width = other.width;
- this.squareCap = other.squareCap;
-
- for (final var point : other.points) {
- this.points.add(new Point(point));
- }
- }
-
- @Override
- public Drawable copy() {
- return new LineSegment(this);
- }
-
@SuppressWarnings("ConstantValue")
private Object readResolve() {
if (width == null) {
@@ -90,12 +73,11 @@ public List getPoints() {
return points;
}
- @Override
- public @Nonnull Area getArea(Zone zone) {
+ public Area getArea() {
if (area == null) {
area = createLineArea();
}
- return Objects.requireNonNullElseGet(area, Area::new);
+ return area;
}
@Override
@@ -112,23 +94,8 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setLineSegment(dto).build();
}
- public static LineSegment fromDto(LineSegmentDrawableDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new LineSegment(id, dto.getWidth(), dto.getSquareCap());
- var points = drawable.getPoints();
- var pointDtos = dto.getPointsList();
- pointDtos.forEach(p -> points.add(Mapper.map(p)));
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
-
private Area createLineArea() {
- if (points.size() < 1) {
- return null;
- }
+ if (points.size() < 1) return null;
GeneralPath gp = null;
for (Point point : points) {
if (gp == null) {
@@ -143,20 +110,24 @@ private Area createLineArea() {
}
@Override
- protected void draw(Zone zone, Graphics2D g) {
+ protected void draw(Graphics2D g) {
width = ((BasicStroke) g.getStroke()).getLineWidth();
squareCap = ((BasicStroke) g.getStroke()).getEndCap() == BasicStroke.CAP_SQUARE;
- Area area = getArea(zone);
- g.fill(area);
+ Area area = getArea();
+ if (area != null) g.fill(area);
}
@Override
- protected void drawBackground(Zone zone, Graphics2D g) {
+ protected void drawBackground(Graphics2D g) {
// do nothing
}
- @Override
- public Rectangle getBounds(Zone zone) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public Rectangle getBounds() {
if (lastPointCount == points.size()) {
return cachedBounds;
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/LineTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/LineTemplate.java
index dff43ffb95..4ebfab6c4d 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/LineTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/LineTemplate.java
@@ -24,8 +24,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
-import javax.annotation.Nonnull;
import net.rptools.maptool.client.AppState;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
@@ -72,30 +72,6 @@ public LineTemplate(GUID id) {
super(id);
}
- public LineTemplate(LineTemplate other) {
- super(other);
-
- this.doubleWide = other.doubleWide;
- this.pathVertex = new ZonePoint(other.pathVertex);
-
- if (other.path != null) {
- this.path = new ArrayList<>(other.path.size());
- for (final var cellPoint : other.path) {
- this.path.add(new CellPoint(cellPoint));
- }
- }
-
- if (other.pool != null) {
- this.pool = new ArrayList<>(other.pool.size());
- for (final var cellPoint : other.pool) {
- this.pool.add(new CellPoint(cellPoint));
- }
- }
-
- this.quadrant = other.quadrant;
- this.mouseSlopeGreater = other.mouseSlopeGreater;
- }
-
/*---------------------------------------------------------------------------------------------
* Overridden AbstractTemplate Methods
*-------------------------------------------------------------------------------------------*/
@@ -142,18 +118,22 @@ protected void paintBorder(
if (!noPaint[3]) paintCloseHorizontalBorder(g, xOff, yOff, gridSize, getQuadrant());
}
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractTemplate#paint(java.awt.Graphics2D, boolean,
+ * boolean)
+ */
@Override
- protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
- if (zone == null) {
+ protected void paint(Graphics2D g, boolean border, boolean area) {
+ if (MapTool.getCampaign().getZone(getZoneId()) == null) {
return;
}
// Need to paint? We need a line and to translate the painting
- if (pathVertex == null || getRadius() == 0 || calcPath() == null) {
- return;
- }
+ if (pathVertex == null) return;
+ if (getRadius() == 0) return;
+ if (calcPath() == null) return;
// Paint each element in the path
- int gridSize = zone.getGrid().getSize();
+ int gridSize = MapTool.getCampaign().getZone(getZoneId()).getGrid().getSize();
ListIterator i = path.listIterator();
while (i.hasNext()) {
CellPoint p = i.next();
@@ -404,18 +384,15 @@ public void setPath(List path) {
* Drawable Interface Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Drawable copy() {
- return new LineTemplate(this);
- }
-
- @Override
- public Rectangle getBounds(Zone zone) {
+ /**
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public Rectangle getBounds() {
// Get all of the numbers needed for the calculation
- if (zone == null) {
+ if (MapTool.getCampaign().getZone(getZoneId()) == null) {
return new Rectangle();
}
- int gridSize = zone.getGrid().getSize();
+ int gridSize = MapTool.getCampaign().getZone(getZoneId()).getGrid().getSize();
ZonePoint vertex = getVertex();
// Find the point that is farthest away in the path, then adjust
@@ -429,7 +406,7 @@ public Rectangle getBounds(Zone zone) {
}
}
for (CellPoint pt : path) {
- ZonePoint p = zone.getGrid().convert(pt);
+ ZonePoint p = MapTool.getCampaign().getZone(getZoneId()).getGrid().convert(pt);
p = new ZonePoint(vertex.x + p.x, vertex.y + p.y);
if (minp == null) {
@@ -475,10 +452,11 @@ public Rectangle getBounds(Zone zone) {
}
@Override
- public @Nonnull Area getArea(Zone zone) {
+ public Area getArea() {
if (path == null) {
calcPath();
}
+ Zone zone = MapTool.getCampaign().getZone(getZoneId());
if (path == null || zone == null || getRadius() == 0 || pathVertex == null) {
return new Area();
}
@@ -505,6 +483,7 @@ public DrawableDto toDto() {
var dto = LineTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
.setVertex(getVertex().toDto())
.setMouseSlopeGreater(isMouseSlopeGreater())
@@ -520,24 +499,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setLineTemplate(dto).build();
}
-
- public static LineTemplate fromDto(LineTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new LineTemplate(id);
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- if (!dto.getQuadrant().isEmpty()) {
- drawable.setQuadrant(AbstractTemplate.Quadrant.valueOf(dto.getQuadrant()));
- }
- drawable.setMouseSlopeGreater(dto.getMouseSlopeGreater());
- var pathVertex = dto.getPathVertex();
- drawable.setPathVertex(new ZonePoint(pathVertex.getX(), pathVertex.getY()));
- drawable.setDoubleWide(dto.getDoubleWide());
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/Oval.java b/src/main/java/net/rptools/maptool/model/drawing/Oval.java
index 9123ed0c9f..060b6c369b 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/Oval.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/Oval.java
@@ -18,9 +18,7 @@
import java.awt.Graphics2D;
import java.awt.geom.Area;
import java.awt.geom.Ellipse2D;
-import javax.annotation.Nonnull;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.server.Mapper;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import net.rptools.maptool.server.proto.drawing.OvalDrawableDto;
@@ -41,17 +39,8 @@ public Oval(GUID id, int x, int y, int width, int height) {
super(id, x, y, width, height);
}
- public Oval(Oval other) {
- super(other);
- }
-
@Override
- public Drawable copy() {
- return new Oval(this);
- }
-
- @Override
- protected void draw(Zone zone, Graphics2D g) {
+ protected void draw(Graphics2D g) {
int minX = Math.min(startPoint.x, endPoint.x);
int minY = Math.min(startPoint.y, endPoint.y);
@@ -62,7 +51,7 @@ protected void draw(Zone zone, Graphics2D g) {
}
@Override
- protected void drawBackground(Zone zone, Graphics2D g) {
+ protected void drawBackground(Graphics2D g) {
int minX = Math.min(startPoint.x, endPoint.x);
int minY = Math.min(startPoint.y, endPoint.y);
@@ -73,8 +62,8 @@ protected void drawBackground(Zone zone, Graphics2D g) {
}
@Override
- public @Nonnull Area getArea(Zone zone) {
- java.awt.Rectangle r = getBounds(zone);
+ public Area getArea() {
+ java.awt.Rectangle r = getBounds();
return new Area(new Ellipse2D.Double(r.x, r.y, r.width, r.height));
}
@@ -89,17 +78,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setOvalDrawable(dto).build();
}
-
- public static Oval fromDto(OvalDrawableDto dto) {
- var id = GUID.valueOf(dto.getId());
- var startPoint = dto.getStartPoint();
- var endPoint = dto.getEndPoint();
- var drawable =
- new Oval(id, startPoint.getX(), startPoint.getY(), endPoint.getX(), endPoint.getY());
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/RadiusCellTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/RadiusCellTemplate.java
index 5f4af61aa3..cb527e89cf 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/RadiusCellTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/RadiusCellTemplate.java
@@ -17,8 +17,9 @@
import com.google.protobuf.StringValue;
import java.awt.Graphics2D;
import java.awt.Rectangle;
+import java.awt.Shape;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
@@ -32,21 +33,19 @@
* @author naciron
*/
public class RadiusCellTemplate extends AbstractTemplate {
+
+ /** Renderer for the blast. The {@link Shape} is just a rectangle. */
+ private final ShapeDrawable renderer = new ShapeDrawable(new Rectangle());
+
+ /** Renderer for the blast. The {@link Shape} is just a rectangle. */
+ private final ShapeDrawable vertexRenderer = new ShapeDrawable(new Rectangle());
+
public RadiusCellTemplate() {}
public RadiusCellTemplate(GUID id) {
super(id);
}
- public RadiusCellTemplate(RadiusCellTemplate other) {
- super(other);
- }
-
- @Override
- public Drawable copy() {
- return new RadiusCellTemplate(this);
- }
-
/**
* Paint the border at a specific radius.
*
@@ -151,13 +150,20 @@ protected void paintArea(
}
}
- @Override
- protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
+ /**
+ * Paint the border or area of the template
+ *
+ * @param g Where to paint
+ * @param border Paint the border?
+ * @param area Paint the area?
+ */
+ protected void paint(Graphics2D g, boolean border, boolean area) {
int radius = getRadius();
+ GUID zoneId = getZoneId();
- if (zone == null || radius == 0) {
- return;
- }
+ if (radius == 0) return;
+ Zone zone = MapTool.getCampaign().getZone(zoneId);
+ if (zone == null) return;
// Find the proper distance
int gridSize = zone.getGrid().getSize();
@@ -169,12 +175,8 @@ protected void paint(Zone zone, Graphics2D g, boolean border, boolean area) {
int yOff = y * gridSize;
// Template specific painting
- if (border) {
- paintBorder(g, x, y, xOff, yOff, gridSize, getDistance(x, y));
- }
- if (area) {
- paintArea(g, x, y, xOff, yOff, gridSize, getDistance(x, y));
- }
+ if (border) paintBorder(g, x, y, xOff, yOff, gridSize, getDistance(x, y));
+ if (area) paintArea(g, x, y, xOff, yOff, gridSize, getDistance(x, y));
} // endfor
} // endfor
}
@@ -219,8 +221,15 @@ protected int getYMult(Quadrant q) {
* Drawable Interface Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Rectangle getBounds(Zone zone) {
+ /**
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public Rectangle getBounds() {
+ if (getZoneId() == null) {
+ // This avoids a NPE when loading up a campaign
+ return new Rectangle();
+ }
+ Zone zone = MapTool.getCampaign().getZone(getZoneId());
if (zone == null) {
return new Rectangle();
}
@@ -236,6 +245,40 @@ public Rectangle getBounds(Zone zone) {
return new Rectangle(x, y, w, h);
}
+ /**
+ * This methods adjusts the rectangle in the renderer to match the new radius, vertex, or
+ * direction. Due to the fact that it is impossible to draw to the cardinal directions evenly when
+ * the radius is an even number and still stay in the squares, that case isn't allowed.
+ */
+ private void adjustShape() {
+ if (getZoneId() == null) return;
+ Zone zone;
+ if (MapTool.isHostingServer()) {
+ zone = MapTool.getServer().getCampaign().getZone(getZoneId());
+ } else {
+ zone = MapTool.getCampaign().getZone(getZoneId());
+ }
+ if (zone == null) return;
+
+ int gridSize = zone.getGrid().getSize();
+ Rectangle r = (Rectangle) vertexRenderer.getShape();
+ r.setBounds(getVertex().x, getVertex().y, gridSize, gridSize);
+ r = (Rectangle) renderer.getShape();
+ r.setBounds(getVertex().x, getVertex().y, gridSize, gridSize);
+ r.x -= getRadius() * gridSize;
+ r.y -= getRadius() * gridSize;
+ r.width = r.height = (getRadius() * 2 + 1) * gridSize;
+ }
+
+ /**
+ * @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int)
+ */
+ @Override
+ public void setRadius(int squares) {
+ super.setRadius(squares);
+ adjustShape();
+ }
+
/**
* Get the distance to a specific coordinate.
*
@@ -251,8 +294,22 @@ public int getDistance(int x, int y) {
return distance;
}
+ /**
+ * @see
+ * net.rptools.maptool.model.drawing.AbstractTemplate#setVertex(net.rptools.maptool.model.ZonePoint)
+ */
+ @Override
+ public void setVertex(ZonePoint vertex) {
+ super.setVertex(vertex);
+ adjustShape();
+ }
+
@Override
- public @Nonnull Area getArea(Zone zone) {
+ public Area getArea() {
+ if (getZoneId() == null) {
+ return new Area();
+ }
+ Zone zone = getCampaign().getZone(getZoneId());
if (zone == null) {
return new Area();
}
@@ -287,6 +344,7 @@ public DrawableDto toDto() {
var dto = RadiusCellTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
.setVertex(getVertex().toDto());
@@ -294,17 +352,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setRadiusCellTemplate(dto).build();
}
-
- public static RadiusCellTemplate fromDto(RadiusCellTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new RadiusCellTemplate(id);
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/RadiusTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/RadiusTemplate.java
index 5542cac729..2455ea25bd 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/RadiusTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/RadiusTemplate.java
@@ -17,8 +17,10 @@
import com.google.protobuf.StringValue;
import java.awt.*;
import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
+import java.awt.geom.PathIterator;
+import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
@@ -40,15 +42,6 @@ public RadiusTemplate(GUID id) {
super(id);
}
- public RadiusTemplate(RadiusTemplate other) {
- super(other);
- }
-
- @Override
- public Drawable copy() {
- return new RadiusTemplate(this);
- }
-
/**
* Paint the border at a specific radius.
*
@@ -125,8 +118,15 @@ protected void paintArea(
* Drawable Interface Methods
*-------------------------------------------------------------------------------------------*/
- @Override
- public Rectangle getBounds(Zone zone) {
+ /**
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public Rectangle getBounds() {
+ if (getZoneId() == null) {
+ // This avoids a NPE when loading up a campaign
+ return new Rectangle();
+ }
+ Zone zone = MapTool.getCampaign().getZone(getZoneId());
if (zone == null) {
return new Rectangle();
}
@@ -137,8 +137,15 @@ public Rectangle getBounds(Zone zone) {
vertex.x - quadrantSize, vertex.y - quadrantSize, quadrantSize * 2, quadrantSize * 2);
}
- @Override
- public @Nonnull Area getArea(Zone zone) {
+ public PathIterator getPathIterator() {
+ return getArea().getPathIterator(new AffineTransform());
+ }
+
+ public Area getArea() {
+ if (getZoneId() == null) {
+ return new Area();
+ }
+ Zone zone = getCampaign().getZone(getZoneId());
if (zone == null) {
return new Area();
}
@@ -168,6 +175,7 @@ public DrawableDto toDto() {
var dto = RadiusTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
.setVertex(getVertex().toDto());
@@ -175,17 +183,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setRadiusTemplate(dto).build();
}
-
- public static RadiusTemplate fromDto(RadiusTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new RadiusTemplate(id);
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/drawing/Rectangle.java b/src/main/java/net/rptools/maptool/model/drawing/Rectangle.java
index b0dbfa771e..ade163f6da 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/Rectangle.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/Rectangle.java
@@ -19,9 +19,7 @@
import java.awt.Point;
import java.awt.RenderingHints;
import java.awt.geom.Area;
-import javax.annotation.Nonnull;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.server.Mapper;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import net.rptools.maptool.server.proto.drawing.RectangleDrawableDto;
@@ -43,20 +41,8 @@ public Rectangle(int startX, int startY, int endX, int endY) {
endPoint = new Point(endX, endY);
}
- public Rectangle(Rectangle other) {
- super(other);
- this.startPoint = new Point(other.startPoint);
- this.endPoint = new Point(other.endPoint);
- }
-
- @Override
- public Drawable copy() {
- return new Rectangle(this);
- }
-
- @Override
- public @Nonnull Area getArea(Zone zone) {
- return new Area(getBounds(zone));
+ public Area getArea() {
+ return new Area(getBounds());
}
@Override
@@ -73,21 +59,12 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setRectangleDrawable(dto).build();
}
- public static Rectangle fromDto(RectangleDrawableDto dto) {
- var id = GUID.valueOf(dto.getId());
- var startPoint = dto.getStartPoint();
- var endPoint = dto.getEndPoint();
- var drawable =
- new Rectangle(id, startPoint.getX(), startPoint.getY(), endPoint.getX(), endPoint.getY());
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
-
- @Override
- public java.awt.Rectangle getBounds(Zone zone) {
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
+ public java.awt.Rectangle getBounds() {
if (bounds == null) {
int x = Math.min(startPoint.x, endPoint.x);
int y = Math.min(startPoint.y, endPoint.y);
@@ -108,7 +85,7 @@ public Point getEndPoint() {
}
@Override
- protected void draw(Zone zone, Graphics2D g) {
+ protected void draw(Graphics2D g) {
int minX = Math.min(startPoint.x, endPoint.x);
int minY = Math.min(startPoint.y, endPoint.y);
@@ -122,7 +99,7 @@ protected void draw(Zone zone, Graphics2D g) {
}
@Override
- protected void drawBackground(Zone zone, Graphics2D g) {
+ protected void drawBackground(Graphics2D g) {
int minX = Math.min(startPoint.x, endPoint.x);
int minY = Math.min(startPoint.y, endPoint.y);
diff --git a/src/main/java/net/rptools/maptool/model/drawing/ShapeDrawable.java b/src/main/java/net/rptools/maptool/model/drawing/ShapeDrawable.java
index fede411fa6..10c1e2688d 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/ShapeDrawable.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/ShapeDrawable.java
@@ -16,14 +16,10 @@
import com.google.protobuf.StringValue;
import java.awt.Graphics2D;
-import java.awt.Polygon;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.geom.Area;
-import java.awt.geom.RectangularShape;
-import javax.annotation.Nonnull;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.server.Mapper;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import net.rptools.maptool.server.proto.drawing.ShapeDrawableDto;
@@ -48,39 +44,20 @@ public ShapeDrawable(Shape shape) {
this(shape, true);
}
- public ShapeDrawable(ShapeDrawable other) {
- super(other);
- this.useAntiAliasing = other.useAntiAliasing;
- this.shape =
- switch (other.shape) {
- // Covers Rectangle, Ellipse2D, etc.
- case RectangularShape r -> (Shape) r.clone();
- case Polygon p -> new Polygon(p.xpoints, p.ypoints, p.npoints);
- case Area a -> new Area(a);
- default -> other.shape; // Assume anything else cannot be copied but is also okay.
- };
- }
-
- @Override
- public Drawable copy() {
- return new ShapeDrawable(this);
- }
-
public boolean getUseAntiAliasing() {
return useAntiAliasing;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.rptools.maptool.model.drawing.Drawable#getBounds()
+ */
public java.awt.Rectangle getBounds() {
return shape.getBounds();
}
- @Override
- public java.awt.Rectangle getBounds(Zone zone) {
- return getBounds();
- }
-
- @Override
- public @Nonnull Area getArea(Zone zone) {
+ public Area getArea() {
return new Area(shape);
}
@@ -99,26 +76,15 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setShapeDrawable(dto).build();
}
- public static ShapeDrawable fromDto(ShapeDrawableDto dto) {
- var shape = Mapper.map(dto.getShape());
- var id = GUID.valueOf(dto.getId());
- var drawable = new ShapeDrawable(id, shape, dto.getUseAntiAliasing());
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
- return drawable;
- }
-
@Override
- protected void draw(Zone zone, Graphics2D g) {
+ protected void draw(Graphics2D g) {
Object oldAA = applyAA(g);
g.draw(shape);
restoreAA(g, oldAA);
}
@Override
- protected void drawBackground(Zone zone, Graphics2D g) {
+ protected void drawBackground(Graphics2D g) {
Object oldAA = applyAA(g);
g.fill(shape);
restoreAA(g, oldAA);
diff --git a/src/main/java/net/rptools/maptool/model/drawing/WallTemplate.java b/src/main/java/net/rptools/maptool/model/drawing/WallTemplate.java
index eb0697aaa1..dfe3a0c4be 100644
--- a/src/main/java/net/rptools/maptool/model/drawing/WallTemplate.java
+++ b/src/main/java/net/rptools/maptool/model/drawing/WallTemplate.java
@@ -15,11 +15,9 @@
package net.rptools.maptool.model.drawing;
import com.google.protobuf.StringValue;
-import java.util.ArrayList;
import java.util.List;
import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.GUID;
-import net.rptools.maptool.model.Zone;
import net.rptools.maptool.model.ZonePoint;
import net.rptools.maptool.server.proto.drawing.DrawableDto;
import net.rptools.maptool.server.proto.drawing.WallTemplateDto;
@@ -42,15 +40,6 @@ public WallTemplate(GUID id) {
setPathVertex(new ZonePoint(0, 0));
}
- public WallTemplate(WallTemplate other) {
- super(other);
- }
-
- @Override
- public Drawable copy() {
- return new WallTemplate(this);
- }
-
/**
* @see net.rptools.maptool.model.drawing.AbstractTemplate#getRadius()
*/
@@ -91,6 +80,7 @@ public DrawableDto toDto() {
var dto = WallTemplateDto.newBuilder();
dto.setId(getId().toString())
.setLayer(getLayer().name())
+ .setZoneId(getZoneId().toString())
.setRadius(getRadius())
.setVertex(getVertex().toDto())
.setMouseSlopeGreater(isMouseSlopeGreater())
@@ -103,28 +93,4 @@ public DrawableDto toDto() {
return DrawableDto.newBuilder().setWallTemplate(dto).build();
}
-
- public static WallTemplate fromDto(WallTemplateDto dto) {
- var id = GUID.valueOf(dto.getId());
- var drawable = new WallTemplate(id);
- drawable.setRadius(dto.getRadius());
- var vertex = dto.getVertex();
- drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
- drawable.setMouseSlopeGreater(dto.getMouseSlopeGreater());
- var pathVertex = dto.getPathVertex();
- drawable.setPathVertex(new ZonePoint(pathVertex.getX(), pathVertex.getY()));
- drawable.setDoubleWide(dto.getDoubleWide());
- if (dto.hasName()) {
- drawable.setName(dto.getName().getValue());
- }
- drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
-
- var cellpoints = new ArrayList();
- for (var point : dto.getPointsList()) {
- cellpoints.add(new CellPoint(point.getX(), point.getY()));
- }
- drawable.setPath(cellpoints);
-
- return drawable;
- }
}
diff --git a/src/main/java/net/rptools/maptool/model/library/LibraryManager.java b/src/main/java/net/rptools/maptool/model/library/LibraryManager.java
index f5507f78d3..3bd991ecdc 100644
--- a/src/main/java/net/rptools/maptool/model/library/LibraryManager.java
+++ b/src/main/java/net/rptools/maptool/model/library/LibraryManager.java
@@ -74,7 +74,7 @@ public class LibraryManager {
private static final AddOnSlashCommandManager addOnSlashCommandManager =
new AddOnSlashCommandManager();
- public static void init() {
+ static {
libraryTokenManager.init();
builtInLibraryManager.loadBuiltIns();
new MapToolEventBus().getMainEventBus().register(addOnSlashCommandManager);
diff --git a/src/main/java/net/rptools/maptool/model/player/DefaultPlayerDatabase.java b/src/main/java/net/rptools/maptool/model/player/DefaultPlayerDatabase.java
index 82a9f58f5a..fa06326016 100644
--- a/src/main/java/net/rptools/maptool/model/player/DefaultPlayerDatabase.java
+++ b/src/main/java/net/rptools/maptool/model/player/DefaultPlayerDatabase.java
@@ -29,13 +29,13 @@
* This class provides the implementation for the default player database, where any one can connect
* as long as they know the role password. This follows the standard behaviour for 1.9 and earlier.
*/
-public class DefaultPlayerDatabase implements ServerSidePlayerDatabase {
+public class DefaultPlayerDatabase implements PlayerDatabase {
private final CipherUtil.Key playerPassword;
private final CipherUtil.Key gmPassword;
private final LoggedInPlayers loggedInPlayers = new LoggedInPlayers();
- public DefaultPlayerDatabase(String playerPassword, String gmPassword)
+ DefaultPlayerDatabase(String playerPassword, String gmPassword)
throws NoSuchAlgorithmException,
InvalidKeySpecException,
NoSuchPaddingException,
@@ -109,10 +109,15 @@ public String getBlockedReason(Player player) {
}
@Override
- public Set getOnlinePlayers() {
+ public Set getOnlinePlayers() throws InterruptedException, InvocationTargetException {
return loggedInPlayers.getPlayers();
}
+ @Override
+ public boolean recordsOnlyConnectedPlayers() {
+ return true;
+ }
+
@Override
public AuthMethod getAuthMethod(Player player) {
return AuthMethod.PASSWORD; // Will always be password based
diff --git a/src/main/java/net/rptools/maptool/model/player/LocalPlayer.java b/src/main/java/net/rptools/maptool/model/player/LocalPlayer.java
index db8d24e005..b3190c6dac 100644
--- a/src/main/java/net/rptools/maptool/model/player/LocalPlayer.java
+++ b/src/main/java/net/rptools/maptool/model/player/LocalPlayer.java
@@ -17,7 +17,6 @@
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.util.Arrays;
-import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.client.AppState;
import net.rptools.maptool.util.cipher.CipherUtil;
@@ -27,10 +26,6 @@ public class LocalPlayer extends Player {
private final String plainTextPassword;
private CipherUtil.Key password;
- public LocalPlayer() throws NoSuchAlgorithmException, InvalidKeySpecException {
- this(AppPreferences.getDefaultUserName(), Role.GM, "");
- }
-
public LocalPlayer(String name, Role role, String plainTextPassword)
throws NoSuchAlgorithmException, InvalidKeySpecException {
super(name, role, null); // Superclass takes care of plainTextPassword info
@@ -64,6 +59,10 @@ public CipherUtil.Key getPassword() {
return password;
}
+ public String getPlainTextPassword() {
+ return plainTextPassword;
+ }
+
@Override
public Player getTransferablePlayer() {
return new Player(getName(), getRole(), getPassword());
diff --git a/src/main/java/net/rptools/maptool/model/player/LocalPlayerDatabase.java b/src/main/java/net/rptools/maptool/model/player/LocalPlayerDatabase.java
index 832672b012..3f2479d772 100644
--- a/src/main/java/net/rptools/maptool/model/player/LocalPlayerDatabase.java
+++ b/src/main/java/net/rptools/maptool/model/player/LocalPlayerDatabase.java
@@ -15,20 +15,30 @@
package net.rptools.maptool.model.player;
import java.lang.reflect.InvocationTargetException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
import java.util.HashSet;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import net.rptools.lib.MD5Key;
+import net.rptools.maptool.model.player.Player.Role;
+import net.rptools.maptool.server.ServerConfig;
import net.rptools.maptool.util.cipher.CipherUtil;
+import net.rptools.maptool.util.cipher.CipherUtil.Key;
import net.rptools.maptool.util.cipher.PublicPrivateKeyStore;
/** This class provides the implementation for the "database" for the client local player. */
public class LocalPlayerDatabase implements PlayerDatabase {
- private final LocalPlayer localPlayer;
+ private LocalPlayer localPlayer;
private final LoggedInPlayers loggedInPlayers = new LoggedInPlayers();
- public LocalPlayerDatabase(LocalPlayer player) {
+ LocalPlayerDatabase() throws NoSuchAlgorithmException, InvalidKeySpecException {
+ localPlayer = new LocalPlayer("None", Role.GM, ServerConfig.getPersonalServerGMPassword());
+ }
+
+ public synchronized void setLocalPlayer(LocalPlayer player) {
localPlayer = player;
}
@@ -51,6 +61,48 @@ public Player getPlayer(String playerName) {
}
}
+ @Override
+ public Optional getPlayerPassword(String playerName) {
+ LocalPlayer player = (LocalPlayer) getPlayer(playerName);
+ if (player != null && player.getName().equals(playerName)) {
+ return Optional.of(player.getPassword());
+ }
+ return Optional.empty();
+ }
+
+ @Override
+ public byte[] getPlayerPasswordSalt(String playerName) {
+ LocalPlayer player = (LocalPlayer) getPlayer(playerName);
+ if (player != null && player.getName().equals(playerName)) {
+ return player.getPassword().salt();
+ }
+ return new byte[0];
+ }
+
+ @Override
+ public Player getPlayerWithRole(String playerName, Role role)
+ throws NoSuchAlgorithmException, InvalidKeySpecException {
+ LocalPlayer player = (LocalPlayer) getPlayer(playerName);
+ if (player != null && player.getName().equals(playerName)) {
+ player.setRole(role);
+ } else {
+ player =
+ new LocalPlayer(
+ playerName,
+ role,
+ role == Role.GM
+ ? ServerConfig.getPersonalServerGMPassword()
+ : ServerConfig.getPersonalServerPlayerPassword());
+ }
+ setLocalPlayer(player);
+ return player;
+ }
+
+ @Override
+ public Optional getRolePassword(Role role) {
+ return Optional.empty();
+ }
+
@Override
public boolean supportsDisabling() {
return false;
@@ -77,10 +129,15 @@ public String getBlockedReason(Player player) {
}
@Override
- public Set getOnlinePlayers() {
+ public Set getOnlinePlayers() throws InterruptedException, InvocationTargetException {
return new HashSet<>(loggedInPlayers.getPlayers());
}
+ @Override
+ public boolean recordsOnlyConnectedPlayers() {
+ return true;
+ }
+
@Override
public AuthMethod getAuthMethod(Player player) {
return AuthMethod.PASSWORD; // This will always be password authentication
diff --git a/src/main/java/net/rptools/maptool/model/player/PasswordFilePlayerDatabase.java b/src/main/java/net/rptools/maptool/model/player/PasswordFilePlayerDatabase.java
index fa9e719d28..0bd6ff4a87 100644
--- a/src/main/java/net/rptools/maptool/model/player/PasswordFilePlayerDatabase.java
+++ b/src/main/java/net/rptools/maptool/model/player/PasswordFilePlayerDatabase.java
@@ -66,7 +66,7 @@
import org.apache.logging.log4j.Logger;
public final class PasswordFilePlayerDatabase
- implements ServerSidePlayerDatabase, PersistedPlayerDatabase {
+ implements PlayerDatabase, PersistedPlayerDatabase, PlayerDBPropertyChange {
private static final Logger log = LogManager.getLogger(PasswordFilePlayerDatabase.class);
private static final String PUBLIC_KEY_DIR = "keys";
@@ -89,6 +89,11 @@ public final class PasswordFilePlayerDatabase
private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+ public PasswordFilePlayerDatabase(File passwordFile)
+ throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
+ this(passwordFile, null);
+ }
+
PasswordFilePlayerDatabase(File passwordFile, File additionalUsers)
throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
Objects.requireNonNull(passwordFile);
@@ -720,29 +725,12 @@ public boolean isPlayerRegistered(String name)
@Override
public void playerSignedIn(Player player) {
- var alreadyExists = playerExists(player.getName());
loggedInPlayers.playerSignedIn(player);
-
- if (!alreadyExists) {
- propertyChangeSupport.firePropertyChange(
- PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_ADDED, null, player.getName());
- } else {
- propertyChangeSupport.firePropertyChange(
- PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_CHANGED, null, player.getName());
- }
}
@Override
public void playerSignedOut(Player player) {
loggedInPlayers.playerSignedOut(player);
-
- if (playerExists(player.getName())) {
- propertyChangeSupport.firePropertyChange(
- PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_CHANGED, null, player.getName());
- } else {
- propertyChangeSupport.firePropertyChange(
- PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_REMOVED, player, null);
- }
}
@Override
@@ -751,7 +739,7 @@ public boolean isPlayerConnected(String name) {
}
@Override
- public Set getAllPlayers() {
+ public Set getAllPlayers() throws InterruptedException, InvocationTargetException {
Set players = new HashSet<>(getOnlinePlayers());
players.addAll(
@@ -763,10 +751,15 @@ public Set getAllPlayers() {
}
@Override
- public Set getOnlinePlayers() {
+ public Set getOnlinePlayers() throws InterruptedException, InvocationTargetException {
return new HashSet<>(loggedInPlayers.getPlayers());
}
+ @Override
+ public boolean recordsOnlyConnectedPlayers() {
+ return false;
+ }
+
/**
* Adds a player to the database with the specified password. The {@link #commitChanges} method
* must be called to commit these changes to persistent storage.
diff --git a/src/main/java/net/rptools/maptool/model/player/PersistedPlayerDatabase.java b/src/main/java/net/rptools/maptool/model/player/PersistedPlayerDatabase.java
index f27aef1a9d..ce423dd658 100644
--- a/src/main/java/net/rptools/maptool/model/player/PersistedPlayerDatabase.java
+++ b/src/main/java/net/rptools/maptool/model/player/PersistedPlayerDatabase.java
@@ -23,7 +23,7 @@
import net.rptools.maptool.model.player.Player.Role;
/** Interface implemented by player databases that persist their information between runs. */
-public interface PersistedPlayerDatabase extends PlayerDatabase, PlayerDBPropertyChange {
+public interface PersistedPlayerDatabase {
/**
* Disables the specified player. This will not boot the player from the server.
diff --git a/src/main/java/net/rptools/maptool/model/player/PersonalServerPlayerDatabase.java b/src/main/java/net/rptools/maptool/model/player/PersonalServerPlayerDatabase.java
index cc5ad33261..68de2e3473 100644
--- a/src/main/java/net/rptools/maptool/model/player/PersonalServerPlayerDatabase.java
+++ b/src/main/java/net/rptools/maptool/model/player/PersonalServerPlayerDatabase.java
@@ -14,22 +14,31 @@
*/
package net.rptools.maptool.model.player;
+import java.lang.reflect.InvocationTargetException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import net.rptools.lib.MD5Key;
+import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.model.player.Player.Role;
+import net.rptools.maptool.server.ServerConfig;
import net.rptools.maptool.util.cipher.CipherUtil;
-public class PersonalServerPlayerDatabase implements ServerSidePlayerDatabase {
+public class PersonalServerPlayerDatabase implements PlayerDatabase {
private final LocalPlayer player;
private final LoggedInPlayers loggedInPlayers = new LoggedInPlayers();
- public PersonalServerPlayerDatabase(LocalPlayer player) {
- this.player = player;
+ public PersonalServerPlayerDatabase() throws NoSuchAlgorithmException, InvalidKeySpecException {
+ player =
+ new LocalPlayer(
+ AppPreferences.getDefaultUserName(),
+ Role.GM,
+ ServerConfig.getPersonalServerGMPassword());
}
@Override
@@ -37,12 +46,9 @@ public boolean playerExists(String playerName) {
return true; // Player always exists no matter what the name
}
- public LocalPlayer getPlayer() {
- return player;
- }
-
@Override
- public Player getPlayer(String playerName) {
+ public Player getPlayer(String playerName)
+ throws NoSuchAlgorithmException, InvalidKeySpecException {
return player;
}
@@ -93,7 +99,8 @@ public CompletableFuture hasPublicKey(Player player, MD5Key md5key) {
}
@Override
- public boolean isPlayerRegistered(String name) {
+ public boolean isPlayerRegistered(String name)
+ throws InterruptedException, InvocationTargetException {
return player != null && player.getName() != null && player.getName().equals(name);
}
@@ -118,10 +125,15 @@ public String getBlockedReason(Player player) {
}
@Override
- public Set getOnlinePlayers() {
+ public Set getOnlinePlayers() throws InterruptedException, InvocationTargetException {
return new HashSet<>(loggedInPlayers.getPlayers());
}
+ @Override
+ public boolean recordsOnlyConnectedPlayers() {
+ return true;
+ }
+
@Override
public boolean isBlocked(Player player) {
return false;
@@ -137,7 +149,8 @@ public Optional getRolePassword(Player.Role role) {
}
@Override
- public Player getPlayerWithRole(String playerName, Player.Role role) {
+ public Player getPlayerWithRole(String playerName, Player.Role role)
+ throws NoSuchAlgorithmException, InvalidKeySpecException {
return player; // There is no non GM personal server player so just return the GM
}
}
diff --git a/src/main/java/net/rptools/maptool/model/player/PlayerDBPropertyChange.java b/src/main/java/net/rptools/maptool/model/player/PlayerDBPropertyChange.java
index f58063ff0e..7e36327281 100644
--- a/src/main/java/net/rptools/maptool/model/player/PlayerDBPropertyChange.java
+++ b/src/main/java/net/rptools/maptool/model/player/PlayerDBPropertyChange.java
@@ -16,7 +16,7 @@
import java.beans.PropertyChangeListener;
-public interface PlayerDBPropertyChange {
+interface PlayerDBPropertyChange {
/**
* Property change event name for when a player is added. Some databases may not support this
diff --git a/src/main/java/net/rptools/maptool/model/player/PlayerDatabase.java b/src/main/java/net/rptools/maptool/model/player/PlayerDatabase.java
index 9ff9771b8f..95ccdd78fc 100644
--- a/src/main/java/net/rptools/maptool/model/player/PlayerDatabase.java
+++ b/src/main/java/net/rptools/maptool/model/player/PlayerDatabase.java
@@ -17,6 +17,7 @@
import java.lang.reflect.InvocationTargetException;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -54,6 +55,42 @@ enum AuthMethod {
*/
Player getPlayer(String playerName) throws NoSuchAlgorithmException, InvalidKeySpecException;
+ /**
+ * Returns the {@link CipherUtil.Key} for the player. If the database only supports role based
+ * passwords the returned value will be empty.
+ *
+ * @param playerName The name of the player to check.
+ * @return the {@link CipherUtil.Key} to use.
+ */
+ Optional getPlayerPassword(String playerName);
+
+ /**
+ * Returns the salt used for the player's password.
+ *
+ * @param playerName the name of the player to get the password salt for.
+ * @return the salt used for the password.
+ */
+ byte[] getPlayerPasswordSalt(String playerName);
+
+ /**
+ * Returns the player overriding the role in the database with the specified role.
+ *
+ * @param playerName The name of the player to retrieve.
+ * @param role The role for the player.
+ * @return The player.
+ */
+ Player getPlayerWithRole(String playerName, Player.Role role)
+ throws NoSuchAlgorithmException, InvalidKeySpecException;
+
+ /**
+ * Returns the password required for the role. If role authentication is not supported this will
+ * be empty.
+ *
+ * @param role The role to retrieve the password for.
+ * @return The password for the role.
+ */
+ Optional getRolePassword(Player.Role role);
+
/**
* Returns if this player database supports disabling players.
*
@@ -98,7 +135,7 @@ enum AuthMethod {
*
* @return The players that are known to the database.
*/
- default Set getAllPlayers() {
+ default Set getAllPlayers() throws InterruptedException, InvocationTargetException {
return getOnlinePlayers();
}
@@ -107,7 +144,14 @@ default Set getAllPlayers() {
*
* @return The players that are currently connected.
*/
- Set getOnlinePlayers();
+ Set getOnlinePlayers() throws InterruptedException, InvocationTargetException;
+
+ /**
+ * Returns if this player database records information about only currently connected players.
+ *
+ * @return if this player database records information about only currently connected players.
+ */
+ boolean recordsOnlyConnectedPlayers();
/**
* Returns the authentication method for the player.
diff --git a/src/main/java/net/rptools/maptool/model/player/PlayerDatabaseFactory.java b/src/main/java/net/rptools/maptool/model/player/PlayerDatabaseFactory.java
index 0e7f1ad621..e078447edb 100644
--- a/src/main/java/net/rptools/maptool/model/player/PlayerDatabaseFactory.java
+++ b/src/main/java/net/rptools/maptool/model/player/PlayerDatabaseFactory.java
@@ -14,67 +14,162 @@
*/
package net.rptools.maptool.model.player;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
import java.io.File;
import java.io.IOException;
-import java.nio.file.Path;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
+import java.util.concurrent.locks.ReentrantLock;
import javax.crypto.NoSuchPaddingException;
import net.rptools.maptool.client.AppUtil;
+import net.rptools.maptool.server.ServerConfig;
public class PlayerDatabaseFactory {
- private enum PlayerDatabaseType {
+
+ public enum PlayerDatabaseType {
+ PERSONAL_SERVER,
LOCAL_PLAYER,
DEFAULT,
PASSWORD_FILE
}
+ interface DatabaseChangeTypeSupport {
+ /**
+ * Adds a property change listener for player database events. Only one type is valid {@link
+ * PlayerDBPropertyChange#PROPERTY_CHANGE_DATABASE_CHANGED}.
+ *
+ * @param listener The property change listener to add.
+ */
+ void addPropertyChangeListener(PropertyChangeListener listener);
+
+ /**
+ * Removes a property change listener for player database events. Only one type is valid {@link
+ * PlayerDBPropertyChange#PROPERTY_CHANGE_DATABASE_CHANGED}.
+ *
+ * @param listener The property change listener to remove.
+ */
+ void removePropertyChangeListener(PropertyChangeListener listener);
+
+ /**
+ * Notifies that the database hase changed.
+ *
+ * @param oldDb the old database.
+ * @param newDb the new database.
+ */
+ void databaseChanged(PlayerDatabase oldDb, PlayerDatabase newDb);
+ }
+
+ private static PlayerDatabase currentPlayerDatabase;
+
private static final Map playerDatabaseMap =
new ConcurrentHashMap<>();
- public static LocalPlayerDatabase getLocalPlayerDatabase(LocalPlayer player) {
- return new LocalPlayerDatabase(player);
+ private static final ReentrantLock lock = new ReentrantLock();
+
+ private static final DatabaseChangeTypeSupport databaseChangeTypeSupport =
+ new DatabaseChangeTypeSupport() {
+
+ private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+
+ @Override
+ public void addPropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.addPropertyChangeListener(listener);
+ }
+
+ @Override
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.removePropertyChangeListener(listener);
+ }
+
+ @Override
+ public void databaseChanged(PlayerDatabase oldDb, PlayerDatabase newDb) {
+ propertyChangeSupport.firePropertyChange(
+ PlayerDBPropertyChange.PROPERTY_CHANGE_DATABASE_CHANGED, oldDb, newDb);
+ }
+ };
+
+ private static final File PASSWORD_FILE =
+ AppUtil.getAppHome("config").toPath().resolve("passwords.json").toFile();
+ private static final File PASSWORD_ADDITION_FILE =
+ AppUtil.getAppHome("config").toPath().resolve("passwords_add.json").toFile();
+ private static ServerConfig serverConfig;
+
+ public static void setServerConfig(ServerConfig config) {
+ try {
+ lock.lock();
+ serverConfig = config;
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ public static PlayerDatabase getCurrentPlayerDatabase() {
+ try {
+ lock.lock();
+ return currentPlayerDatabase;
+ } finally {
+ lock.unlock();
+ }
}
- public static PersonalServerPlayerDatabase getPersonalServerPlayerDatabase(LocalPlayer player) {
- return new PersonalServerPlayerDatabase(player);
+ public static void setCurrentPlayerDatabase(PlayerDatabaseType playerDatabaseType) {
+ try {
+ lock.lock();
+ var oldPlayerDatabase = getCurrentPlayerDatabase();
+ currentPlayerDatabase = getPlayerDatabase(playerDatabaseType);
+ databaseChangeTypeSupport.databaseChanged(oldPlayerDatabase, currentPlayerDatabase);
+ } finally {
+ lock.unlock();
+ }
}
- public static DefaultPlayerDatabase getDefaultPlayerDatabase(
- String playerPassword, String gmPassword) {
+ private static ServerConfig getServerConfig() {
try {
- return new DefaultPlayerDatabase(playerPassword, gmPassword);
- } catch (NoSuchAlgorithmException
- | InvalidKeySpecException
- | NoSuchPaddingException
- | InvalidKeyException e) {
- throw new IllegalStateException(e);
+ lock.lock();
+ return serverConfig;
+ } finally {
+ lock.unlock();
}
}
- public static PasswordFilePlayerDatabase getPasswordFilePlayerDatabase() {
- return (PasswordFilePlayerDatabase)
- getStashed(
- PlayerDatabaseType.PASSWORD_FILE,
- () -> {
- try {
- Path configRoot = AppUtil.getAppHome("config").toPath();
- File passwordFile = configRoot.resolve("passwords.json").toFile();
- File additionalFile = configRoot.resolve("passwords_add.json").toFile();
-
- return new PasswordFilePlayerDatabase(passwordFile, additionalFile);
- } catch (IOException | NoSuchAlgorithmException | InvalidKeySpecException e) {
- throw new IllegalStateException(e);
- }
- });
+ public static PlayerDatabase getPlayerDatabase(PlayerDatabaseType databaseType) {
+ switch (databaseType) {
+ case LOCAL_PLAYER:
+ case PASSWORD_FILE:
+ return playerDatabaseMap.computeIfAbsent(
+ databaseType, PlayerDatabaseFactory::createPlayerDatabase);
+ default:
+ return createPlayerDatabase(databaseType);
+ }
}
- private static PlayerDatabase getStashed(
- PlayerDatabaseType databaseType, Supplier supplier) {
- return playerDatabaseMap.computeIfAbsent(databaseType, type -> supplier.get());
+ static DatabaseChangeTypeSupport getDatabaseChangeTypeSupport() {
+ return databaseChangeTypeSupport;
+ }
+
+ private static PlayerDatabase createPlayerDatabase(PlayerDatabaseType databaseType) {
+ try {
+ switch (databaseType) {
+ case LOCAL_PLAYER:
+ return new LocalPlayerDatabase();
+ case PASSWORD_FILE:
+ return new PasswordFilePlayerDatabase(PASSWORD_FILE, PASSWORD_ADDITION_FILE);
+ case PERSONAL_SERVER:
+ return new PersonalServerPlayerDatabase();
+ default:
+ ServerConfig config = getServerConfig();
+ return new DefaultPlayerDatabase(config.getPlayerPassword(), config.getGmPassword());
+ }
+ } catch (IOException
+ | NoSuchAlgorithmException
+ | InvalidKeySpecException
+ | NoSuchPaddingException
+ | InvalidKeyException e) {
+ throw new IllegalStateException(e);
+ }
}
}
diff --git a/src/main/java/net/rptools/maptool/model/player/PlayerDatabaseInfo.java b/src/main/java/net/rptools/maptool/model/player/PlayerDatabaseInfo.java
new file mode 100644
index 0000000000..dde4b62631
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/model/player/PlayerDatabaseInfo.java
@@ -0,0 +1,21 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.model.player;
+
+public record PlayerDatabaseInfo(
+ boolean supportsBlocking,
+ boolean supportsIndividualPasswords,
+ boolean supportsAsymmetricalKeys,
+ boolean recordsOnlyConnectedPlayers) {}
diff --git a/src/main/java/net/rptools/maptool/model/player/Players.java b/src/main/java/net/rptools/maptool/model/player/Players.java
index 8ac034b8ca..7bb63434ec 100644
--- a/src/main/java/net/rptools/maptool/model/player/Players.java
+++ b/src/main/java/net/rptools/maptool/model/player/Players.java
@@ -14,6 +14,9 @@
*/
package net.rptools.maptool.model.player;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
@@ -46,13 +49,71 @@ public enum ChangePlayerStatus {
NOT_SUPPORTED
}
+ /**
+ * Property change event name for when a player is added. Some databases may not support this
+ * event, so you will also need to listen to {@link #PROPERTY_CHANGE_DATABASE_CHANGED} for changes
+ * to players in the database.
+ */
+ public static final String PROPERTY_CHANGE_PLAYER_ADDED =
+ PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_ADDED;
+
+ /**
+ * Property change event name for when a player is removed. Some databases may not support this
+ * event, so you will also need to listen to {@link #PROPERTY_CHANGE_DATABASE_CHANGED} for changes
+ * to players in the database.
+ */
+ public static final String PROPERTY_CHANGE_PLAYER_REMOVED =
+ PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_REMOVED;
+
+ /** Property change event name for when a player is changed. */
+ public static final String PROPERTY_CHANGE_PLAYER_CHANGED =
+ PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_CHANGED;
+
+ /**
+ * Property change event name for when the database is changed or there are mas updates. Some
+ * databases may only support this event and not player added/removed/changed
+ */
+ public static final String PROPERTY_CHANGE_DATABASE_CHANGED =
+ PlayerDBPropertyChange.PROPERTY_CHANGE_DATABASE_CHANGED;
+
/** Instance for logging messages. */
private static final Logger log = LogManager.getLogger(Players.class);
- private final PlayerDatabase playerDatabase;
+ /** instance variable for property change support. */
+ private static final PropertyChangeSupport propertyChangeSupport =
+ new PropertyChangeSupport(Players.class);
- public Players(PlayerDatabase playerDatabase) {
- this.playerDatabase = playerDatabase;
+ private static final PropertyChangeListener databaseChangeListener =
+ new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ propertyChangeSupport.firePropertyChange(evt);
+ }
+ };
+
+ private static final PropertyChangeListener databaseTypeChangeListener =
+ new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ PlayerDatabase oldDb = (PlayerDatabase) evt.getOldValue();
+ PlayerDatabase newDb = (PlayerDatabase) evt.getNewValue();
+
+ if (oldDb instanceof PlayerDBPropertyChange playerdb) {
+ playerdb.removePropertyChangeListener(databaseChangeListener);
+ }
+
+ if (newDb instanceof PlayerDBPropertyChange playerdb) {
+ playerdb.addPropertyChangeListener(databaseChangeListener);
+ }
+ }
+ };
+
+ static {
+ PlayerDatabaseFactory.getDatabaseChangeTypeSupport()
+ .addPropertyChangeListener(databaseTypeChangeListener);
+ if (PlayerDatabaseFactory.getCurrentPlayerDatabase() instanceof PlayerDBPropertyChange pdb) {
+ pdb.addPropertyChangeListener(databaseChangeListener);
+ }
}
/**
@@ -99,6 +160,29 @@ public CompletableFuture> getDatabasePlayers() {
return CompletableFuture.supplyAsync(this::getPlayersInfo);
}
+ /**
+ * Returns the information about the current player database capabilities.
+ *
+ * @return the information about the current player database capabilities.
+ */
+ public CompletableFuture getDatabaseCapabilities() {
+ return CompletableFuture.supplyAsync(this::getPlayerDatabaseInfo);
+ }
+
+ /**
+ * Returns the information about the current player databases capabilities.
+ *
+ * @return the information about the current player databases capabilities.
+ */
+ private PlayerDatabaseInfo getPlayerDatabaseInfo() {
+ PlayerDatabase playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
+ return new PlayerDatabaseInfo(
+ playerDatabase.supportsDisabling(),
+ !playerDatabase.supportsRolePasswords(),
+ playerDatabase.supportsAsymmetricalKeys(),
+ playerDatabase.recordsOnlyConnectedPlayers());
+ }
+
/**
* Returns information about the specified player.
*
@@ -107,6 +191,7 @@ public CompletableFuture> getDatabasePlayers() {
*/
private PlayerInfo getPlayerInfo(String name) {
try {
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (!playerDatabase.playerExists(name)) {
return null;
}
@@ -131,8 +216,8 @@ private PlayerInfo getPlayerInfo(String name) {
blocked = true;
}
}
+ boolean connected = PlayerDatabaseFactory.getCurrentPlayerDatabase().isPlayerConnected(name);
- boolean connected = playerDatabase.isPlayerConnected(name);
AuthMethod authMethod = playerDatabase.getAuthMethod(player);
boolean persisted = false;
if (playerDatabase instanceof PersistedPlayerDatabase persistedPlayerDatabase) {
@@ -159,6 +244,7 @@ private PlayerInfo getPlayerInfo(String name) {
*/
private Set getPlayersInfo() {
Set players = new HashSet<>();
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
try {
for (Player p : playerDatabase.getAllPlayers()) {
players.add(getPlayerInfo(p.getName()));
@@ -174,13 +260,22 @@ private Set getPlayersInfo() {
return players.stream().filter(Objects::nonNull).collect(Collectors.toSet());
}
+ /**
+ * Returns if the current player database only records players that are connected.
+ *
+ * @return {@code true} if the player database only records players while they are connected.
+ */
+ public boolean recordsOnlyConnectedPlayers() {
+ return PlayerDatabaseFactory.getCurrentPlayerDatabase().recordsOnlyConnectedPlayers();
+ }
+
/**
* Returns if this current player database supports per player passwords.
*
* @return {@code true} if the player database supports per player passwords.
*/
- private boolean supportsPerPlayerPasswords() {
- return !playerDatabase.supportsRolePasswords();
+ public boolean supportsPerPlayerPasswords() {
+ return !PlayerDatabaseFactory.getCurrentPlayerDatabase().supportsRolePasswords();
}
/**
@@ -188,8 +283,8 @@ private boolean supportsPerPlayerPasswords() {
*
* @return {@code true} if the player database supports asymmetric keys.
*/
- private boolean supportsAsymmetricKeys() {
- return playerDatabase.supportsAsymmetricalKeys();
+ public boolean supportsAsymmetricKeys() {
+ return PlayerDatabaseFactory.getCurrentPlayerDatabase().supportsAsymmetricalKeys();
}
/**
@@ -206,6 +301,7 @@ public ChangePlayerStatus addPlayerWithPassword(String name, Role role, String p
return ChangePlayerStatus.NOT_SUPPORTED;
}
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
try {
playerDb.addPlayerSharedPassword(name, role, password);
@@ -240,6 +336,7 @@ public ChangePlayerStatus addPlayerWithPublicKey(String name, Role role, String
}
var pkeys = new HashSet<>(Arrays.asList(CipherUtil.splitPublicKeys(publicKeyString)));
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
try {
playerDb.addPlayerAsymmetricKey(name, role, pkeys);
@@ -274,6 +371,7 @@ public ChangePlayerStatus setPublicKeys(String name, String publicKeyString) {
}
var pkeys = new HashSet<>(Arrays.asList(CipherUtil.splitPublicKeys(publicKeyString)));
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
try {
playerDb.setAsymmetricKeys(name, pkeys);
@@ -301,6 +399,7 @@ public ChangePlayerStatus setPublicKeys(String name, String publicKeyString) {
* @return {@link ChangePlayerStatus#OK} if successful, otherwise the reason for the failure.
*/
public ChangePlayerStatus setPassword(String name, String password) {
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
try {
playerDb.setSharedPassword(name, password);
@@ -329,6 +428,7 @@ public ChangePlayerStatus setPassword(String name, String password) {
* @return {@link ChangePlayerStatus#OK} if successful, otherwise the reason for the failure.
*/
public ChangePlayerStatus setRole(String name, Role role) {
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
playerDb.setRole(name, role);
return ChangePlayerStatus.OK;
@@ -347,6 +447,7 @@ public ChangePlayerStatus setRole(String name, Role role) {
* @return {@link ChangePlayerStatus#OK} if successful, otherwise the reason for the failure.
*/
public ChangePlayerStatus blockPlayer(String name, String reason) {
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
playerDb.blockPlayer(name, reason);
return ChangePlayerStatus.OK;
@@ -363,6 +464,7 @@ public ChangePlayerStatus blockPlayer(String name, String reason) {
* @return {@link ChangePlayerStatus#OK} if successful, otherwise the reason for the failure.
*/
public ChangePlayerStatus unblockPlayer(String name) {
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
playerDb.unblockPlayer(name);
return ChangePlayerStatus.OK;
@@ -371,4 +473,119 @@ public ChangePlayerStatus unblockPlayer(String name) {
return ChangePlayerStatus.NOT_SUPPORTED;
}
}
+
+ /**
+ * Removes the specified player from the database.
+ *
+ * @param name the name of the player to remove.
+ * @return {@link ChangePlayerStatus#OK} if successful, otherwise the reason for the failure.
+ */
+ public ChangePlayerStatus removePlayer(String name) {
+ var playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
+ if (playerDatabase instanceof PersistedPlayerDatabase playerDb) {
+ playerDb.deletePlayer(name);
+ return ChangePlayerStatus.OK;
+ } else {
+ log.error(I18N.getText("msg.error.playerDB.cantUpdatePlayer", name));
+ return ChangePlayerStatus.NOT_SUPPORTED;
+ }
+ }
+
+ /**
+ * Adds a property change listener for player database events.
+ *
+ * @param listener The property change listener to add.
+ */
+ public static void addPropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.addPropertyChangeListener(listener);
+ }
+
+ /**
+ * Removes a property change listener for player database events.
+ *
+ * @param listener The property change listener to remove.
+ */
+ public static void removePropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.removePropertyChangeListener(listener);
+ }
+
+ /**
+ * Commits the pending changes writing them out to the persistent storage.
+ *
+ * @throws NoSuchPaddingException if there is an error hashing the password.
+ * @throws NoSuchAlgorithmException if there is an error hashing the password.
+ * @throws InvalidKeySpecException if there is an error hashing the password.
+ * @throws PasswordDatabaseException if there is an error adding the player to the file.
+ * @throws InvalidKeyException if there is an error hashing the password.
+ */
+ public void commitChanges()
+ throws NoSuchPaddingException,
+ NoSuchAlgorithmException,
+ InvalidKeySpecException,
+ PasswordDatabaseException,
+ InvalidKeyException {
+ if (PlayerDatabaseFactory.getCurrentPlayerDatabase() instanceof PersistedPlayerDatabase db) {
+ db.commitChanges();
+ }
+ }
+
+ /**
+ * Rolls back any pending changes that haven't been written to the file.
+ *
+ * @throws NoSuchPaddingException if there is an error hashing the password.
+ * @throws NoSuchAlgorithmException if there is an error hashing the password.
+ * @throws InvalidKeySpecException if there is an error hashing the password.
+ * @throws PasswordDatabaseException if there is an error adding the player to the file.
+ * @throws InvalidKeyException i
+ */
+ public void rollbackChanges()
+ throws NoSuchPaddingException,
+ NoSuchAlgorithmException,
+ InvalidKeySpecException,
+ PasswordDatabaseException,
+ InvalidKeyException {
+ if (PlayerDatabaseFactory.getCurrentPlayerDatabase() instanceof PersistedPlayerDatabase db) {
+ db.rollbackChanges();
+ }
+ }
+
+ /**
+ * Notify that a player has signed in.
+ *
+ * @param player the player that has signed in.
+ */
+ public void playerSignedIn(Player player) {
+ PlayerDatabase playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
+ var oldInfo = getPlayerInfo(player.getName());
+ playerDatabase.playerSignedIn(player);
+ var newInfo = getPlayerInfo(player.getName());
+ if (newInfo != null) {
+ if (oldInfo != null) {
+ propertyChangeSupport.firePropertyChange(
+ PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_CHANGED, oldInfo, newInfo);
+ } else {
+ propertyChangeSupport.firePropertyChange(PROPERTY_CHANGE_PLAYER_ADDED, null, newInfo);
+ }
+ }
+ }
+
+ /**
+ * Notify that a player has signed out.
+ *
+ * @param player the player that has signed out.
+ */
+ public void playerSignedOut(Player player) {
+ PlayerDatabase playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
+ var oldInfo = getPlayerInfo(player.getName());
+ playerDatabase.playerSignedOut(player);
+ var newInfo = getPlayerInfo(player.getName());
+ if (oldInfo != null) {
+ if (newInfo != null) {
+ propertyChangeSupport.firePropertyChange(
+ PlayerDBPropertyChange.PROPERTY_CHANGE_PLAYER_CHANGED, oldInfo, newInfo);
+ } else {
+ propertyChangeSupport.firePropertyChange(PROPERTY_CHANGE_PLAYER_REMOVED, oldInfo, null);
+ }
+ }
+ }
}
diff --git a/src/main/java/net/rptools/maptool/model/player/ServerSidePlayerDatabase.java b/src/main/java/net/rptools/maptool/model/player/ServerSidePlayerDatabase.java
deleted file mode 100644
index a597be6fd6..0000000000
--- a/src/main/java/net/rptools/maptool/model/player/ServerSidePlayerDatabase.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * This software Copyright by the RPTools.net development team, and
- * licensed under the Affero GPL Version 3 or, at your option, any later
- * version.
- *
- * MapTool Source Code is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public
- * License * along with this source Code. If not, please visit
- * and specifically the Affero license
- * text at .
- */
-package net.rptools.maptool.model.player;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.util.Optional;
-import net.rptools.maptool.util.cipher.CipherUtil;
-
-/**
- * A {@link net.rptools.maptool.model.player.PlayerDatabase} augmented with functinoality only
- * needed by servers (password validation, etc).
- */
-public interface ServerSidePlayerDatabase extends PlayerDatabase {
- /**
- * Returns the {@link net.rptools.maptool.util.cipher.CipherUtil.Key} for the player. If the
- * database only supports role based passwords the returned value will be empty.
- *
- * @param playerName The name of the player to check.
- * @return the {@link net.rptools.maptool.util.cipher.CipherUtil.Key} to use.
- */
- Optional getPlayerPassword(String playerName);
-
- /**
- * Returns the salt used for the player's password.
- *
- * @param playerName the name of the player to get the password salt for.
- * @return the salt used for the password.
- */
- byte[] getPlayerPasswordSalt(String playerName);
-
- /**
- * Returns the player overriding the role in the database with the specified role.
- *
- * @param playerName The name of the player to retrieve.
- * @param role The role for the player.
- * @return The player.
- */
- Player getPlayerWithRole(String playerName, Player.Role role)
- throws NoSuchAlgorithmException, InvalidKeySpecException;
-
- /**
- * Returns the password required for the role. If role authentication is not supported this will
- * be empty.
- *
- * @param role The role to retrieve the password for.
- * @return The password for the role.
- */
- Optional getRolePassword(Player.Role role);
-}
diff --git a/src/main/java/net/rptools/maptool/model/sheet/stats/StatSheet.java b/src/main/java/net/rptools/maptool/model/sheet/stats/StatSheet.java
index 6f043dc0e7..733a6eb6e6 100644
--- a/src/main/java/net/rptools/maptool/model/sheet/stats/StatSheet.java
+++ b/src/main/java/net/rptools/maptool/model/sheet/stats/StatSheet.java
@@ -15,7 +15,6 @@
package net.rptools.maptool.model.sheet.stats;
import java.net.URL;
-import java.util.Objects;
import java.util.Set;
/**
@@ -29,36 +28,4 @@
* @param namespace The namespace of the add-on that provides the spreadsheet.
*/
public record StatSheet(
- String name, String description, URL entry, Set propertyTypes, String namespace) {
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof StatSheet other)) {
- return false;
- }
- if (!Objects.equals(name, other.name)) {
- return false;
- }
- if (!Objects.equals(description, other.description)) {
- return false;
- }
- if (!Objects.equals(propertyTypes, other.propertyTypes)) {
- return false;
- }
- if (!Objects.equals(namespace, other.namespace)) {
- return false;
- }
-
- // Finally the URLs
- var thisUrl = entry == null ? null : entry.toString();
- var otherUrl = other.entry == null ? null : other.entry.toString();
-
- return Objects.equals(thisUrl, otherUrl);
- }
-
- @Override
- public int hashCode() {
- // Hash the URL as a string. E.g., we don't need hostname resolution just for a hashcode.
- return Objects.hash(
- name, description, entry == null ? null : entry.toString(), propertyTypes, namespace);
- }
-}
+ String name, String description, URL entry, Set propertyTypes, String namespace) {}
diff --git a/src/main/java/net/rptools/maptool/server/ClientHandshake.java b/src/main/java/net/rptools/maptool/server/ClientHandshake.java
index 09d5e58087..984e33e9db 100644
--- a/src/main/java/net/rptools/maptool/server/ClientHandshake.java
+++ b/src/main/java/net/rptools/maptool/server/ClientHandshake.java
@@ -24,11 +24,9 @@
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
-import java.util.function.BiConsumer;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
@@ -37,7 +35,6 @@
import net.rptools.clientserver.simple.connection.Connection;
import net.rptools.lib.MD5Key;
import net.rptools.maptool.client.MapTool;
-import net.rptools.maptool.client.MapToolClient;
import net.rptools.maptool.language.I18N;
import net.rptools.maptool.model.Asset;
import net.rptools.maptool.model.AssetManager;
@@ -46,7 +43,12 @@
import net.rptools.maptool.model.gamedata.GameDataImporter;
import net.rptools.maptool.model.library.LibraryManager;
import net.rptools.maptool.model.library.addon.AddOnLibraryImporter;
+import net.rptools.maptool.model.player.LocalPlayer;
+import net.rptools.maptool.model.player.LocalPlayerDatabase;
+import net.rptools.maptool.model.player.Player;
import net.rptools.maptool.model.player.Player.Role;
+import net.rptools.maptool.model.player.PlayerDatabaseFactory;
+import net.rptools.maptool.model.player.PlayerDatabaseFactory.PlayerDatabaseType;
import net.rptools.maptool.server.proto.*;
import net.rptools.maptool.server.proto.HandshakeMsg.MessageTypeCase;
import net.rptools.maptool.util.cipher.CipherUtil;
@@ -56,19 +58,29 @@
import org.apache.logging.log4j.Logger;
/** Class that implements the client side of the handshake. */
-public class ClientHandshake implements Handshake, MessageHandler {
+public class ClientHandshake implements Handshake, MessageHandler {
/** Instance used for log messages. */
private static final Logger log = LogManager.getLogger(ClientHandshake.class);
- private final CompletableFuture future = new CompletableFuture<>();
- private CompletionStage stage = future;
+ /** The index in the array for the GM handshake challenge, only used for role based auth */
+ private static final int GM_CHALLENGE = 0;
- private final MapToolClient client;
+ /** The index in the array for the Player handshake challenge, only used for role based auth */
+ private static final int PLAYER_CHALLENGE = 1;
/** The connection for the handshake. */
private final Connection connection;
+ /** The player for the client. */
+ private final LocalPlayer player;
+
+ /** Observers that want to be notified when the status changes. */
+ private final List observerList = new CopyOnWriteArrayList<>();
+
+ /** Message for any error that has occurred, {@code null} if no error has occurred. */
+ private String errorMessage;
+
/** PIN for sending public key to client */
private String pin;
@@ -76,36 +88,18 @@ public class ClientHandshake implements Handshake, MessageHandler {
private WindowListener easyConnectWindowListener;
+ /**
+ * Any exception that occurred that causes an error, {@code null} if no exception which causes an
+ * error has occurred.
+ */
+ private Exception exception;
+
/** The current state of the handshake process. */
private State currentState = State.AwaitingUseAuthType;
- public ClientHandshake(MapToolClient client, Connection connection) {
- this.client = client;
+ public ClientHandshake(Connection connection, LocalPlayer player) {
this.connection = connection;
-
- whenComplete(
- (result, error) -> {
- connection.removeMessageHandler(this);
- SwingUtilities.invokeLater(this::closeEasyConnectDialog);
- });
- }
-
- @Override
- public void whenComplete(BiConsumer callback) {
- stage =
- stage.whenComplete(
- (result, error) -> {
- // Hand back the original exception, not the wrapped one.
- if (error instanceof CompletionException e) {
- error = e.getCause();
- }
- callback.accept(result, error);
- });
- }
-
- private void setCurrentState(State state) {
- log.debug("Transitioning from {} to {}", currentState, state);
- currentState = state;
+ this.player = player;
}
private synchronized JDialog getEasyConnectDialog() {
@@ -125,37 +119,22 @@ private synchronized void setEasyConnectWindowListener(WindowListener easyConnec
}
@Override
- public void startHandshake() {
- connection.addMessageHandler(this);
- startHandshakeInternal();
- }
-
- private void startHandshakeInternal() {
- MD5Key md5key;
- try {
- md5key = CipherUtil.publicKeyMD5(new PublicPrivateKeyStore().getKeys().get().publicKey());
- } catch (ExecutionException | InterruptedException e) {
- // Report the error the same way as any other handshake error.
- var errorMessage = I18N.getText("Handshake.msg.failedToGetPublicKey");
- setCurrentState(State.Error);
- future.completeExceptionally(new Failure(errorMessage, e));
- return;
- }
-
+ public void startHandshake() throws ExecutionException, InterruptedException {
+ var md5key = CipherUtil.publicKeyMD5(new PublicPrivateKeyStore().getKeys().get().publicKey());
var clientInitMsg =
ClientInitMsg.newBuilder()
- .setPlayerName(client.getPlayer().getName())
+ .setPlayerName(player.getName())
.setVersion(MapTool.getVersion())
.setPublicKeyMd5(md5key.toString());
var handshakeMsg = HandshakeMsg.newBuilder().setClientInitMsg(clientInitMsg).build();
- sendMessage(State.AwaitingUseAuthType, handshakeMsg);
- }
- private void sendMessage(State newState, HandshakeMsg message) {
- setCurrentState(newState);
+ sendMessage(handshakeMsg);
+ currentState = State.AwaitingUseAuthType;
+ }
+ private void sendMessage(HandshakeMsg message) {
var msgType = message.getMessageTypeCase();
- log.debug("{} sent: {}", connection.getId(), msgType);
+ log.debug(connection.getId() + " sent: " + msgType);
connection.sendMessage(message.toByteArray());
}
@@ -165,11 +144,10 @@ public void handleMessage(String id, byte[] message) {
var handshakeMsg = HandshakeMsg.parseFrom(message);
var msgType = handshakeMsg.getMessageTypeCase();
- log.debug("{} got: {}", id, msgType);
+ log.debug(id + " got: " + msgType);
if (msgType == MessageTypeCase.HANDSHAKE_RESPONSE_CODE_MSG) {
HandshakeResponseCodeMsg code = handshakeMsg.getHandshakeResponseCodeMsg();
- String errorMessage;
if (code.equals(HandshakeResponseCodeMsg.INVALID_PASSWORD)) {
errorMessage = I18N.getText("Handshake.msg.incorrectPassword");
} else if (code.equals(HandshakeResponseCodeMsg.INVALID_PUBLIC_KEY)) {
@@ -183,7 +161,7 @@ public void handleMessage(String id, byte[] message) {
} else {
errorMessage = I18N.getText("Handshake.msg.invalidHandshake");
}
- future.completeExceptionally(new Failure(errorMessage));
+ notifyObservers();
return;
}
@@ -194,46 +172,49 @@ public void handleMessage(String id, byte[] message) {
} else if (msgType == MessageTypeCase.USE_AUTH_TYPE_MSG) {
handle(handshakeMsg.getUseAuthTypeMsg());
} else if (msgType == MessageTypeCase.PLAYER_BLOCKED_MSG) {
- var errorMessage =
+ errorMessage =
I18N.getText(
"Handshake.msg.playerBlocked", handshakeMsg.getPlayerBlockedMsg().getReason());
- future.completeExceptionally(new Failure(errorMessage));
+ notifyObservers();
} else {
- var errorMessage = I18N.getText("Handshake.msg.invalidHandshake");
- setCurrentState(State.Error);
- future.completeExceptionally(new Failure(errorMessage));
+ errorMessage = I18N.getText("Handshake.msg.invalidHandshake");
+ currentState = State.Error;
+ notifyObservers();
}
break;
case AwaitingPublicKeyAddition:
if (msgType == MessageTypeCase.PUBLIC_KEY_ADDED_MSG) {
handle(handshakeMsg.getPublicKeyAddedMsg());
} else {
- var errorMessage = I18N.getText("Handshake.msg.gmDeniedRequest");
- setCurrentState(State.Error);
- future.completeExceptionally(new Failure(errorMessage));
+ errorMessage = I18N.getText("Handshake.msg.gmDeniedRequest");
+ currentState = State.Error;
+ notifyObservers();
}
break;
case AwaitingConnectionSuccessful:
if (msgType == MessageTypeCase.CONNECTION_SUCCESSFUL_MSG) {
handle(handshakeMsg.getConnectionSuccessfulMsg());
} else {
- var errorMessage = I18N.getText("Handshake.msg.invalidHandshake");
- setCurrentState(State.Error);
- future.completeExceptionally(new Failure(errorMessage));
+ errorMessage = I18N.getText("Handshake.msg.invalidHandshake");
+ currentState = State.Error;
+ notifyObservers();
}
break;
}
} catch (Exception e) {
- log.warn("Unexpected exception during client handshake", e);
- setCurrentState(State.Error);
- future.completeExceptionally(new Failure("Handshake.msg.unexpectedError", e));
+ log.warn(e.toString());
+ exception = e;
+ currentState = State.Error;
+ errorMessage = I18N.getText("Handshake.msg.incorrectPassword");
+ notifyObservers();
}
}
- private void handle(PublicKeyAddedMsg publicKeyAddedMsg) {
+ private void handle(PublicKeyAddedMsg publicKeyAddedMsg)
+ throws ExecutionException, InterruptedException {
SwingUtilities.invokeLater(this::closeEasyConnectDialog);
- startHandshakeInternal();
+ startHandshake();
}
private void handle(RequestPublicKeyMsg requestPublicKeyMsg) {
@@ -241,9 +222,8 @@ private void handle(RequestPublicKeyMsg requestPublicKeyMsg) {
var publicKey = new PublicPrivateKeyStore().getKeys().join();
var publicKeyUploadBuilder = PublicKeyUploadMsg.newBuilder();
publicKeyUploadBuilder.setPublicKey(publicKey.getEncodedPublicKeyText());
- sendMessage(
- State.AwaitingPublicKeyAddition,
- HandshakeMsg.newBuilder().setPublicKeyUploadMsg(publicKeyUploadBuilder).build());
+ sendMessage(HandshakeMsg.newBuilder().setPublicKeyUploadMsg(publicKeyUploadBuilder).build());
+ currentState = State.AwaitingPublicKeyAddition;
SwingUtilities.invokeLater(
() -> {
JOptionPane pane = new JOptionPane();
@@ -264,7 +244,7 @@ public void windowClosed(WindowEvent e) {
HandshakeMsg.newBuilder()
.setHandshakeResponseCodeMsg(HandshakeResponseCodeMsg.INVALID_PUBLIC_KEY)
.build();
- sendMessage(State.Error, msg);
+ sendMessage(msg);
}
};
dialog.addWindowListener(windowListener);
@@ -290,9 +270,7 @@ private void handle(UseAuthTypeMsg useAuthTypeMsg)
CipherUtil.Key publicKey = new PublicPrivateKeyStore().getKeys().get();
var handshakeChallenge =
HandshakeChallenge.fromAsymmetricChallengeBytes(
- client.getPlayer().getName(),
- useAuthTypeMsg.getChallenge(0).toByteArray(),
- publicKey);
+ player.getName(), useAuthTypeMsg.getChallenge(0).toByteArray(), publicKey);
var expectedResponse = handshakeChallenge.getExpectedResponse();
clientAuthMsg = clientAuthMsg.setChallengeResponse(ByteString.copyFrom(expectedResponse));
} else {
@@ -300,18 +278,15 @@ private void handle(UseAuthTypeMsg useAuthTypeMsg)
byte[] responseIv = new byte[CipherUtil.CIPHER_BLOCK_SIZE];
rnd.nextBytes(responseIv);
- client.getPlayer().setPasswordSalt(useAuthTypeMsg.getSalt().toByteArray());
+ player.setPasswordSalt(useAuthTypeMsg.getSalt().toByteArray());
var iv = useAuthTypeMsg.getIv().toByteArray();
for (int i = 0; i < useAuthTypeMsg.getChallengeCount(); i++) {
try {
- Key key = client.getPlayer().getPassword();
+ Key key = player.getPassword();
// Key key = playerDatabase.getPlayerPassword(player.getName()).get();
var handshakeChallenge =
HandshakeChallenge.fromSymmetricChallengeBytes(
- client.getPlayer().getName(),
- useAuthTypeMsg.getChallenge(i).toByteArray(),
- key,
- iv);
+ player.getName(), useAuthTypeMsg.getChallenge(i).toByteArray(), key, iv);
var expectedResponse = handshakeChallenge.getExpectedResponse(responseIv);
clientAuthMsg =
clientAuthMsg
@@ -328,25 +303,27 @@ private void handle(UseAuthTypeMsg useAuthTypeMsg)
}
var handshakeMsg = HandshakeMsg.newBuilder().setClientAuthMessage(clientAuthMsg).build();
- sendMessage(State.AwaitingConnectionSuccessful, handshakeMsg);
+ sendMessage(handshakeMsg);
+ currentState = State.AwaitingConnectionSuccessful;
}
private void handle(ConnectionSuccessfulMsg connectionSuccessfulMsg) throws IOException {
var policy = ServerPolicy.fromDto(connectionSuccessfulMsg.getServerPolicyDto());
- client.setServerPolicy(policy);
- client
- .getPlayer()
- .setRole(connectionSuccessfulMsg.getRoleDto() == RoleDto.GM ? Role.GM : Role.PLAYER);
+ MapTool.setServerPolicy(policy);
+ player.setRole(connectionSuccessfulMsg.getRoleDto() == RoleDto.GM ? Role.GM : Role.PLAYER);
MapTool.getFrame()
.getToolbarPanel()
.getMapselect()
- .setVisible((!policy.getMapSelectUIHidden()) || client.getPlayer().isGM());
- if ((!policy.getDisablePlayerAssetPanel()) || client.getPlayer().isGM()) {
+ .setVisible((!policy.getMapSelectUIHidden()) || MapTool.getPlayer().isGM());
+ if ((!policy.getDisablePlayerAssetPanel()) || MapTool.getPlayer().isGM()) {
MapTool.getFrame().getAssetPanel().enableAssets();
} else {
MapTool.getFrame().getAssetPanel().disableAssets();
}
if (!MapTool.isHostingServer()) {
+ PlayerDatabaseFactory.setCurrentPlayerDatabase(PlayerDatabaseType.LOCAL_PLAYER);
+ var playerDb = (LocalPlayerDatabase) PlayerDatabaseFactory.getCurrentPlayerDatabase();
+ playerDb.setLocalPlayer(player);
if (!MapTool.isPersonalServer()) {
new CampaignManager().clearCampaignData();
if (connectionSuccessfulMsg.hasGameDataDto()) {
@@ -385,8 +362,51 @@ private void handle(ConnectionSuccessfulMsg connectionSuccessfulMsg) throws IOEx
}
}
}
- setCurrentState(State.Success);
- future.complete(null);
+ currentState = State.Success;
+ notifyObservers();
+ }
+
+ @Override
+ public void addObserver(HandshakeObserver observer) {
+ observerList.add(observer);
+ }
+
+ @Override
+ public void removeObserver(HandshakeObserver observer) {
+ observerList.remove(observer);
+ }
+
+ /** Notifies observers that the handshake has completed or errored out.. */
+ private void notifyObservers() {
+ SwingUtilities.invokeLater(this::closeEasyConnectDialog);
+ for (var observer : observerList) {
+ observer.onCompleted(this);
+ }
+ }
+
+ @Override
+ public boolean isSuccessful() {
+ return currentState == State.Success;
+ }
+
+ @Override
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ @Override
+ public Connection getConnection() {
+ return connection;
+ }
+
+ @Override
+ public Exception getException() {
+ return exception;
+ }
+
+ @Override
+ public Player getPlayer() {
+ return player;
}
private void closeEasyConnectDialog() {
diff --git a/src/main/java/net/rptools/maptool/server/Handshake.java b/src/main/java/net/rptools/maptool/server/Handshake.java
index 8adbb68c37..7cc26cdafd 100644
--- a/src/main/java/net/rptools/maptool/server/Handshake.java
+++ b/src/main/java/net/rptools/maptool/server/Handshake.java
@@ -14,23 +14,68 @@
*/
package net.rptools.maptool.server;
-import java.util.function.BiConsumer;
+import java.util.concurrent.ExecutionException;
+import net.rptools.clientserver.simple.MessageHandler;
+import net.rptools.clientserver.simple.connection.Connection;
+import net.rptools.maptool.model.player.Player;
-public interface Handshake {
+public interface Handshake extends MessageHandler {
- void whenComplete(BiConsumer callback);
+ /**
+ * Returns if the handshake has been successful or not.
+ *
+ * @return {@code true} if the handshake has been successful, {code false} if it has failed or is
+ * still in progress.
+ */
+ boolean isSuccessful();
- /** Starts the handshake process. */
- void startHandshake();
+ /**
+ * Returns the message for the error -- if any -- that occurred during the handshake.
+ *
+ * @return the message for the error that occurred during handshake.
+ */
+ String getErrorMessage();
- class Failure extends Exception {
- // TODO When we have access to I18N, force this to be translatable.
- public Failure(String message) {
- super(message);
- }
+ /**
+ * Returns the connection for this {@code ServerHandshake}.
+ *
+ * @return the connection for this {@code ServerHandshake}.
+ */
+ Connection getConnection();
- public Failure(String message, Throwable cause) {
- super(message, cause);
- }
- }
+ /**
+ * Returns the exception -- if any -- that occurred during processing of the handshake.
+ *
+ * @return the exception that occurred during the processing of the handshake.
+ */
+ Exception getException();
+
+ /**
+ * Returns the player associated with the handshake.
+ *
+ * @return the player associated with the handshake.
+ */
+ Player getPlayer();
+
+ /**
+ * Adds an observer to the handshake process.
+ *
+ * @param observer the observer of the handshake process.
+ */
+ void addObserver(HandshakeObserver observer);
+
+ /**
+ * Removes an observer from the handshake process.
+ *
+ * @param observer the observer of the handshake process.
+ */
+ void removeObserver(HandshakeObserver observer);
+
+ /**
+ * Starts the handshake process.
+ *
+ * @throws ExecutionException when there is an exception in the background task.
+ * @throws InterruptedException when the background task is interrupted.
+ */
+ void startHandshake() throws ExecutionException, InterruptedException;
}
diff --git a/src/main/java/net/rptools/maptool/server/HandshakeObserver.java b/src/main/java/net/rptools/maptool/server/HandshakeObserver.java
new file mode 100644
index 0000000000..e8e62d66a0
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/server/HandshakeObserver.java
@@ -0,0 +1,20 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.server;
+
+public interface HandshakeObserver {
+
+ void onCompleted(Handshake handshake);
+}
diff --git a/src/main/java/net/rptools/maptool/server/MapToolServer.java b/src/main/java/net/rptools/maptool/server/MapToolServer.java
index aeac1666e2..be03bd4393 100644
--- a/src/main/java/net/rptools/maptool/server/MapToolServer.java
+++ b/src/main/java/net/rptools/maptool/server/MapToolServer.java
@@ -14,22 +14,17 @@
*/
package net.rptools.maptool.server;
+import static net.rptools.maptool.model.player.PlayerDatabaseFactory.PlayerDatabaseType.PERSONAL_SERVER;
+
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
-import javax.annotation.Nullable;
import javax.swing.SwingUtilities;
-import net.rptools.clientserver.ConnectionFactory;
-import net.rptools.clientserver.simple.DisconnectHandler;
-import net.rptools.clientserver.simple.MessageHandler;
import net.rptools.clientserver.simple.connection.Connection;
-import net.rptools.clientserver.simple.server.Router;
-import net.rptools.clientserver.simple.server.Server;
import net.rptools.clientserver.simple.server.ServerObserver;
-import net.rptools.maptool.client.AppConstants;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.MapToolRegistry;
import net.rptools.maptool.client.ui.connectioninfodialog.ConnectionInfoDialog;
@@ -38,17 +33,12 @@
import net.rptools.maptool.model.Campaign;
import net.rptools.maptool.model.GUID;
import net.rptools.maptool.model.TextMessage;
-import net.rptools.maptool.model.player.Player;
-import net.rptools.maptool.model.player.ServerSidePlayerDatabase;
+import net.rptools.maptool.model.player.PlayerDatabase;
+import net.rptools.maptool.model.player.PlayerDatabaseFactory;
import net.rptools.maptool.server.proto.Message;
-import net.rptools.maptool.server.proto.PlayerConnectedMsg;
-import net.rptools.maptool.server.proto.PlayerDisconnectedMsg;
-import net.rptools.maptool.server.proto.SetCampaignMsg;
import net.rptools.maptool.server.proto.UpdateAssetTransferMsg;
import net.rptools.maptool.transfer.AssetProducer;
import net.rptools.maptool.transfer.AssetTransferManager;
-import net.rptools.maptool.util.UPnPUtil;
-import net.tsc.servicediscovery.ServiceAnnouncer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -59,255 +49,98 @@ public class MapToolServer {
private static final Logger log = LogManager.getLogger(MapToolServer.class);
private static final int ASSET_CHUNK_SIZE = 5 * 1024;
- public enum State {
- New,
- Started,
- Stopped
- }
-
- private final Server server;
- private final MessageHandler messageHandler;
- private final Router router;
+ private final MapToolServerConnection conn;
private final ServerConfig config;
- private final ServerSidePlayerDatabase playerDatabase;
-
- /** Maps connection IDs to their associated player */
- private final Map playerMap = Collections.synchronizedMap(new HashMap<>());
+ private final PlayerDatabase playerDatabase;
private final Map assetManagerMap =
Collections.synchronizedMap(new HashMap());
+ private final Map connectionMap =
+ Collections.synchronizedMap(new HashMap());
private final AssetProducerThread assetProducerThread;
- private final boolean useUPnP;
- private final ServiceAnnouncer announcer;
private Campaign campaign;
private ServerPolicy policy;
private HeartbeatThread heartbeatThread;
- private final DisconnectHandler onConnectionDisconnected;
- private final ServerObserver serverObserver;
-
- private State currentState;
-
- public MapToolServer(
- String id,
- Campaign campaign,
- @Nullable ServerConfig config,
- boolean useUPnP,
- ServerPolicy policy,
- ServerSidePlayerDatabase playerDb) {
- this.config = config;
- this.useUPnP = useUPnP;
- this.policy = new ServerPolicy(policy);
- this.playerDatabase = playerDb;
-
- this.announcer =
- config == null
- ? null
- : new ServiceAnnouncer(id, config.getPort(), AppConstants.SERVICE_GROUP);
- server = ConnectionFactory.getInstance().createServer(this.config);
- messageHandler = new ServerMessageHandler(this);
- this.router = new Router();
+ public MapToolServer(ServerConfig config, ServerPolicy policy, PlayerDatabase playerDb)
+ throws IOException {
+ this.config = config;
+ this.policy = policy;
+ playerDatabase = playerDb;
+ conn = new MapToolServerConnection(this, playerDatabase, new ServerMessageHandler(this));
- // Make sure the server has a different copy than the client.
- this.campaign = new Campaign(campaign);
+ campaign = new Campaign();
assetProducerThread = new AssetProducerThread();
+ assetProducerThread.start();
- currentState = State.New;
-
- this.onConnectionDisconnected = this::releaseClientConnection;
- this.serverObserver = this::connectionAdded;
- }
-
- /**
- * Transition from any state except {@code newState} to {@code newState}.
- *
- * @param newState The new state to set.
- */
- private boolean transitionToState(State newState) {
- if (currentState == newState) {
- log.warn(
- "Failed to transition to state {} because that is already the current state", newState);
- return false;
- } else {
- currentState = newState;
- return true;
- }
- }
-
- /**
- * Transition from {@code expectedState} to {@code newState}.
- *
- * @param expectedState The state to transition from
- * @param newState The new state to set.
- */
- private boolean transitionToState(State expectedState, State newState) {
- if (currentState != expectedState) {
- log.warn(
- "Failed to transition from state {} to state {} because the current state is actually {}",
- expectedState,
- newState,
- currentState);
- return false;
- } else {
- currentState = newState;
- return true;
+ // Start a heartbeat if requested
+ if (config.isServerRegistered()) {
+ heartbeatThread = new HeartbeatThread();
+ heartbeatThread.start();
}
}
- public ServerSidePlayerDatabase getPlayerDatabase() {
- return playerDatabase;
+ public void configureClientConnection(Connection connection) {
+ String id = connection.getId();
+ assetManagerMap.put(id, new AssetTransferManager());
+ connectionMap.put(id, connection);
}
- public State getState() {
- return currentState;
+ public Connection getClientConnection(String id) {
+ return connectionMap.get(id);
}
- private String getConnectionId(String playerId) {
- synchronized (playerMap) {
- for (Map.Entry entry : playerMap.entrySet()) {
- if (entry.getValue().getName().equalsIgnoreCase(playerId)) {
- return entry.getKey();
- }
- }
- }
- return null;
+ public String getConnectionId(String playerId) {
+ return conn.getConnectionId(playerId);
}
- private Player getPlayer(String playerId) {
- synchronized (playerMap) {
- for (Player player : playerMap.values()) {
- if (player.getName().equalsIgnoreCase(playerId)) {
- return player;
- }
- }
+ /**
+ * Forceably disconnects a client and cleans up references to it
+ *
+ * @param id the connection ID
+ */
+ public void releaseClientConnection(String id) {
+ Connection connection = getClientConnection(id);
+ if (connection != null) {
+ connection.close();
}
- return null;
- }
-
- public boolean isPersonalServer() {
- return config == null;
+ assetManagerMap.remove(id);
+ connectionMap.remove(id);
}
- public boolean isServerRegistered() {
- return config == null ? false : config.isServerRegistered();
- }
-
- public String getName() {
- return config == null ? "" : config.getServerName();
- }
-
- public int getPort() {
- return config == null ? -1 : config.getPort();
- }
-
- private void connectionAdded(Connection conn) {
- var handshake =
- new ServerHandshake(
- this, conn, playerDatabase, config != null && config.getUseEasyConnect());
-
- handshake.whenComplete(
- (player, error) -> {
- if (error != null) {
- log.error("Client closing: bad handshake", error);
- releaseClientConnection(conn);
- } else {
- log.debug("About to add new client");
- addRemoteConnection(conn, player);
- }
- });
- // Make sure the client is allowed
- handshake.startHandshake();
+ public void addAssetProducer(String connectionId, AssetProducer producer) {
+ AssetTransferManager manager = assetManagerMap.get(connectionId);
+ manager.addProducer(producer);
}
- private void installConnection(Connection conn, Player player) {
- playerMap.put(conn.getId().toUpperCase(), player);
-
- conn.addMessageHandler(messageHandler);
- conn.addDisconnectHandler(onConnectionDisconnected);
-
- // Make sure any stale connections are gone to avoid conflicts, then add the new one.
- for (var reaped : router.reapClients()) {
- try {
- releaseClientConnection(reaped);
- } catch (Exception e) {
- // Don't want to raise an error if notification of removing a dead connection failed
- }
+ public void addObserver(ServerObserver observer) {
+ if (observer != null) {
+ conn.addObserver(observer);
}
- router.addConnection(conn);
-
- assetManagerMap.put(conn.getId(), new AssetTransferManager());
-
- synchronized (playerMap) {
- for (Player remotePlayer : playerMap.values()) {
- var msg = PlayerConnectedMsg.newBuilder().setPlayer(remotePlayer.toDto());
- sendMessage(conn.getId(), Message.newBuilder().setPlayerConnectedMsg(msg).build());
- }
- }
- var msg = PlayerConnectedMsg.newBuilder().setPlayer(player.getTransferablePlayer().toDto());
- broadcastMessage(Message.newBuilder().setPlayerConnectedMsg(msg).build());
- }
-
- public void addLocalConnection(Connection conn, Player localPlayer) {
- installConnection(conn, localPlayer);
- }
-
- private void addRemoteConnection(Connection conn, Player connPlayer) {
- installConnection(conn, connPlayer);
-
- var msg2 = SetCampaignMsg.newBuilder().setCampaign(campaign.toDto());
- sendMessage(conn.getId(), Message.newBuilder().setSetCampaignMsg(msg2).build());
}
- public void bootPlayer(String playerId) {
- var connectionId = getConnectionId(playerId);
- var connection = router.getConnection(connectionId);
- if (connection == null) {
- return;
- }
-
- releaseClientConnection(connection);
+ public void removeObserver(ServerObserver observer) {
+ conn.removeObserver(observer);
}
- /**
- * Cleans up references to a disconnected client connection.
- *
- * @param connection the connection to release
- */
- private void releaseClientConnection(Connection connection) {
- connection.removeDisconnectHandler(onConnectionDisconnected);
-
- connection.close();
- router.removeConnection(connection);
- assetManagerMap.remove(connection.getId());
-
- // Notify everyone else about the disconnection.
- var player = playerMap.remove(connection.getId().toUpperCase());
- if (player != null) {
- var msg =
- PlayerDisconnectedMsg.newBuilder().setPlayer(player.getTransferablePlayer().toDto());
- broadcastMessage(
- new String[] {connection.getId()},
- Message.newBuilder().setPlayerDisconnectedMsg(msg).build());
- }
+ public boolean isHostId(String playerId) {
+ return config.getHostPlayerId() != null && config.getHostPlayerId().equals(playerId);
}
- public void addAssetProducer(String connectionId, AssetProducer producer) {
- AssetTransferManager manager = assetManagerMap.get(connectionId);
- manager.addProducer(producer);
+ public MapToolServerConnection getConnection() {
+ return conn;
}
- public boolean isPlayerConnected(String playerId) {
- return getPlayer(playerId) != null;
+ public boolean isPlayerConnected(String id) {
+ return conn.getPlayer(id) != null;
}
public void updatePlayerStatus(String playerName, GUID zoneId, boolean loaded) {
- var player = getPlayer(playerName);
- if (player != null) {
- player.setLoaded(loaded);
- player.setZoneId(zoneId);
- }
+ var player = conn.getPlayer(playerName);
+ player.setLoaded(loaded);
+ player.setZoneId(zoneId);
}
public void setCampaign(Campaign campaign) {
@@ -323,143 +156,46 @@ public Campaign getCampaign() {
}
public ServerPolicy getPolicy() {
- return new ServerPolicy(policy);
+ return policy;
}
public void updateServerPolicy(ServerPolicy policy) {
- this.policy = new ServerPolicy(policy);
+ this.policy = policy;
}
- public void stop() {
- if (!transitionToState(State.Stopped)) {
- return;
- }
-
- server.close();
- for (var connection : router.removeAll()) {
- connection.removeDisconnectHandler(onConnectionDisconnected);
- connection.close();
- }
-
- assetManagerMap.clear();
+ public ServerConfig getConfig() {
+ return config;
+ }
+ public void stop() {
+ conn.close();
if (heartbeatThread != null) {
heartbeatThread.shutdown();
}
if (assetProducerThread != null) {
assetProducerThread.shutdown();
}
-
- if (announcer != null) {
- announcer.stop();
- }
-
- // Unregister ourselves
- if (config != null && config.isServerRegistered()) {
- try {
- MapToolRegistry.getInstance().unregisterInstance();
- } catch (Throwable t) {
- MapTool.showError("While unregistering server instance", t);
- }
- }
-
- // Close UPnP port mapping if used
- if (useUPnP && config != null) {
- int port = config.getPort();
- UPnPUtil.closePort(port);
- }
}
- public void start() throws IOException {
- if (!transitionToState(State.New, State.Started)) {
- return;
- }
+ private static final Random random = new Random();
- server.addObserver(serverObserver);
- try {
- server.start();
- } catch (IOException e) {
- // Make sure we're in a reasonable state before propagating.
- log.error("Failed to start server", e);
- transitionToState(State.Stopped);
- server.removeObserver(serverObserver);
- throw e;
- }
-
- // Use UPnP to open port in router
- if (useUPnP && config != null) {
- UPnPUtil.openPort(config.getPort());
- }
-
- // Registered ?
- if (config != null && config.isServerRegistered()) {
- try {
- MapToolRegistry.RegisterResponse result =
- MapToolRegistry.getInstance()
- .registerInstance(config.getServerName(), config.getPort(), config.getUseWebRTC());
- if (result == MapToolRegistry.RegisterResponse.NAME_EXISTS) {
- MapTool.showError("msg.error.alreadyRegistered");
- } else {
- heartbeatThread = new HeartbeatThread(config.getPort());
- heartbeatThread.start();
- }
- // TODO: I don't like this
- } catch (Exception e) {
- MapTool.showError("msg.error.failedCannotRegisterServer", e);
- }
- }
-
- if (announcer != null) {
- announcer.start();
- }
-
- assetProducerThread.start();
- }
-
- public void sendMessage(String id, Message message) {
- log.debug("{} sent to {}: {}", getName(), id, message.getMessageTypeCase());
- router.sendMessage(id, message.toByteArray());
- }
-
- public void sendMessage(String id, Object channel, Message message) {
- log.debug(
- "{} sent to {}: {} ({})", getName(), id, message.getMessageTypeCase(), channel.toString());
- router.sendMessage(id, channel, message.toByteArray());
- }
-
- public void broadcastMessage(Message message) {
- log.debug("{} broadcast: {}", getName(), message.getMessageTypeCase());
- router.broadcastMessage(message.toByteArray());
- }
-
- public void broadcastMessage(String[] exclude, Message message) {
- log.debug(
- "{} broadcast: {} except to {}",
- getName(),
- message.getMessageTypeCase(),
- String.join(",", exclude));
- router.broadcastMessage(exclude, message.toByteArray());
+ public void start() throws IOException {
+ conn.open();
}
private class HeartbeatThread extends Thread {
- private static final Random random = new Random();
-
- private final int port;
private boolean stop = false;
private static final int HEARTBEAT_DELAY = 10 * 60 * 1000; // 10 minutes
private static final int HEARTBEAT_FLUX = 20 * 1000; // 20 seconds
private boolean ever_had_an_error = false;
- public HeartbeatThread(int port) {
- this.port = port;
- }
-
@Override
public void run() {
int WARNING_TIME = 2; // number of heartbeats before popup warning
int errors = 0;
String IP_addr = ConnectionInfoDialog.getExternalAddress();
+ int port = getConfig().getPort();
while (!stop) {
try {
@@ -546,10 +282,11 @@ public void run() {
if (chunk != null) {
lookForMore = true;
var msg = UpdateAssetTransferMsg.newBuilder().setChunk(chunk);
- sendMessage(
- entry.getKey(),
- MapToolConstants.Channel.IMAGE,
- Message.newBuilder().setUpdateAssetTransferMsg(msg).build());
+ getConnection()
+ .sendMessage(
+ entry.getKey(),
+ MapToolConstants.Channel.IMAGE,
+ Message.newBuilder().setUpdateAssetTransferMsg(msg).build());
}
}
if (lookForMore) {
@@ -570,4 +307,14 @@ public void shutdown() {
stop = true;
}
}
+
+ ////
+ // STANDALONE SERVER
+ public static void main(String[] args) throws IOException {
+ // This starts the server thread.
+ PlayerDatabaseFactory.setCurrentPlayerDatabase(PERSONAL_SERVER);
+ PlayerDatabase playerDatabase = PlayerDatabaseFactory.getCurrentPlayerDatabase();
+ MapToolServer server =
+ new MapToolServer(new ServerConfig(), new ServerPolicy(), playerDatabase);
+ }
}
diff --git a/src/main/java/net/rptools/maptool/server/MapToolServerConnection.java b/src/main/java/net/rptools/maptool/server/MapToolServerConnection.java
new file mode 100644
index 0000000000..30ac5b3c26
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/server/MapToolServerConnection.java
@@ -0,0 +1,202 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.server;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import net.rptools.clientserver.ConnectionFactory;
+import net.rptools.clientserver.simple.connection.Connection;
+import net.rptools.clientserver.simple.server.HandshakeProvider;
+import net.rptools.clientserver.simple.server.Server;
+import net.rptools.clientserver.simple.server.ServerObserver;
+import net.rptools.maptool.model.player.Player;
+import net.rptools.maptool.model.player.PlayerDatabase;
+import net.rptools.maptool.server.proto.Message;
+import net.rptools.maptool.server.proto.PlayerConnectedMsg;
+import net.rptools.maptool.server.proto.PlayerDisconnectedMsg;
+import net.rptools.maptool.server.proto.SetCampaignMsg;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @author trevor
+ */
+public class MapToolServerConnection
+ implements ServerObserver, HandshakeProvider, HandshakeObserver {
+ private static final Logger log = LogManager.getLogger(MapToolServerConnection.class);
+ private final Map playerMap = new ConcurrentHashMap<>();
+ private final Map handshakeMap = new ConcurrentHashMap<>();
+ private final MapToolServer server;
+ private final Server connection;
+ private final PlayerDatabase playerDatabase;
+ private final boolean useEasyConnect;
+
+ public MapToolServerConnection(
+ MapToolServer server, PlayerDatabase playerDatabase, ServerMessageHandler handler)
+ throws IOException {
+ this.connection =
+ ConnectionFactory.getInstance().createServer(server.getConfig(), this, handler);
+ this.server = server;
+ this.playerDatabase = playerDatabase;
+ this.useEasyConnect = server.getConfig().getUseEasyConnect();
+ addObserver(this);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.rptools.clientserver.simple.server.ServerConnection# handleConnectionHandshake(java.net.Socket)
+ */
+ public Handshake getConnectionHandshake(Connection conn) {
+ var handshake = new ServerHandshake(conn, playerDatabase, useEasyConnect);
+ handshakeMap.put(conn, handshake);
+ handshake.addObserver(this);
+ conn.addMessageHandler(handshake);
+ return handshake;
+ }
+
+ @Override
+ public void releaseHandshake(Connection conn) {
+ var handshake = handshakeMap.get(conn);
+ handshakeMap.remove(conn);
+ conn.removeMessageHandler(handshake);
+ }
+
+ public Player getPlayer(String id) {
+ for (Player player : playerMap.values()) {
+ if (player.getName().equalsIgnoreCase(id)) {
+ return player;
+ }
+ }
+ return null;
+ }
+
+ public String getConnectionId(String playerId) {
+ for (Map.Entry entry : playerMap.entrySet()) {
+ if (entry.getValue().getName().equalsIgnoreCase(playerId)) {
+ return entry.getKey();
+ }
+ }
+ return null;
+ }
+
+ ////
+ // SERVER OBSERVER
+
+ /** Handle late connections */
+ public void connectionAdded(Connection conn) {
+ server.configureClientConnection(conn);
+
+ Player connectedPlayer = playerMap.get(conn.getId().toUpperCase());
+ for (Player player : playerMap.values()) {
+ var msg = PlayerConnectedMsg.newBuilder().setPlayer(player.toDto());
+ server
+ .getConnection()
+ .sendMessage(conn.getId(), Message.newBuilder().setPlayerConnectedMsg(msg).build());
+ }
+ var msg =
+ PlayerConnectedMsg.newBuilder().setPlayer(connectedPlayer.getTransferablePlayer().toDto());
+ server
+ .getConnection()
+ .broadcastMessage(Message.newBuilder().setPlayerConnectedMsg(msg).build());
+
+ var msg2 = SetCampaignMsg.newBuilder().setCampaign(server.getCampaign().toDto());
+ server
+ .getConnection()
+ .sendMessage(conn.getId(), Message.newBuilder().setSetCampaignMsg(msg2).build());
+ }
+
+ public void connectionRemoved(Connection conn) {
+ server.releaseClientConnection(conn.getId());
+ var player = playerMap.get(conn.getId().toUpperCase()).getTransferablePlayer();
+ var msg = PlayerDisconnectedMsg.newBuilder().setPlayer(player.toDto());
+ server
+ .getConnection()
+ .broadcastMessage(
+ new String[] {conn.getId()},
+ Message.newBuilder().setPlayerDisconnectedMsg(msg).build());
+ playerMap.remove(conn.getId().toUpperCase());
+ }
+
+ public void sendMessage(String id, Message message) {
+ log.debug(
+ server.getConfig().getServerName()
+ + " sent to "
+ + id
+ + ": "
+ + message.getMessageTypeCase());
+ connection.sendMessage(id, message.toByteArray());
+ }
+
+ public void sendMessage(String id, Object channel, Message message) {
+ log.debug(
+ server.getConfig().getServerName()
+ + " sent to "
+ + id
+ + ":"
+ + message.getMessageTypeCase()
+ + " ("
+ + channel.toString()
+ + ")");
+ connection.sendMessage(id, channel, message.toByteArray());
+ }
+
+ public void broadcastMessage(Message message) {
+ log.debug(server.getConfig().getServerName() + " broadcast: " + message.getMessageTypeCase());
+ connection.broadcastMessage(message.toByteArray());
+ }
+
+ public void broadcastMessage(String[] exclude, Message message) {
+ log.debug(
+ server.getConfig().getServerName()
+ + " broadcast: "
+ + message.getMessageTypeCase()
+ + " except to "
+ + String.join(",", exclude));
+ connection.broadcastMessage(exclude, message.toByteArray());
+ }
+
+ public void open() throws IOException {
+ connection.start();
+ }
+
+ public void close() {
+ connection.close();
+ }
+
+ public void addObserver(ServerObserver observer) {
+ connection.addObserver(observer);
+ }
+
+ public void removeObserver(ServerObserver observer) {
+ connection.removeObserver(observer);
+ }
+
+ @Override
+ public void onCompleted(Handshake handshake) {
+ handshake.removeObserver(this);
+ if (handshake.isSuccessful()) {
+ Player player = handshake.getPlayer();
+
+ if (player != null) {
+ playerMap.put(handshake.getConnection().getId().toUpperCase(), player);
+ }
+ } else {
+ var exception = handshake.getException();
+ if (exception != null) log.error("Handshake failure: " + exception, exception);
+ }
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/server/ServerConfig.java b/src/main/java/net/rptools/maptool/server/ServerConfig.java
index 818f9a31f4..9807b3acba 100644
--- a/src/main/java/net/rptools/maptool/server/ServerConfig.java
+++ b/src/main/java/net/rptools/maptool/server/ServerConfig.java
@@ -14,18 +14,69 @@
*/
package net.rptools.maptool.server;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.Random;
+import net.rptools.maptool.util.PasswordGenerator;
+
public class ServerConfig {
public static final int DEFAULT_PORT = 51234;
- private final int port;
- private final String hostPlayerId;
+ public static final int PORT_RANGE_START = 4000;
+ public static final int PORT_RANGE_END = 20000;
+
+ private static final String personalServerGMPassword;
+
+ private static final String personalServerPlayerPassword;
+
+ static {
+ PasswordGenerator passwordGenerator = new PasswordGenerator();
+ // Generate a random password for personal server
+ personalServerGMPassword = passwordGenerator.getPassword();
+ String playerPass = passwordGenerator.getPassword();
+ if (playerPass.equals(personalServerGMPassword)) { // super unlikely but just to play safe
+ personalServerPlayerPassword = playerPass + "!";
+ } else {
+ personalServerPlayerPassword = playerPass;
+ }
+ }
+
+ private int port;
+ private String hostPlayerId;
private final String gmPassword;
private final String playerPassword;
- private final String serverName;
- private final String hostName;
+ private boolean personalServer;
+ private String serverName;
+ private String hostName;
private final boolean useEasyConnect;
private final boolean useWebRTC;
+ public static String getPersonalServerGMPassword() {
+ return personalServerGMPassword;
+ }
+
+ public static String getPersonalServerPlayerPassword() {
+ return personalServerPlayerPassword;
+ }
+
+ public ServerConfig() {
+ playerPassword = getPersonalServerPlayerPassword();
+ gmPassword = getPersonalServerGMPassword();
+ useEasyConnect = false;
+ useWebRTC = false;
+ }
+
+ public ServerConfig(
+ String hostPlayerId,
+ String gmPassword,
+ String playerPassword,
+ int port,
+ String serverName,
+ String hostName,
+ boolean useWebRTC) {
+ this(hostPlayerId, gmPassword, playerPassword, port, serverName, hostName, false, useWebRTC);
+ }
+
public ServerConfig(
String hostPlayerId,
String gmPassword,
@@ -50,17 +101,38 @@ public String getHostPlayerId() {
}
public boolean isServerRegistered() {
- return serverName != null && !serverName.isEmpty();
+ return serverName != null && serverName.length() > 0;
}
public String getServerName() {
return serverName;
}
+ public boolean gmPasswordMatches(String password) {
+ return safeCompare(gmPassword, password);
+ }
+
+ public boolean playerPasswordMatches(String password) {
+ return safeCompare(playerPassword, password);
+ }
+
+ public boolean isPersonalServer() {
+ return personalServer;
+ }
+
public int getPort() {
return port;
}
+ public static ServerConfig createPersonalServerConfig() {
+ ServerConfig config = new ServerConfig();
+ config.serverName = "Personal server";
+ config.hostName = "localhost";
+ config.personalServer = true;
+ config.port = findOpenPort(PORT_RANGE_START, PORT_RANGE_END);
+ return config;
+ }
+
public String getGmPassword() {
return gmPassword;
}
@@ -80,4 +152,45 @@ public boolean getUseEasyConnect() {
public boolean getUseWebRTC() {
return useWebRTC;
}
+
+ private static Random r = new Random();
+
+ private static int findOpenPort(int rangeLow, int rangeHigh) {
+ // Presumably there will always be at least one open port between low and high
+ while (true) {
+ ServerSocket ss = null;
+ try {
+ int port = rangeLow + (int) ((rangeHigh - rangeLow) * r.nextFloat());
+ ss = new ServerSocket(port);
+
+ // This port was open before we took it, so we'll just close it and use this one
+ // LATER: This isn't super exact, it's conceivable that another process will take
+ // the port between our closing it and the server opening it. But that's the best
+ // we can do at the moment until the server is refactored.
+ return port;
+ } catch (Exception e) {
+ // Just keep trying
+ } finally {
+ if (ss != null) {
+ try {
+ ss.close();
+ } catch (IOException ioe) {
+ // No big deal
+ ioe.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+
+ private static boolean safeCompare(String s1, String s2) {
+ if (s1 == null) {
+ s1 = "";
+ }
+ if (s2 == null) {
+ s2 = "";
+ }
+
+ return s1.equals(s2);
+ }
}
diff --git a/src/main/java/net/rptools/maptool/server/ServerHandshake.java b/src/main/java/net/rptools/maptool/server/ServerHandshake.java
index 919339615a..5fe1768808 100644
--- a/src/main/java/net/rptools/maptool/server/ServerHandshake.java
+++ b/src/main/java/net/rptools/maptool/server/ServerHandshake.java
@@ -21,11 +21,10 @@
import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
import java.util.Arrays;
+import java.util.List;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
-import java.util.function.BiConsumer;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
@@ -42,8 +41,8 @@
import net.rptools.maptool.model.player.Player;
import net.rptools.maptool.model.player.Player.Role;
import net.rptools.maptool.model.player.PlayerAwaitingApproval;
+import net.rptools.maptool.model.player.PlayerDatabase;
import net.rptools.maptool.model.player.PlayerDatabase.AuthMethod;
-import net.rptools.maptool.model.player.ServerSidePlayerDatabase;
import net.rptools.maptool.server.proto.AuthTypeEnum;
import net.rptools.maptool.server.proto.ClientAuthMsg;
import net.rptools.maptool.server.proto.ClientInitMsg;
@@ -64,33 +63,40 @@
import org.apache.logging.log4j.Logger;
/** Class used to handle the server side part of the connection handshake. */
-public class ServerHandshake implements Handshake, MessageHandler {
+public class ServerHandshake implements Handshake, MessageHandler {
/** Instance used for log messages. */
private static final Logger log = LogManager.getLogger(ServerHandshake.class);
- private final CompletableFuture future = new CompletableFuture<>();
- private CompletionStage stage = future;
-
/** The database used for retrieving players. */
- private final ServerSidePlayerDatabase playerDatabase;
-
- private final MapToolServer server;
+ private final PlayerDatabase playerDatabase;
/** The connection to the client. */
private final Connection connection;
+ /** Observers that want to be notified when the status changes. */
+ private final List observerList = new CopyOnWriteArrayList<>();
+
/** The index in the array for the GM handshake challenge, only used for role based auth */
private static final int GM_CHALLENGE = 0;
/** The index in the array for the Player handshake challenge, only used for role based auth */
private static final int PLAYER_CHALLENGE = 1;
+ /** Message for any error that has occurred, {@code null} if no error has occurred. */
+ private String errorMessage;
+
/** The pin for the new public key easy connect request. */
private String easyConnectPin;
/** The username for the new public key easy connect request. */
private String easyConnectName;
+ /**
+ * Any exception that occurred that causes an error, {@code null} if no exception which causes an
+ * error has occurred.
+ */
+ private Exception exception;
+
/** The player that this connection is for. */
private Player player;
@@ -112,43 +118,69 @@ public class ServerHandshake implements Handshake, MessageHandler {
* @param useEasyConnect If true, the client will use the easy connect method.
*/
public ServerHandshake(
- MapToolServer server,
- Connection connection,
- ServerSidePlayerDatabase playerDatabase,
- boolean useEasyConnect) {
- this.server = server;
+ Connection connection, PlayerDatabase playerDatabase, boolean useEasyConnect) {
this.connection = connection;
this.playerDatabase = playerDatabase;
this.useEasyConnect = useEasyConnect;
+ }
- whenComplete(
- (result, error) -> {
- connection.removeMessageHandler(this);
+ @Override
+ public boolean isSuccessful() {
+ return currentState == State.Success;
+ }
- if (getEasyConnectName() != null) {
- SwingUtilities.invokeLater(
- () ->
- MapTool.getFrame()
- .getConnectionPanel()
- .removeAwaitingApproval(easyConnectName));
- }
- });
+ @Override
+ public synchronized String getErrorMessage() {
+ return errorMessage;
}
@Override
- public void whenComplete(BiConsumer callback) {
- stage = stage.whenComplete(callback);
+ public synchronized Connection getConnection() {
+ return connection;
+ }
+
+ @Override
+ public synchronized Exception getException() {
+ return exception;
+ }
+
+ @Override
+ public synchronized Player getPlayer() {
+ return player;
}
private synchronized void setPlayer(Player player) {
this.player = player;
}
+ private synchronized void setErrorMessage(String errorMessage) {
+ this.errorMessage = errorMessage;
+ }
+
+ private synchronized void setException(Exception exception) {
+ this.exception = exception;
+ }
+
private synchronized void setCurrentState(State state) {
- log.debug("Transitioning from {} to {}", currentState, state);
currentState = state;
}
+ private synchronized State getCurrentState() {
+ return currentState;
+ }
+
+ private synchronized void setEasyConnectPin(String pin) {
+ easyConnectPin = pin;
+ }
+
+ private String getEasyConnectPin() {
+ return easyConnectPin;
+ }
+
+ private synchronized void setEasyConnectName(String name) {
+ easyConnectName = name;
+ }
+
private synchronized String getEasyConnectName() {
return easyConnectName;
}
@@ -161,17 +193,16 @@ private synchronized String getEasyConnectName() {
*/
private void sendErrorResponseAndNotify(HandshakeResponseCodeMsg errorCode) {
var msg = HandshakeMsg.newBuilder().setHandshakeResponseCodeMsg(errorCode).build();
- sendMessage(State.PlayerBlocked, msg);
+ sendMessage(msg);
+ setCurrentState(State.PlayerBlocked);
// Do not notify users as it will disconnect and client won't get message instead wait
// for client to disconnect after getting this message, if they don't then it will fail
// with invalid handshake.
}
- private void sendMessage(State newState, HandshakeMsg message) {
- setCurrentState(newState);
-
+ private void sendMessage(HandshakeMsg message) {
var msgType = message.getMessageTypeCase();
- log.debug("Server sent to {}: {}", connection.getId(), msgType);
+ log.info("Server sent to " + connection.getId() + ": " + msgType);
connection.sendMessage(message.toByteArray());
}
@@ -181,30 +212,32 @@ public void handleMessage(String id, byte[] message) {
var handshakeMsg = HandshakeMsg.parseFrom(message);
var msgType = handshakeMsg.getMessageTypeCase();
- log.debug("from {} got: {}", id, msgType);
+ log.info("from " + id + " got: " + msgType);
if (msgType == MessageTypeCase.HANDSHAKE_RESPONSE_CODE_MSG) {
HandshakeResponseCodeMsg code = handshakeMsg.getHandshakeResponseCodeMsg();
- String errorMessage;
if (code.equals(HandshakeResponseCodeMsg.INVALID_PASSWORD)) {
- errorMessage = I18N.getText("Handshake.msg.incorrectPassword");
+ setErrorMessage(I18N.getText("Handshake.msg.incorrectPassword"));
} else if (code.equals(HandshakeResponseCodeMsg.INVALID_PUBLIC_KEY)) {
- errorMessage = I18N.getText("Handshake.msg.incorrectPublicKey");
+ setErrorMessage(I18N.getText("Handshake.msg.incorrectPublicKey"));
} else {
- errorMessage = I18N.getText("Handshake.msg.invalidHandshake");
+ setErrorMessage(I18N.getText("Handshake.msg.invalidHandshake"));
}
- future.completeExceptionally(new Failure(errorMessage));
+
+ notifyObservers();
return;
}
switch (currentState) {
case PlayerBlocked:
+ setErrorMessage(I18N.getText("Handshake.msg.invalidHandshake"));
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.INVALID_HANDSHAKE);
break;
case AwaitingClientInit:
if (msgType == HandshakeMsg.MessageTypeCase.CLIENT_INIT_MSG) {
handle(handshakeMsg.getClientInitMsg());
} else {
+ setErrorMessage(I18N.getText("Handshake.msg.invalidHandshake"));
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.INVALID_HANDSHAKE);
}
break;
@@ -213,6 +246,7 @@ public void handleMessage(String id, byte[] message) {
if (msgType == MessageTypeCase.CLIENT_AUTH_MESSAGE) {
handle(handshakeMsg.getClientAuthMessage());
} else {
+ setErrorMessage(I18N.getText("Handshake.msg.invalidHandshake"));
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.INVALID_HANDSHAKE);
}
break;
@@ -222,9 +256,11 @@ public void handleMessage(String id, byte[] message) {
}
}
} catch (Exception e) {
- log.warn("Unexpected exception during server handshake", e);
+ log.warn(e.toString());
+ setException(e);
setCurrentState(State.Error);
- future.completeExceptionally(new Failure(I18N.getText("Handshake.msg.unexpectedError"), e));
+ setErrorMessage(e.getMessage());
+ notifyObservers();
}
}
@@ -249,7 +285,7 @@ private void acceptNewPublicKey(PlayerAwaitingApproval p) {
if (getEasyConnectName() == null) {
return; // Protect from event being fired more than once
}
- easyConnectName = null;
+ setEasyConnectName(null);
try {
var playerDb = (PersistedPlayerDatabase) playerDatabase;
var pl = playerDatabase.getPlayer(p.name());
@@ -261,13 +297,12 @@ private void acceptNewPublicKey(PlayerAwaitingApproval p) {
playerDb.setRole(pl.getName(), p.role());
setPlayer(playerDatabase.getPlayer(pl.getName()));
}
+ playerDb.commitChanges();
}
- playerDb.commitChanges();
-
var publicKeyAddedMsgBuilder = PublicKeyAddedMsg.newBuilder();
publicKeyAddedMsgBuilder.setPublicKey(p.publicKey());
- var msg = HandshakeMsg.newBuilder().setPublicKeyAddedMsg(publicKeyAddedMsgBuilder).build();
- sendMessage(State.AwaitingClientInit, msg);
+ sendMessage(HandshakeMsg.newBuilder().setPublicKeyAddedMsg(publicKeyAddedMsgBuilder).build());
+ setCurrentState(State.AwaitingClientInit);
} catch (NoSuchPaddingException
| NoSuchAlgorithmException
| InvalidAlgorithmParameterException
@@ -286,6 +321,7 @@ private void handle(ClientAuthMsg clientAuthMessage)
InterruptedException,
NoSuchPaddingException,
IllegalBlockSizeException,
+ NoSuchAlgorithmException,
BadPaddingException,
InvalidKeyException,
InvalidAlgorithmParameterException {
@@ -319,16 +355,18 @@ private void handle(ClientAuthMsg clientAuthMessage)
}
private void sendConnectionSuccessful() throws ExecutionException, InterruptedException {
+ var server = MapTool.getServer();
var connectionSuccessfulMsg =
ConnectionSuccessfulMsg.newBuilder()
- .setRoleDto(player.isGM() ? RoleDto.GM : RoleDto.PLAYER)
+ .setRoleDto(getPlayer().isGM() ? RoleDto.GM : RoleDto.PLAYER)
.setServerPolicyDto(server.getPolicy().toDto())
.setGameDataDto(new DataStoreManager().toDto().get())
.setAddOnLibraryListDto(new LibraryManager().addOnLibrariesToDto().get());
var handshakeMsg =
HandshakeMsg.newBuilder().setConnectionSuccessfulMsg(connectionSuccessfulMsg).build();
- sendMessage(State.Success, handshakeMsg);
- future.complete(player);
+ sendMessage(handshakeMsg);
+ setCurrentState(State.Success);
+ notifyObservers();
}
/**
@@ -352,12 +390,15 @@ private void handle(ClientInitMsg clientInitMsg)
BadPaddingException,
InvalidKeyException,
InvalidAlgorithmParameterException {
+ var server = MapTool.getServer();
if (server.isPlayerConnected(clientInitMsg.getPlayerName())) {
+ setErrorMessage(I18N.getText("Handshake.msg.duplicateName"));
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.PLAYER_ALREADY_CONNECTED);
return;
}
if (!MapTool.isDevelopment() && !MapTool.getVersion().equals(clientInitMsg.getVersion())) {
+ setErrorMessage(I18N.getText("Handshake.msg.wrongVersion"));
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.WRONG_VERSION);
}
@@ -366,6 +407,7 @@ private void handle(ClientInitMsg clientInitMsg)
try {
setPlayer(playerDatabase.getPlayer(clientInitMsg.getPlayerName()));
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+ setErrorMessage(I18N.getText("Handshake.msg.encodeInitFail", clientInitMsg.getPlayerName()));
// Error fetching player is sent to client as invalid password intentionally.
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.INVALID_PASSWORD);
return;
@@ -377,6 +419,7 @@ private void handle(ClientInitMsg clientInitMsg)
return;
}
// Unknown player is sent to client as invalid password intentionally.
+ setErrorMessage(I18N.getText("Handshake.msg.unknownPlayer", clientInitMsg.getPlayerName()));
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.INVALID_PASSWORD);
return;
}
@@ -385,12 +428,14 @@ private void handle(ClientInitMsg clientInitMsg)
var blockedMsg =
PlayerBlockedMsg.newBuilder().setReason(playerDatabase.getBlockedReason(player)).build();
var msg = HandshakeMsg.newBuilder().setPlayerBlockedMsg(blockedMsg).build();
- sendMessage(State.Error, msg);
+ sendMessage(msg);
+ setCurrentState(State.Error);
return;
}
if (playerDatabase.getAuthMethod(player) == AuthMethod.ASYMMETRIC_KEY) {
- sendAsymmetricKeyAuthType();
+ var state = sendAsymmetricKeyAuthType();
+ setCurrentState(state);
} else {
handshakeChallenges = new HandshakeChallenge[2];
if (playerDatabase.supportsRolePasswords()) {
@@ -398,6 +443,7 @@ private void handle(ClientInitMsg clientInitMsg)
} else {
sendSharedPasswordAuthType();
}
+ setCurrentState(State.AwaitingClientPasswordAuth);
}
}
@@ -406,8 +452,8 @@ private void requestPublicKey(String playerName) {
easyConnectPin = String.format("%04d", new SecureRandom().nextInt(9999));
easyConnectName = playerName;
requestPublicKeyBuilder.setPin(easyConnectPin);
- var msg = HandshakeMsg.newBuilder().setRequestPublicKeyMsg(requestPublicKeyBuilder).build();
- sendMessage(State.AwaitingPublicKey, msg);
+ sendMessage(HandshakeMsg.newBuilder().setRequestPublicKeyMsg(requestPublicKeyBuilder).build());
+ currentState = State.AwaitingPublicKey;
}
/**
@@ -444,7 +490,7 @@ private void sendSharedPasswordAuthType()
.setIv(ByteString.copyFrom(iv))
.addChallenge(ByteString.copyFrom(handshakeChallenges[0].getChallenge()));
var handshakeMsg = HandshakeMsg.newBuilder().setUseAuthTypeMsg(authTypeMsg).build();
- sendMessage(State.AwaitingClientPasswordAuth, handshakeMsg);
+ sendMessage(handshakeMsg);
}
/**
@@ -493,12 +539,13 @@ private void sendRoleSharedPasswordAuthType()
.addChallenge(
ByteString.copyFrom(handshakeChallenges[PLAYER_CHALLENGE].getChallenge()));
var handshakeMsg = HandshakeMsg.newBuilder().setUseAuthTypeMsg(authTypeMsg).build();
- sendMessage(State.AwaitingClientPasswordAuth, handshakeMsg);
+ sendMessage(handshakeMsg);
}
/**
* Send the authentication type message when using asymmetric keys
*
+ * @return the new state for the state machine.
* @throws ExecutionException when there is an error fetching the public key.
* @throws InterruptedException when there is an error fetching the public key.
* @throws NoSuchPaddingException when there is an error during encryption.
@@ -507,7 +554,7 @@ private void sendRoleSharedPasswordAuthType()
* @throws BadPaddingException when there is an error during encryption.
* @throws InvalidKeyException when there is an error during encryption.
*/
- private void sendAsymmetricKeyAuthType()
+ private State sendAsymmetricKeyAuthType()
throws ExecutionException,
InterruptedException,
NoSuchPaddingException,
@@ -523,6 +570,7 @@ private void sendAsymmetricKeyAuthType()
} else {
sendErrorResponseAndNotify(HandshakeResponseCodeMsg.INVALID_PUBLIC_KEY);
}
+ return State.AwaitingPublicKey;
}
CipherUtil.Key publicKey = playerDatabase.getPublicKey(player, playerPublicKeyMD5).get();
String password = new PasswordGenerator().getPassword();
@@ -534,12 +582,39 @@ private void sendAsymmetricKeyAuthType()
.setAuthType(AuthTypeEnum.ASYMMETRIC_KEY)
.addChallenge(ByteString.copyFrom(handshakeChallenges[0].getChallenge()));
var handshakeMsg = HandshakeMsg.newBuilder().setUseAuthTypeMsg(authTypeMsg).build();
- sendMessage(State.AwaitingClientPublicKeyAuth, handshakeMsg);
+ sendMessage(handshakeMsg);
+ return State.AwaitingClientPublicKeyAuth;
+ }
+
+ /**
+ * Adds an observer to the handshake process.
+ *
+ * @param observer the observer of the handshake process.
+ */
+ public synchronized void addObserver(HandshakeObserver observer) {
+ observerList.add(observer);
+ }
+
+ /**
+ * Removes an observer from the handshake process.
+ *
+ * @param observer the observer of the handshake process.
+ */
+ public synchronized void removeObserver(HandshakeObserver observer) {
+ observerList.remove(observer);
+ }
+
+ /** Notifies observers that the handshake has completed or errored out.. */
+ private synchronized void notifyObservers() {
+ if (getEasyConnectName() != null) {
+ SwingUtilities.invokeLater(
+ () -> MapTool.getFrame().getConnectionPanel().removeAwaitingApproval(easyConnectName));
+ }
+ for (var observer : observerList) observer.onCompleted(this);
}
@Override
public void startHandshake() {
- connection.addMessageHandler(this);
setCurrentState(State.AwaitingClientInit);
}
diff --git a/src/main/java/net/rptools/maptool/server/ServerMessageHandler.java b/src/main/java/net/rptools/maptool/server/ServerMessageHandler.java
index df66daae4c..c181e141f2 100644
--- a/src/main/java/net/rptools/maptool/server/ServerMessageHandler.java
+++ b/src/main/java/net/rptools/maptool/server/ServerMessageHandler.java
@@ -282,6 +282,7 @@ private void handle(UpdateGmMacrosMsg msg) {
msg.getMacrosList().stream()
.map(MacroButtonProperties::fromDto)
.collect(Collectors.toList());
+ MapTool.getCampaign().setGmMacroButtonPropertiesArray(campaignMacros);
server.getCampaign().setGmMacroButtonPropertiesArray(campaignMacros);
});
}
@@ -293,6 +294,7 @@ private void handle(UpdateCampaignMacrosMsg msg) {
msg.getMacrosList().stream()
.map(MacroButtonProperties::fromDto)
.collect(Collectors.toList());
+ MapTool.getCampaign().setMacroButtonPropertiesArray(campaignMacros);
server.getCampaign().setMacroButtonPropertiesArray(campaignMacros);
});
}
@@ -414,12 +416,10 @@ private void handle(SetZoneGridSizeMsg msg) {
EventQueue.invokeLater(
() -> {
Zone zone = server.getCampaign().getZone(GUID.valueOf(msg.getZoneGuid()));
- if (zone != null) {
- Grid grid = zone.getGrid();
- grid.setSize(msg.getSize());
- grid.setOffset(msg.getXOffset(), msg.getYOffset());
- zone.setGridColor(msg.getColor());
- }
+ Grid grid = zone.getGrid();
+ grid.setSize(msg.getSize());
+ grid.setOffset(msg.getXOffset(), msg.getYOffset());
+ zone.setGridColor(msg.getColor());
});
}
@@ -690,7 +690,7 @@ private void handle(AddTopologyMsg addTopologyMsg) {
private void handle(BootPlayerMsg bootPlayerMsg) {
// And just to be sure, remove them from the server
- server.bootPlayer(bootPlayerMsg.getPlayerName());
+ server.releaseClientConnection(server.getConnectionId(bootPlayerMsg.getPlayerName()));
}
private void handle(String id, UpdatePlayerStatusMsg updatePlayerStatusMsg) {
@@ -704,11 +704,11 @@ private void handle(String id, UpdatePlayerStatusMsg updatePlayerStatusMsg) {
}
private void sendToClients(String excludedId, Message message) {
- server.broadcastMessage(new String[] {excludedId}, message);
+ server.getConnection().broadcastMessage(new String[] {excludedId}, message);
}
private void sendToAllClients(Message message) {
- server.broadcastMessage(message);
+ server.getConnection().broadcastMessage(message);
}
private void bringTokensToFront(GUID zoneGUID, Set tokenSet) {
@@ -750,10 +750,12 @@ private void getAsset(String id, MD5Key assetID) {
AssetManager.getAssetInfo(assetID).getProperty(AssetManager.NAME),
AssetManager.getAssetCacheFile(assetID));
var msg = StartAssetTransferMsg.newBuilder().setHeader(producer.getHeader().toDto());
- server.sendMessage(
- id,
- MapToolConstants.Channel.IMAGE,
- Message.newBuilder().setStartAssetTransferMsg(msg).build());
+ server
+ .getConnection()
+ .sendMessage(
+ id,
+ MapToolConstants.Channel.IMAGE,
+ Message.newBuilder().setStartAssetTransferMsg(msg).build());
server.addAssetProducer(id, producer);
} catch (IllegalArgumentException iae) {
@@ -762,14 +764,14 @@ private void getAsset(String id, MD5Key assetID) {
// image instead of blowing up
Asset asset = Asset.createBrokenImageAsset(assetID);
var msg = PutAssetMsg.newBuilder().setAsset(asset.toDto());
- server.sendMessage(id, Message.newBuilder().setPutAssetMsg(msg).build());
+ server.getConnection().sendMessage(id, Message.newBuilder().setPutAssetMsg(msg).build());
}
}
private void getZone(String id, GUID zoneGUID) {
var zone = server.getCampaign().getZone(zoneGUID);
var msg = PutZoneMsg.newBuilder().setZone(zone.toDto());
- server.sendMessage(id, Message.newBuilder().setPutZoneMsg(msg).build());
+ server.getConnection().sendMessage(id, Message.newBuilder().setPutZoneMsg(msg).build());
}
private void putToken(String clientId, GUID zoneGUID, Token token) {
@@ -791,7 +793,9 @@ private void putToken(String clientId, GUID zoneGUID, Token token) {
.setTokenGuid(token.getId().toString())
.setProperty(TokenUpdateDto.valueOf(Token.Update.setZOrder.name()))
.addValues(0, TokenPropertyValueDto.newBuilder().setIntValue(zOrder));
- server.sendMessage(clientId, Message.newBuilder().setUpdateTokenPropertyMsg(msg).build());
+ server
+ .getConnection()
+ .sendMessage(clientId, Message.newBuilder().setUpdateTokenPropertyMsg(msg).build());
}
}
diff --git a/src/main/java/net/rptools/maptool/server/ServerPolicy.java b/src/main/java/net/rptools/maptool/server/ServerPolicy.java
index b4cdb80530..a46080d5b5 100644
--- a/src/main/java/net/rptools/maptool/server/ServerPolicy.java
+++ b/src/main/java/net/rptools/maptool/server/ServerPolicy.java
@@ -53,26 +53,6 @@ public ServerPolicy() {
movementMetric = AppPreferences.getMovementMetric();
}
- public ServerPolicy(ServerPolicy other) {
- this.strictTokenMovement = other.strictTokenMovement;
- this.isMovementLocked = other.isMovementLocked;
- this.isTokenEditorLocked = other.isTokenEditorLocked;
- this.playersCanRevealVision = other.playersCanRevealVision;
- this.gmRevealsVisionForUnownedTokens = other.gmRevealsVisionForUnownedTokens;
- this.useIndividualViews = other.useIndividualViews;
- this.restrictedImpersonation = other.restrictedImpersonation;
- this.playersReceiveCampaignMacros = other.playersReceiveCampaignMacros;
- this.useToolTipsForDefaultRollFormat = other.useToolTipsForDefaultRollFormat;
- this.useIndividualFOW = other.useIndividualFOW;
- this.isAutoRevealOnMovement = other.isAutoRevealOnMovement;
- this.includeOwnedNPCs = other.includeOwnedNPCs;
- this.movementMetric = other.movementMetric;
- this.hidemapselectui = other.hidemapselectui;
- this.disablePlayerAssetPanel = other.disablePlayerAssetPanel;
- this.useAstarPathfinding = other.useAstarPathfinding;
- this.vblBlocksMove = other.vblBlocksMove;
- }
-
/**
* Whether token management can be done by everyone or only the GM and assigned tokens
*
@@ -184,7 +164,7 @@ public boolean getUseToolTipsForDefaultRollFormat() {
* @return the current server time as the difference, measured in milliseconds, between the now
* and midnight, January 1, 1970 UTC
*/
- private long getSystemTime() {
+ public long getSystemTime() {
return System.currentTimeMillis();
}
@@ -194,7 +174,7 @@ private String getLocalTimeDate() {
return sdf.format(cal.getTime());
}
- private String getTimeDate() {
+ public String getTimeDate() {
return getLocalTimeDate();
}
diff --git a/src/main/java/net/rptools/maptool/util/PersistenceUtil.java b/src/main/java/net/rptools/maptool/util/PersistenceUtil.java
index d570cecd72..21254eb2b4 100644
--- a/src/main/java/net/rptools/maptool/util/PersistenceUtil.java
+++ b/src/main/java/net/rptools/maptool/util/PersistenceUtil.java
@@ -320,9 +320,6 @@ public static PersistedMap loadMap(File mapFile) throws IOException {
z.setName(n);
z.imported(); // Resets creation timestamp and init panel, among other things
z.optimize(); // Collapses overlaid or redundant drawables
-
- // Make sure the imported zone is as fresh as possible (new IDs all the way down).
- persistedMap.zone = new Zone(z, false);
} else {
// TODO: Not a map but it is something with a property.xml file in it.
// Should we have a filetype property in there?
diff --git a/src/main/java/net/rptools/maptool/util/cipher/CipherUtil.java b/src/main/java/net/rptools/maptool/util/cipher/CipherUtil.java
index af604f448f..72854b647e 100644
--- a/src/main/java/net/rptools/maptool/util/cipher/CipherUtil.java
+++ b/src/main/java/net/rptools/maptool/util/cipher/CipherUtil.java
@@ -36,6 +36,7 @@
import javax.crypto.spec.SecretKeySpec;
import net.rptools.lib.MD5Key;
import net.rptools.maptool.language.I18N;
+import net.rptools.maptool.server.MapToolServerConnection;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -55,7 +56,7 @@ public class CipherUtil {
private static final String MESSAGE_DIGEST_ALGORITHM = "SHA3-256";
/** Logger used for log messages. */
- private static final Logger log = LogManager.getLogger(CipherUtil.class);
+ private static final Logger log = LogManager.getLogger(MapToolServerConnection.class);
/** The length of the generated key. */
public static final int DEFAULT_GENERATED_KEY_LEN = 128;
diff --git a/src/main/java/net/rptools/maptool/webapi/MTWebAppServer.java b/src/main/java/net/rptools/maptool/webapi/MTWebAppServer.java
new file mode 100644
index 0000000000..69166d6cb7
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/webapi/MTWebAppServer.java
@@ -0,0 +1,179 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.webapi;
+
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import net.rptools.maptool.client.MapTool;
+import net.rptools.maptool.language.I18N;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.log.StdErrLog;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.websocket.server.WebSocketHandler;
+import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
+
+public class MTWebAppServer {
+ public static final String WEBAPP_CONTEXT_PATH = "webapi";
+
+ /** The port to listen on. */
+ private int port = 8000;
+
+ /** The embedded Jetty server we will use. */
+ private Server server = null;
+
+ /** Has the server been started. */
+ private boolean started = false;
+
+ /** Extra resource directories. */
+ private Map resourceDirs = new HashMap<>();
+
+ public synchronized void addResourceDir(String contextPath, String dirname) {
+ if (started) {
+ System.err.println("Can not add a resource directory to a running Webapp server.");
+ throw new IllegalArgumentException(
+ "Can not add a resource directory to a running Webapp server.");
+ }
+ resourceDirs.put(contextPath, dirname);
+ }
+
+ /**
+ * Sets the port
+ *
+ * @param port the port for the server
+ */
+ public synchronized void setPort(int port) {
+ if (started) {
+ System.err.println("Can not change port of running Webapp server.");
+ throw new IllegalArgumentException("Can not change port of running Webapp server.");
+ }
+ this.port = port;
+ }
+
+ /** Starts the server at the specified port. */
+ public synchronized void startServer() {
+ if (started) {
+ return; // Do nothing as its already running.
+ }
+
+ System.out.println("DEBUG: Starting server on port " + this.port + "...");
+ server = new org.eclipse.jetty.server.Server(this.port);
+
+ // set up the web socket handler
+ ContextHandler contextHandler = new ContextHandler();
+ contextHandler.setContextPath("/ws");
+ contextHandler.setHandler(
+ new WebSocketHandler() {
+
+ @Override
+ public void configure(WebSocketServletFactory factory) {
+ factory.setCreator(
+ (req, resp) -> {
+ String query = req.getRequestURI().toString();
+ if ((query == null) || (query.length() <= 0)) {
+ try {
+ resp.sendForbidden("DEBUG: Unspecified query");
+ } catch (IOException e) {
+
+ }
+
+ return null;
+ }
+
+ return new MTWebSocket();
+ });
+ }
+ });
+
+ WebAppContext webAppContext = new WebAppContext();
+ webAppContext.setResourceBase(
+ this.getClass().getResource("/net/rptools/maptool/webapp").toExternalForm());
+ webAppContext.setContextPath("/" + WEBAPP_CONTEXT_PATH);
+ webAppContext.setLogger(new StdErrLog());
+
+ HandlerList handlers = new HandlerList();
+
+ handlers.addHandler(contextHandler);
+ handlers.addHandler(webAppContext);
+
+ for (Map.Entry res : resourceDirs.entrySet()) {
+ ContextHandler context = new ContextHandler();
+ context.setWelcomeFiles(new String[] {"index.html"});
+ context.setContextPath(res.getKey());
+
+ ResourceHandler resourceHandler = new ResourceHandler();
+ resourceHandler.setDirectoriesListed(true);
+ resourceHandler.setWelcomeFiles(new String[] {"index.html"});
+ resourceHandler.setResourceBase(res.getValue());
+
+ context.setHandler(resourceHandler);
+ handlers.addHandler(context);
+
+ System.err.println("DEBUG: name=" + res.getKey() + ": value=" + res.getValue());
+ }
+
+ ContextHandler tokenImageContext = new ContextHandler();
+ tokenImageContext.setContextPath("/token");
+ tokenImageContext.setLogger(new StdErrLog());
+ tokenImageContext.setHandler(new TokenImageHandler());
+
+ handlers.addHandler(tokenImageContext);
+
+ server.setHandler(handlers);
+
+ try {
+ server.start();
+ } catch (Exception e) {
+
+ }
+ System.out.println("DEBUG: Started.");
+ started = true;
+
+ // Set up the heartbeat
+ ScheduledExecutorService ses = Executors.newSingleThreadScheduledExecutor();
+
+ ses.scheduleAtFixedRate(
+ () -> {
+ JsonObject data = new JsonObject();
+ MTWebClientManager.getInstance().sendToAllSessions("keepalive", data);
+ },
+ 1,
+ 1,
+ TimeUnit.MINUTES);
+
+ try {
+ String address = InetAddress.getLocalHost().getHostAddress();
+ String portString = Integer.toString(port);
+ MapTool.addLocalMessage(
+ I18N.getText("webapp.serverStarted", address, portString, WEBAPP_CONTEXT_PATH));
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ // FIXME: log this error
+ }
+ }
+
+ public boolean hasStarted() {
+ return started;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/webapi/MTWebClientManager.java b/src/main/java/net/rptools/maptool/webapi/MTWebClientManager.java
new file mode 100644
index 0000000000..79d1fb911c
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/webapi/MTWebClientManager.java
@@ -0,0 +1,91 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.webapi;
+
+import com.google.gson.JsonObject;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class MTWebClientManager {
+
+ /** Create the singleton instance. */
+ private static final MTWebClientManager instance = new MTWebClientManager();
+
+ /** The connected clients. */
+ private Set clientSockets = Collections.synchronizedSet(new HashSet());
+
+ /** Create a new MTWebClientManager. */
+ private MTWebClientManager() {}
+
+ /**
+ * Returns the singleton instance of MTWebClientManager.
+ *
+ * @return the instance of MTWebClientManager.
+ */
+ public static MTWebClientManager getInstance() {
+ return instance;
+ }
+
+ /**
+ * Return the sessions for the clients that are connected.
+ *
+ * @return the sessions for the clients that are connected.
+ */
+ Collection getClientSessions() {
+ return Collections.unmodifiableCollection(clientSockets);
+ }
+
+ /**
+ * Sends a message to all sessions.
+ *
+ * @param messageType the type of the message.
+ * @param data the data to send
+ */
+ public void sendToAllSessions(String messageType, JsonObject data) {
+ for (MTWebSocket ws : clientSockets) {
+ ws.sendMessage(messageType, data);
+ }
+ }
+
+ /**
+ * Adds a client to the list of clients being managed.
+ *
+ * @param wcs The web socket of the client.
+ */
+ void addClient(MTWebSocket wcs) {
+ clientSockets.add(wcs);
+ sendInitialInfo(wcs);
+ }
+
+ /**
+ * Removes a client from the list of clients being managed.
+ *
+ * @param wcs The web socket of the client.
+ */
+ void removeClient(MTWebSocket wcs) {
+ clientSockets.remove(wcs);
+ }
+
+ /**
+ * Send the initiative information to the specified client.
+ *
+ * @param wcs the web socket of the client.
+ */
+ void sendInitialInfo(MTWebSocket wcs) {
+ WebAppInitiative.getInstance().sendInitiative(wcs);
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/webapi/MTWebSocket.java b/src/main/java/net/rptools/maptool/webapi/MTWebSocket.java
new file mode 100644
index 0000000000..da276aee7e
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/webapi/MTWebSocket.java
@@ -0,0 +1,115 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.webapi;
+
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import net.rptools.maptool.client.functions.json.JSONMacroFunctions;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.WebSocketAdapter;
+
+public class MTWebSocket extends WebSocketAdapter {
+
+ /** The Session of this socket. */
+ private Session session;
+
+ @Override
+ /**
+ * Adds the session to the chatroom participants list, and sends back to the user the last three
+ * messages in the conversation.
+ */
+ public void onWebSocketConnect(Session session) {
+ System.out.println("DEBUG: Websocket Connect from " + session.getRemoteAddress().getAddress());
+ this.session = session;
+ System.out.println("DEBUG: Connected");
+ MTWebClientManager.getInstance().addClient(this);
+ }
+
+ @Override
+ public void onWebSocketBinary(byte[] bytes, int x, int y) {
+ // not used
+ }
+
+ @Override
+ public void onWebSocketText(String message) {
+ System.out.println("DEBUG: Got Message" + message);
+ // FIXME: need to test this is valid
+ try {
+ JsonObject json = JSONMacroFunctions.getInstance().asJsonElement(message).getAsJsonObject();
+ String messageType = json.get("messageType").getAsString();
+ String messageId = json.get("messageId").getAsString();
+ JsonObject data = json.get("data").getAsJsonObject();
+
+ if ("initiative".equals(messageType)) {
+ System.out.println("DEBUG: Got an initiative message");
+ WebAppInitiative.getInstance().processInitiativeMessage(data);
+ } else if ("tokenInfo".equals(messageType) || "tokenProperties".equals(messageType)) {
+ WebTokenInfo.getInstance().sendTokenInfo(this, messageId, data);
+ } else if ("macro".equals(messageType)) {
+ WebTokenInfo.getInstance().processMacro(data);
+ } else if ("setProperties".equals(messageType)) {
+ WebTokenInfo.getInstance().processSetProperties(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace(); // FIXME: fix this to deal with error properly.
+ }
+ }
+
+ @Override
+ public void onWebSocketError(Throwable cause) {
+ System.out.println("DEBUG: Websocket Error " + cause.getMessage());
+ System.out.println(
+ "DEBUG: number connections = "
+ + MTWebClientManager.getInstance().getClientSessions().size());
+ MTWebClientManager.getInstance().removeClient(this);
+ }
+
+ @Override
+ public void onWebSocketClose(int statusCode, String reason) {
+ System.out.println("DEBUG: Websocket Close from " + session.getRemoteAddress().getAddress());
+ MTWebClientManager.getInstance().removeClient(this);
+ }
+
+ void sendMessage(String messageType, JsonObject data) {
+ sendMessage(messageType, null, data);
+ }
+
+ /**
+ * Sends a message to the client.
+ *
+ * @param messageType The type of the message.
+ * @param inResponseTo The message this is a response to.
+ * @param data The data in the message.
+ */
+ void sendMessage(String messageType, String inResponseTo, JsonObject data) {
+ JsonObject message = new JsonObject();
+ message.addProperty("messageType", messageType);
+ message.add("data", data);
+ if (inResponseTo != null) {
+ message.addProperty("inResponseTo", inResponseTo);
+ }
+
+ try {
+ session.getRemote().sendString(message.toString());
+ System.out.println("DEBUG: Wrote: " + message.toString());
+ } catch (IOException ioe) {
+ System.out.println("DEBUG: websocket write error.");
+ System.out.println(
+ "DEBUG: number connections = "
+ + MTWebClientManager.getInstance().getClientSessions().size());
+ MTWebClientManager.getInstance().removeClient(this);
+ }
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/webapi/TokenImageHandler.java b/src/main/java/net/rptools/maptool/webapi/TokenImageHandler.java
new file mode 100644
index 0000000000..6fe6feb51c
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/webapi/TokenImageHandler.java
@@ -0,0 +1,140 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.webapi;
+
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import net.rptools.maptool.model.Asset;
+import net.rptools.maptool.model.AssetManager;
+import net.rptools.maptool.model.Token;
+import net.rptools.maptool.util.ImageManager;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+
+public class TokenImageHandler extends AbstractHandler {
+ @Override
+ public void handle(
+ String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
+
+ String args[] = target.replaceAll("^/", "").split("/");
+
+ for (String s : args) {
+ System.out.println("DEBUG: ARGS: " + s);
+ }
+
+ if ("portrait".equalsIgnoreCase(args[0])) {
+ baseRequest.setHandled(sendPortrait(response, args[1]));
+ } else if ("image".equalsIgnoreCase(args[0])) {
+ baseRequest.setHandled(sendImage(response, args[1]));
+ } else if ("portraitOrImage".equalsIgnoreCase(args[0])) {
+ baseRequest.setHandled(sendPortraitOrImage(response, args[1]));
+ }
+
+ /*
+ * response.setContentType("text/html; charset=utf-8"); response.setStatus(HttpServletResponse.SC_OK);
+ *
+ * PrintWriter out = response.getWriter();
+ *
+ * baseRequest.setHandled(true);
+ */
+ }
+
+ private boolean sendImage(HttpServletResponse response, String tokenId) throws IOException {
+ System.out.println("DEBUG: Here (> 0) as well");
+ Token token = WebTokenInfo.getInstance().findTokenFromId(tokenId);
+ if (token == null) {
+ return false;
+ // FIXME: log this error
+ }
+
+ if (token.getImageAssetId() == null) {
+ response.setContentType("image/png");
+ ImageIO.write(ImageManager.BROKEN_IMAGE, "png", response.getOutputStream());
+ response.setStatus(HttpServletResponse.SC_OK);
+ } else {
+ Asset asset = AssetManager.getAsset(token.getImageAssetId());
+ byte[] image = asset.getData();
+ response.setContentType("image/" + asset.getExtension());
+ response.setStatus(HttpServletResponse.SC_OK);
+
+ response.setContentLength(image.length);
+ response.getOutputStream().write(image);
+ }
+
+ return true;
+ }
+
+ private boolean sendPortrait(HttpServletResponse response, String tokenId) throws IOException {
+
+ System.out.println("DEBUG: Here (> 0) as well");
+ Token token = WebTokenInfo.getInstance().findTokenFromId(tokenId);
+ if (token == null) {
+ return false;
+ // FIXME: log this error
+ }
+
+ if (token.getPortraitImage() == null) {
+ response.setContentType("image/png");
+ ImageIO.write(ImageManager.BROKEN_IMAGE, "png", response.getOutputStream());
+ response.setStatus(HttpServletResponse.SC_OK);
+ } else {
+ Asset asset = AssetManager.getAsset(token.getPortraitImage());
+ byte[] image = asset.getData();
+ response.setContentType("image/" + asset.getExtension());
+ response.setStatus(HttpServletResponse.SC_OK);
+
+ response.setContentLength(image.length);
+ response.getOutputStream().write(image);
+ }
+
+ return true;
+ }
+
+ private boolean sendPortraitOrImage(HttpServletResponse response, String tokenId)
+ throws IOException {
+
+ System.out.println("DEBUG: Here (> 0) as well");
+ Token token = WebTokenInfo.getInstance().findTokenFromId(tokenId);
+ if (token == null) {
+ return false;
+ // FIXME: log this error
+ }
+
+ Asset asset = null;
+ if (token.getPortraitImage() != null) {
+ asset = AssetManager.getAsset(token.getPortraitImage());
+ } else if (token.getImageAssetId() != null) {
+ asset = AssetManager.getAsset(token.getImageAssetId());
+ }
+
+ if (asset != null) {
+ byte[] image = asset.getData();
+ response.setContentType("image/" + asset.getExtension());
+ response.setStatus(HttpServletResponse.SC_OK);
+
+ response.setContentLength(image.length);
+ response.getOutputStream().write(image);
+ } else {
+ response.setContentType("image/png");
+ ImageIO.write(ImageManager.BROKEN_IMAGE, "png", response.getOutputStream());
+ response.setStatus(HttpServletResponse.SC_OK);
+ }
+
+ return true;
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/webapi/WebAppInitiative.java b/src/main/java/net/rptools/maptool/webapi/WebAppInitiative.java
new file mode 100644
index 0000000000..e8dbeccf0e
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/webapi/WebAppInitiative.java
@@ -0,0 +1,216 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.webapi;
+
+import com.google.common.eventbus.Subscribe;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.List;
+import javax.swing.*;
+import net.rptools.maptool.client.AppUtil;
+import net.rptools.maptool.client.MapTool;
+import net.rptools.maptool.client.events.ZoneActivated;
+import net.rptools.maptool.client.ui.tokenpanel.InitiativePanel;
+import net.rptools.maptool.events.MapToolEventBus;
+import net.rptools.maptool.model.*;
+import net.rptools.maptool.model.zones.InitiativeListChanged;
+
+public class WebAppInitiative {
+
+ private static final WebAppInitiative instance = new WebAppInitiative();
+
+ private class InitiativeListener implements PropertyChangeListener {
+
+ private InitiativeList initiativeList;
+ private Zone zone;
+
+ private void setList(InitiativeList ilist) {
+ if (initiativeList != null) {
+ initiativeList.removePropertyChangeListener(this);
+ }
+ initiativeList = ilist;
+ initiativeList.addPropertyChangeListener(this);
+ }
+
+ private void setZone(Zone z) {
+ setList(z.getInitiativeList());
+ zone = z;
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ // This should really be run in a separate thread, but to do that I need to work out
+ // concurrency issues.
+ sendInitiative();
+ System.out.println("Here!");
+ }
+
+ @Subscribe
+ void onInitiativeListChanged(InitiativeListChanged event) {
+ final var list = event.initiativeList();
+ if (list.getZone() != zone) {
+ return;
+ }
+
+ setList(list);
+ sendInitiative();
+ }
+
+ @Subscribe
+ void onZoneActivated(ZoneActivated event) {
+ setZone(event.zone());
+ sendInitiative();
+ }
+
+ public void updateListeners() {
+ setZone(MapTool.getFrame().getCurrentZoneRenderer().getZone());
+ }
+ }
+
+ private InitiativeListener initiativeListener;
+
+ public static WebAppInitiative getInstance() {
+ return instance;
+ }
+
+ private WebAppInitiative() {
+ initiativeListener = new InitiativeListener();
+ SwingUtilities.invokeLater(
+ () -> {
+ new MapToolEventBus().getMainEventBus().register(this);
+ initiativeListener.updateListeners();
+ System.out.println("Here...");
+ });
+ }
+
+ private JsonObject getInitiativeDetails() {
+ JsonObject json = new JsonObject();
+ InitiativeList initiativeList =
+ MapTool.getFrame().getCurrentZoneRenderer().getZone().getInitiativeList();
+
+ List tokenInitList =
+ initiativeList.getTokens();
+
+ JsonArray tokArray = new JsonArray();
+ int index = 0;
+ for (InitiativeList.TokenInitiative token : tokenInitList) {
+ if (InitiativeListModel.isTokenVisible(token.getToken(), initiativeList.isHideNPC())) {
+ JsonObject tokJSon = new JsonObject();
+ tokJSon.addProperty("id", token.getToken().getId().toString());
+ tokJSon.addProperty("name", token.getToken().getName());
+ tokJSon.addProperty("holding", token.isHolding());
+ if (token.getState() != null) {
+ tokJSon.addProperty("initiative", token.getState());
+ }
+ tokJSon.addProperty("tokenIndex", index);
+ /*
+ * if (AppUtil.playerOwns(token.getToken())) { tokJSon.put("playerOwns", "true"); } else { tokJSon.put("playerOwns", "false"); }
+ */
+ tokJSon.addProperty("playerOwns", AppUtil.playerOwns(token.getToken()));
+ tokArray.add(tokJSon);
+ }
+ index++;
+ }
+
+ json.add("initiative", tokArray);
+ json.addProperty("current", initiativeList.getCurrent());
+ json.addProperty("round", initiativeList.getRound());
+ json.addProperty("canAdvance", canAdvanceInitiative());
+
+ return json;
+ }
+
+ void sendInitiative(MTWebSocket mtws) {
+ mtws.sendMessage("initiative", getInitiativeDetails());
+ }
+
+ void sendInitiative(MTWebSocket mtws, String inReponseTo) {
+ mtws.sendMessage("initiative", inReponseTo, getInitiativeDetails());
+ }
+
+ void sendInitiative() {
+ JsonObject init = getInitiativeDetails();
+ MTWebClientManager.getInstance().sendToAllSessions("initiative", init);
+ }
+
+ void processInitiativeMessage(JsonObject json) {
+ InitiativeList ilist = initiativeListener.initiativeList;
+ String currentInit = Integer.toString(ilist.getCurrent());
+ String currentRound = Integer.toString(ilist.getRound());
+
+ // If there is a mismatch between client and us don't perform the command. This can happen
+ // because multiple
+ // people can be updating the initiative at the same time and its possible that two people might
+ // update the
+ // initiative at the same time.
+ if (!currentInit.equals(json.get("currentInitiative").getAsString())
+ || !currentRound.equals(json.get("currentRound").getAsString())) {
+ return; // FIXME: This needs to send a "can not do" message back to client.
+ }
+
+ String command = json.get("command").getAsString();
+ if ("nextInitiative".equals(command)) {
+ System.out.println("DEBUG: got next initiative call" + json.toString());
+
+ if (canAdvanceInitiative()) { // Trust a web client? You gotta be joking :)
+ ilist.nextInitiative();
+ }
+ } else if ("previousInitiative".equals(command)) {
+ if (canAdvanceInitiative()) { // Trust a web client? You gotta be joking :)
+ ilist.prevInitiative();
+ }
+ } else if ("sortInitiative".equals(command)) {
+ ilist.sort();
+ } else if ("toggleHoldInitiative".equals(command)) {
+ InitiativeList.TokenInitiative tokenInit = null;
+ GUID id = new GUID(json.get("token").getAsString());
+ int tokenIndex = json.get("tokenIndex").getAsInt();
+ int index = 0;
+ for (InitiativeList.TokenInitiative ti : ilist.getTokens()) {
+ if (ti.getId().equals(id) && tokenIndex == index) {
+ System.out.println("DEBUG: Here, index = " + index + ", id = " + ti.getId());
+ tokenInit = ti;
+ break;
+ }
+ index++;
+ }
+
+ if (tokenInit == null) {
+ // FIXME: need to log this.
+ } else {
+ System.out.println("DEBUG: Here, changing holding on " + tokenInit.getToken().getName());
+ tokenInit.setHolding(!tokenInit.isHolding());
+ }
+
+ } else {
+ // FIXME: need to log this.
+ }
+ }
+
+ // TODO: When the whole of initiative functionality is fixed up then this needs to be rolled into
+ // that.
+ private boolean canAdvanceInitiative() {
+ InitiativePanel ipanel = MapTool.getFrame().getInitiativePanel();
+ if (ipanel.hasGMPermission()) {
+ return true;
+ }
+
+ InitiativeList ilist = initiativeListener.initiativeList;
+
+ return ipanel.hasOwnerPermission(ilist.getTokenInitiative(ilist.getCurrent()).getToken());
+ }
+}
diff --git a/src/main/java/net/rptools/maptool/webapi/WebTokenInfo.java b/src/main/java/net/rptools/maptool/webapi/WebTokenInfo.java
new file mode 100644
index 0000000000..8fc98a184a
--- /dev/null
+++ b/src/main/java/net/rptools/maptool/webapi/WebTokenInfo.java
@@ -0,0 +1,285 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code. If not, please visit
+ * and specifically the Affero license
+ * text at .
+ */
+package net.rptools.maptool.webapi;
+
+import com.google.common.eventbus.Subscribe;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.awt.*;
+import java.util.*;
+import java.util.List;
+import net.rptools.maptool.client.MapTool;
+import net.rptools.maptool.client.functions.json.JSONMacroFunctions;
+import net.rptools.maptool.client.ui.zone.renderer.ZoneRenderer;
+import net.rptools.maptool.events.MapToolEventBus;
+import net.rptools.maptool.model.*;
+import net.rptools.maptool.model.zones.TokensAdded;
+import net.rptools.maptool.model.zones.TokensChanged;
+import net.rptools.maptool.model.zones.TokensRemoved;
+
+public class WebTokenInfo {
+
+ private static final WebTokenInfo instance = new WebTokenInfo();
+
+ private WebTokenInfo() {
+ // Add listener for new zones.
+ new MapToolEventBus().getMainEventBus().register(this);
+ }
+
+ @Subscribe
+ private void onTokensAdded(TokensAdded event) {
+ for (final var token : event.tokens()) {
+ tokenAdded(token);
+ }
+ }
+
+ @Subscribe
+ private void onTokensRemoved(TokensRemoved event) {
+ for (final var token : event.tokens()) {
+ tokenRemoved(token);
+ }
+ }
+
+ @Subscribe
+ private void onTokensChanged(TokensChanged event) {
+ for (final var token : event.tokens()) {
+ tokenChanged(token);
+ }
+ }
+
+ private void tokenChanged(Token token) {
+ JsonObject jobj = new JsonObject();
+ JsonArray tokenArray = new JsonArray();
+ tokenArray.add(token.getId().toString());
+ jobj.add("tokensChanged", tokenArray);
+
+ MTWebClientManager.getInstance().sendToAllSessions("token-update", jobj);
+ }
+
+ private void tokenAdded(Token token) {
+ JsonObject jobj = new JsonObject();
+ JsonArray tokenArray = new JsonArray();
+ tokenArray.add(token.getId().toString());
+ jobj.add("tokensAdded", tokenArray);
+
+ MTWebClientManager.getInstance().sendToAllSessions("token-update", jobj);
+ }
+
+ private void tokenRemoved(Token token) {
+ JsonObject jobj = new JsonObject();
+ JsonArray tokenArray = new JsonArray();
+ tokenArray.add(token.getId().toString());
+ jobj.add("tokensRemoved", tokenArray);
+
+ MTWebClientManager.getInstance().sendToAllSessions("token-update", jobj);
+ }
+
+ public static WebTokenInfo getInstance() {
+ return instance;
+ }
+
+ public Token findTokenFromId(String tokenId) {
+ System.out.println("DEBUG: tokenId = " + tokenId);
+ final GUID id = new GUID(tokenId);
+
+ final List tokenList = new ArrayList<>();
+
+ List zrenderers = MapTool.getFrame().getZoneRenderers();
+ for (ZoneRenderer zr : zrenderers) {
+ tokenList.addAll(zr.getZone().getTokensFiltered(t -> t.getId().equals(id)));
+
+ if (tokenList.size() > 0) {
+ break;
+ }
+ }
+
+ if (tokenList.size() > 0) {
+ return tokenList.get(0);
+ } else {
+ return null;
+ }
+ }
+
+ private Zone findZoneTokenIsOn(Token token) {
+ List