From f187157456505f27e6bd1a51b69bf0bc52383080 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Tue, 14 Feb 2017 01:36:05 -0500 Subject: [PATCH] llvm: Run code cleanup Mostly organize imports and remove redundant type arguments. Change-Id: I11e8e76f96a17fa521f3e7f8c8f9e3d645d445b3 Signed-off-by: Marc-Andre Laperle --- .../llvm/ui/LlvmEnvironmentVariableSupplier.java | 2 +- .../org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java | 1 - .../managedbuilder/llvm/ui/preferences/LlvmListEditor.java | 4 ++-- .../llvm/ui/preferences/LlvmPreferencePage.java | 5 +++-- .../eclipse/cdt/managedbuilder/llvm/util/FindStdLibPath.java | 1 - .../cdt/managedbuilder/llvm/util/LlvmToolOptionPathUtil.java | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java index 4ef05ef20c9..bee8351269d 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java @@ -38,7 +38,7 @@ public class LlvmEnvironmentVariableSupplier implements IConfigurationEnvironmen private static boolean preferencesChanged = true; // LLVM environment variable data structure private static HashMap llvmEnvironmentVariables = - new HashMap(6); + new HashMap<>(6); // Environment variables for HashMap usage private static final String ENV_VAR_NAME_LLVM_BIN = "LLVM_BIN_PATH"; //$NON-NLS-1$ private static final String ENV_VAR_NAME_LLVMINTERP = "LLVMINTERP"; //$NON-NLS-1$ diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java index fd6a073fe47..6df5d1b19bb 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmUIPlugin.java @@ -26,7 +26,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; - import org.osgi.framework.BundleContext; /** diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmListEditor.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmListEditor.java index 66b8573dc82..2178408760f 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmListEditor.java +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmListEditor.java @@ -13,11 +13,11 @@ package org.eclipse.cdt.managedbuilder.llvm.ui.preferences; import java.util.regex.Pattern; +import org.eclipse.cdt.managedbuilder.llvm.util.Separators; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.ListEditor; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.cdt.managedbuilder.llvm.util.Separators; -import org.eclipse.core.runtime.Assert; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java index b8a1bf720e8..95ab535ef6e 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java @@ -13,9 +13,10 @@ package org.eclipse.cdt.managedbuilder.llvm.ui.preferences; import org.eclipse.cdt.managedbuilder.llvm.ui.LlvmUIPlugin; -import org.eclipse.jface.preference.*; -import org.eclipse.ui.IWorkbenchPreferencePage; +import org.eclipse.jface.preference.DirectoryFieldEditor; +import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; /** * This class represents a preference page that diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/FindStdLibPath.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/FindStdLibPath.java index 8d0b6e7c08c..b6cd4f91df2 100644 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/FindStdLibPath.java +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/FindStdLibPath.java @@ -14,7 +14,6 @@ package org.eclipse.cdt.managedbuilder.llvm.util; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.lang.ProcessBuilder; /** * The purpose is to find a path where stdc++ library is located. diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmToolOptionPathUtil.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmToolOptionPathUtil.java index c888af63a2b..9c96dc88824 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmToolOptionPathUtil.java +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmToolOptionPathUtil.java @@ -774,7 +774,7 @@ public class LlvmToolOptionPathUtil { */ public static String[] addNewPathToExistingPathList(String[] existingPaths, String newPath) { String pathSep = java.io.File.pathSeparator; // semicolon for windows, colon for Linux/Mac - List newPathList = new ArrayList(); + List newPathList = new ArrayList<>(); String path; //adds existing paths to new paths list for (int i = 0; i < existingPaths.length; i++) { @@ -800,7 +800,7 @@ public class LlvmToolOptionPathUtil { * @return String[] List that includes existing paths without the path that was removed. */ public static String[] removePathFromExistingPathList(String[] existingPaths, String removePath) { - List newPathList = new ArrayList(); + List newPathList = new ArrayList<>(); String path; //adds existing paths to new paths list for (int i = 0; i < existingPaths.length; i++) {