From 6e82813243e1d54d27b026e567e3d5c6c42fb720 Mon Sep 17 00:00:00 2001 From: Craig Wisniewski Date: Sat, 22 Apr 2023 22:53:19 +0930 Subject: [PATCH] update google format version in spotless --- build.gradle | 2 +- .../simple/DisconnectHandler.java | 4 +- .../simple/server/SocketServerConnection.java | 4 +- .../java/net/rptools/lib/image/ImageUtil.java | 4 +- .../java/net/rptools/lib/io/PackedFile.java | 4 +- .../lib/transferable/TokenTransferData.java | 48 ++++++-- .../net/rptools/maptool/client/AppStyle.java | 4 +- .../rptools/maptool/client/ChatAutoSave.java | 4 +- .../maptool/client/MRUCampaignManager.java | 4 +- .../net/rptools/maptool/client/MapTool.java | 9 +- .../maptool/client/MapToolConnection.java | 4 +- .../rptools/maptool/client/ScreenPoint.java | 4 +- .../maptool/client/TransferableHelper.java | 20 +++- .../functions/AddAllToInitiativeFunction.java | 8 +- .../functions/CurrentInitiativeFunction.java | 8 +- .../client/functions/FindTokenFunctions.java | 4 +- .../functions/InitiativeRoundFunction.java | 4 +- .../functions/MiscInitiativeFunction.java | 8 +- .../RemoveAllFromInitiativeFunction.java | 8 +- .../client/functions/TokenBarFunction.java | 12 +- .../client/functions/TokenInitFunction.java | 4 +- .../functions/TokenInitHoldFunction.java | 4 +- .../functions/TokenLocationFunctions.java | 4 +- .../client/functions/TokenMoveFunctions.java | 4 +- .../TokenRemoveFromInitiativeFunction.java | 8 +- .../rptools/maptool/client/macro/Macro.java | 4 +- .../maptool/client/macro/MacroManager.java | 4 +- .../client/macro/impl/AddTokenStateMacro.java | 4 +- .../maptool/client/swing/Animatable.java | 4 +- .../client/swing/AnimationManager.java | 4 +- .../client/swing/ColorPickerButton.java | 4 +- .../maptool/client/swing/ImageBorder.java | 4 +- .../client/swing/MapToolEventQueue.java | 4 +- .../client/swing/MessagePanelImageView.java | 20 +++- .../maptool/client/swing/StatusPanel.java | 4 +- .../client/swing/TwoToneTextFieldUI.java | 12 +- .../maptool/client/swing/TwoToneTextPane.java | 12 +- .../maptool/client/tool/DefaultTool.java | 4 +- .../net/rptools/maptool/client/tool/Tool.java | 4 +- .../maptool/client/tool/ToolHelper.java | 4 +- .../client/tool/drawing/AbstractLineTool.java | 4 +- .../tool/drawing/BlastTemplateTool.java | 12 +- .../tool/drawing/BurstTemplateTool.java | 12 +- .../client/tool/drawing/ConeTemplateTool.java | 12 +- .../tool/drawing/CrossTopologyTool.java | 4 +- .../client/tool/drawing/DrawnTextTool.java | 40 +++++-- .../drawing/HollowRectangleTopologyTool.java | 4 +- .../tool/drawing/LineCellTemplateTool.java | 12 +- .../client/tool/drawing/LineTemplateTool.java | 16 ++- .../maptool/client/tool/drawing/OvalTool.java | 8 +- .../tool/drawing/RadiusCellTemplateTool.java | 32 +++-- .../tool/drawing/RadiusTemplateTool.java | 32 +++-- .../client/tool/drawing/RectangleTool.java | 4 +- .../tool/drawing/RectangleTopologyTool.java | 4 +- .../client/tool/drawing/UndoPerZone.java | 4 +- .../client/tool/drawing/WallTemplateTool.java | 16 ++- .../client/ui/ActivityMonitorPanel.java | 4 +- .../rptools/maptool/client/ui/AppMenuBar.java | 4 +- .../maptool/client/ui/MapToolFrame.java | 8 +- .../TokenBarController.java | 20 +++- .../TokenStatesController.java | 20 +++- .../client/ui/commandpanel/CommandPanel.java | 32 +++-- .../ConnectToServerDialog.java | 4 +- .../client/ui/exportdialog/ExportDialog.java | 12 +- .../client/ui/htmlframe/HTMLActionEvent.java | 4 +- .../ui/htmlframe/HTMLOverlayManager.java | 12 +- .../client/ui/htmlframe/HTMLOverlayPanel.java | 8 +- .../maptool/client/ui/htmlframe/HTMLPane.java | 4 +- .../ui/htmlframe/HTMLPanelContainer.java | 16 ++- .../maptool/client/ui/io/FTPClient.java | 4 +- .../maptool/client/ui/io/FTPClientConn.java | 4 +- .../maptool/client/ui/io/LoadSaveImpl.java | 4 +- .../maptool/client/ui/io/UIBuilder.java | 4 +- .../client/ui/io/UpdateRepoDialog.java | 4 +- .../MacroButtonHotKeyManager.java | 4 +- .../panels/AbstractMacroPanel.java | 4 +- .../preferencesdialog/PreferencesDialog.java | 8 +- .../startserverdialog/StartServerDialog.java | 4 +- .../ui/syntax/MapToolScriptTokenMaker.java | 12 +- .../maptool/client/ui/theme/ThemeSupport.java | 7 +- .../client/ui/token/AbstractTokenOverlay.java | 60 +++++++--- .../client/ui/token/BarTokenOverlay.java | 20 +++- .../client/ui/token/ColorDotTokenOverlay.java | 8 +- .../ui/token/CornerImageTokenOverlay.java | 12 +- .../client/ui/token/CrossTokenOverlay.java | 4 +- .../client/ui/token/DiamondTokenOverlay.java | 4 +- .../client/ui/token/DrawnBarTokenOverlay.java | 20 +++- .../ui/token/FlowColorDotTokenOverlay.java | 8 +- .../ui/token/FlowColorSquareTokenOverlay.java | 8 +- .../ui/token/FlowDiamondTokenOverlay.java | 8 +- .../ui/token/FlowImageTokenOverlay.java | 12 +- .../ui/token/FlowTriangleTokenOverlay.java | 8 +- .../ui/token/FlowYieldTokenOverlay.java | 8 +- .../client/ui/token/ImageTokenOverlay.java | 8 +- .../token/MultipleImageBarTokenOverlay.java | 12 +- .../client/ui/token/OTokenOverlay.java | 4 +- .../client/ui/token/ShadedTokenOverlay.java | 4 +- .../ui/token/SingleImageBarTokenOverlay.java | 12 +- .../client/ui/token/TriangleTokenOverlay.java | 4 +- .../ui/token/TwoImageBarTokenOverlay.java | 20 +++- .../ui/token/TwoToneBarTokenOverlay.java | 16 ++- .../client/ui/token/XTokenOverlay.java | 4 +- .../client/ui/token/YieldTokenOverlay.java | 4 +- .../ui/token/dialog/edit/EditTokenDialog.java | 8 +- .../InitiativeListCellRenderer.java | 16 ++- .../client/ui/tokenpanel/InitiativePanel.java | 56 ++++++--- .../tokenpanel/InitiativeTransferHandler.java | 8 +- .../ui/tokenpanel/InitiativeTransferable.java | 16 ++- .../maptool/client/ui/zone/PlayerView.java | 4 +- .../client/ui/zone/SelectionModel.java | 4 +- .../maptool/client/ui/zone/ZoneRenderer.java | 12 +- .../maptool/client/ui/zone/vbl/AreaMeta.java | 4 +- .../client/walker/AbstractZoneWalker.java | 8 +- .../net/rptools/maptool/model/Campaign.java | 20 +++- .../maptool/model/CampaignProperties.java | 20 +++- .../java/net/rptools/maptool/model/Grid.java | 12 +- .../net/rptools/maptool/model/HexGrid.java | 8 +- .../rptools/maptool/model/InitiativeList.java | 64 +++++++--- .../maptool/model/InitiativeListModel.java | 12 +- .../rptools/maptool/model/LightSource.java | 4 +- .../rptools/maptool/model/LookupTable.java | 4 +- .../java/net/rptools/maptool/model/Token.java | 72 ++++++++--- .../java/net/rptools/maptool/model/Zone.java | 40 +++++-- .../model/drawing/AbstractTemplate.java | 8 +- .../maptool/model/drawing/BlastTemplate.java | 12 +- .../maptool/model/drawing/BurstTemplate.java | 16 ++- .../maptool/model/drawing/ConeTemplate.java | 4 +- .../maptool/model/drawing/Drawable.java | 4 +- .../maptool/model/drawing/DrawnLabel.java | 4 +- .../model/drawing/LineCellTemplate.java | 20 +++- .../maptool/model/drawing/LineSegment.java | 4 +- .../maptool/model/drawing/LineTemplate.java | 20 +++- .../model/drawing/RadiusCellTemplate.java | 8 +- .../maptool/model/drawing/RadiusTemplate.java | 4 +- .../maptool/model/drawing/WallTemplate.java | 12 +- .../model/player/DefaultPlayerDatabase.java | 4 +- .../maptool/model/player/LocalPlayer.java | 8 +- .../player/PasswordFilePlayerDatabase.java | 112 +++++++++++++----- .../model/player/PersistedPlayerDatabase.java | 52 +++++--- .../rptools/maptool/model/player/Player.java | 16 ++- .../rptools/maptool/model/player/Players.java | 14 ++- .../maptool/server/ClientHandshake.java | 12 +- .../maptool/server/HandshakeChallenge.java | 56 ++++++--- .../rptools/maptool/server/MapToolServer.java | 4 +- .../server/MapToolServerConnection.java | 4 +- .../maptool/server/ServerHandshake.java | 50 ++++++-- .../rptools/maptool/server/ServerPolicy.java | 8 +- .../maptool/transfer/AssetConsumer.java | 4 +- .../maptool/transfer/AssetProducer.java | 4 +- .../rptools/maptool/util/CreateGridFile.java | 4 +- .../rptools/maptool/util/PersistenceUtil.java | 4 +- .../net/rptools/maptool/util/StringUtil.java | 4 +- .../net/rptools/maptool/util/UPnPUtil.java | 4 +- .../maptool/util/cipher/CipherUtil.java | 47 ++++++-- 154 files changed, 1415 insertions(+), 478 deletions(-) diff --git a/build.gradle b/build.gradle index dbe0c45ab7..fc952ece38 100644 --- a/build.gradle +++ b/build.gradle @@ -105,7 +105,7 @@ spotless { toggleOffOn() // Now using the Google Java style guide - googleJavaFormat("1.11.0") + googleJavaFormat("1.16.0") } format 'misc', { diff --git a/src/main/java/net/rptools/clientserver/simple/DisconnectHandler.java b/src/main/java/net/rptools/clientserver/simple/DisconnectHandler.java index 7df2edf25e..9631013f27 100644 --- a/src/main/java/net/rptools/clientserver/simple/DisconnectHandler.java +++ b/src/main/java/net/rptools/clientserver/simple/DisconnectHandler.java @@ -14,7 +14,9 @@ */ package net.rptools.clientserver.simple; -/** @author trevor */ +/** + * @author trevor + */ public interface DisconnectHandler { public void handleDisconnect(AbstractConnection conn); diff --git a/src/main/java/net/rptools/clientserver/simple/server/SocketServerConnection.java b/src/main/java/net/rptools/clientserver/simple/server/SocketServerConnection.java index 763913622e..3612088f17 100644 --- a/src/main/java/net/rptools/clientserver/simple/server/SocketServerConnection.java +++ b/src/main/java/net/rptools/clientserver/simple/server/SocketServerConnection.java @@ -22,7 +22,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author drice */ +/** + * @author drice + */ public class SocketServerConnection extends AbstractServerConnection { private static final Logger log = LogManager.getLogger(SocketServerConnection.class); diff --git a/src/main/java/net/rptools/lib/image/ImageUtil.java b/src/main/java/net/rptools/lib/image/ImageUtil.java index b59e473612..fe4195ed5b 100644 --- a/src/main/java/net/rptools/lib/image/ImageUtil.java +++ b/src/main/java/net/rptools/lib/image/ImageUtil.java @@ -43,7 +43,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author trevor */ +/** + * @author trevor + */ public class ImageUtil { private static final Logger log = LogManager.getLogger(); diff --git a/src/main/java/net/rptools/lib/io/PackedFile.java b/src/main/java/net/rptools/lib/io/PackedFile.java index 6a33d180a9..2f54f7f446 100644 --- a/src/main/java/net/rptools/lib/io/PackedFile.java +++ b/src/main/java/net/rptools/lib/io/PackedFile.java @@ -784,7 +784,9 @@ public Set getPaths() throws IOException { return paths; } - /** @return Getter for file */ + /** + * @return Getter for file + */ public File getPackedFile() { return file; } diff --git a/src/main/java/net/rptools/lib/transferable/TokenTransferData.java b/src/main/java/net/rptools/lib/transferable/TokenTransferData.java index 19149e1645..17e7d516fc 100644 --- a/src/main/java/net/rptools/lib/transferable/TokenTransferData.java +++ b/src/main/java/net/rptools/lib/transferable/TokenTransferData.java @@ -129,62 +129,86 @@ public class TokenTransferData extends HashMap implements Serial * Instance Methods *-------------------------------------------------------------------------------------------*/ - /** @return Getter for isVisible */ + /** + * @return Getter for isVisible + */ public boolean isVisible() { return isVisible; } - /** @param aIsVisible Setter for isVisible */ + /** + * @param aIsVisible Setter for isVisible + */ public void setVisible(boolean aIsVisible) { isVisible = aIsVisible; } - /** @return Getter for name */ + /** + * @return Getter for name + */ public String getName() { return name; } - /** @param aName Setter for name */ + /** + * @param aName Setter for name + */ public void setName(String aName) { name = aName; } - /** @return Getter for players */ + /** + * @return Getter for players + */ public Set getPlayers() { return players; } - /** @param aPlayers Setter for players */ + /** + * @param aPlayers Setter for players + */ public void setPlayers(Set aPlayers) { players = aPlayers; } - /** @return Getter for token */ + /** + * @return Getter for token + */ public ImageIcon getToken() { return token; } - /** @param aToken Setter for token */ + /** + * @param aToken Setter for token + */ public void setToken(ImageIcon aToken) { token = aToken; } - /** @return Getter for facing */ + /** + * @return Getter for facing + */ public Integer getFacing() { return facing; } - /** @param aFacing Setter for facing */ + /** + * @param aFacing Setter for facing + */ public void setFacing(Integer aFacing) { facing = aFacing; } - /** @return Getter for location */ + /** + * @return Getter for location + */ public Point getLocation() { return location; } - /** @param aLocation Setter for location */ + /** + * @param aLocation Setter for location + */ public void setLocation(Point aLocation) { location = aLocation; } diff --git a/src/main/java/net/rptools/maptool/client/AppStyle.java b/src/main/java/net/rptools/maptool/client/AppStyle.java index c5002efb18..12722e5fb8 100644 --- a/src/main/java/net/rptools/maptool/client/AppStyle.java +++ b/src/main/java/net/rptools/maptool/client/AppStyle.java @@ -20,7 +20,9 @@ import net.rptools.maptool.client.ui.theme.Borders; import net.rptools.maptool.client.ui.theme.RessourceManager; -/** @author trevor */ +/** + * @author trevor + */ public class AppStyle { public static ImageBorder border = RessourceManager.getBorder(Borders.GRAY2); diff --git a/src/main/java/net/rptools/maptool/client/ChatAutoSave.java b/src/main/java/net/rptools/maptool/client/ChatAutoSave.java index cb1ec58db9..60e632cd3f 100644 --- a/src/main/java/net/rptools/maptool/client/ChatAutoSave.java +++ b/src/main/java/net/rptools/maptool/client/ChatAutoSave.java @@ -25,7 +25,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author frank */ +/** + * @author frank + */ public class ChatAutoSave { private static Logger log = LogManager.getLogger(ChatAutoSave.class); private static final ChatAutoSave self = new ChatAutoSave(); diff --git a/src/main/java/net/rptools/maptool/client/MRUCampaignManager.java b/src/main/java/net/rptools/maptool/client/MRUCampaignManager.java index 83f59f0e5b..68428192b5 100644 --- a/src/main/java/net/rptools/maptool/client/MRUCampaignManager.java +++ b/src/main/java/net/rptools/maptool/client/MRUCampaignManager.java @@ -22,7 +22,9 @@ import javax.swing.JMenu; import javax.swing.JMenuItem; -/** @author tylere */ +/** + * @author tylere + */ public class MRUCampaignManager { // To increase max mru's need to update mnemonics code private static final int DEFAULT_MAX_MRU = 9; diff --git a/src/main/java/net/rptools/maptool/client/MapTool.java b/src/main/java/net/rptools/maptool/client/MapTool.java index de1e40d7e5..7ce22c59aa 100644 --- a/src/main/java/net/rptools/maptool/client/MapTool.java +++ b/src/main/java/net/rptools/maptool/client/MapTool.java @@ -741,7 +741,9 @@ public static ServerCommand serverCommand() { return serverCommand; } - /** @return the server, or null if player is a client. */ + /** + * @return the server, or null if player is a client. + */ public static MapToolServer getServer() { return server; } @@ -1155,7 +1157,10 @@ public static LocalPlayer getPlayer() { } public static void startPersonalServer(Campaign campaign) - throws IOException, NoSuchAlgorithmException, InvalidKeySpecException, ExecutionException, + throws IOException, + NoSuchAlgorithmException, + InvalidKeySpecException, + ExecutionException, InterruptedException { ServerConfig config = ServerConfig.createPersonalServerConfig(); diff --git a/src/main/java/net/rptools/maptool/client/MapToolConnection.java b/src/main/java/net/rptools/maptool/client/MapToolConnection.java index ba4b7777d2..121f21c5da 100644 --- a/src/main/java/net/rptools/maptool/client/MapToolConnection.java +++ b/src/main/java/net/rptools/maptool/client/MapToolConnection.java @@ -29,7 +29,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author trevor */ +/** + * @author trevor + */ public class MapToolConnection { /** Instance used for log messages. */ diff --git a/src/main/java/net/rptools/maptool/client/ScreenPoint.java b/src/main/java/net/rptools/maptool/client/ScreenPoint.java index 8a976c22d9..74a63ac349 100644 --- a/src/main/java/net/rptools/maptool/client/ScreenPoint.java +++ b/src/main/java/net/rptools/maptool/client/ScreenPoint.java @@ -149,7 +149,9 @@ public String toString() { return "ScreenPoint" + super.toString(); } - /** @see java.lang.Object#equals(java.lang.Object) */ + /** + * @see java.lang.Object#equals(java.lang.Object) + */ @Override public boolean equals(Object pt) { if (!(pt instanceof ScreenPoint)) return false; diff --git a/src/main/java/net/rptools/maptool/client/TransferableHelper.java b/src/main/java/net/rptools/maptool/client/TransferableHelper.java index 5dca1c3902..9def5c1867 100644 --- a/src/main/java/net/rptools/maptool/client/TransferableHelper.java +++ b/src/main/java/net/rptools/maptool/client/TransferableHelper.java @@ -679,30 +679,40 @@ public boolean importData(JComponent comp, Transferable t) { return tokens != null; } - /** @see javax.swing.TransferHandler#getSourceActions(javax.swing.JComponent) */ + /** + * @see javax.swing.TransferHandler#getSourceActions(javax.swing.JComponent) + */ @Override public int getSourceActions(JComponent c) { return NONE; } - /** @return Getter for tokens */ + /** + * @return Getter for tokens + */ public List getTokens() { return tokens; } - /** @param tokens Setter for tokens */ + /** + * @param tokens Setter for tokens + */ public void setTokens(List tokens) { // This doesn't appear to be called from anywhere; this class simply makes assignments // to the instance member variable. Remove this method? this.tokens = tokens; } - /** @return Getter for configureTokens */ + /** + * @return Getter for configureTokens + */ public List getConfigureTokens() { return configureTokens; } - /** @param configureTokens Setter for configureTokens */ + /** + * @param configureTokens Setter for configureTokens + */ public void setConfigureTokens(List configureTokens) { this.configureTokens = configureTokens; } diff --git a/src/main/java/net/rptools/maptool/client/functions/AddAllToInitiativeFunction.java b/src/main/java/net/rptools/maptool/client/functions/AddAllToInitiativeFunction.java index b3e2522b7e..d34a69e1d9 100644 --- a/src/main/java/net/rptools/maptool/client/functions/AddAllToInitiativeFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/AddAllToInitiativeFunction.java @@ -43,12 +43,16 @@ private AddAllToInitiativeFunction() { /** singleton instance of this function */ private static final AddAllToInitiativeFunction instance = new AddAllToInitiativeFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static AddAllToInitiativeFunction getInstance() { return instance; } - /** @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) */ + /** + * @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) + */ @Override public Object childEvaluate( Parser parser, VariableResolver resolver, String functionName, List args) diff --git a/src/main/java/net/rptools/maptool/client/functions/CurrentInitiativeFunction.java b/src/main/java/net/rptools/maptool/client/functions/CurrentInitiativeFunction.java index c4096037ff..76417c0860 100644 --- a/src/main/java/net/rptools/maptool/client/functions/CurrentInitiativeFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/CurrentInitiativeFunction.java @@ -39,12 +39,16 @@ private CurrentInitiativeFunction() { /** singleton instance of this function */ private static final CurrentInitiativeFunction instance = new CurrentInitiativeFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static CurrentInitiativeFunction getInstance() { return instance; } - /** @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) */ + /** + * @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) + */ @Override public Object childEvaluate( Parser parser, VariableResolver resolver, String functionName, List args) diff --git a/src/main/java/net/rptools/maptool/client/functions/FindTokenFunctions.java b/src/main/java/net/rptools/maptool/client/functions/FindTokenFunctions.java index 85a1212bf0..80c80559be 100644 --- a/src/main/java/net/rptools/maptool/client/functions/FindTokenFunctions.java +++ b/src/main/java/net/rptools/maptool/client/functions/FindTokenFunctions.java @@ -300,7 +300,9 @@ private FindTokenFunctions() { "getVisibleTokenNames"); } - /** @return the instance. */ + /** + * @return the instance. + */ public static FindTokenFunctions getInstance() { return instance; } diff --git a/src/main/java/net/rptools/maptool/client/functions/InitiativeRoundFunction.java b/src/main/java/net/rptools/maptool/client/functions/InitiativeRoundFunction.java index 266577d0c5..89863d6c36 100644 --- a/src/main/java/net/rptools/maptool/client/functions/InitiativeRoundFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/InitiativeRoundFunction.java @@ -39,7 +39,9 @@ private InitiativeRoundFunction() { /** singleton instance of this function */ private static final InitiativeRoundFunction instance = new InitiativeRoundFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static InitiativeRoundFunction getInstance() { return instance; } diff --git a/src/main/java/net/rptools/maptool/client/functions/MiscInitiativeFunction.java b/src/main/java/net/rptools/maptool/client/functions/MiscInitiativeFunction.java index c3c27e9aea..46265967dc 100644 --- a/src/main/java/net/rptools/maptool/client/functions/MiscInitiativeFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/MiscInitiativeFunction.java @@ -52,12 +52,16 @@ private MiscInitiativeFunction() { /** singleton instance of this function */ private static final MiscInitiativeFunction instance = new MiscInitiativeFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static MiscInitiativeFunction getInstance() { return instance; } - /** @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) */ + /** + * @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) + */ @Override public Object childEvaluate( Parser parser, VariableResolver resolver, String functionName, List args) diff --git a/src/main/java/net/rptools/maptool/client/functions/RemoveAllFromInitiativeFunction.java b/src/main/java/net/rptools/maptool/client/functions/RemoveAllFromInitiativeFunction.java index 18c220bfdb..54bfa370f9 100644 --- a/src/main/java/net/rptools/maptool/client/functions/RemoveAllFromInitiativeFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/RemoveAllFromInitiativeFunction.java @@ -47,12 +47,16 @@ private RemoveAllFromInitiativeFunction() { private static final RemoveAllFromInitiativeFunction instance = new RemoveAllFromInitiativeFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static RemoveAllFromInitiativeFunction getInstance() { return instance; } - /** @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) */ + /** + * @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) + */ @Override public Object childEvaluate( Parser parser, VariableResolver resolver, String functionName, List args) diff --git a/src/main/java/net/rptools/maptool/client/functions/TokenBarFunction.java b/src/main/java/net/rptools/maptool/client/functions/TokenBarFunction.java index 12be345af4..eb02dde8c1 100644 --- a/src/main/java/net/rptools/maptool/client/functions/TokenBarFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/TokenBarFunction.java @@ -25,7 +25,9 @@ import net.rptools.parser.VariableResolver; import net.rptools.parser.function.AbstractFunction; -/** @author Jay */ +/** + * @author Jay + */ public class TokenBarFunction extends AbstractFunction { /** Support get and set bar on tokens */ @@ -36,12 +38,16 @@ private TokenBarFunction() { /** singleton instance of this function */ private static final TokenBarFunction instance = new TokenBarFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static TokenBarFunction getInstance() { return instance; } - /** @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) */ + /** + * @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) + */ @Override public Object childEvaluate( Parser parser, VariableResolver resolver, String functionName, List parameters) diff --git a/src/main/java/net/rptools/maptool/client/functions/TokenInitFunction.java b/src/main/java/net/rptools/maptool/client/functions/TokenInitFunction.java index c12d34f813..d1baec1150 100644 --- a/src/main/java/net/rptools/maptool/client/functions/TokenInitFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/TokenInitFunction.java @@ -42,7 +42,9 @@ private TokenInitFunction() { /** singleton instance of this function */ private static final TokenInitFunction singletonInstance = new TokenInitFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static TokenInitFunction getInstance() { return singletonInstance; } diff --git a/src/main/java/net/rptools/maptool/client/functions/TokenInitHoldFunction.java b/src/main/java/net/rptools/maptool/client/functions/TokenInitHoldFunction.java index ea043e41cc..0bfbbb1a24 100644 --- a/src/main/java/net/rptools/maptool/client/functions/TokenInitHoldFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/TokenInitHoldFunction.java @@ -41,7 +41,9 @@ private TokenInitHoldFunction() { /** singleton instance of this function */ private static final TokenInitHoldFunction singletonInstance = new TokenInitHoldFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static TokenInitHoldFunction getInstance() { return singletonInstance; } diff --git a/src/main/java/net/rptools/maptool/client/functions/TokenLocationFunctions.java b/src/main/java/net/rptools/maptool/client/functions/TokenLocationFunctions.java index 781e9e46ed..c66b419320 100644 --- a/src/main/java/net/rptools/maptool/client/functions/TokenLocationFunctions.java +++ b/src/main/java/net/rptools/maptool/client/functions/TokenLocationFunctions.java @@ -74,7 +74,9 @@ private TokenLocationFunctions() { "moveTokenFromMap"); } - /** @return instance of TokenLocationFunctions. */ + /** + * @return instance of TokenLocationFunctions. + */ public static TokenLocationFunctions getInstance() { return instance; } diff --git a/src/main/java/net/rptools/maptool/client/functions/TokenMoveFunctions.java b/src/main/java/net/rptools/maptool/client/functions/TokenMoveFunctions.java index 7a8f9d7640..cf7995a6d0 100644 --- a/src/main/java/net/rptools/maptool/client/functions/TokenMoveFunctions.java +++ b/src/main/java/net/rptools/maptool/client/functions/TokenMoveFunctions.java @@ -54,7 +54,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author Joe.Frazier */ +/** + * @author Joe.Frazier + */ public class TokenMoveFunctions extends AbstractFunction { /** macro name to call for the onTokenMove event */ diff --git a/src/main/java/net/rptools/maptool/client/functions/TokenRemoveFromInitiativeFunction.java b/src/main/java/net/rptools/maptool/client/functions/TokenRemoveFromInitiativeFunction.java index 9be13b9612..85e8bcad16 100644 --- a/src/main/java/net/rptools/maptool/client/functions/TokenRemoveFromInitiativeFunction.java +++ b/src/main/java/net/rptools/maptool/client/functions/TokenRemoveFromInitiativeFunction.java @@ -42,12 +42,16 @@ private TokenRemoveFromInitiativeFunction() { private static final TokenRemoveFromInitiativeFunction instance = new TokenRemoveFromInitiativeFunction(); - /** @return singleton instance */ + /** + * @return singleton instance + */ public static TokenRemoveFromInitiativeFunction getInstance() { return instance; } - /** @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) */ + /** + * @see AbstractFunction#childEvaluate(Parser, VariableResolver, String, List) + */ @Override public Object childEvaluate( Parser parser, VariableResolver resolver, String functionName, List args) diff --git a/src/main/java/net/rptools/maptool/client/macro/Macro.java b/src/main/java/net/rptools/maptool/client/macro/Macro.java index 6f3b04d37b..d8e4afbe8f 100644 --- a/src/main/java/net/rptools/maptool/client/macro/Macro.java +++ b/src/main/java/net/rptools/maptool/client/macro/Macro.java @@ -16,7 +16,9 @@ import net.rptools.maptool.client.MapToolMacroContext; -/** @author drice */ +/** + * @author drice + */ public interface Macro { public void execute(MacroContext context, String macro, MapToolMacroContext executionContext); 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 623e0c08dc..dde5f2408c 100644 --- a/src/main/java/net/rptools/maptool/client/macro/MacroManager.java +++ b/src/main/java/net/rptools/maptool/client/macro/MacroManager.java @@ -32,7 +32,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author drice */ +/** + * @author drice + */ public class MacroManager { private static final Logger log = LogManager.getLogger(MacroManager.class); diff --git a/src/main/java/net/rptools/maptool/client/macro/impl/AddTokenStateMacro.java b/src/main/java/net/rptools/maptool/client/macro/impl/AddTokenStateMacro.java index d29d5d24be..57e461a182 100644 --- a/src/main/java/net/rptools/maptool/client/macro/impl/AddTokenStateMacro.java +++ b/src/main/java/net/rptools/maptool/client/macro/impl/AddTokenStateMacro.java @@ -70,7 +70,9 @@ public class AddTokenStateMacro implements Macro { CORNER_MAP.put("se", Quadrant.SOUTH_EAST); } - /** @see net.rptools.maptool.client.macro.Macro#execute execute(java.lang.String) */ + /** + * @see net.rptools.maptool.client.macro.Macro#execute execute(java.lang.String) + */ public void execute(MacroContext context, String aMacro, MapToolMacroContext executionContext) { // Split the command line into an array and get the tokens String[] tokens = aMacro.split("\\s"); diff --git a/src/main/java/net/rptools/maptool/client/swing/Animatable.java b/src/main/java/net/rptools/maptool/client/swing/Animatable.java index 9f2dede3ca..6e005a7615 100644 --- a/src/main/java/net/rptools/maptool/client/swing/Animatable.java +++ b/src/main/java/net/rptools/maptool/client/swing/Animatable.java @@ -14,7 +14,9 @@ */ package net.rptools.maptool.client.swing; -/** @author trevor */ +/** + * @author trevor + */ public interface Animatable { public void animate(); diff --git a/src/main/java/net/rptools/maptool/client/swing/AnimationManager.java b/src/main/java/net/rptools/maptool/client/swing/AnimationManager.java index c307739b18..3bc186f584 100644 --- a/src/main/java/net/rptools/maptool/client/swing/AnimationManager.java +++ b/src/main/java/net/rptools/maptool/client/swing/AnimationManager.java @@ -17,7 +17,9 @@ import java.util.ArrayList; import java.util.List; -/** @author trevor */ +/** + * @author trevor + */ public class AnimationManager { private static final List animatableList = new ArrayList(); diff --git a/src/main/java/net/rptools/maptool/client/swing/ColorPickerButton.java b/src/main/java/net/rptools/maptool/client/swing/ColorPickerButton.java index fbec79a292..81d1127004 100644 --- a/src/main/java/net/rptools/maptool/client/swing/ColorPickerButton.java +++ b/src/main/java/net/rptools/maptool/client/swing/ColorPickerButton.java @@ -25,7 +25,9 @@ import javax.swing.border.BevelBorder; import net.rptools.maptool.client.MapTool; -/** @author trevor */ +/** + * @author trevor + */ public class ColorPickerButton extends JComponent { private Color color; diff --git a/src/main/java/net/rptools/maptool/client/swing/ImageBorder.java b/src/main/java/net/rptools/maptool/client/swing/ImageBorder.java index 67eef489aa..9e29fd414a 100644 --- a/src/main/java/net/rptools/maptool/client/swing/ImageBorder.java +++ b/src/main/java/net/rptools/maptool/client/swing/ImageBorder.java @@ -21,7 +21,9 @@ import javax.swing.border.Border; import net.rptools.lib.image.ImageUtil; -/** @author trevor */ +/** + * @author trevor + */ public class ImageBorder implements Border { private BufferedImage topRight; private BufferedImage top; diff --git a/src/main/java/net/rptools/maptool/client/swing/MapToolEventQueue.java b/src/main/java/net/rptools/maptool/client/swing/MapToolEventQueue.java index 36cef8469b..b00d8612bc 100644 --- a/src/main/java/net/rptools/maptool/client/swing/MapToolEventQueue.java +++ b/src/main/java/net/rptools/maptool/client/swing/MapToolEventQueue.java @@ -87,7 +87,9 @@ protected void dispatchEvent(AWTEvent event) { } } - /** @return the JideOptionPane. Initializes it if null. Must be done after Jide is configured. */ + /** + * @return the JideOptionPane. Initializes it if null. Must be done after Jide is configured. + */ private static JideOptionPane getOptionPane() { if (optionPane == null) { optionPane = diff --git a/src/main/java/net/rptools/maptool/client/swing/MessagePanelImageView.java b/src/main/java/net/rptools/maptool/client/swing/MessagePanelImageView.java index fdac4ad85b..c4c9d319c1 100644 --- a/src/main/java/net/rptools/maptool/client/swing/MessagePanelImageView.java +++ b/src/main/java/net/rptools/maptool/client/swing/MessagePanelImageView.java @@ -130,7 +130,9 @@ public String getAltText() { return (String) getElement().getAttributes().getAttribute(HTML.Attribute.ALT); } - /** @return a URL for the image source, or null if it could not be determined. */ + /** + * @return a URL for the image source, or null if it could not be determined. + */ public URL getImageURL() { String src = (String) getElement().getAttributes().getAttribute(HTML.Attribute.SRC); if (src == null) { @@ -145,17 +147,23 @@ public URL getImageURL() { } } - /** @return the icon to use if the image couldn't be found. */ + /** + * @return the icon to use if the image couldn't be found. + */ public Icon getNoImageIcon() { return (Icon) UIManager.getLookAndFeelDefaults().get(MISSING_IMAGE); } - /** @return the icon to use while in the process of loading the image. */ + /** + * @return the icon to use while in the process of loading the image. + */ public Icon getLoadingImageIcon() { return (Icon) UIManager.getLookAndFeelDefaults().get(PENDING_IMAGE); } - /** @return the image to render. */ + /** + * @return the image to render. + */ public Image getImage() { sync(); return imageCache.get(getImageURL(), imageObserver); @@ -179,7 +187,9 @@ public void setLoadsSynchronously(boolean newValue) { } } - /** @return true if the image should be loaded when first asked for. */ + /** + * @return true if the image should be loaded when first asked for. + */ public boolean getLoadsSynchronously() { return ((state & SYNC_LOAD_FLAG) != 0); } diff --git a/src/main/java/net/rptools/maptool/client/swing/StatusPanel.java b/src/main/java/net/rptools/maptool/client/swing/StatusPanel.java index b1056eca19..7b047fef89 100644 --- a/src/main/java/net/rptools/maptool/client/swing/StatusPanel.java +++ b/src/main/java/net/rptools/maptool/client/swing/StatusPanel.java @@ -21,7 +21,9 @@ import javax.swing.JPanel; import javax.swing.border.BevelBorder; -/** @author trevor */ +/** + * @author trevor + */ public class StatusPanel extends JPanel { private JLabel statusLabel; diff --git a/src/main/java/net/rptools/maptool/client/swing/TwoToneTextFieldUI.java b/src/main/java/net/rptools/maptool/client/swing/TwoToneTextFieldUI.java index 3842392694..a43d6cb06e 100644 --- a/src/main/java/net/rptools/maptool/client/swing/TwoToneTextFieldUI.java +++ b/src/main/java/net/rptools/maptool/client/swing/TwoToneTextFieldUI.java @@ -36,7 +36,9 @@ */ public class TwoToneTextFieldUI extends BasicTextFieldUI { - /** @see javax.swing.plaf.basic.BasicTextFieldUI#create(javax.swing.text.Element) */ + /** + * @see javax.swing.plaf.basic.BasicTextFieldUI#create(javax.swing.text.Element) + */ public View create(Element aElem) { return new TwoToneTextFieldView(aElem); } @@ -87,13 +89,17 @@ public TwoToneTextFieldView(Element aElem) { * Overridden FieldView Methods *-------------------------------------------------------------------------------------------*/ - /** @see javax.swing.text.FieldView#getPreferredSpan(int) */ + /** + * @see javax.swing.text.FieldView#getPreferredSpan(int) + */ public float getPreferredSpan(int axis) { // Do not use the HORIZONTAL_OFFSET here as it will interfere with highlighting return super.getPreferredSpan(axis) + (axis == View.X_AXIS ? 0 : VERTICAL_OFFSET); } - /** @see javax.swing.text.PlainView#drawUnselectedText(java.awt.Graphics, int, int, int, int) */ + /** + * @see javax.swing.text.PlainView#drawUnselectedText(java.awt.Graphics, int, int, int, int) + */ protected int drawUnselectedText(Graphics g, int x, int y, int p0, int p1) throws BadLocationException { diff --git a/src/main/java/net/rptools/maptool/client/swing/TwoToneTextPane.java b/src/main/java/net/rptools/maptool/client/swing/TwoToneTextPane.java index ca7c848de7..7d8514895b 100644 --- a/src/main/java/net/rptools/maptool/client/swing/TwoToneTextPane.java +++ b/src/main/java/net/rptools/maptool/client/swing/TwoToneTextPane.java @@ -195,7 +195,9 @@ class TwoToneStyledEditorKit extends StyledEditorKit { /** The view factory used by the editor kit */ private ViewFactory defaultViewFactory = new TwoToneStyledViewFactory(); - /** @see javax.swing.text.StyledEditorKit#getViewFactory() */ + /** + * @see javax.swing.text.StyledEditorKit#getViewFactory() + */ public ViewFactory getViewFactory() { return defaultViewFactory; } @@ -214,7 +216,9 @@ public ViewFactory getViewFactory() { */ class TwoToneStyledViewFactory implements ViewFactory { - /** @see javax.swing.text.ViewFactory#create(javax.swing.text.Element) */ + /** + * @see javax.swing.text.ViewFactory#create(javax.swing.text.Element) + */ public View create(Element elem) { String kind = elem.getName(); if (kind != null) { @@ -338,7 +342,9 @@ public float getSpan(GlyphView v, int p0, int p1, TabExpander e, float x) { return width; } - /** @see javax.swing.text.GlyphView.GlyphPainter#getHeight(javax.swing.text.GlyphView) */ + /** + * @see javax.swing.text.GlyphView.GlyphPainter#getHeight(javax.swing.text.GlyphView) + */ public float getHeight(GlyphView v) { sync(v); return metrics.getHeight() + VERTICAL_OFFSET; diff --git a/src/main/java/net/rptools/maptool/client/tool/DefaultTool.java b/src/main/java/net/rptools/maptool/client/tool/DefaultTool.java index 9d232de85d..f1dc145dcf 100644 --- a/src/main/java/net/rptools/maptool/client/tool/DefaultTool.java +++ b/src/main/java/net/rptools/maptool/client/tool/DefaultTool.java @@ -217,7 +217,9 @@ public void mouseReleased(MouseEvent e) { isDraggingMap = false; } - /** @param isDraggingMap whether the user drags the map */ + /** + * @param isDraggingMap whether the user drags the map + */ void setDraggingMap(boolean isDraggingMap) { this.isDraggingMap = isDraggingMap; } diff --git a/src/main/java/net/rptools/maptool/client/tool/Tool.java b/src/main/java/net/rptools/maptool/client/tool/Tool.java index d90efccd76..99b288f4ff 100644 --- a/src/main/java/net/rptools/maptool/client/tool/Tool.java +++ b/src/main/java/net/rptools/maptool/client/tool/Tool.java @@ -187,7 +187,9 @@ private class EscapeAction extends AbstractAction { private static final long serialVersionUID = -514197544905143826L; - /** @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ + /** + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ public void actionPerformed(ActionEvent e) { // This should probably go somewhere else like MapToolFrame... // but it was just too easy to plop down here to resist =) diff --git a/src/main/java/net/rptools/maptool/client/tool/ToolHelper.java b/src/main/java/net/rptools/maptool/client/tool/ToolHelper.java index f79c9d6c64..fec6abb47d 100644 --- a/src/main/java/net/rptools/maptool/client/tool/ToolHelper.java +++ b/src/main/java/net/rptools/maptool/client/tool/ToolHelper.java @@ -30,7 +30,9 @@ import net.rptools.maptool.client.ui.zone.ZoneRenderer; import net.rptools.maptool.util.GraphicsUtil; -/** @author trevor */ +/** + * @author trevor + */ public class ToolHelper { private static AbstractAction deleteTokenAction = 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 5996ff2f32..88329648ea 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 @@ -164,7 +164,9 @@ protected boolean drawMeasurement() { return true; } - /** @see Tool#resetTool() */ + /** + * @see Tool#resetTool() + */ @Override protected void resetTool() { if (line != null) { diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/BlastTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/BlastTemplateTool.java index 3da459792c..345ecb9e89 100644 --- a/src/main/java/net/rptools/maptool/client/tool/drawing/BlastTemplateTool.java +++ b/src/main/java/net/rptools/maptool/client/tool/drawing/BlastTemplateTool.java @@ -37,19 +37,25 @@ public BlastTemplateTool() {} * Overridden RadiusTemplateTool methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.drawing.BurstTemplateTool#createBaseTemplate() */ + /** + * @see net.rptools.maptool.client.tool.drawing.BurstTemplateTool#createBaseTemplate() + */ @Override protected AbstractTemplate createBaseTemplate() { return new BlastTemplate(); } - /** @see Tool#getTooltip() */ + /** + * @see Tool#getTooltip() + */ @Override public String getTooltip() { return "tool.blasttemplate.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.blasttemplate.instructions"; diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/BurstTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/BurstTemplateTool.java index 741ecaeaa0..befb54f693 100644 --- a/src/main/java/net/rptools/maptool/client/tool/drawing/BurstTemplateTool.java +++ b/src/main/java/net/rptools/maptool/client/tool/drawing/BurstTemplateTool.java @@ -48,7 +48,9 @@ public BurstTemplateTool() {} * Overridden RadiusTemplateTool methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() + */ @Override protected AbstractTemplate createBaseTemplate() { return new BurstTemplate(); @@ -90,13 +92,17 @@ protected int getRadiusAtMouse(MouseEvent e) { return super.getRadiusAtMouse(e); } - /** @see Tool#getTooltip() */ + /** + * @see Tool#getTooltip() + */ @Override public String getTooltip() { return "tool.bursttemplate.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.bursttemplate.instructions"; diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/ConeTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/ConeTemplateTool.java index e00273547e..f4b5db31d7 100644 --- a/src/main/java/net/rptools/maptool/client/tool/drawing/ConeTemplateTool.java +++ b/src/main/java/net/rptools/maptool/client/tool/drawing/ConeTemplateTool.java @@ -44,19 +44,25 @@ public ConeTemplateTool() {} * Overridden RadiusTemplateTool Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() + */ @Override protected AbstractTemplate createBaseTemplate() { return new ConeTemplate(); } - /** @see Tool#getTooltip() */ + /** + * @see Tool#getTooltip() + */ @Override public String getTooltip() { return "tool.cone.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.cone.instructions"; 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 46f76638f3..1e8838e08a 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 @@ -27,7 +27,9 @@ import net.rptools.maptool.model.drawing.Pen; import net.rptools.maptool.util.GraphicsUtil; -/** @author CoveredInFish */ +/** + * @author CoveredInFish + */ public class CrossTopologyTool extends AbstractDrawingTool implements MouseMotionListener { private static final long serialVersionUID = 3258413928311830323L; 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 index b09174b775..556bb23319 100644 --- a/src/main/java/net/rptools/maptool/client/tool/drawing/DrawnTextTool.java +++ b/src/main/java/net/rptools/maptool/client/tool/drawing/DrawnTextTool.java @@ -90,19 +90,25 @@ public void paintOverlay(ZoneRenderer aRenderer, Graphics2D aG) { aG.drawRect(bounds.x, bounds.y, bounds.width, bounds.height); } - /** @see Tool#getTooltip() */ + /** + * @see Tool#getTooltip() + */ @Override public String getTooltip() { return "tool.text.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.text.instructions"; } - /** @see Tool#resetTool() */ + /** + * @see Tool#resetTool() + */ @Override protected void resetTool() { anchorSet = false; @@ -115,12 +121,16 @@ protected void resetTool() { * MouseListener Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) */ + /** + * @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) */ + /** + * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) + */ public void mousePressed(MouseEvent event) { if (!anchorSet) { anchor.x = event.getX(); @@ -149,19 +159,25 @@ public void actionPerformed(ActionEvent aE) { } } - /** @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) */ + /** + * @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) */ + /** + * @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) */ + /** + * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) + */ public void mouseExited(MouseEvent aE) { // TODO Auto-generated method stub @@ -171,7 +187,9 @@ public void mouseExited(MouseEvent aE) { * MouseMotionListener Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent) + */ public void mouseMoved(MouseEvent event) { if (!anchorSet) return; if (textPane != null) return; @@ -179,7 +197,9 @@ public void mouseMoved(MouseEvent event) { renderer.repaint(); } - /** @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseMotionListener#mouseDragged(java.awt.event.MouseEvent) + */ public void mouseDragged(MouseEvent aE) { // TODO Auto-generated method stub 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 c90bae4dd7..79c46aa6f8 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 @@ -25,7 +25,9 @@ import net.rptools.maptool.model.drawing.Pen; import net.rptools.maptool.model.drawing.Rectangle; -/** @author drice */ +/** + * @author drice + */ public class HollowRectangleTopologyTool extends AbstractDrawingTool implements MouseMotionListener { private static final long serialVersionUID = 3258413928311830323L; 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 f0138eb53d..39daa8e8ab 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 @@ -56,20 +56,26 @@ public LineCellTemplateTool() {} * Overridden RadiusTemplateTool Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#getTooltip() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#getTooltip() + */ @Override public String getTooltip() { return "tool.LineCellTemplate.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { // No reason to create new instructions return "tool.linetemplate.instructions"; } - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() + */ @Override protected AbstractTemplate createBaseTemplate() { return new LineCellTemplate(); 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 c6a91fc033..ac8e8d879e 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 @@ -63,19 +63,25 @@ public LineTemplateTool() { * Overridden RadiusTemplateTool Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#getTooltip() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#getTooltip() + */ @Override public String getTooltip() { return "tool.linetemplate.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.linetemplate.instructions"; } - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() + */ @Override protected AbstractTemplate createBaseTemplate() { return new LineTemplate(); @@ -250,7 +256,9 @@ protected void handleMouseMovement(MouseEvent e) { * PropertyChangeListener Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ + /** + * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) + */ public void propertyChange(PropertyChangeEvent aEvt) { ((LineTemplate) template).setDoubleWide((Boolean) aEvt.getNewValue()); } 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 e7070ab738..3832f1c43f 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 @@ -30,7 +30,9 @@ import net.rptools.maptool.model.drawing.Pen; import net.rptools.maptool.model.drawing.ShapeDrawable; -/** @author drice */ +/** + * @author drice + */ public class OvalTool extends AbstractDrawingTool implements MouseMotionListener { private static final long serialVersionUID = 3258413928311830323L; @@ -145,7 +147,9 @@ public void mouseMoved(MouseEvent e) { } } - /** @see Tool#resetTool() */ + /** + * @see Tool#resetTool() + */ @Override protected void resetTool() { 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 65ac137327..984754830d 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 @@ -288,7 +288,9 @@ protected void handleMouseMovement(MouseEvent e) { * DefaultTool Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.DefaultTool#mouseMoved(java.awt.event.MouseEvent) */ + /** + * @see net.rptools.maptool.client.tool.DefaultTool#mouseMoved(java.awt.event.MouseEvent) + */ @Override public void mouseMoved(MouseEvent e) { super.mouseMoved(e); @@ -347,7 +349,9 @@ protected Pen getPen() { return pen; } - /** @see Tool#detachFrom(net.rptools.maptool.client.ui.zone.ZoneRenderer) */ + /** + * @see Tool#detachFrom(net.rptools.maptool.client.ui.zone.ZoneRenderer) + */ @Override protected void detachFrom(ZoneRenderer renderer) { super.detachFrom(renderer); @@ -355,7 +359,9 @@ protected void detachFrom(ZoneRenderer renderer) { renderer.repaint(); } - /** @see Tool#attachTo(net.rptools.maptool.client.ui.zone.ZoneRenderer) */ + /** + * @see Tool#attachTo(net.rptools.maptool.client.ui.zone.ZoneRenderer) + */ @Override protected void attachTo(ZoneRenderer renderer) { template.setZoneId(renderer.getZone().getId()); @@ -363,13 +369,17 @@ protected void attachTo(ZoneRenderer renderer) { super.attachTo(renderer); } - /** @see Tool#getTooltip() */ + /** + * @see Tool#getTooltip() + */ @Override public String getTooltip() { return "tool.radiusCellTemplate.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.radiustemplate.instructions"; @@ -379,7 +389,9 @@ public String getInstructions() { * MouseListener Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) + */ @Override public void mousePressed(MouseEvent e) { super.mousePressed(e); @@ -407,7 +419,9 @@ public void mousePressed(MouseEvent e) { } } - /** @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) + */ @Override public void mouseEntered(MouseEvent e) { super.mouseEntered(e); @@ -415,7 +429,9 @@ public void mouseEntered(MouseEvent e) { renderer.repaint(); } - /** @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) + */ @Override public void mouseExited(MouseEvent e) { super.mouseExited(e); 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 0fc1e8f1e1..60483e7957 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 @@ -291,7 +291,9 @@ protected void handleMouseMovement(MouseEvent e) { * DefaultTool Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.DefaultTool#mouseMoved(java.awt.event.MouseEvent) */ + /** + * @see net.rptools.maptool.client.tool.DefaultTool#mouseMoved(java.awt.event.MouseEvent) + */ @Override public void mouseMoved(MouseEvent e) { super.mouseMoved(e); @@ -350,7 +352,9 @@ protected Pen getPen() { return pen; } - /** @see Tool#detachFrom(net.rptools.maptool.client.ui.zone.ZoneRenderer) */ + /** + * @see Tool#detachFrom(net.rptools.maptool.client.ui.zone.ZoneRenderer) + */ @Override protected void detachFrom(ZoneRenderer renderer) { super.detachFrom(renderer); @@ -358,7 +362,9 @@ protected void detachFrom(ZoneRenderer renderer) { renderer.repaint(); } - /** @see Tool#attachTo(net.rptools.maptool.client.ui.zone.ZoneRenderer) */ + /** + * @see Tool#attachTo(net.rptools.maptool.client.ui.zone.ZoneRenderer) + */ @Override protected void attachTo(ZoneRenderer renderer) { template.setZoneId(renderer.getZone().getId()); @@ -366,13 +372,17 @@ protected void attachTo(ZoneRenderer renderer) { super.attachTo(renderer); } - /** @see Tool#getTooltip() */ + /** + * @see Tool#getTooltip() + */ @Override public String getTooltip() { return "tool.radiustemplate.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.radiustemplate.instructions"; @@ -382,7 +392,9 @@ public String getInstructions() { * MouseListener Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) + */ @Override public void mousePressed(MouseEvent e) { super.mousePressed(e); @@ -410,7 +422,9 @@ public void mousePressed(MouseEvent e) { } } - /** @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) + */ @Override public void mouseEntered(MouseEvent e) { super.mouseEntered(e); @@ -418,7 +432,9 @@ public void mouseEntered(MouseEvent e) { renderer.repaint(); } - /** @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) + */ @Override public void mouseExited(MouseEvent e) { super.mouseExited(e); 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 ea03523958..4ff9fc08b2 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 @@ -28,7 +28,9 @@ import net.rptools.maptool.model.drawing.Pen; import net.rptools.maptool.model.drawing.ShapeDrawable; -/** @author drice */ +/** + * @author drice + */ public class RectangleTool extends AbstractDrawingTool implements MouseMotionListener { private static final long serialVersionUID = 3258413928311830323L; 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 e1c95ec0a0..8b294abde3 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 @@ -24,7 +24,9 @@ import net.rptools.maptool.model.ZonePoint; import net.rptools.maptool.model.drawing.Rectangle; -/** @author drice */ +/** + * @author drice + */ public class RectangleTopologyTool extends AbstractDrawingTool implements MouseMotionListener { private static final long serialVersionUID = 3258413928311830323L; diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/UndoPerZone.java b/src/main/java/net/rptools/maptool/client/tool/drawing/UndoPerZone.java index 402fa50a91..7cf79db973 100644 --- a/src/main/java/net/rptools/maptool/client/tool/drawing/UndoPerZone.java +++ b/src/main/java/net/rptools/maptool/client/tool/drawing/UndoPerZone.java @@ -180,7 +180,9 @@ public void undo() throws CannotUndoException { MapTool.serverCommand().undoDraw(zone.getId(), drawable.getId()); } - /** @see javax.swing.undo.UndoableEdit#redo() */ + /** + * @see javax.swing.undo.UndoableEdit#redo() + */ @Override public void redo() throws CannotRedoException { super.redo(); diff --git a/src/main/java/net/rptools/maptool/client/tool/drawing/WallTemplateTool.java b/src/main/java/net/rptools/maptool/client/tool/drawing/WallTemplateTool.java index e334e4b9c2..363f398bc9 100644 --- a/src/main/java/net/rptools/maptool/client/tool/drawing/WallTemplateTool.java +++ b/src/main/java/net/rptools/maptool/client/tool/drawing/WallTemplateTool.java @@ -45,19 +45,25 @@ public WallTemplateTool() {} * Overridden RadiusTemplateTool methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#createBaseTemplate() + */ @Override protected AbstractTemplate createBaseTemplate() { return new WallTemplate(); } - /** @see Tool#getTooltip() */ + /** + * @see Tool#getTooltip() + */ @Override public String getTooltip() { return "tool.walltemplate.tooltip"; } - /** @see Tool#getInstructions() */ + /** + * @see Tool#getInstructions() + */ @Override public String getInstructions() { return "tool.walltemplate.instructions"; @@ -133,7 +139,9 @@ protected void handleMouseMovement(MouseEvent e) { } // endif } - /** @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#resetTool() */ + /** + * @see net.rptools.maptool.client.tool.drawing.RadiusTemplateTool#resetTool() + */ @Override protected void resetTool() { super.resetTool(); diff --git a/src/main/java/net/rptools/maptool/client/ui/ActivityMonitorPanel.java b/src/main/java/net/rptools/maptool/client/ui/ActivityMonitorPanel.java index cb88042107..6b84001eab 100644 --- a/src/main/java/net/rptools/maptool/client/ui/ActivityMonitorPanel.java +++ b/src/main/java/net/rptools/maptool/client/ui/ActivityMonitorPanel.java @@ -25,7 +25,9 @@ import net.rptools.maptool.client.ui.theme.RessourceManager; import net.rptools.maptool.language.I18N; -/** @author trevor */ +/** + * @author trevor + */ public class ActivityMonitorPanel extends JComponent implements ActivityListener, Animatable { private static final int PADDING = 5; private static final int ON_DELAY = 100; diff --git a/src/main/java/net/rptools/maptool/client/ui/AppMenuBar.java b/src/main/java/net/rptools/maptool/client/ui/AppMenuBar.java index cd945428ad..4da5bebd70 100644 --- a/src/main/java/net/rptools/maptool/client/ui/AppMenuBar.java +++ b/src/main/java/net/rptools/maptool/client/ui/AppMenuBar.java @@ -415,7 +415,9 @@ protected JMenu createZoomMenu() { return menu; } - /** @return an overlay menu. */ + /** + * @return an overlay menu. + */ protected JMenu createOverlayMenu() { overlayMenu = I18N.createMenu("menu.overlay"); overlayMenu.setEnabled(false); // empty by default 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 39a988b993..fea91d1135 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -1450,7 +1450,9 @@ public ZoneRenderer getCurrentZoneRenderer() { return currentRenderer; } - /** @return the HTML Overlay Panel */ + /** + * @return the HTML Overlay Panel + */ public HTMLOverlayPanel getOverlayPanel() { return overlayPanel; } @@ -2069,7 +2071,9 @@ public void resetPanels() { updateKeyStrokes(); } - /** @return Getter for initiativePanel */ + /** + * @return Getter for initiativePanel + */ public InitiativePanel getInitiativePanel() { return initiativePanel; } diff --git a/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenBarController.java b/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenBarController.java index ee3fd6578b..321237c99a 100644 --- a/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenBarController.java +++ b/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenBarController.java @@ -521,12 +521,16 @@ public void changedUpdate(DocumentEvent e) { .setEnabled(hasName && hasUniqueUpdateName && selectedBar != null && hasShow && hasImages); } - /** @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) */ + /** + * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) + */ public void insertUpdate(DocumentEvent e) { changedUpdate(e); } - /** @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) */ + /** + * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) + */ public void removeUpdate(DocumentEvent e) { changedUpdate(e); } @@ -772,12 +776,16 @@ public BarTokenOverlay createTokenOverlay(BarTokenOverlay updatedOverlay) { return to; } - /** @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) */ + /** + * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) + */ public void itemStateChanged(ItemEvent e) { changedUpdate(null); } - /** @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) */ + /** + * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) + */ public void stateChanged(ChangeEvent e) { if (e.getSource() == formPanel.getComponent(TESTER)) { renderer.value = ((JSlider) formPanel.getComponent(TESTER)).getValue() / 100.0; @@ -787,7 +795,9 @@ public void stateChanged(ChangeEvent e) { } } - /** @param names Setter for names */ + /** + * @param names Setter for names + */ public void setNames(Set names) { this.names = names; } diff --git a/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenStatesController.java b/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenStatesController.java index aa2c7839f5..6a3a3c8587 100644 --- a/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenStatesController.java +++ b/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenStatesController.java @@ -274,7 +274,9 @@ public TokenStatesController(AbeillePanel panel) { changedUpdate(null); } - /** @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) */ + /** + * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) + */ @Override public void itemStateChanged(ItemEvent e) { changedUpdate(null); @@ -465,13 +467,17 @@ public void changedUpdate(DocumentEvent e) { .setEnabled(hasName && hasUniqueUpdateName && selectedState != null && hasShow); } - /** @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) */ + /** + * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) + */ @Override public void insertUpdate(DocumentEvent e) { changedUpdate(e); } - /** @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) */ + /** + * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) + */ @Override public void removeUpdate(DocumentEvent e) { changedUpdate(e); @@ -807,12 +813,16 @@ public static int getSpinner(String name, String displayName, AbeillePanel formP return width; } - /** @return Getter for names */ + /** + * @return Getter for names + */ public Set getNames() { return names; } - /** @param names Setter for names */ + /** + * @param names Setter for names + */ public void setNames(Set names) { this.names = names; } diff --git a/src/main/java/net/rptools/maptool/client/ui/commandpanel/CommandPanel.java b/src/main/java/net/rptools/maptool/client/ui/commandpanel/CommandPanel.java index c23371e408..3e561bb17a 100644 --- a/src/main/java/net/rptools/maptool/client/ui/commandpanel/CommandPanel.java +++ b/src/main/java/net/rptools/maptool/client/ui/commandpanel/CommandPanel.java @@ -198,12 +198,16 @@ public void setIdentity(TokenIdentity macroIdentity) { } } - /** @return whether the current identity is a token. */ + /** + * @return whether the current identity is a token. + */ public boolean isImpersonatingToken() { return getCurrentIdentity().validToken(); } - /** @return whether the global identity is a token. */ + /** + * @return whether the global identity is a token. + */ public boolean isGlobalImpersonatingToken() { return globalIdentity.validToken(); } @@ -385,7 +389,9 @@ public TokenIdentity(Token token, String backupName, boolean canImpersonate) { } } - /** @return a string representing the identity. */ + /** + * @return a string representing the identity. + */ public String getIdentity() { if (identityName == null) { if (identityGUID == null) return MapTool.getPlayer().getName(); @@ -394,27 +400,37 @@ public String getIdentity() { return identityName; } - /** @return a string for the character label of the identity. */ + /** + * @return a string for the character label of the identity. + */ public String getCharacterLabel() { return hasName() ? identityName : ""; } - /** @return the GUID of the identity. */ + /** + * @return the GUID of the identity. + */ public GUID getIdentityGUID() { return identityGUID; } - /** @return the token of the identity. */ + /** + * @return the token of the identity. + */ public Token getToken() { return FindTokenFunctions.findToken(identityGUID, null); } - /** @return whether the identity has a name. */ + /** + * @return whether the identity has a name. + */ public boolean hasName() { return identityName != null; } - /** @return whether the token can still be found on the current map. */ + /** + * @return whether the token can still be found on the current map. + */ public boolean validToken() { if (identityGUID == null) { return false; diff --git a/src/main/java/net/rptools/maptool/client/ui/connecttoserverdialog/ConnectToServerDialog.java b/src/main/java/net/rptools/maptool/client/ui/connecttoserverdialog/ConnectToServerDialog.java index 1609c460a8..56af639297 100644 --- a/src/main/java/net/rptools/maptool/client/ui/connecttoserverdialog/ConnectToServerDialog.java +++ b/src/main/java/net/rptools/maptool/client/ui/connecttoserverdialog/ConnectToServerDialog.java @@ -48,7 +48,9 @@ import net.tsc.servicediscovery.ServiceFinder; import yasb.Binder; -/** @author trevor */ +/** + * @author trevor + */ public class ConnectToServerDialog extends AbeillePanel implements AnnouncementListener { private static ServiceFinder finder; 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 fc0e78ca63..d217e88d01 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 @@ -196,7 +196,9 @@ public void addActionListener(ActionListener listener) { form.getRadioButton(this.toString()).addActionListener(listener); } - /** @return which of the buttons in the Type group is selected */ + /** + * @return which of the buttons in the Type group is selected + */ public static ExportRadioButtons getType() { if (ExportRadioButtons.TYPE_CURRENT_VIEW.isChecked()) { return TYPE_CURRENT_VIEW; @@ -206,7 +208,9 @@ public static ExportRadioButtons getType() { return null; } - /** @return which of the buttons in the View group is selected */ + /** + * @return which of the buttons in the View group is selected + */ public static ExportRadioButtons getView() { if (ExportRadioButtons.VIEW_GM.isChecked()) { return VIEW_GM; @@ -216,7 +220,9 @@ public static ExportRadioButtons getView() { return null; } - /** @return which of the buttons in the Layers group is selected */ + /** + * @return which of the buttons in the Layers group is selected + */ public static ExportRadioButtons getLayers() { if (ExportRadioButtons.LAYERS_CURRENT.isChecked()) { return LAYERS_CURRENT; diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLActionEvent.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLActionEvent.java index 516dbc07b3..5e167ae42e 100644 --- a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLActionEvent.java +++ b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLActionEvent.java @@ -27,7 +27,9 @@ public static class ChangeTitleActionEvent extends ActionEvent { newTitle = title; } - /** @return the new title. */ + /** + * @return the new title. + */ String getNewTitle() { return newTitle; } diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayManager.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayManager.java index 9e814d0f8b..470aab1bf0 100644 --- a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayManager.java +++ b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayManager.java @@ -96,7 +96,9 @@ public void setupWebView(WebView webView) { super.setupWebView(webView); } - /** @return the zOrder of the overlay. */ + /** + * @return the zOrder of the overlay. + */ public int getZOrder() { return zOrder; } @@ -110,7 +112,9 @@ void setZOrder(int zOrder) { this.zOrder = zOrder; } - /** @return the name of the overlay. */ + /** + * @return the name of the overlay. + */ public String getName() { return name; } @@ -153,7 +157,9 @@ private void updateOverlayCursor(javafx.scene.Cursor newCursor) { } } - /** @return the rule for an invisible body. */ + /** + * @return the rule for an invisible body. + */ @Override String getCSSRule() { return String.format(CSS_BODY, AppPreferences.getFontSize()) diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayPanel.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayPanel.java index 711b647d1f..59390d0a4b 100644 --- a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayPanel.java +++ b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayPanel.java @@ -110,7 +110,9 @@ void setupScene() { this.setScene(scene); } - /** @return a cloned set of the overlays. */ + /** + * @return a cloned set of the overlays. + */ public ConcurrentSkipListSet getOverlays() { return overlays.clone(); } @@ -174,7 +176,9 @@ public boolean runScript(String name, String script) { return true; } - /** @return whether all overlay WebViews have the default cursor. */ + /** + * @return whether all overlay WebViews have the default cursor. + */ public boolean areWebViewCursorsDefault() { for (HTMLOverlayManager overlay : overlays) { if (overlay.isVisible()) { diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPane.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPane.java index d45f530484..91933481b1 100644 --- a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPane.java +++ b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPane.java @@ -91,7 +91,9 @@ public HTMLPane() { ToolTipManager.sharedInstance().registerComponent(this); } - /** @return the rule for the body tag */ + /** + * @return the rule for the body tag + */ public String getRuleBody() { return String.format(CSS_RULE_BODY, AppPreferences.getFontSize()); } diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPanelContainer.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPanelContainer.java index 30a4b05f7a..d193d70bc5 100644 --- a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPanelContainer.java +++ b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLPanelContainer.java @@ -24,10 +24,14 @@ /** Interface for the container of an HTML panel. */ public interface HTMLPanelContainer extends ActionListener { - /** @return the visibility of the container. */ + /** + * @return the visibility of the container. + */ boolean isVisible(); - /** @return the macroCallBacks of the container. */ + /** + * @return the macroCallBacks of the container. + */ Map macroCallbacks(); /** @@ -37,7 +41,9 @@ public interface HTMLPanelContainer extends ActionListener { */ void setVisible(boolean visible); - /** @return the temporary status of the container. */ + /** + * @return the temporary status of the container. + */ boolean getTemporary(); /** @@ -47,7 +53,9 @@ public interface HTMLPanelContainer extends ActionListener { */ void setTemporary(boolean temp); - /** @return the value stored into the container. */ + /** + * @return the value stored into the container. + */ Object getValue(); /** diff --git a/src/main/java/net/rptools/maptool/client/ui/io/FTPClient.java b/src/main/java/net/rptools/maptool/client/ui/io/FTPClient.java index d3c0c1c5ca..5bb1fafded 100644 --- a/src/main/java/net/rptools/maptool/client/ui/io/FTPClient.java +++ b/src/main/java/net/rptools/maptool/client/ui/io/FTPClient.java @@ -14,7 +14,9 @@ */ package net.rptools.maptool.client.ui.io; -/** @author crash */ +/** + * @author crash + */ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridLayout; diff --git a/src/main/java/net/rptools/maptool/client/ui/io/FTPClientConn.java b/src/main/java/net/rptools/maptool/client/ui/io/FTPClientConn.java index 7f0fa18cd0..4dac84a1a4 100644 --- a/src/main/java/net/rptools/maptool/client/ui/io/FTPClientConn.java +++ b/src/main/java/net/rptools/maptool/client/ui/io/FTPClientConn.java @@ -20,7 +20,9 @@ import java.net.MalformedURLException; import java.net.URL; -/** @author crash */ +/** + * @author crash + */ class FTPClientConn { private static final String PROTOCOL = "ftp://"; private static final String TYPE_IMAGE = ";type=i"; diff --git a/src/main/java/net/rptools/maptool/client/ui/io/LoadSaveImpl.java b/src/main/java/net/rptools/maptool/client/ui/io/LoadSaveImpl.java index cb16913407..560dd4e68e 100644 --- a/src/main/java/net/rptools/maptool/client/ui/io/LoadSaveImpl.java +++ b/src/main/java/net/rptools/maptool/client/ui/io/LoadSaveImpl.java @@ -26,7 +26,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author crash */ +/** + * @author crash + */ public class LoadSaveImpl { private static final Logger log = LogManager.getLogger(LoadSaveImpl.class); diff --git a/src/main/java/net/rptools/maptool/client/ui/io/UIBuilder.java b/src/main/java/net/rptools/maptool/client/ui/io/UIBuilder.java index 3afc9fa7b5..813cc1479f 100644 --- a/src/main/java/net/rptools/maptool/client/ui/io/UIBuilder.java +++ b/src/main/java/net/rptools/maptool/client/ui/io/UIBuilder.java @@ -48,7 +48,9 @@ public class UIBuilder extends JDialog { private static final Logger log = LogManager.getLogger(UIBuilder.class); - /** @author crash */ + /** + * @author crash + */ public static class TreeModel extends DefaultTreeModel { /** * @param root the top-level node for the tree diff --git a/src/main/java/net/rptools/maptool/client/ui/io/UpdateRepoDialog.java b/src/main/java/net/rptools/maptool/client/ui/io/UpdateRepoDialog.java index 0220ae19f1..22ed83dced 100644 --- a/src/main/java/net/rptools/maptool/client/ui/io/UpdateRepoDialog.java +++ b/src/main/java/net/rptools/maptool/client/ui/io/UpdateRepoDialog.java @@ -39,7 +39,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author crash */ +/** + * @author crash + */ @SuppressWarnings("serial") public class UpdateRepoDialog extends JDialog { private static final Logger log = LogManager.getLogger(FTPClient.class); diff --git a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/MacroButtonHotKeyManager.java b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/MacroButtonHotKeyManager.java index e6d50050d2..374afb4f71 100644 --- a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/MacroButtonHotKeyManager.java +++ b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/MacroButtonHotKeyManager.java @@ -20,7 +20,9 @@ import net.rptools.maptool.client.MapTool; import net.rptools.maptool.client.ui.macrobuttons.buttons.MacroButton; -/** @author tylere */ +/** + * @author tylere + */ public class MacroButtonHotKeyManager { // Changing and adding more hotkeys should work smoothly, however hotkeys[0] diff --git a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/panels/AbstractMacroPanel.java b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/panels/AbstractMacroPanel.java index 583a30d895..dddd25038d 100644 --- a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/panels/AbstractMacroPanel.java +++ b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/panels/AbstractMacroPanel.java @@ -93,7 +93,9 @@ public void setPanelClass(String panelClass) { this.panelClass = panelClass; } - /** @return the token on the current map corresponding to the stored token id. */ + /** + * @return the token on the current map corresponding to the stored token id. + */ public Token getToken() { if (this.tokenId == null) { return null; diff --git a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java index 9c7b32e618..6c1bfb63eb 100644 --- a/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java +++ b/src/main/java/net/rptools/maptool/client/ui/preferencesdialog/PreferencesDialog.java @@ -1248,7 +1248,9 @@ private ComboBoxModel getLocalizedModel( return model; } - /** @author frank */ + /** + * @author frank + */ private abstract static class DocumentListenerProxy implements DocumentListener { JTextField comp; @@ -1285,7 +1287,9 @@ protected void updateValue() { protected abstract void storeNumericValue(T value); } - /** @author frank */ + /** + * @author frank + */ private abstract static class ChangeListenerProxy implements ChangeListener { @Override diff --git a/src/main/java/net/rptools/maptool/client/ui/startserverdialog/StartServerDialog.java b/src/main/java/net/rptools/maptool/client/ui/startserverdialog/StartServerDialog.java index b61b22f680..81098006ff 100644 --- a/src/main/java/net/rptools/maptool/client/ui/startserverdialog/StartServerDialog.java +++ b/src/main/java/net/rptools/maptool/client/ui/startserverdialog/StartServerDialog.java @@ -33,7 +33,9 @@ import net.rptools.maptool.util.StringUtil; import yasb.Binder; -/** @author trevor */ +/** + * @author trevor + */ public class StartServerDialog extends AbeillePanel { private boolean accepted; diff --git a/src/main/java/net/rptools/maptool/client/ui/syntax/MapToolScriptTokenMaker.java b/src/main/java/net/rptools/maptool/client/ui/syntax/MapToolScriptTokenMaker.java index 6ce64d8d23..ecd693f9dd 100644 --- a/src/main/java/net/rptools/maptool/client/ui/syntax/MapToolScriptTokenMaker.java +++ b/src/main/java/net/rptools/maptool/client/ui/syntax/MapToolScriptTokenMaker.java @@ -480,7 +480,9 @@ public final void yyclose() throws java.io.IOException { if (zzReader != null) zzReader.close(); } - /** @return the current lexical state. */ + /** + * @return the current lexical state. + */ public final int yystate() { return zzLexicalState; } @@ -494,7 +496,9 @@ public final void yybegin(int newState) { zzLexicalState = newState; } - /** @return the text matched by the current regular expression. */ + /** + * @return the text matched by the current regular expression. + */ public final String yytext() { return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); } @@ -511,7 +515,9 @@ public final char yycharat(int pos) { return zzBuffer[zzStartRead + pos]; } - /** @return the length of the matched text region. */ + /** + * @return the length of the matched text region. + */ public final int yylength() { return zzMarkedPos - zzStartRead; } 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 789b929cee..f7bf829ca1 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 @@ -504,8 +504,11 @@ public record ThemeDetails( * @throws UnsupportedLookAndFeelException if the look and feel is not supported. */ public static void loadTheme() - throws NoSuchMethodException, InvocationTargetException, InstantiationException, - IllegalAccessException, UnsupportedLookAndFeelException { + throws NoSuchMethodException, + InvocationTargetException, + InstantiationException, + IllegalAccessException, + UnsupportedLookAndFeelException { JsonObject theme = readTheme(); String themeName = theme.getAsJsonPrimitive("theme").getAsString(); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/AbstractTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/AbstractTokenOverlay.java index 7be5cc6efb..52e3c53eff 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/AbstractTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/AbstractTokenOverlay.java @@ -106,76 +106,104 @@ public void setName(String aName) { name = aName; } - /** @return Getter for order */ + /** + * @return Getter for order + */ public int getOrder() { return order; } - /** @param order Setter for the order to set */ + /** + * @param order Setter for the order to set + */ public void setOrder(int order) { this.order = order; } - /** @return Getter for group */ + /** + * @return Getter for group + */ public String getGroup() { return group; } - /** @param group Setter for group */ + /** + * @param group Setter for group + */ public void setGroup(String group) { this.group = group; } - /** @return Getter for mouseover */ + /** + * @return Getter for mouseover + */ public boolean isMouseover() { return mouseover; } - /** @param mouseover Setter for mouseover */ + /** + * @param mouseover Setter for mouseover + */ public void setMouseover(boolean mouseover) { this.mouseover = mouseover; } - /** @return Getter for opacity */ + /** + * @return Getter for opacity + */ public int getOpacity() { if (opacity == 0) opacity = 100; return opacity; } - /** @param opacity Setter for opacity */ + /** + * @param opacity Setter for opacity + */ public void setOpacity(int opacity) { this.opacity = opacity; } - /** @return Getter for showGM */ + /** + * @return Getter for showGM + */ public boolean isShowGM() { if (!showGM && !showOwner && !showOthers) showGM = showOwner = showOthers = true; return showGM; } - /** @param showGM Setter for showGM */ + /** + * @param showGM Setter for showGM + */ public void setShowGM(boolean showGM) { this.showGM = showGM; } - /** @return Getter for showOwner */ + /** + * @return Getter for showOwner + */ public boolean isShowOwner() { if (!showGM && !showOwner && !showOthers) showGM = showOwner = showOthers = true; return showOwner; } - /** @param showOwner Setter for showOwner */ + /** + * @param showOwner Setter for showOwner + */ public void setShowOwner(boolean showOwner) { this.showOwner = showOwner; } - /** @return Getter for showOthers */ + /** + * @return Getter for showOthers + */ public boolean isShowOthers() { if (!showGM && !showOwner && !showOthers) showGM = showOwner = showOthers = true; return showOthers; } - /** @param showOthers Setter for showOthers */ + /** + * @param showOthers Setter for showOthers + */ public void setShowOthers(boolean showOthers) { this.showOthers = showOthers; } @@ -213,7 +241,9 @@ public boolean showPlayer(Token token, Player player) { */ public abstract void paintOverlay(Graphics2D g, Token token, Rectangle bounds, Object value); - /** @see java.lang.Object#clone() */ + /** + * @see java.lang.Object#clone() + */ public abstract Object clone(); protected void fillFrom(TokenOverlayDto dto) { diff --git a/src/main/java/net/rptools/maptool/client/ui/token/BarTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/BarTokenOverlay.java index 89cfb04635..3b4c86ff6b 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/BarTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/BarTokenOverlay.java @@ -51,7 +51,9 @@ public abstract class BarTokenOverlay extends AbstractTokenOverlay { * Constructors *-------------------------------------------------------------------------------------------*/ - /** @param name Name of the new bar. */ + /** + * @param name Name of the new bar. + */ public BarTokenOverlay(String name) { super(name); } @@ -60,12 +62,16 @@ public BarTokenOverlay(String name) { * Instance Methods *-------------------------------------------------------------------------------------------*/ - /** @return Getter for increments */ + /** + * @return Getter for increments + */ public int getIncrements() { return increments; } - /** @param increments Setter for increments */ + /** + * @param increments Setter for increments + */ public void setIncrements(int increments) { this.increments = increments; } @@ -98,12 +104,16 @@ public int findIncrement(double value) { return (int) Math.ceil(value * (increments - 1)); } - /** @return Getter for side */ + /** + * @return Getter for side + */ public Side getSide() { return side; } - /** @param side Setter for side */ + /** + * @param side Setter for side + */ public void setSide(Side side) { this.side = side; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/ColorDotTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/ColorDotTokenOverlay.java index 02d7dd4f07..939044a5f1 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/ColorDotTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/ColorDotTokenOverlay.java @@ -54,7 +54,9 @@ public ColorDotTokenOverlay(String aName, Color aColor, Quadrant aCorner) { if (aCorner != null) corner = aCorner; } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new ColorDotTokenOverlay(getName(), getColor(), getCorner()); @@ -110,7 +112,9 @@ public void paintOverlay(Graphics2D g, Token aToken, Rectangle bounds) { } } - /** @return Getter for corner */ + /** + * @return Getter for corner + */ public Quadrant getCorner() { return corner; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/CornerImageTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/CornerImageTokenOverlay.java index 5e2557ffa4..0e350a0193 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/CornerImageTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/CornerImageTokenOverlay.java @@ -48,7 +48,9 @@ public CornerImageTokenOverlay(String name, MD5Key anAssetId, Quadrant aCorner) corner = aCorner; } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new CornerImageTokenOverlay(getName(), getAssetId(), corner); @@ -62,7 +64,9 @@ public Object clone() { return overlay; } - /** @see ImageTokenOverlay#getImageBounds(java.awt.Rectangle, Token) */ + /** + * @see ImageTokenOverlay#getImageBounds(java.awt.Rectangle, Token) + */ @Override protected Rectangle getImageBounds(Rectangle bounds, Token token) { int x = (bounds.width + 1) / 2; @@ -83,7 +87,9 @@ protected Rectangle getImageBounds(Rectangle bounds, Token token) { return new Rectangle(x, y, bounds.width / 2, bounds.height / 2); } - /** @return Getter for corner */ + /** + * @return Getter for corner + */ public Quadrant getCorner() { return corner; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/CrossTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/CrossTokenOverlay.java index 11274d9048..6e424262c4 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/CrossTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/CrossTokenOverlay.java @@ -48,7 +48,9 @@ public CrossTokenOverlay(String aName, Color aColor, int aWidth) { super(aName, aColor, aWidth); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new CrossTokenOverlay(getName(), getColor(), getWidth()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/DiamondTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/DiamondTokenOverlay.java index 8135487d27..6faf5a9dd8 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/DiamondTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/DiamondTokenOverlay.java @@ -48,7 +48,9 @@ public DiamondTokenOverlay(String aName, Color aColor, int aWidth) { super(aName, aColor, aWidth); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new DiamondTokenOverlay(getName(), getColor(), getWidth()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/DrawnBarTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/DrawnBarTokenOverlay.java index 7690947738..eb390e5d18 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/DrawnBarTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/DrawnBarTokenOverlay.java @@ -81,7 +81,9 @@ public void paintOverlay(Graphics2D g, Token token, Rectangle bounds, double val g.setColor(tempColor); } - /** @see AbstractTokenOverlay#clone() */ + /** + * @see AbstractTokenOverlay#clone() + */ @Override public Object clone() { BarTokenOverlay overlay = new DrawnBarTokenOverlay(getName(), barColor, thickness); @@ -97,22 +99,30 @@ public Object clone() { return overlay; } - /** @return Getter for barColor */ + /** + * @return Getter for barColor + */ public Color getBarColor() { return barColor; } - /** @param barColor Setter for barColor */ + /** + * @param barColor Setter for barColor + */ public void setBarColor(Color barColor) { this.barColor = barColor; } - /** @return Getter for thickness */ + /** + * @return Getter for thickness + */ public int getThickness() { return thickness; } - /** @param thickness Setter for thickness */ + /** + * @param thickness Setter for thickness + */ public void setThickness(int thickness) { this.thickness = thickness; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/FlowColorDotTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/FlowColorDotTokenOverlay.java index f5a96dab85..a503b737bd 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/FlowColorDotTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/FlowColorDotTokenOverlay.java @@ -57,7 +57,9 @@ public FlowColorDotTokenOverlay(String aName, Color aColor, int aGrid) { grid = aGrid; } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new FlowColorDotTokenOverlay(getName(), getColor(), grid); @@ -117,7 +119,9 @@ protected Shape getShape(Rectangle bounds, Token token) { return new Ellipse2D.Double(r.getX(), r.getY(), r.getWidth(), r.getHeight()); } - /** @return Getter for grid */ + /** + * @return Getter for grid + */ public int getGrid() { return grid; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/FlowColorSquareTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/FlowColorSquareTokenOverlay.java index 4890f372d1..4b0419f2e4 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/FlowColorSquareTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/FlowColorSquareTokenOverlay.java @@ -44,7 +44,9 @@ public FlowColorSquareTokenOverlay(String aName, Color aColor, int aGrid) { super(aName, aColor, aGrid); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new FlowColorSquareTokenOverlay(getName(), getColor(), getGrid()); @@ -58,7 +60,9 @@ public Object clone() { return overlay; } - /** @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) */ + /** + * @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) + */ @Override protected Shape getShape(Rectangle bounds, Token token) { return getFlow().getStateBounds2D(bounds, token, getName()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/FlowDiamondTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/FlowDiamondTokenOverlay.java index 1bf73f30a4..5622189d98 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/FlowDiamondTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/FlowDiamondTokenOverlay.java @@ -46,7 +46,9 @@ public FlowDiamondTokenOverlay(String aName, Color aColor, int aGrid) { super(aName, aColor, aGrid); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new FlowDiamondTokenOverlay(getName(), getColor(), getGrid()); @@ -60,7 +62,9 @@ public Object clone() { return overlay; } - /** @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) */ + /** + * @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) + */ @Override protected Shape getShape(Rectangle bounds, Token token) { Rectangle2D r = getFlow().getStateBounds2D(bounds, token, getName()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/FlowImageTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/FlowImageTokenOverlay.java index f5f7d5b3f3..33533d560e 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/FlowImageTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/FlowImageTokenOverlay.java @@ -61,13 +61,17 @@ protected TokenOverlayFlow getFlow() { return flow; } - /** @see ImageTokenOverlay#getImageBounds(java.awt.Rectangle, Token) */ + /** + * @see ImageTokenOverlay#getImageBounds(java.awt.Rectangle, Token) + */ @Override protected Rectangle getImageBounds(Rectangle bounds, Token token) { return getFlow().getStateBounds(bounds, token, getName()); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new FlowImageTokenOverlay(getName(), getAssetId(), grid); @@ -81,7 +85,9 @@ public Object clone() { return overlay; } - /** @return Getter for grid */ + /** + * @return Getter for grid + */ public int getGrid() { return grid; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/FlowTriangleTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/FlowTriangleTokenOverlay.java index 712e3455e3..4f26005b60 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/FlowTriangleTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/FlowTriangleTokenOverlay.java @@ -45,7 +45,9 @@ public FlowTriangleTokenOverlay(String aName, Color aColor, int aGrid) { super(aName, aColor, aGrid); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new FlowTriangleTokenOverlay(getName(), getColor(), getGrid()); @@ -59,7 +61,9 @@ public Object clone() { return overlay; } - /** @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) */ + /** + * @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) + */ @Override protected Shape getShape(Rectangle bounds, Token token) { Rectangle2D r = getFlow().getStateBounds2D(bounds, token, getName()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/FlowYieldTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/FlowYieldTokenOverlay.java index 2a29438383..727283ba46 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/FlowYieldTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/FlowYieldTokenOverlay.java @@ -46,7 +46,9 @@ public FlowYieldTokenOverlay(String aName, Color aColor, int aGrid) { super(aName, aColor, aGrid); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new FlowYieldTokenOverlay(getName(), getColor(), getGrid()); @@ -60,7 +62,9 @@ public Object clone() { return overlay; } - /** @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) */ + /** + * @see FlowColorDotTokenOverlay#getShape(java.awt.Rectangle, net.rptools.maptool.model.Token) + */ @Override protected Shape getShape(Rectangle bounds, Token token) { Rectangle2D r = getFlow().getStateBounds2D(bounds, token, getName()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/ImageTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/ImageTokenOverlay.java index 8f493d8198..e3e9dc5cf6 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/ImageTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/ImageTokenOverlay.java @@ -53,7 +53,9 @@ public ImageTokenOverlay(String name, MD5Key anAssetId) { assetId = anAssetId; } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new ImageTokenOverlay(getName(), assetId); @@ -95,7 +97,9 @@ public void paintOverlay(Graphics2D g, Token token, Rectangle bounds) { g.setComposite(tempComposite); } - /** @return Getter for assetId */ + /** + * @return Getter for assetId + */ public MD5Key getAssetId() { return assetId; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/MultipleImageBarTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/MultipleImageBarTokenOverlay.java index 553f2766b2..b5d3fed496 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/MultipleImageBarTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/MultipleImageBarTokenOverlay.java @@ -54,7 +54,9 @@ public MultipleImageBarTokenOverlay(String name, MD5Key[] theAssetIds) { assetIds = theAssetIds; } - /** @see AbstractTokenOverlay#clone() */ + /** + * @see AbstractTokenOverlay#clone() + */ @Override public Object clone() { BarTokenOverlay overlay = new MultipleImageBarTokenOverlay(getName(), assetIds); @@ -105,12 +107,16 @@ public void paintOverlay(Graphics2D g, Token token, Rectangle bounds, double val g.setComposite(tempComposite); } - /** @return Getter for bottomAssetId */ + /** + * @return Getter for bottomAssetId + */ public MD5Key[] getAssetIds() { return assetIds; } - /** @param theAssetIds Setter for bottomAssetId */ + /** + * @param theAssetIds Setter for bottomAssetId + */ public void setAssetIds(MD5Key[] theAssetIds) { this.assetIds = theAssetIds; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/OTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/OTokenOverlay.java index c739ab6b94..31b9c9795f 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/OTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/OTokenOverlay.java @@ -49,7 +49,9 @@ public OTokenOverlay(String aName, Color aColor, int aWidth) { super(aName, aColor, aWidth); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new OTokenOverlay(getName(), getColor(), getWidth()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/ShadedTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/ShadedTokenOverlay.java index 4a97740686..e18bab642c 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/ShadedTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/ShadedTokenOverlay.java @@ -82,7 +82,9 @@ public void paintOverlay(Graphics2D g, Token aToken, Rectangle bounds) { g.setComposite(tempComposite); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new ShadedTokenOverlay(getName(), getColor()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/SingleImageBarTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/SingleImageBarTokenOverlay.java index fb26322c9f..fceb2a5d77 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/SingleImageBarTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/SingleImageBarTokenOverlay.java @@ -52,7 +52,9 @@ public SingleImageBarTokenOverlay(String name, MD5Key theAssetId) { assetId = theAssetId; } - /** @see AbstractTokenOverlay#clone() */ + /** + * @see AbstractTokenOverlay#clone() + */ @Override public Object clone() { BarTokenOverlay overlay = new SingleImageBarTokenOverlay(getName(), assetId); @@ -130,12 +132,16 @@ public void paintOverlay(Graphics2D g, Token token, Rectangle bounds, double val g.setComposite(tempComposite); } - /** @return Getter for assetId */ + /** + * @return Getter for assetId + */ public MD5Key getAssetId() { return assetId; } - /** @param topAssetId Setter for assetId */ + /** + * @param topAssetId Setter for assetId + */ public void setAssetId(MD5Key topAssetId) { this.assetId = topAssetId; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/TriangleTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/TriangleTokenOverlay.java index a98bf76b17..cf89173ecc 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/TriangleTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/TriangleTokenOverlay.java @@ -48,7 +48,9 @@ public TriangleTokenOverlay(String aName, Color aColor, int aWidth) { super(aName, aColor, aWidth); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new TriangleTokenOverlay(getName(), getColor(), getWidth()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/TwoImageBarTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/TwoImageBarTokenOverlay.java index fef1050b32..f4188c469a 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/TwoImageBarTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/TwoImageBarTokenOverlay.java @@ -57,7 +57,9 @@ public TwoImageBarTokenOverlay(String name, MD5Key theTopAssetId, MD5Key theBott bottomAssetId = theBottomAssetId; } - /** @see AbstractTokenOverlay#clone() */ + /** + * @see AbstractTokenOverlay#clone() + */ @Override public Object clone() { BarTokenOverlay overlay = new TwoImageBarTokenOverlay(getName(), topAssetId, bottomAssetId); @@ -142,22 +144,30 @@ public void paintOverlay(Graphics2D g, Token token, Rectangle bounds, double val g.setComposite(tempComposite); } - /** @return Getter for bottomAssetId */ + /** + * @return Getter for bottomAssetId + */ public MD5Key getBottomAssetId() { return bottomAssetId; } - /** @param bottomAssetId Setter for bottomAssetId */ + /** + * @param bottomAssetId Setter for bottomAssetId + */ public void setBottomAssetId(MD5Key bottomAssetId) { this.bottomAssetId = bottomAssetId; } - /** @return Getter for topAssetId */ + /** + * @return Getter for topAssetId + */ public MD5Key getTopAssetId() { return topAssetId; } - /** @param topAssetId Setter for topAssetId */ + /** + * @param topAssetId Setter for topAssetId + */ public void setTopAssetId(MD5Key topAssetId) { this.topAssetId = topAssetId; } diff --git a/src/main/java/net/rptools/maptool/client/ui/token/TwoToneBarTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/TwoToneBarTokenOverlay.java index 26eeb285a2..6c7db0b0dd 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/TwoToneBarTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/TwoToneBarTokenOverlay.java @@ -20,7 +20,9 @@ import net.rptools.maptool.model.Token; import net.rptools.maptool.server.proto.BarTokenOverlayDto; -/** @author Jay */ +/** + * @author Jay + */ public class TwoToneBarTokenOverlay extends DrawnBarTokenOverlay { /** Background color of the bar. */ @@ -44,12 +46,16 @@ public TwoToneBarTokenOverlay() { this(DEFAULT_STATE_NAME, Color.RED, Color.BLACK, 5); } - /** @return Getter for bgColor */ + /** + * @return Getter for bgColor + */ public Color getBgColor() { return bgColor; } - /** @param bgColor Setter for bgColor */ + /** + * @param bgColor Setter for bgColor + */ public void setBgColor(Color bgColor) { this.bgColor = bgColor; } @@ -93,7 +99,9 @@ public void paintOverlay(Graphics2D g, Token token, Rectangle bounds, double val g.setColor(tempColor); } - /** @see AbstractTokenOverlay#clone() */ + /** + * @see AbstractTokenOverlay#clone() + */ @Override public Object clone() { BarTokenOverlay overlay = diff --git a/src/main/java/net/rptools/maptool/client/ui/token/XTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/XTokenOverlay.java index d272dc4fe8..6719cf9b70 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/XTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/XTokenOverlay.java @@ -82,7 +82,9 @@ public void paintOverlay(Graphics2D g, Token aToken, Rectangle bounds) { g.setComposite(tempComposite); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new XTokenOverlay(getName(), getColor(), getWidth()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/YieldTokenOverlay.java b/src/main/java/net/rptools/maptool/client/ui/token/YieldTokenOverlay.java index 86446f865b..f810f6e5a8 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/YieldTokenOverlay.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/YieldTokenOverlay.java @@ -48,7 +48,9 @@ public YieldTokenOverlay(String aName, Color aColor, int aWidth) { super(aName, aColor, aWidth); } - /** @see BooleanTokenOverlay#clone() */ + /** + * @see BooleanTokenOverlay#clone() + */ @Override public Object clone() { BooleanTokenOverlay overlay = new YieldTokenOverlay(getName(), getColor(), getWidth()); diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java index 7a2e914016..082bbf9f31 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java @@ -948,7 +948,9 @@ private void updateStatesPanel() { } } - /** @return Getter for tokenSaved */ + /** + * @return Getter for tokenSaved + */ public boolean isTokenSaved() { return tokenSaved; } @@ -1387,7 +1389,9 @@ public void initTokenTopologyPanel() { getVisibilityToleranceSpinner().setModel(new SpinnerNumberModel(2, 1, 9, 1)); } - /** @param regenerate Only regenerate topology from token image when needed */ + /** + * @param regenerate Only regenerate topology from token image when needed + */ protected void updateAutoGeneratedTopology(boolean regenerate) { if (getTokenTopologyPanel().getAutoGenerated()) { getTokenTopologyPanel().setInProgress(true); diff --git a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeListCellRenderer.java b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeListCellRenderer.java index 9a79bbe319..bd51c8d96c 100644 --- a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeListCellRenderer.java +++ b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeListCellRenderer.java @@ -225,7 +225,9 @@ public Component getListCellRendererComponent( */ public class NameLabel extends JLabel { - /** @see javax.swing.JComponent#paintComponent(java.awt.Graphics) */ + /** + * @see javax.swing.JComponent#paintComponent(java.awt.Graphics) + */ @Override protected void paintComponent(Graphics g) { boolean initStateSecondLine = panel.isInitStateSecondLine() && panel.isShowInitState(); @@ -235,7 +237,9 @@ protected void paintComponent(Graphics g) { super.paintComponent(g); } - /** @see javax.swing.JComponent#getPreferredSize() */ + /** + * @see javax.swing.JComponent#getPreferredSize() + */ @Override public Dimension getPreferredSize() { boolean initStateSecondLine = panel.isInitStateSecondLine() && panel.isShowInitState(); @@ -315,13 +319,17 @@ public Image scaleImage() { return bi; } - /** @see javax.swing.ImageIcon#getIconHeight() */ + /** + * @see javax.swing.ImageIcon#getIconHeight() + */ @Override public int getIconHeight() { return panel.isShowTokenStates() ? ICON_SIZE : textTokenSize; } - /** @see javax.swing.ImageIcon#getIconWidth() */ + /** + * @see javax.swing.ImageIcon#getIconWidth() + */ @Override public int getIconWidth() { return panel.isShowTokenStates() ? ICON_SIZE : textTokenSize; diff --git a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativePanel.java b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativePanel.java index 8645711ddb..38bbd8c488 100644 --- a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativePanel.java +++ b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativePanel.java @@ -318,12 +318,16 @@ private void updateRound() { else round.setText(""); } - /** @return Getter for list */ + /** + * @return Getter for list + */ public InitiativeList getList() { return list; } - /** @param theList Setter for the list to set */ + /** + * @param theList Setter for the list to set + */ public void setList(InitiativeList theList) { // Remove the old list if (list == theList) return; @@ -348,22 +352,30 @@ public void setList(InitiativeList theList) { }); } - /** @return Getter for showTokens */ + /** + * @return Getter for showTokens + */ public boolean isShowTokens() { return showTokens; } - /** @return Getter for showTokenStates */ + /** + * @return Getter for showTokenStates + */ public boolean isShowTokenStates() { return showTokenStates; } - /** @return Getter for showInitState */ + /** + * @return Getter for showInitState + */ public boolean isShowInitState() { return showInitState; } - /** @return Getter for model */ + /** + * @return Getter for model + */ public InitiativeListModel getModel() { return model; } @@ -417,23 +429,31 @@ public boolean hasGMPermission() { return (MapTool.getPlayer() == null || MapTool.getPlayer().isGM()); } - /** @return Getter for ownerPermissions */ + /** + * @return Getter for ownerPermissions + */ public boolean isOwnerPermissions() { return ownerPermissions; } - /** @param anOwnerPermissions Setter for ownerPermissions */ + /** + * @param anOwnerPermissions Setter for ownerPermissions + */ public void setOwnerPermissions(boolean anOwnerPermissions) { ownerPermissions = anOwnerPermissions; updateView(); } - /** @return Getter for MovementLock */ + /** + * @return Getter for MovementLock + */ public boolean isMovementLock() { return movementLock; } - /** @param anMovementLock Setter for MovementLock */ + /** + * @param anMovementLock Setter for MovementLock + */ public void setMovementLock(boolean anMovementLock) { movementLock = anMovementLock; } @@ -481,12 +501,16 @@ public boolean isMovementLocked(Token token) { return true; } - /** @return Getter for initStateSecondLine */ + /** + * @return Getter for initStateSecondLine + */ public boolean isInitStateSecondLine() { return initStateSecondLine; } - /** @param initStateSecondLine Setter for initStateSecondLine */ + /** + * @param initStateSecondLine Setter for initStateSecondLine + */ public void setInitStateSecondLine(boolean initStateSecondLine) { this.initStateSecondLine = initStateSecondLine; } @@ -554,7 +578,9 @@ public void valueChanged(ListSelectionEvent e) { * PropertyChangeListener Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ + /** + * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) + */ @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(InitiativeList.ROUND_PROP)) { @@ -850,7 +876,9 @@ public void actionPerformed(ActionEvent e) { */ private class MouseHandler extends MouseAdapter { - /** @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) */ + /** + * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) + */ @Override public void mouseClicked(MouseEvent e) { diff --git a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferHandler.java b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferHandler.java index 06d5d09a5f..61db439d96 100644 --- a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferHandler.java +++ b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferHandler.java @@ -102,13 +102,17 @@ public boolean importData(JComponent comp, Transferable t) { return false; } - /** @see javax.swing.TransferHandler#getSourceActions(javax.swing.JComponent) */ + /** + * @see javax.swing.TransferHandler#getSourceActions(javax.swing.JComponent) + */ @Override public int getSourceActions(JComponent c) { return COPY_OR_MOVE; } - /** @see javax.swing.TransferHandler#createTransferable(javax.swing.JComponent) */ + /** + * @see javax.swing.TransferHandler#createTransferable(javax.swing.JComponent) + */ @Override protected Transferable createTransferable(JComponent c) { JList displayList = (JList) c; diff --git a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferable.java b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferable.java index 1291f491b5..e7a015ec5c 100644 --- a/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferable.java +++ b/src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeTransferable.java @@ -82,7 +82,9 @@ public InitiativeTransferable(GUID anId, int init) { * Transferable Method Implementations *-------------------------------------------------------------------------------------------*/ - /** @see java.awt.datatransfer.Transferable#getTransferData(java.awt.datatransfer.DataFlavor) */ + /** + * @see java.awt.datatransfer.Transferable#getTransferData(java.awt.datatransfer.DataFlavor) + */ public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException { if (INIT_TOKEN_FLAVOR.equals(flavor)) { return this; @@ -92,7 +94,9 @@ public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorExcepti throw new UnsupportedFlavorException(flavor); } - /** @see java.awt.datatransfer.Transferable#getTransferDataFlavors() */ + /** + * @see java.awt.datatransfer.Transferable#getTransferDataFlavors() + */ public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[] {INIT_TOKEN_FLAVOR}; } @@ -108,12 +112,16 @@ public boolean isDataFlavorSupported(DataFlavor flavor) { * Instance Methods *-------------------------------------------------------------------------------------------*/ - /** @return Getter for id */ + /** + * @return Getter for id + */ public GUID getId() { return id; } - /** @return Getter for initiative */ + /** + * @return Getter for initiative + */ public int getInititiave() { return inititiave; } diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/PlayerView.java b/src/main/java/net/rptools/maptool/client/ui/zone/PlayerView.java index 21c20d9320..91cbe979e4 100644 --- a/src/main/java/net/rptools/maptool/client/ui/zone/PlayerView.java +++ b/src/main/java/net/rptools/maptool/client/ui/zone/PlayerView.java @@ -49,7 +49,9 @@ public List getTokens() { return tokens; } - /** @return true if the view is for some tokens only, false if the view is global */ + /** + * @return true if the view is for some tokens only, false if the view is global + */ public boolean isUsingTokenView() { return tokens != null; } diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/SelectionModel.java b/src/main/java/net/rptools/maptool/client/ui/zone/SelectionModel.java index a5f33e9023..2167e313d9 100644 --- a/src/main/java/net/rptools/maptool/client/ui/zone/SelectionModel.java +++ b/src/main/java/net/rptools/maptool/client/ui/zone/SelectionModel.java @@ -38,7 +38,9 @@ public record SelectionChanged(Zone zone) {} /** How long {@link #selectionHistory} can get before old entries are forgotten. */ private int maxHistoryLength = 20; - /** @param zone The zone in which selections will be managed. */ + /** + * @param zone The zone in which selections will be managed. + */ public SelectionModel(Zone zone) { this.zone = zone; } diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/ZoneRenderer.java b/src/main/java/net/rptools/maptool/client/ui/zone/ZoneRenderer.java index 75700c49e6..b1b285502b 100644 --- a/src/main/java/net/rptools/maptool/client/ui/zone/ZoneRenderer.java +++ b/src/main/java/net/rptools/maptool/client/ui/zone/ZoneRenderer.java @@ -641,7 +641,9 @@ public void flush(Token token) { zoneView.flush(token); } - /** @return the ZoneView */ + /** + * @return the ZoneView + */ public ZoneView getZoneView() { return zoneView; } @@ -681,7 +683,9 @@ public void flushFog() { repaintDebouncer.dispatch(); } - /** @return the Zone */ + /** + * @return the Zone + */ public Zone getZone() { return zone; } @@ -4111,7 +4115,9 @@ public SelectionSet(String playerId, GUID tokenGUID, Set selectionList) { } } - /** @return path computation. */ + /** + * @return path computation. + */ public Path getGridlessPath() { return gridlessPath; } diff --git a/src/main/java/net/rptools/maptool/client/ui/zone/vbl/AreaMeta.java b/src/main/java/net/rptools/maptool/client/ui/zone/vbl/AreaMeta.java index 6afdda5e5e..5b951aaa7a 100644 --- a/src/main/java/net/rptools/maptool/client/ui/zone/vbl/AreaMeta.java +++ b/src/main/java/net/rptools/maptool/client/ui/zone/vbl/AreaMeta.java @@ -46,7 +46,9 @@ public Area getBounds() { return new Area(area); } - /** @return true if this object does not have any edges. */ + /** + * @return true if this object does not have any edges. + */ public boolean isEmpty() { // Note: vertices is a closed loop, so we can only have edges if we have at least 3 points with // which to form a line. diff --git a/src/main/java/net/rptools/maptool/client/walker/AbstractZoneWalker.java b/src/main/java/net/rptools/maptool/client/walker/AbstractZoneWalker.java index 411f7afd80..1bea16bc2b 100644 --- a/src/main/java/net/rptools/maptool/client/walker/AbstractZoneWalker.java +++ b/src/main/java/net/rptools/maptool/client/walker/AbstractZoneWalker.java @@ -197,7 +197,9 @@ public boolean toggleWaypoint(CellPoint aPoint) { return true; } - /** @see java.lang.Object#toString() */ + /** + * @see java.lang.Object#toString() + */ @Override public String toString() { StringBuilder s = new StringBuilder("Path: "); @@ -229,7 +231,9 @@ public PartialPath(CellPoint start, CellPoint end, List path) { } } - /** @see java.lang.Object#toString() */ + /** + * @see java.lang.Object#toString() + */ @Override public String toString() { StringBuilder s = new StringBuilder("PartialPath(["); diff --git a/src/main/java/net/rptools/maptool/model/Campaign.java b/src/main/java/net/rptools/maptool/model/Campaign.java index e547429dc3..1bc572811c 100644 --- a/src/main/java/net/rptools/maptool/model/Campaign.java +++ b/src/main/java/net/rptools/maptool/model/Campaign.java @@ -664,22 +664,30 @@ public Set getAllAssetIds() { return assetSet; } - /** @return Getter for initiativeOwnerPermissions */ + /** + * @return Getter for initiativeOwnerPermissions + */ public boolean isInitiativeOwnerPermissions() { return campaignProperties != null && campaignProperties.isInitiativeOwnerPermissions(); } - /** @param initiativeOwnerPermissions Setter for initiativeOwnerPermissions */ + /** + * @param initiativeOwnerPermissions Setter for initiativeOwnerPermissions + */ public void setInitiativeOwnerPermissions(boolean initiativeOwnerPermissions) { campaignProperties.setInitiativeOwnerPermissions(initiativeOwnerPermissions); } - /** @return Getter for initiativeMovementLock */ + /** + * @return Getter for initiativeMovementLock + */ public boolean isInitiativeMovementLock() { return campaignProperties != null && campaignProperties.isInitiativeMovementLock(); } - /** @param initiativeMovementLock Setter for initiativeMovementLock */ + /** + * @param initiativeMovementLock Setter for initiativeMovementLock + */ public void setInitiativeMovementLock(boolean initiativeMovementLock) { campaignProperties.setInitiativeMovementLock(initiativeMovementLock); } @@ -700,7 +708,9 @@ public void setInitiativePanelButtonsDisabled(boolean disabled) { campaignProperties.setInitiativePanelButtonsDisabled(disabled); } - /** @return Getter for characterSheets */ + /** + * @return Getter for characterSheets + */ public Map getCharacterSheets() { return getCampaignProperties().getCharacterSheets(); } diff --git a/src/main/java/net/rptools/maptool/model/CampaignProperties.java b/src/main/java/net/rptools/maptool/model/CampaignProperties.java index e4bea967f4..949d56ba39 100644 --- a/src/main/java/net/rptools/maptool/model/CampaignProperties.java +++ b/src/main/java/net/rptools/maptool/model/CampaignProperties.java @@ -345,22 +345,30 @@ public Set getAllImageAssets() { return set; } - /** @return Getter for initiativeOwnerPermissions */ + /** + * @return Getter for initiativeOwnerPermissions + */ public boolean isInitiativeOwnerPermissions() { return initiativeOwnerPermissions; } - /** @param initiativeOwnerPermissions Setter for initiativeOwnerPermissions */ + /** + * @param initiativeOwnerPermissions Setter for initiativeOwnerPermissions + */ public void setInitiativeOwnerPermissions(boolean initiativeOwnerPermissions) { this.initiativeOwnerPermissions = initiativeOwnerPermissions; } - /** @return Getter for initiativeMovementLock */ + /** + * @return Getter for initiativeMovementLock + */ public boolean isInitiativeMovementLock() { return initiativeMovementLock; } - /** @param initiativeMovementLock Setter for initiativeMovementLock */ + /** + * @param initiativeMovementLock Setter for initiativeMovementLock + */ public void setInitiativeMovementLock(boolean initiativeMovementLock) { this.initiativeMovementLock = initiativeMovementLock; } @@ -391,7 +399,9 @@ public Map getCharacterSheets() { return characterSheets; } - /** @param characterSheets Setter for characterSheets */ + /** + * @param characterSheets Setter for characterSheets + */ public void setCharacterSheets(Map characterSheets) { this.characterSheets.clear(); this.characterSheets.putAll(characterSheets); diff --git a/src/main/java/net/rptools/maptool/model/Grid.java b/src/main/java/net/rptools/maptool/model/Grid.java index 721ba64110..20ead3bfad 100644 --- a/src/main/java/net/rptools/maptool/model/Grid.java +++ b/src/main/java/net/rptools/maptool/model/Grid.java @@ -240,7 +240,9 @@ public double getCellHeight() { return 0; } - /** @return the difference in pixels between the center of a cell and its converted zonepoint. */ + /** + * @return the difference in pixels between the center of a cell and its converted zonepoint. + */ public abstract Point2D.Double getCenterOffset(); /** @@ -290,12 +292,16 @@ public void setOffset(int offsetX, int offsetY) { fireGridChanged(); } - /** @return The x component of the grid's offset. */ + /** + * @return The x component of the grid's offset. + */ public int getOffsetX() { return offsetX; } - /** @return The y component of the grid's offset */ + /** + * @return The y component of the grid's offset + */ public int getOffsetY() { return offsetY; } diff --git a/src/main/java/net/rptools/maptool/model/HexGrid.java b/src/main/java/net/rptools/maptool/model/HexGrid.java index 499a2b23eb..d887e9152c 100644 --- a/src/main/java/net/rptools/maptool/model/HexGrid.java +++ b/src/main/java/net/rptools/maptool/model/HexGrid.java @@ -184,12 +184,16 @@ public Rectangle getBounds(CellPoint cp) { return new Rectangle(zp.x, zp.y, w, h); } - /** @return Distance from the center to edge of a hex */ + /** + * @return Distance from the center to edge of a hex + */ public double getVRadius() { return minorRadius; } - /** @return Distance from the center to vertex of a hex */ + /** + * @return Distance from the center to vertex of a hex + */ public double getURadius() { return edgeLength / 2 + edgeProjection; } diff --git a/src/main/java/net/rptools/maptool/model/InitiativeList.java b/src/main/java/net/rptools/maptool/model/InitiativeList.java index 75603d9a67..4b18b4c8cf 100644 --- a/src/main/java/net/rptools/maptool/model/InitiativeList.java +++ b/src/main/java/net/rptools/maptool/model/InitiativeList.java @@ -263,12 +263,16 @@ public TokenInitiative getCurrentTokenInitiative() { return currentIndex < 0 ? null : getTokenInitiative(currentIndex); } - /** @return Getter for current */ + /** + * @return Getter for current + */ public int getCurrent() { return current; } - /** @param aCurrent Setter for the current to set */ + /** + * @param aCurrent Setter for the current to set + */ public void setCurrent(int aCurrent) { if (current == aCurrent) return; startUnitOfWork(); @@ -329,12 +333,16 @@ && callForInitiativeChangeVetoes( finishUnitOfWork(); } - /** @return Getter for round */ + /** + * @return Getter for round + */ public int getRound() { return round; } - /** @param aRound Setter for the round to set */ + /** + * @param aRound Setter for the round to set + */ public void setRound(int aRound) { if (round == aRound) return; startUnitOfWork(); @@ -525,13 +533,17 @@ public void sort(boolean ascendingOrder) { finishUnitOfWork(); } - /** @return Getter for zone */ + /** + * @return Getter for zone + */ public Zone getZone() { if (zone == null && zoneId != null) zone = MapTool.getCampaign().getZone(zoneId); return zone; } - /** @return Getter for pcs */ + /** + * @return Getter for pcs + */ private PropertyChangeSupport getPCS() { if (pcs == null) pcs = new PropertyChangeSupport(this); return pcs; @@ -598,7 +610,9 @@ public void updateServer(TokenInitiative ti) { .updateTokenInitiative(zoneId, ti.getId(), ti.isHolding(), ti.getState(), indexOf(ti)); } - /** @param aZone Setter for the zone */ + /** + * @param aZone Setter for the zone + */ public void setZone(Zone aZone) { zone = aZone; if (aZone != null) { @@ -608,12 +622,16 @@ public void setZone(Zone aZone) { } // endif } - /** @return Getter for hideNPC */ + /** + * @return Getter for hideNPC + */ public boolean isHideNPC() { return hideNPC; } - /** @param hide Setter for hideNPC */ + /** + * @param hide Setter for hideNPC + */ public void setHideNPC(boolean hide) { if (hide == hideNPC) return; startUnitOfWork(); @@ -623,7 +641,9 @@ public void setHideNPC(boolean hide) { finishUnitOfWork(); } - /** @return Getter for tokens */ + /** + * @return Getter for tokens + */ public List getTokens() { return Collections.unmodifiableList(tokens); } @@ -854,22 +874,30 @@ public TokenInitiative(Token aToken) { * Instance Methods *-------------------------------------------------------------------------------------------*/ - /** @return Getter for token */ + /** + * @return Getter for token + */ public Token getToken() { return getZone().getToken(id); } - /** @return Getter for id */ + /** + * @return Getter for id + */ public GUID getId() { return id; } - /** @param id Setter for the id to set */ + /** + * @param id Setter for the id to set + */ public void setId(GUID id) { this.id = id; } - /** @return Getter for holding */ + /** + * @return Getter for holding + */ public boolean isHolding() { return holding; } @@ -888,7 +916,9 @@ public void setHolding(boolean isHolding) { finishUnitOfWork(this); } - /** @return Getter for state */ + /** + * @return Getter for state + */ public String getState() { return state; } @@ -907,7 +937,9 @@ public void setState(String aState) { finishUnitOfWork(this); } - /** @return Getter for displayIcon */ + /** + * @return Getter for displayIcon + */ public Icon getDisplayIcon() { return displayIcon; } diff --git a/src/main/java/net/rptools/maptool/model/InitiativeListModel.java b/src/main/java/net/rptools/maptool/model/InitiativeListModel.java index ac7d86fcc1..9b6a65580a 100644 --- a/src/main/java/net/rptools/maptool/model/InitiativeListModel.java +++ b/src/main/java/net/rptools/maptool/model/InitiativeListModel.java @@ -83,12 +83,16 @@ public void updateModel() { fireContentsChanged(this, 0, getSize() - 1); } - /** @return Getter for list */ + /** + * @return Getter for list + */ public InitiativeList getList() { return list; } - /** @param theList Setter for the list to set */ + /** + * @param theList Setter for the list to set + */ public void setList(InitiativeList theList) { // Remove the old list @@ -137,7 +141,9 @@ public static boolean isTokenVisible(Token token, boolean hideNPC) { * PropertyChangeEvent Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ + /** + * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) + */ @SuppressWarnings("unchecked") public void propertyChange(PropertyChangeEvent evt) { diff --git a/src/main/java/net/rptools/maptool/model/LightSource.java b/src/main/java/net/rptools/maptool/model/LightSource.java index aab4d4f3c7..a633a70e99 100644 --- a/src/main/java/net/rptools/maptool/model/LightSource.java +++ b/src/main/java/net/rptools/maptool/model/LightSource.java @@ -168,7 +168,9 @@ public void remove(@Nonnull Light source) { lightList.remove(source); } - /** @return the lights belonging to this LightSource. */ + /** + * @return the lights belonging to this LightSource. + */ public @Nonnull List getLightList() { return Collections.unmodifiableList(lightList); } diff --git a/src/main/java/net/rptools/maptool/model/LookupTable.java b/src/main/java/net/rptools/maptool/model/LookupTable.java index 9f79b0b51a..7e789c412b 100644 --- a/src/main/java/net/rptools/maptool/model/LookupTable.java +++ b/src/main/java/net/rptools/maptool/model/LookupTable.java @@ -373,7 +373,9 @@ public static class LookupEntry { private @Nullable String value; private @Nullable MD5Key imageId; - /** @deprecated here to prevent xstream from breaking b24-b25 */ + /** + * @deprecated here to prevent xstream from breaking b24-b25 + */ @Deprecated private @Nullable String result; public LookupEntry(int min, int max, String value, MD5Key imageId) { diff --git a/src/main/java/net/rptools/maptool/model/Token.java b/src/main/java/net/rptools/maptool/model/Token.java index 07fa78f775..cc96fd3b6e 100644 --- a/src/main/java/net/rptools/maptool/model/Token.java +++ b/src/main/java/net/rptools/maptool/model/Token.java @@ -674,7 +674,9 @@ public Color getHaloColor() { return haloColor; } - /** @return The token opacity, in the range [0.0f, 1.0f]. */ + /** + * @return The token opacity, in the range [0.0f, 1.0f]. + */ public float getTokenOpacity() { return tokenOpacity; } @@ -1017,7 +1019,9 @@ public boolean hasLightSource(LightSource source) { return false; } - /** @return false if lightSourceList is null or empty, and true otherwise */ + /** + * @return false if lightSourceList is null or empty, and true otherwise + */ public boolean hasLightSources() { return !lightSourceList.isEmpty(); } @@ -1031,7 +1035,9 @@ public synchronized void addOwner(String playerId) { ownerList.add(playerId); } - /** @return true if the token is owned by all or has explicit owners. */ + /** + * @return true if the token is owned by all or has explicit owners. + */ public synchronized boolean hasOwners() { return ownerType == OWNER_TYPE_ALL || !ownerList.isEmpty(); } @@ -1050,7 +1056,9 @@ public synchronized void setOwnedByAll(boolean ownedByAll) { } } - /** @return the set of owner names of the token. */ + /** + * @return the set of owner names of the token. + */ public Set getOwners() { return Collections.unmodifiableSet(ownerList); } @@ -1290,12 +1298,16 @@ public void setScaleY(double scaleY) { this.scaleY = scaleY; } - /** @return Returns the snapScale. */ + /** + * @return Returns the snapScale. + */ public boolean isSnapToScale() { return snapToScale; } - /** @param snapScale The snapScale to set. */ + /** + * @param snapScale The snapScale to set. + */ public void setSnapToScale(boolean snapScale) { this.snapToScale = snapScale; } @@ -1304,17 +1316,23 @@ public void setVisible(boolean visible) { this.isVisible = visible; } - /** @return isVisible */ + /** + * @return isVisible + */ public boolean isVisible() { return isVisible; } - /** @return the visibleOnlyToOwner */ + /** + * @return the visibleOnlyToOwner + */ public boolean isVisibleOnlyToOwner() { return visibleOnlyToOwner; } - /** @param visibleOnlyToOwner the visibleOnlyToOwner to set */ + /** + * @param visibleOnlyToOwner the visibleOnlyToOwner to set + */ public void setVisibleOnlyToOwner(boolean visibleOnlyToOwner) { this.visibleOnlyToOwner = visibleOnlyToOwner; } @@ -1661,7 +1679,9 @@ private Point2D.Double getSnapToUnsnapOffset(Zone zone) { return new Point2D.Double(offsetX, offsetY); } - /** @return the String of the sightType */ + /** + * @return the String of the sightType + */ public String getSightType() { return sightType; } @@ -1855,12 +1875,16 @@ public Object getEvaluatedProperty(MapToolVariableResolver resolver, String key) return val; } - /** @return all property names, all in lowercase. */ + /** + * @return all property names, all in lowercase. + */ public Set getPropertyNames() { return getPropertyMap().keySet(); } - /** @return all property names, preserving their case. */ + /** + * @return all property names, preserving their case. + */ public Set getPropertyNamesRaw() { return getPropertyMap().keySetRaw(); } @@ -2045,12 +2069,16 @@ public Set getStatePropertyNames(Object value) { return matches.keySet(); } - /** @return Getter for notes */ + /** + * @return Getter for notes + */ public String getNotes() { return notes; } - /** @param aNotes Setter for notes */ + /** + * @param aNotes Setter for notes + */ public void setNotes(String aNotes) { notes = aNotes; } @@ -2128,7 +2156,9 @@ public int getAnchorY() { return anchorY; } - /** @return the scale of the token layout */ + /** + * @return the scale of the token layout + */ public double getSizeScale() { return sizeScale; } @@ -2514,12 +2544,16 @@ protected Object readResolve() { return this; } - /** @param exposedAreaGUID the exposedAreaGUID to set */ + /** + * @param exposedAreaGUID the exposedAreaGUID to set + */ public void setExposedAreaGUID(GUID exposedAreaGUID) { this.exposedAreaGUID = exposedAreaGUID; } - /** @return the exposedAreaGUID */ + /** + * @return the exposedAreaGUID + */ public GUID getExposedAreaGUID() { return exposedAreaGUID; } @@ -2538,7 +2572,9 @@ public Token clone() { } } - /** @return is token an image/lib token */ + /** + * @return is token an image/lib token + */ public boolean isImgOrLib() { return (getName().toLowerCase().startsWith("image:") || getName().toLowerCase().startsWith("lib:")); diff --git a/src/main/java/net/rptools/maptool/model/Zone.java b/src/main/java/net/rptools/maptool/model/Zone.java index 0332f33194..306a7a4fbf 100644 --- a/src/main/java/net/rptools/maptool/model/Zone.java +++ b/src/main/java/net/rptools/maptool/model/Zone.java @@ -137,7 +137,9 @@ public String toString() { /** A simple interface to allow layers to be turned on/off */ private boolean drawEnabled = true; - /** @return drawEnabled */ + /** + * @return drawEnabled + */ public boolean isEnabled() { return drawEnabled; } @@ -384,7 +386,9 @@ public void setTokenSelection(TokenSelection tokenSelection) { this.tokenSelection = tokenSelection; } - /** @return the distance in map pixels at a 1:1 zoom */ + /** + * @return the distance in map pixels at a 1:1 zoom + */ public int getTokenVisionInPixels() { if (tokenVisionDistance == 0) { // TODO: This is here to provide transition between pre 1.3b19 an 1.3b19. Remove later @@ -397,12 +401,16 @@ public void setFogPaint(DrawablePaint paint) { fogPaint = paint; } - /** @return name of the zone */ + /** + * @return name of the zone + */ public @Nonnull String getName() { return name; } - /** @return The zone's player alias, if set. Otherwise {@code null}. */ + /** + * @return The zone's player alias, if set. Otherwise {@code null}. + */ public @Nullable String getPlayerAlias() { return playerAlias; } @@ -1725,7 +1733,9 @@ public List removeTokens(List tokensToKeep, List tokensToRe return Collections.unmodifiableList(originalList); } - /** @return list of non-stamp tokens, both pc and npc */ + /** + * @return list of non-stamp tokens, both pc and npc + */ public List getTokens() { return getTokens(true); } @@ -1849,7 +1859,9 @@ public List getOwnedTokensWithSight(Player p) { }); } - /** @return list of PCs tokens with sight. For FogUtil.exposePCArea to skip sight test. */ + /** + * @return list of PCs tokens with sight. For FogUtil.exposePCArea to skip sight test. + */ public List getPlayerTokensWithSight() { return getTokensFiltered(t -> t.getType() == Token.Type.PC && t.getHasSight()); } @@ -2007,17 +2019,23 @@ private int getFigureZOrder(Token t) { return bottom - centre; } - /** @return this */ + /** + * @return this + */ private Zone getZone() { return this; } - /** @return Getter for initiativeList */ + /** + * @return Getter for initiativeList + */ public InitiativeList getInitiativeList() { return initiativeList; } - /** @param initiativeList Setter for the initiativeList */ + /** + * @param initiativeList Setter for the initiativeList + */ public void setInitiativeList(InitiativeList initiativeList) { this.initiativeList = initiativeList; new MapToolEventBus().getMainEventBus().post(new InitiativeListChanged(initiativeList)); @@ -2177,7 +2195,9 @@ protected Object readResolve() { return this; } - /** @return the exposedAreaMeta. */ + /** + * @return the exposedAreaMeta. + */ public Map getExposedAreaMetaData() { if (exposedAreaMeta == null) { exposedAreaMeta = new HashMap(); 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 8c8f291b89..b15bf75782 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/AbstractTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/AbstractTemplate.java @@ -331,13 +331,17 @@ public int getDistance(int x, int y) { * Overridden AbstractDrawing Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D) + */ @Override protected void draw(Graphics2D g) { paint(g, true, false); } - /** @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D) + */ @Override protected void drawBackground(Graphics2D g) { 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 76f8c164bd..7398001059 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/BlastTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/BlastTemplate.java @@ -148,7 +148,9 @@ public void setVertex(ZonePoint vertex) { adjustRectangle(); } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#getDistance(int, int) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#getDistance(int, int) + */ @Override public int getDistance(int x, int y) { return Math.max(x, y); @@ -158,13 +160,17 @@ public int getDistance(int x, int y) { * Overridden AbstractDrawing Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D) + */ @Override protected void draw(Graphics2D g) { renderer.draw(g); } - /** @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D) + */ @Override protected void drawBackground(Graphics2D g) { Composite old = g.getComposite(); 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 3d4b83484c..8217a3a5e3 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/BurstTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/BurstTemplate.java @@ -83,7 +83,9 @@ private void adjustShape() { * Overridden *Template Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) + */ @Override public void setRadius(int squares) { super.setRadius(squares); @@ -100,7 +102,9 @@ public void setVertex(ZonePoint vertex) { adjustShape(); } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#getDistance(int, int) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#getDistance(int, int) + */ @Override public int getDistance(int x, int y) { return Math.max(x, y); @@ -122,14 +126,18 @@ public Rectangle getBounds() { * Overridden AbstractDrawing Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractDrawing#draw(java.awt.Graphics2D) + */ @Override protected void draw(Graphics2D g) { renderer.draw(g); vertexRenderer.draw(g); } - /** @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractDrawing#drawBackground(java.awt.Graphics2D) + */ @Override protected void drawBackground(Graphics2D g) { Composite old = g.getComposite(); 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 653e53eb13..a475c7ea5d 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/ConeTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/ConeTemplate.java @@ -257,7 +257,9 @@ private boolean withinQuadrant(Quadrant q) { * Drawable Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.Drawable#getBounds() */ + /** + * @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 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 64bfc8323d..4053a8fb04 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/Drawable.java +++ b/src/main/java/net/rptools/maptool/model/drawing/Drawable.java @@ -25,7 +25,9 @@ import net.rptools.maptool.server.proto.drawing.DrawableDto; import org.apache.logging.log4j.LogManager; -/** @author drice */ +/** + * @author drice + */ public interface Drawable { void draw(Graphics2D g, Pen pen); 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 2ca5b47a6c..7e33424dd5 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/DrawnLabel.java +++ b/src/main/java/net/rptools/maptool/model/drawing/DrawnLabel.java @@ -94,7 +94,9 @@ public void draw(Graphics2D aG) { @Override protected void drawBackground(Graphics2D g) {} - /** @see net.rptools.maptool.model.drawing.Drawable#getBounds() */ + /** + * @see net.rptools.maptool.model.drawing.Drawable#getBounds() + */ public Rectangle getBounds() { return bounds; } 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 f12c1a08ef..1a5a5f87c7 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/LineCellTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/LineCellTemplate.java @@ -160,14 +160,18 @@ protected void paint(Graphics2D g, boolean border, boolean area) { } // endfor } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#setVertex(ZonePoint) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#setVertex(ZonePoint) + */ @Override public void setVertex(ZonePoint vertex) { clearPath(); super.setVertex(vertex); } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) + */ @Override public void setRadius(int squares) { if (squares == getRadius()) { @@ -370,12 +374,16 @@ public void setMouseSlopeGreater(boolean aMouseSlopeGreater) { mouseSlopeGreater = aMouseSlopeGreater; } - /** @return Getter for path */ + /** + * @return Getter for path + */ public List getPath() { return path; } - /** @param path Setter for the path to set */ + /** + * @param path Setter for the path to set + */ public void setPath(List path) { this.path = path; } @@ -384,7 +392,9 @@ public void setPath(List path) { * Drawable Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.Drawable#getBounds() */ + /** + * @see net.rptools.maptool.model.drawing.Drawable#getBounds() + */ public Rectangle getBounds() { // Get all of the numbers needed for the calculation if (MapTool.getCampaign().getZone(getZoneId()) == null) { 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 a8d0d922c6..b10dc2669f 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/LineSegment.java +++ b/src/main/java/net/rptools/maptool/model/drawing/LineSegment.java @@ -28,7 +28,9 @@ import net.rptools.maptool.server.proto.drawing.DrawableDto; import net.rptools.maptool.server.proto.drawing.LineSegmentDrawableDto; -/** @author drice */ +/** + * @author drice + */ public class LineSegment extends AbstractDrawing { private final List points = new ArrayList(); private Float width; 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 d66f1a2952..1c146e7bbb 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/LineTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/LineTemplate.java @@ -151,14 +151,18 @@ protected void paint(Graphics2D g, boolean border, boolean area) { } // endfor } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#setVertex(ZonePoint) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#setVertex(ZonePoint) + */ @Override public void setVertex(ZonePoint vertex) { clearPath(); super.setVertex(vertex); } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) + */ @Override public void setRadius(int squares) { if (squares == getRadius()) return; @@ -362,12 +366,16 @@ public void setDoubleWide(boolean aDoubleWide) { doubleWide = aDoubleWide; } - /** @return Getter for path */ + /** + * @return Getter for path + */ public List getPath() { return path; } - /** @param path Setter for the path to set */ + /** + * @param path Setter for the path to set + */ public void setPath(List path) { this.path = path; } @@ -376,7 +384,9 @@ public void setPath(List path) { * Drawable Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.Drawable#getBounds() */ + /** + * @see net.rptools.maptool.model.drawing.Drawable#getBounds() + */ public Rectangle getBounds() { // Get all of the numbers needed for the calculation if (MapTool.getCampaign().getZone(getZoneId()) == null) { 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 8d84b7e843..cb527e89cf 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/RadiusCellTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/RadiusCellTemplate.java @@ -221,7 +221,9 @@ protected int getYMult(Quadrant q) { * Drawable Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.Drawable#getBounds() */ + /** + * @see net.rptools.maptool.model.drawing.Drawable#getBounds() + */ public Rectangle getBounds() { if (getZoneId() == null) { // This avoids a NPE when loading up a campaign @@ -268,7 +270,9 @@ private void adjustShape() { r.width = r.height = (getRadius() * 2 + 1) * gridSize; } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#setRadius(int) + */ @Override public void setRadius(int squares) { super.setRadius(squares); 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 b3cde29974..2455ea25bd 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/RadiusTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/RadiusTemplate.java @@ -118,7 +118,9 @@ protected void paintArea( * Drawable Interface Methods *-------------------------------------------------------------------------------------------*/ - /** @see net.rptools.maptool.model.drawing.Drawable#getBounds() */ + /** + * @see net.rptools.maptool.model.drawing.Drawable#getBounds() + */ public Rectangle getBounds() { if (getZoneId() == null) { // This avoids a NPE when loading up a campaign 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 83519271a4..dfe3a0c4be 100644 --- a/src/main/java/net/rptools/maptool/model/drawing/WallTemplate.java +++ b/src/main/java/net/rptools/maptool/model/drawing/WallTemplate.java @@ -40,13 +40,17 @@ public WallTemplate(GUID id) { setPathVertex(new ZonePoint(0, 0)); } - /** @see net.rptools.maptool.model.drawing.AbstractTemplate#getRadius() */ + /** + * @see net.rptools.maptool.model.drawing.AbstractTemplate#getRadius() + */ @Override public int getRadius() { return getPath() == null ? 0 : getPath().size(); } - /** @see net.rptools.maptool.model.drawing.LineTemplate#setRadius(int) */ + /** + * @see net.rptools.maptool.model.drawing.LineTemplate#setRadius(int) + */ @Override public void setRadius(int squares) { // Do nothing, calculated from path length @@ -63,7 +67,9 @@ public void setVertex(ZonePoint vertex) { v.y = vertex.y; } - /** @see net.rptools.maptool.model.drawing.LineTemplate#calcPath() */ + /** + * @see net.rptools.maptool.model.drawing.LineTemplate#calcPath() + */ @Override protected List calcPath() { return getPath(); // Do nothing, path is set by tool. 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 559dc48748..fa06326016 100644 --- a/src/main/java/net/rptools/maptool/model/player/DefaultPlayerDatabase.java +++ b/src/main/java/net/rptools/maptool/model/player/DefaultPlayerDatabase.java @@ -36,7 +36,9 @@ public class DefaultPlayerDatabase implements PlayerDatabase { private final LoggedInPlayers loggedInPlayers = new LoggedInPlayers(); DefaultPlayerDatabase(String playerPassword, String gmPassword) - throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, + throws NoSuchAlgorithmException, + InvalidKeySpecException, + NoSuchPaddingException, InvalidKeyException { byte[] salt = CipherUtil.createSalt(); this.playerPassword = CipherUtil.fromSharedKey(playerPassword, salt); 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 f0152bdb6c..10e5fa7c28 100644 --- a/src/main/java/net/rptools/maptool/model/player/LocalPlayer.java +++ b/src/main/java/net/rptools/maptool/model/player/LocalPlayer.java @@ -33,7 +33,9 @@ public LocalPlayer(String name, Role role, String plainTextPassword) setPasswordSalt(CipherUtil.createSalt()); } - /** @return the effective role of the local player, taking into account Show As Player. */ + /** + * @return the effective role of the local player, taking into account Show As Player. + */ public Role getEffectiveRole() { if (isGM() && AppState.isShowAsPlayer()) { return Role.PLAYER; @@ -61,7 +63,9 @@ public String getPlainTextPassword() { return plainTextPassword; } - /** @return whether the player is a GM using GM view. */ + /** + * @return whether the player is a GM using GM view. + */ public boolean isEffectiveGM() { return isGM() && !AppState.isShowAsPlayer(); } 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 f380e274a8..1c10566cb9 100644 --- a/src/main/java/net/rptools/maptool/model/player/PasswordFilePlayerDatabase.java +++ b/src/main/java/net/rptools/maptool/model/player/PasswordFilePlayerDatabase.java @@ -117,8 +117,12 @@ public PasswordFilePlayerDatabase(File passwordFile) } public void readPasswordFile() - throws PasswordDatabaseException, NoSuchAlgorithmException, InvalidKeySpecException, - NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws PasswordDatabaseException, + NoSuchAlgorithmException, + InvalidKeySpecException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { try { passwordFileLock.lock(); @@ -137,8 +141,12 @@ public void readPasswordFile() } public void initialize() - throws PasswordDatabaseException, NoSuchAlgorithmException, InvalidKeySpecException, - NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws PasswordDatabaseException, + NoSuchAlgorithmException, + InvalidKeySpecException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { transientPlayerDetails.clear(); readPasswordFile(); savedDetails.putAll(playerDetails); @@ -147,8 +155,12 @@ public void initialize() } private Map readPasswordFile(File file) - throws PasswordDatabaseException, NoSuchAlgorithmException, InvalidKeySpecException, - NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws PasswordDatabaseException, + NoSuchAlgorithmException, + InvalidKeySpecException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { try { passwordFileLock.lock(); @@ -438,8 +450,11 @@ public void disablePlayer(String player, String reason) throws PasswordDatabaseE @Override public void addPlayerSharedPassword(String name, Role role, String password) - throws NoSuchAlgorithmException, InvalidKeySpecException, PasswordDatabaseException, - NoSuchPaddingException, InvalidKeyException { + throws NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + NoSuchPaddingException, + InvalidKeyException { if (playerExists(name)) { throw new PasswordDatabaseException(I18N.getText("Password.playerExists", name)); } @@ -448,8 +463,12 @@ public void addPlayerSharedPassword(String name, Role role, String password) @Override public void addPlayerAsymmetricKey(String name, Role role, Set publicKeyStrings) - throws NoSuchAlgorithmException, InvalidKeySpecException, PasswordDatabaseException, - NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { if (playerExists(name)) { throw new PasswordDatabaseException(I18N.getText("Password.playerExists", name)); } @@ -458,8 +477,11 @@ public void addPlayerAsymmetricKey(String name, Role role, Set publicKey @Override public void setSharedPassword(String name, String password) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException { var pd = getPlayerDetails(name); pd.publicKeyDetails().forEach(pk -> removedPubKeyFiles.add(pk.filename())); @@ -520,8 +542,12 @@ public void setRole(String name, Role role) { @Override public void setAsymmetricKeys(String name, Set keys) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException, + InvalidAlgorithmParameterException { var pd = getPlayerDetails(name); @@ -535,8 +561,12 @@ public void setAsymmetricKeys(String name, Set keys) @Override public void addAsymmetricKeys(String name, Set keys) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException, + InvalidAlgorithmParameterException { if (!playerExists(name)) { throw new PasswordDatabaseException(I18N.getText("msg.error.playerNotInDatabase", name)); } @@ -556,8 +586,11 @@ public void addAsymmetricKeys(String name, Set keys) @Override public void commitChanges() - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException { if (savedDetails.size() > 0) { removeOldPublicKeys(); savedDetails.clear(); @@ -599,8 +632,11 @@ private void removeOldPublicKeys() { @Override public void rollbackChanges() - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException { if (savedDetails.size() > 0) { playerDetails.clear(); playerDetails.putAll(savedDetails); @@ -743,8 +779,11 @@ public boolean recordsOnlyConnectedPlayers() { */ private PlayerDetails putUncommittedPlayer( String name, Role role, String password, String blockedReason, boolean persisted) - throws NoSuchAlgorithmException, InvalidKeySpecException, PasswordDatabaseException, - NoSuchPaddingException, InvalidKeyException { + throws NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + NoSuchPaddingException, + InvalidKeyException { return putUncommittedPlayerHashPassword( name, role, password, Set.of(), blockedReason, persisted); } @@ -768,8 +807,12 @@ private PlayerDetails putUncommittedPlayer( */ private PlayerDetails putUncommittedPlayer( String name, Role role, Set publicKeyStrings, String blockedReason, boolean persisted) - throws NoSuchAlgorithmException, InvalidKeySpecException, PasswordDatabaseException, - NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { return putUncommittedPlayer( name, role, null, createPublicKeyDetails(publicKeyStrings, name), blockedReason, persisted); } @@ -839,8 +882,11 @@ private PlayerDetails putUncommittedPlayerHashPassword( Set publicKeyDetails, String blockedReason, boolean persisted) - throws NoSuchAlgorithmException, InvalidKeySpecException, PasswordDatabaseException, - NoSuchPaddingException, InvalidKeyException { + throws NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + NoSuchPaddingException, + InvalidKeyException { return putUncommittedPlayer( name, @@ -865,8 +911,11 @@ private PlayerDetails putUncommittedPlayerHashPassword( */ private Set createPublicKeyDetails( Set publicKeyStrings, String playerName) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + InvalidKeyException, + InvalidAlgorithmParameterException { Set pkDetails = new HashSet<>(); String pkFilename = derivePublicKeyFilename(playerName); @@ -911,8 +960,11 @@ private String derivePublicKeyFilename(String name) { * @throws IllegalStateException If there is an error hashing the password. */ public void addTemporaryPlayer(String name, Role role, String password) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException { putUncommittedPlayerHashPassword(name, role, password, Set.of(), "", false); } 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 8943f8cdb8..ce423dd658 100644 --- a/src/main/java/net/rptools/maptool/model/player/PersistedPlayerDatabase.java +++ b/src/main/java/net/rptools/maptool/model/player/PersistedPlayerDatabase.java @@ -49,8 +49,11 @@ public interface PersistedPlayerDatabase { * @throws IllegalStateException If there is an error hashing the password. */ void addPlayerSharedPassword(String name, Role role, String password) - throws NoSuchAlgorithmException, InvalidKeySpecException, PasswordDatabaseException, - NoSuchPaddingException, InvalidKeyException; + throws NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + NoSuchPaddingException, + InvalidKeyException; /** * Adds a new player to the database with multiple public asymmetric key. If the player already @@ -67,8 +70,12 @@ void addPlayerSharedPassword(String name, Role role, String password) * @throws IllegalStateException If there is an error hashing the password. */ void addPlayerAsymmetricKey(String name, Role role, Set publicKeyStrings) - throws NoSuchAlgorithmException, InvalidKeySpecException, PasswordDatabaseException, - NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException; + throws NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException; /** * Sets the shared password for the specified player. If the player does not exist then a {@link @@ -85,8 +92,11 @@ void addPlayerAsymmetricKey(String name, Role role, Set publicKeyStrings * @throws IllegalStateException If there is an error hashing the password. */ void setSharedPassword(String name, String password) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException; + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException; /** * Sets the asymmetric keys for the player. This will remove any shared password keys for the @@ -102,8 +112,12 @@ void setSharedPassword(String name, String password) * @throws IllegalStateException If there is an error hashing the password. */ void setAsymmetricKeys(String name, Set keys) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException, InvalidAlgorithmParameterException; + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException, + InvalidAlgorithmParameterException; /** * Adds the keys to the existing keys for the specified player. This will remove any shared key @@ -120,8 +134,12 @@ void setAsymmetricKeys(String name, Set keys) * @throws IllegalStateException If there is an error hashing the password. */ void addAsymmetricKeys(String name, Set keys) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException, InvalidAlgorithmParameterException; + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException, + InvalidAlgorithmParameterException; /** * Returns if the specified player is persisted or not. Persisted players include those that are @@ -172,8 +190,11 @@ void addAsymmetricKeys(String name, Set keys) * @throws InvalidKeyException if there is an error hashing the password. */ void commitChanges() - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException; + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException; /** * Rolls back any pending changes that haven't been written to the file. @@ -185,6 +206,9 @@ void commitChanges() * @throws InvalidKeyException i */ void rollbackChanges() - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException; + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException; } diff --git a/src/main/java/net/rptools/maptool/model/player/Player.java b/src/main/java/net/rptools/maptool/model/player/Player.java index c48f089f29..aba313918b 100644 --- a/src/main/java/net/rptools/maptool/model/player/Player.java +++ b/src/main/java/net/rptools/maptool/model/player/Player.java @@ -18,7 +18,9 @@ import net.rptools.maptool.server.proto.PlayerDto; import net.rptools.maptool.util.cipher.CipherUtil; -/** @author trevor */ +/** + * @author trevor + */ public class Player { public enum Role { @@ -79,12 +81,16 @@ public boolean isGM() { return getRole() == Role.GM; } - /** @return Returns the name. */ + /** + * @return Returns the name. + */ public String getName() { return name; } - /** @param name The name to set. */ + /** + * @param name The name to set. + */ public void setName(String name) { this.name = name; } @@ -93,7 +99,9 @@ public CipherUtil.Key getPassword() { return password; } - /** @return Returns the role. */ + /** + * @return Returns the role. + */ public Role getRole() { if (actualRole == null) { actualRole = Role.valueOf(role); 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 f584099eed..e49a4759f2 100644 --- a/src/main/java/net/rptools/maptool/model/player/Players.java +++ b/src/main/java/net/rptools/maptool/model/player/Players.java @@ -518,8 +518,11 @@ public static void removePropertyChangeListener(PropertyChangeListener listener) * @throws InvalidKeyException if there is an error hashing the password. */ public void commitChanges() - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException { if (PlayerDatabaseFactory.getCurrentPlayerDatabase() instanceof PersistedPlayerDatabase db) { db.commitChanges(); } @@ -535,8 +538,11 @@ public void commitChanges() * @throws InvalidKeyException i */ public void rollbackChanges() - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, - PasswordDatabaseException, InvalidKeyException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, + PasswordDatabaseException, + InvalidKeyException { if (PlayerDatabaseFactory.getCurrentPlayerDatabase() instanceof PersistedPlayerDatabase db) { db.rollbackChanges(); } diff --git a/src/main/java/net/rptools/maptool/server/ClientHandshake.java b/src/main/java/net/rptools/maptool/server/ClientHandshake.java index f431480b74..bacbcef0aa 100644 --- a/src/main/java/net/rptools/maptool/server/ClientHandshake.java +++ b/src/main/java/net/rptools/maptool/server/ClientHandshake.java @@ -250,9 +250,15 @@ public void windowClosed(WindowEvent e) { } private void handle(UseAuthTypeMsg useAuthTypeMsg) - throws ExecutionException, InterruptedException, IllegalBlockSizeException, - BadPaddingException, NoSuchPaddingException, NoSuchAlgorithmException, - InvalidKeyException, InvalidKeySpecException, InvalidAlgorithmParameterException { + throws ExecutionException, + InterruptedException, + IllegalBlockSizeException, + BadPaddingException, + NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, + InvalidKeySpecException, + InvalidAlgorithmParameterException { var clientAuthMsg = ClientAuthMsg.newBuilder(); diff --git a/src/main/java/net/rptools/maptool/server/HandshakeChallenge.java b/src/main/java/net/rptools/maptool/server/HandshakeChallenge.java index 3b08063322..3f12dd0158 100644 --- a/src/main/java/net/rptools/maptool/server/HandshakeChallenge.java +++ b/src/main/java/net/rptools/maptool/server/HandshakeChallenge.java @@ -43,8 +43,12 @@ private HandshakeChallenge(byte[] challenge, byte[] expectedResponse) { static HandshakeChallenge createSymmetricChallenge( String username, String password, CipherUtil.Key key, byte[] iv) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, - IllegalBlockSizeException, BadPaddingException, AssertionError, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, + IllegalBlockSizeException, + BadPaddingException, + AssertionError, InvalidAlgorithmParameterException { if (key.asymmetric()) { throw new AssertionError("Expected Symmetric algorithm and IV, got Asymmetric algorithm"); @@ -54,8 +58,12 @@ static HandshakeChallenge createSymmetricChallenge( static HandshakeChallenge createAsymmetricChallenge( String username, String password, CipherUtil.Key key) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, - IllegalBlockSizeException, BadPaddingException, AssertionError, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, + IllegalBlockSizeException, + BadPaddingException, + AssertionError, InvalidAlgorithmParameterException { if (!key.asymmetric()) { throw new AssertionError("Expected Asymmetric algorithm without IV, got Symmetric algorithm"); @@ -65,8 +73,12 @@ static HandshakeChallenge createAsymmetricChallenge( private static HandshakeChallenge createChallenge( String username, String password, CipherUtil.Key key, byte[] iv) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, - IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, + IllegalBlockSizeException, + BadPaddingException, + InvalidAlgorithmParameterException { Cipher encryptor; if (key.asymmetric()) { encryptor = CipherUtil.createAsymmetricEncryptor(key); @@ -87,8 +99,12 @@ private static HandshakeChallenge createChallenge( static HandshakeChallenge fromSymmetricChallengeBytes( String username, byte[] challenge, CipherUtil.Key key, byte[] iv) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, - IllegalBlockSizeException, BadPaddingException, AssertionError, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, + IllegalBlockSizeException, + BadPaddingException, + AssertionError, InvalidAlgorithmParameterException { if (key.asymmetric()) { throw new AssertionError("Expected Symmetric algorithm and IV, got Asymmetric algorithm"); @@ -98,8 +114,12 @@ static HandshakeChallenge fromSymmetricChallengeBytes( static HandshakeChallenge fromAsymmetricChallengeBytes( String username, byte[] challenge, CipherUtil.Key key) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, - IllegalBlockSizeException, BadPaddingException, AssertionError, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, + IllegalBlockSizeException, + BadPaddingException, + AssertionError, InvalidAlgorithmParameterException { if (!key.asymmetric()) { throw new AssertionError("Expected Symmetric algorithm and IV, got Asymmetric algorithm"); @@ -109,8 +129,12 @@ static HandshakeChallenge fromAsymmetricChallengeBytes( private static HandshakeChallenge fromChallengeBytes( String username, byte[] challenge, CipherUtil.Key key, byte[] iv) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, - IllegalBlockSizeException, BadPaddingException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, + IllegalBlockSizeException, + BadPaddingException, + InvalidAlgorithmParameterException { Cipher decryptor; if (key.asymmetric()) { decryptor = CipherUtil.createAsymmetricDecryptor(key); @@ -142,8 +166,12 @@ public byte[] getExpectedResponse() { } public byte[] getExpectedResponse(byte[] iv) - throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, - BadPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + IllegalBlockSizeException, + NoSuchAlgorithmException, + BadPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { Cipher encryptor = CipherUtil.createSymmetricEncryptor(key, iv); return encryptor.doFinal(expectedResponse); } diff --git a/src/main/java/net/rptools/maptool/server/MapToolServer.java b/src/main/java/net/rptools/maptool/server/MapToolServer.java index 76695650ba..43da26dd9f 100644 --- a/src/main/java/net/rptools/maptool/server/MapToolServer.java +++ b/src/main/java/net/rptools/maptool/server/MapToolServer.java @@ -41,7 +41,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author drice */ +/** + * @author drice + */ public class MapToolServer { private static final Logger log = LogManager.getLogger(MapToolServer.class); private static final int ASSET_CHUNK_SIZE = 5 * 1024; diff --git a/src/main/java/net/rptools/maptool/server/MapToolServerConnection.java b/src/main/java/net/rptools/maptool/server/MapToolServerConnection.java index 9c3de83262..b1344d1d65 100644 --- a/src/main/java/net/rptools/maptool/server/MapToolServerConnection.java +++ b/src/main/java/net/rptools/maptool/server/MapToolServerConnection.java @@ -31,7 +31,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author trevor */ +/** + * @author trevor + */ public class MapToolServerConnection implements ServerObserver, HandshakeProvider, HandshakeObserver { private static final Logger log = LogManager.getLogger(MapToolServerConnection.class); diff --git a/src/main/java/net/rptools/maptool/server/ServerHandshake.java b/src/main/java/net/rptools/maptool/server/ServerHandshake.java index 7bb9b61f0d..064cf17824 100644 --- a/src/main/java/net/rptools/maptool/server/ServerHandshake.java +++ b/src/main/java/net/rptools/maptool/server/ServerHandshake.java @@ -313,9 +313,15 @@ private void acceptNewPublicKey(PlayerAwaitingApproval p) { } private void handle(ClientAuthMsg clientAuthMessage) - throws NoSuchAlgorithmException, InvalidKeySpecException, ExecutionException, - InterruptedException, NoSuchPaddingException, IllegalBlockSizeException, - NoSuchAlgorithmException, BadPaddingException, InvalidKeyException, + throws NoSuchAlgorithmException, + InvalidKeySpecException, + ExecutionException, + InterruptedException, + NoSuchPaddingException, + IllegalBlockSizeException, + NoSuchAlgorithmException, + BadPaddingException, + InvalidKeyException, InvalidAlgorithmParameterException { byte[] response = clientAuthMessage.getChallengeResponse().toByteArray(); if (handshakeChallenges.length > 1) { @@ -374,9 +380,14 @@ private void sendConnectionSuccessful() throws ExecutionException, InterruptedEx * @throws InvalidKeyException when there is an error during encryption. */ private void handle(ClientInitMsg clientInitMsg) - throws ExecutionException, InterruptedException, NoSuchPaddingException, - IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, - InvalidKeyException, InvalidAlgorithmParameterException { + throws ExecutionException, + InterruptedException, + NoSuchPaddingException, + IllegalBlockSizeException, + NoSuchAlgorithmException, + BadPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { var server = MapTool.getServer(); if (server.isPlayerConnected(clientInitMsg.getPlayerName())) { setErrorMessage(I18N.getText("Handshake.msg.duplicateName")); @@ -453,8 +464,12 @@ private void requestPublicKey(String playerName) { * @throws InvalidKeyException when there is an error during encryption. */ private void sendSharedPasswordAuthType() - throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, - BadPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + IllegalBlockSizeException, + NoSuchAlgorithmException, + BadPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { byte[] playerPasswordSalt = playerDatabase.getPlayerPasswordSalt(player.getName()); SecureRandom rnd = new SecureRandom(); @@ -486,8 +501,12 @@ private void sendSharedPasswordAuthType() * @throws InvalidKeyException when there is an error during encryption. */ private void sendRoleSharedPasswordAuthType() - throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, - BadPaddingException, InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchPaddingException, + IllegalBlockSizeException, + NoSuchAlgorithmException, + BadPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { byte[] playerPasswordSalt = playerDatabase.getPlayerPasswordSalt(player.getName()); String[] password = new String[2]; password[GM_CHALLENGE] = new PasswordGenerator().getPassword(); @@ -534,9 +553,14 @@ private void sendRoleSharedPasswordAuthType() * @throws InvalidKeyException when there is an error during encryption. */ private State sendAsymmetricKeyAuthType() - throws ExecutionException, InterruptedException, NoSuchPaddingException, - IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, - InvalidKeyException, InvalidAlgorithmParameterException { + throws ExecutionException, + InterruptedException, + NoSuchPaddingException, + IllegalBlockSizeException, + NoSuchAlgorithmException, + BadPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { handshakeChallenges = new HandshakeChallenge[1]; if (!playerDatabase.hasPublicKey(player, playerPublicKeyMD5).join()) { if (useEasyConnect) { diff --git a/src/main/java/net/rptools/maptool/server/ServerPolicy.java b/src/main/java/net/rptools/maptool/server/ServerPolicy.java index 41e4bb6987..a46080d5b5 100644 --- a/src/main/java/net/rptools/maptool/server/ServerPolicy.java +++ b/src/main/java/net/rptools/maptool/server/ServerPolicy.java @@ -194,12 +194,16 @@ public void setUseIndividualFOW(boolean flag) { useIndividualFOW = flag; } - /** @return the includeOwnedNPCs */ + /** + * @return the includeOwnedNPCs + */ public boolean isIncludeOwnedNPCs() { return includeOwnedNPCs; } - /** @param includeOwnedNPCs the includeOwnedNPCs to set */ + /** + * @param includeOwnedNPCs the includeOwnedNPCs to set + */ public void setIncludeOwnedNPCs(boolean includeOwnedNPCs) { this.includeOwnedNPCs = includeOwnedNPCs; } diff --git a/src/main/java/net/rptools/maptool/transfer/AssetConsumer.java b/src/main/java/net/rptools/maptool/transfer/AssetConsumer.java index 39574450e4..aece600db5 100644 --- a/src/main/java/net/rptools/maptool/transfer/AssetConsumer.java +++ b/src/main/java/net/rptools/maptool/transfer/AssetConsumer.java @@ -56,7 +56,9 @@ public AssetConsumer(File destinationDir, AssetHeader header) { } } - /** @return the ID of the incoming asset */ + /** + * @return the ID of the incoming asset + */ public MD5Key getId() { return header.getId(); } diff --git a/src/main/java/net/rptools/maptool/transfer/AssetProducer.java b/src/main/java/net/rptools/maptool/transfer/AssetProducer.java index 2bccb61b58..9c1eff4a85 100644 --- a/src/main/java/net/rptools/maptool/transfer/AssetProducer.java +++ b/src/main/java/net/rptools/maptool/transfer/AssetProducer.java @@ -44,7 +44,9 @@ public AssetProducer(MD5Key id, String name, File assetFile) { length = assetFile.length(); } - /** @return the header needed to create the corresponding AssetConsumer */ + /** + * @return the header needed to create the corresponding AssetConsumer + */ public AssetHeader getHeader() { return new AssetHeader(id, name, assetFile.length()); } diff --git a/src/main/java/net/rptools/maptool/util/CreateGridFile.java b/src/main/java/net/rptools/maptool/util/CreateGridFile.java index 7252b8d8d5..93cda16c61 100644 --- a/src/main/java/net/rptools/maptool/util/CreateGridFile.java +++ b/src/main/java/net/rptools/maptool/util/CreateGridFile.java @@ -21,7 +21,9 @@ import javax.imageio.ImageIO; import net.rptools.lib.image.ImageUtil; -/** @author drice */ +/** + * @author drice + */ public class CreateGridFile { private static BufferedImage createImage( diff --git a/src/main/java/net/rptools/maptool/util/PersistenceUtil.java b/src/main/java/net/rptools/maptool/util/PersistenceUtil.java index 42ab58607f..dbdcdb4de9 100644 --- a/src/main/java/net/rptools/maptool/util/PersistenceUtil.java +++ b/src/main/java/net/rptools/maptool/util/PersistenceUtil.java @@ -78,7 +78,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author trevor */ +/** + * @author trevor + */ public class PersistenceUtil { private static final Logger log = LogManager.getLogger(PersistenceUtil.class); diff --git a/src/main/java/net/rptools/maptool/util/StringUtil.java b/src/main/java/net/rptools/maptool/util/StringUtil.java index 0a63b45ddd..7d331ae011 100644 --- a/src/main/java/net/rptools/maptool/util/StringUtil.java +++ b/src/main/java/net/rptools/maptool/util/StringUtil.java @@ -27,7 +27,9 @@ import org.apache.commons.lang.StringUtils; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; -/** @author Tylere */ +/** + * @author Tylere + */ public class StringUtil { private static NumberFormat nf = NumberFormat.getNumberInstance(); private static final int MIN_FRACTION_DIGITS = 0; diff --git a/src/main/java/net/rptools/maptool/util/UPnPUtil.java b/src/main/java/net/rptools/maptool/util/UPnPUtil.java index 32614b2479..e4211c4180 100644 --- a/src/main/java/net/rptools/maptool/util/UPnPUtil.java +++ b/src/main/java/net/rptools/maptool/util/UPnPUtil.java @@ -41,7 +41,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** @author Phil Wright */ +/** + * @author Phil Wright + */ public class UPnPUtil { private static final Logger log = LogManager.getLogger(UPnPUtil.class); private static Map igds; 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 41fa5c3436..616b80d839 100644 --- a/src/main/java/net/rptools/maptool/util/cipher/CipherUtil.java +++ b/src/main/java/net/rptools/maptool/util/cipher/CipherUtil.java @@ -97,32 +97,45 @@ public String getEncodedPublicKeyText() { ; public static CipherUtil.Key fromPublicPrivatePair(File publicKeyFile, File privateKeyFile) - throws IOException, NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, - InvalidKeyException, InvalidAlgorithmParameterException { + throws IOException, + NoSuchAlgorithmException, + InvalidKeySpecException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { KeyPair keyPair = readKeyPair(publicKeyFile, privateKeyFile); return CipherUtil.fromPublicPrivatePair(keyPair.getPublic(), keyPair.getPrivate()); } public static CipherUtil.Key fromPublicPrivatePair(PublicKey publicKey, PrivateKey privateKey) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, InvalidAlgorithmParameterException { return new Key(publicKey, privateKey); } public static CipherUtil.Key fromPublicKeyString(String pk) - throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, - InvalidKeyException, InvalidAlgorithmParameterException { + throws NoSuchAlgorithmException, + InvalidKeySpecException, + NoSuchPaddingException, + InvalidKeyException, + InvalidAlgorithmParameterException { return new Key(CipherUtil.decodePublicKeyString(pk), null); } public static CipherUtil.Key fromSharedKey(String pass, byte[] salt) - throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, + throws NoSuchAlgorithmException, + InvalidKeySpecException, + NoSuchPaddingException, InvalidKeyException { return createKey(pass, salt); } public static CipherUtil.Key fromSharedKeyNewSalt(String pass) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeySpecException, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeySpecException, InvalidKeyException { byte[] salt = createSalt(); return fromSharedKey(pass, salt); @@ -144,7 +157,9 @@ public static CipherUtil.Key fromSecretKeySpec(SecretKeySpec keySpec) * @throws InvalidKeyException if there are problems with the supplied key. */ public static Cipher createSymmetricDecryptor(Key key, byte[] iv) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, InvalidAlgorithmParameterException { if (key.asymmetric()) { throw new AssertionError("Expected symmetric key, got asymmetric"); @@ -166,7 +181,9 @@ public static Cipher createSymmetricDecryptor(Key key, byte[] iv) * @throws InvalidKeyException if there are problems with the supplied key. */ public static Cipher createAsymmetricDecryptor(Key key) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, InvalidAlgorithmParameterException { if (!key.asymmetric()) { throw new AssertionError("Expected asymmetric key, got symmetric"); @@ -189,7 +206,9 @@ public static Cipher createAsymmetricDecryptor(Key key) * @throws InvalidKeyException if there are problems with the supplied key. */ public static Cipher createSymmetricEncryptor(Key key, byte[] iv) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, InvalidAlgorithmParameterException { if (key.asymmetric()) { throw new AssertionError("Expected symmetric key, got asymmetric"); @@ -211,7 +230,9 @@ public static Cipher createSymmetricEncryptor(Key key, byte[] iv) * @throws InvalidKeyException if there are problems with the supplied key. */ public static Cipher createAsymmetricEncryptor(Key key) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, InvalidAlgorithmParameterException { if (!key.asymmetric()) { throw new AssertionError("Expected asymmetric key, got symmetric"); @@ -235,7 +256,9 @@ public static Cipher createAsymmetricEncryptor(Key key) * @throws InvalidKeyException if there are problems with the supplied key. */ private static Cipher createCipher(int encryptMode, Key key, byte[] iv) - throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, + throws NoSuchPaddingException, + NoSuchAlgorithmException, + InvalidKeyException, InvalidAlgorithmParameterException { if (key.asymmetric()) { Cipher cipher = Cipher.getInstance(ASYNC_KEY_ALGORITHM);