This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 467711fcd8424c26600160a57bbeed104eae4924
Author: Sebb <s...@apache.org>
AuthorDate: Thu Jan 28 15:41:40 2021 +0000
Tidy
Array designator belongs with type
One declaration per line
---
.../commons/net/io/ToNetASCIIInputStream.java | 4 ++--
.../java/org/apache/commons/net/telnet/Telnet.java | 22 +++++++++++++---------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
b/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
index 61d744f..3b453a8 100644
--- a/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
+++ b/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
@@ -107,7 +107,7 @@ public final class ToNetASCIIInputStream extends
FilterInputStream
* stream.
*/
@Override
- public int read(final byte buffer[]) throws IOException
+ public int read(final byte[] buffer) throws IOException
{
return read(buffer, 0, buffer.length);
}
@@ -128,7 +128,7 @@ public final class ToNetASCIIInputStream extends
FilterInputStream
* stream.
*/
@Override
- public int read(final byte buffer[], int offset, int length) throws
IOException
+ public int read(final byte[] buffer, int offset, int length) throws
IOException
{
int ch;
final int off;
diff --git a/src/main/java/org/apache/commons/net/telnet/Telnet.java
b/src/main/java/org/apache/commons/net/telnet/Telnet.java
index 17658d8..cf82ad8 100644
--- a/src/main/java/org/apache/commons/net/telnet/Telnet.java
+++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java
@@ -55,13 +55,17 @@ class Telnet extends SocketClient
(byte)TelnetCommand.IAC,
(byte)TelnetCommand.SE
};
- static final int WILL_MASK = 0x01, DO_MASK = 0x02,
- REQUESTED_WILL_MASK = 0x04,
REQUESTED_DO_MASK = 0x08;
+ static final int WILL_MASK = 0x01;
+ static final int DO_MASK = 0x02;
+ static final int REQUESTED_WILL_MASK = 0x04;
+ static final int REQUESTED_DO_MASK = 0x08;
/* public */
static final int DEFAULT_PORT = 23;
- private final int[] doResponse, willResponse, options;
+ private final int[] doResponse;
+ private final int[] willResponse;
+ private final int[] options;
/* TERMINAL-TYPE option (start)*/
/**
@@ -96,7 +100,7 @@ class Telnet extends SocketClient
/**
* Array of option handlers
*/
- private final TelnetOptionHandler optionHandlers[];
+ private final TelnetOptionHandler[] optionHandlers;
/* open TelnetOptionHandler functionality (end)*/
@@ -272,7 +276,7 @@ class Telnet extends SocketClient
{
optionHandlers[option].setWill(true);
- final int subneg[] =
+ final int[] subneg =
optionHandlers[option].startSubnegotiationLocal();
if (subneg != null)
@@ -301,7 +305,7 @@ class Telnet extends SocketClient
{
optionHandlers[option].setDo(true);
- final int subneg[] =
+ final int[] subneg =
optionHandlers[option].startSubnegotiationRemote();
if (subneg != null)
@@ -684,7 +688,7 @@ class Telnet extends SocketClient
* @param suboptionLength - length of data received
* @throws IOException - Exception in I/O.
**/
- void processSuboption(final int suboption[], final int suboptionLength)
+ void processSuboption(final int[] suboption, final int suboptionLength)
throws IOException
{
if (debug)
@@ -697,7 +701,7 @@ class Telnet extends SocketClient
{
if (optionHandlers[suboption[0]] != null)
{
- final int responseSuboption[] =
+ final int[] responseSuboption =
optionHandlers[suboption[0]].answerSubnegotiation(suboption,
suboptionLength);
_sendSubnegotiation(responseSuboption);
@@ -756,7 +760,7 @@ class Telnet extends SocketClient
* @param subn - subnegotiation data to be sent
* @throws IOException - Exception in I/O.
**/
- final synchronized void _sendSubnegotiation(final int subn[])
+ final synchronized void _sendSubnegotiation(final int[] subn)
throws IOException
{
if (debug)
