From e79461c53adce17f83f30954f8a03d67bb761a1f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 06 Jul 2015 15:42:24 +0000
Subject: [PATCH] AutoRefactor'ed Use Diamond Operator
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index c0101ca..fdd837e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -191,25 +191,21 @@
private String[] getOtherArguments()
{
String sArgs = this.tfOtherArguments.getText().trim();
- if (sArgs.length() > 0)
- {
- String[] args = sArgs.split(" ");
- ArrayList<String> array = new ArrayList<String>();
- for (String arg : args)
- {
- if (arg.length() > 0)
- {
- array.add(arg);
- }
- }
- String[] fArgs = new String[array.size()];
- array.toArray(fArgs);
- return fArgs;
- }
- else
+ if (sArgs.length() <= 0)
{
return new String[]{};
}
+
+ String[] args = sArgs.split(" ");
+ ArrayList<String> array = new ArrayList<>();
+ for (String arg : args)
+ {
+ if (arg.length() > 0)
+ {
+ array.add(arg);
+ }
+ }
+ return array.toArray(new String[array.size()]);
}
/**
@@ -473,7 +469,7 @@
setValidLater(lOtherArguments, true);
int initialMemory = -1;
int maxMemory = -1;
- ArrayList<LocalizableMessage> errorMsgs = new ArrayList<LocalizableMessage>();
+ ArrayList<LocalizableMessage> errorMsgs = new ArrayList<>();
try
{
String sInitialMemory = tfInitialMemory.getText().trim();
@@ -523,14 +519,14 @@
if (errorMsgs.isEmpty())
{
// Try the options together, often there are interdependencies.
- ArrayList<LocalizableMessage> allErrors = new ArrayList<LocalizableMessage>();
+ ArrayList<LocalizableMessage> allErrors = new ArrayList<>();
checkAllArgumentsTogether(initialMemory, maxMemory, allErrors);
if (!allErrors.isEmpty())
{
- ArrayList<LocalizableMessage> memoryErrors = new ArrayList<LocalizableMessage>();
+ ArrayList<LocalizableMessage> memoryErrors = new ArrayList<>();
checkMemoryArguments(initialMemory, maxMemory, memoryErrors);
- ArrayList<LocalizableMessage> otherErrors = new ArrayList<LocalizableMessage>();
+ ArrayList<LocalizableMessage> otherErrors = new ArrayList<>();
checkOtherArguments(otherErrors);
if (!memoryErrors.isEmpty())
@@ -841,7 +837,7 @@
setValidLater(lInitialMemory, true);
setValidLater(lMaxMemory, true);
setValidLater(lOtherArguments, true);
- ArrayList<JLabel> ls = new ArrayList<JLabel>();
+ ArrayList<JLabel> ls = new ArrayList<>();
StringBuilder sb = new StringBuilder();
if (initialMemory != -1)
@@ -891,7 +887,7 @@
private void checkOtherArguments(Collection<LocalizableMessage> errorMsgs)
{
setValidLater(lOtherArguments, true);
- ArrayList<JLabel> ls = new ArrayList<JLabel>();
+ ArrayList<JLabel> ls = new ArrayList<>();
StringBuilder sb = new StringBuilder();
String[] otherArgs = getOtherArguments();
--
Gitblit v1.10.0