From 289e3028289e84df424eb02b30d822df44ce2d37 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 31 Oct 2017 09:37:02 +0100 Subject: [PATCH] C-style array declaration fixed --- .../ide/ui/laf/darcula/ui/DarculaMenuItemUIBase.java | 4 ++-- .../src/com/intellij/ui/plaf/beg/BegMenuItemUI.java | 6 +++--- .../src/com/intellij/ui/plaf/beg/IdeaMenuUI.java | 4 ++-- .../src/net/sf/cglib/proxy/AdvancedEnhancer.java | 2 +- .../com/intellij/util/io/UnsyncByteArrayOutputStream.java | 2 +- .../com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java | 4 ++-- .../cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java | 4 ++-- .../lib/cvsclient/io/AbstractOutputStreamWriter.java | 2 +- plugins/devkit/src/dom/generator/Main.java | 2 +- .../plugins/relaxNG/compact/lexer/EscapePreprocessor.java | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaMenuItemUIBase.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaMenuItemUIBase.java index 084e46d7ad90..4063ecb13cc8 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaMenuItemUIBase.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaMenuItemUIBase.java @@ -35,7 +35,7 @@ public class DarculaMenuItemUIBase extends BasicMenuItemUI { return new DarculaMenuItemUIBase(); } - public void processMouseEvent(JMenuItem item, MouseEvent e, MenuElement path[], MenuSelectionManager manager) { + public void processMouseEvent(JMenuItem item, MouseEvent e, MenuElement[] path, MenuSelectionManager manager) { Point p = e.getPoint(); if (p.x >= 0 && p.x < item.getWidth() && p.y >= 0 && p.y < item.getHeight()) { @@ -46,7 +46,7 @@ public class DarculaMenuItemUIBase extends BasicMenuItemUI { } else manager.setSelectedPath(path); } else if (item.getModel().isArmed()) { - MenuElement newPath[] = new MenuElement[path.length - 1]; + MenuElement[] newPath = new MenuElement[path.length - 1]; int i, c; for (i = 0, c = path.length - 1; i < c; i++) newPath[i] = path[i]; diff --git a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java index c8e8b4c747cf..f9ae3963fc67 100644 --- a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java +++ b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegMenuItemUI.java @@ -271,13 +271,13 @@ public class BegMenuItemUI extends BasicMenuItemUI { public MenuElement[] getPath() { MenuSelectionManager menuselectionmanager = MenuSelectionManager.defaultManager(); - MenuElement amenuelement[] = menuselectionmanager.getSelectedPath(); + MenuElement[] amenuelement = menuselectionmanager.getSelectedPath(); int i1 = amenuelement.length; if (i1 == 0){ return new MenuElement[0]; } java.awt.Container container = menuItem.getParent(); - MenuElement amenuelement1[]; + MenuElement[] amenuelement1; if (amenuelement[i1 - 1].getComponent() == container){ amenuelement1 = new MenuElement[i1 + 1]; System.arraycopy(amenuelement, 0, amenuelement1, 0, i1); @@ -554,7 +554,7 @@ public class BegMenuItemUI extends BasicMenuItemUI { public void menuDragMouseDragged(MenuDragMouseEvent e){ MenuSelectionManager manager=e.getMenuSelectionManager(); - MenuElement path[]=e.getPath(); + MenuElement[] path = e.getPath(); manager.setSelectedPath(path); } diff --git a/platform/platform-impl/src/com/intellij/ui/plaf/beg/IdeaMenuUI.java b/platform/platform-impl/src/com/intellij/ui/plaf/beg/IdeaMenuUI.java index 1171b751f47d..c6d79f6215bb 100644 --- a/platform/platform-impl/src/com/intellij/ui/plaf/beg/IdeaMenuUI.java +++ b/platform/platform-impl/src/com/intellij/ui/plaf/beg/IdeaMenuUI.java @@ -210,13 +210,13 @@ public class IdeaMenuUI extends BasicMenuUI{ public MenuElement[] getPath() { MenuSelectionManager menuselectionmanager = MenuSelectionManager.defaultManager(); - MenuElement amenuelement[] = menuselectionmanager.getSelectedPath(); + MenuElement[] amenuelement = menuselectionmanager.getSelectedPath(); int i1 = amenuelement.length; if (i1 == 0){ return new MenuElement[0]; } Container container = menuItem.getParent(); - MenuElement amenuelement1[]; + MenuElement[] amenuelement1; if (amenuelement[i1 - 1].getComponent() == container){ amenuelement1 = new MenuElement[i1 + 1]; System.arraycopy(amenuelement, 0, amenuelement1, 0, i1); diff --git a/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java b/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java index abf06aead668..d7a992e41ad2 100644 --- a/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java +++ b/platform/platform-impl/src/net/sf/cglib/proxy/AdvancedEnhancer.java @@ -774,7 +774,7 @@ public class AdvancedEnhancer extends AbstractClassGenerator EmitUtils.constructor_switch(e, constructors, new ObjectSwitchCallback() { public void processCase(Object key, $Label end) { MethodInfo constructor = (MethodInfo)key; - $Type types[] = constructor.getSignature().getArgumentTypes(); + $Type[] types = constructor.getSignature().getArgumentTypes(); for (int i = 0; i < types.length; i++) { e.load_arg(1); e.push(i); diff --git a/platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java b/platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java index 3a780a16ec9f..994a6296f600 100644 --- a/platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java +++ b/platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java @@ -47,7 +47,7 @@ public class UnsyncByteArrayOutputStream extends OutputStream { } @Override - public void write(byte b[], int off, int len) { + public void write(byte[] b, int off, int len) { if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0)) { throw new IndexOutOfBoundsException(); diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java index 9dd7763fd42b..05b4d1711a8e 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java @@ -111,7 +111,7 @@ public class ReadThread implements Runnable { return internalRead(); } - public synchronized int read(byte b[], int off, int len) throws IOException { + public synchronized int read(byte[] b, int off, int len) throws IOException { int result = waitForAvailableBytes(); if (result == END_OF_STREAM) return END_OF_STREAM; return internalRead(b, off, len); @@ -213,7 +213,7 @@ public class ReadThread implements Runnable { } } - private synchronized int internalRead(byte b[], int off, int len) { + private synchronized int internalRead(byte[] b, int off, int len) { int result = Math.min(len, size()); System.arraycopy(myBuffer, myFirstIndex, b, off, result); myFirstIndex += result; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java index 991ff213ab24..c6debdf98abd 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java @@ -39,12 +39,12 @@ public class OutputStreamWrapper extends OutputStream{ myOutputStream.close(); } - public void write(byte b[]) throws IOException { + public void write(byte[] b) throws IOException { myOutputStream.write(b); myStatistics.send(b.length); } - public void write(byte b[], int off, int len) throws IOException { + public void write(byte[] b, int off, int len) throws IOException { myOutputStream.write(b, off, len); myStatistics.send(len); diff --git a/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/io/AbstractOutputStreamWriter.java b/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/io/AbstractOutputStreamWriter.java index 2ea04062005b..9ebb729b9977 100644 --- a/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/io/AbstractOutputStreamWriter.java +++ b/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/io/AbstractOutputStreamWriter.java @@ -47,7 +47,7 @@ public abstract class AbstractOutputStreamWriter extends Writer { writeChar((char)chr, outputStream); } - public final void write(char buffer[], int offset, int length) throws IOException { + public final void write(char[] buffer, int offset, int length) throws IOException { if (offset < 0 || length < 0 || offset + length > buffer.length) { diff --git a/plugins/devkit/src/dom/generator/Main.java b/plugins/devkit/src/dom/generator/Main.java index e164a89dcbff..7724fcbd4bf7 100644 --- a/plugins/devkit/src/dom/generator/Main.java +++ b/plugins/devkit/src/dom/generator/Main.java @@ -31,7 +31,7 @@ import java.io.File; public class Main { - public static void main(String argv[]) throws Exception { + public static void main(String[] argv) throws Exception { if (argv.length != 4) { System.out.println("Usage: Main "); } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/lexer/EscapePreprocessor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/lexer/EscapePreprocessor.java index d759d3291763..da9b54c7fad1 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/lexer/EscapePreprocessor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/lexer/EscapePreprocessor.java @@ -46,7 +46,7 @@ class EscapePreprocessor extends FilterReader { } @Override - public int read(char cbuf[], int off, int len) throws IOException { + public int read(char[] cbuf, int off, int len) throws IOException { final int i = read(); if (i == -1) { return -1;