Cleanups.

* Member to variable.
* String.isEmpty usage.
* Unnecessary local before return.
* Naming conventions
* Integer instantiation
* Dead store to local variable

Change-Id: I96b495245a2505fcbd608965319b3565edf513ff
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/25766
Tested-by: Hudson CI

7 files changed, 14 insertions, 81 deletions

diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/ImportRPMsPage.java b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/ImportRPMsPage.java
index 915644fb96..fceb243ff7 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/ImportRPMsPage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/ImportRPMsPage.java
@@ -71,10 +71,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
 
     private CreaterepoProject project;
 
-    private FormToolkit toolkit;
-    private ScrolledForm form;
-
-    private Composite buttonList;
     private Tree tree;
 
     private static final String MENU_URI = "toolbar:formsToolbar"; //$NON-NLS-1$
@@ -91,10 +87,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
         this.project = project;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.ui.forms.editor.FormPage#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-     */
     @Override
     public void init(IEditorSite site, IEditorInput input) {
         super.init(site, input);
@@ -102,10 +94,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
         ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.ui.forms.editor.FormPage#dispose()
-     */
     @Override
     public void dispose() {
         // remove the resource change listener
@@ -113,18 +101,13 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
         super.dispose();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-     */
     @Override
     protected void createFormContent(IManagedForm managedForm) {
         // setting up the form page
         super.createFormContent(managedForm);
         GridLayout layout = new GridLayout();
-        GridData data = new GridData();
-        toolkit = managedForm.getToolkit();
-        form = managedForm.getForm();
+        FormToolkit toolkit = managedForm.getToolkit();
+        ScrolledForm form = managedForm.getForm();
         form.setText(Messages.ImportRPMsPage_formHeaderText);
         form.setImage(Activator.getImageDescriptor(HEADER_ICON).createImage());
         ToolBarManager toolbarManager = (ToolBarManager) form.getToolBarManager();
@@ -159,9 +142,9 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
         tree = viewer.getTree();
         tree.setLayoutData(expandComposite());
 
-        buttonList = toolkit.createComposite(sectionClient);
+        Composite buttonList = toolkit.createComposite(sectionClient);
         layout = new GridLayout();
-        data = new GridData(SWT.BEGINNING, SWT.FILL, false, true);
+        GridData data = new GridData(SWT.BEGINNING, SWT.FILL, false, true);
         layout.marginWidth = 0; layout.marginHeight = 0;
         buttonList.setLayout(layout);
         buttonList.setLayoutData(data);
@@ -170,7 +153,7 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
                 toolkit).addSelectionListener(new ImportButtonListener());
         createPushButton(buttonList, Messages.ImportRPMsPage_buttonRemoveRPMs,
                 toolkit).addSelectionListener(new RemoveButtonListener());
-        createSpace();
+        new Label(buttonList, SWT.NONE).setLayoutData(new GridData(0,0));
 
         createPushButton(buttonList, Messages.ImportRPMsPage_buttonCreateRepo,
                 toolkit).addSelectionListener(new CreaterepoButtonListener());
@@ -213,15 +196,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
     }
 
     /**
-     * Create space between composites, such as buttons within a button list.
-     *
-     * @param parent The composite to attach a space to.
-     */
-    private void createSpace() {
-        new Label(buttonList, SWT.NONE).setLayoutData(new GridData(0,0));
-    }
-
-    /**
      * On creating the form content the tree will be populated with
      * RPMs found in the root of the current project.
      *
@@ -273,10 +247,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
     public class ImportButtonListener extends SelectionAdapter {
         private final String[] EXTENSION_FILTERS = {"*." + ICreaterepoConstants.RPM_FILE_EXTENSION}; //$NON-NLS-1$
 
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-         */
         @Override
         public void widgetSelected(SelectionEvent e) {
             IWorkbench workbench = PlatformUI.getWorkbench();
@@ -305,10 +275,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
      * Handle the remove button execution on the Import RPMs page.
      */
     public class RemoveButtonListener extends SelectionAdapter {
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-         */
         @Override
         public void widgetSelected(SelectionEvent e) {
             TreeItem[] selection = tree.getSelection();
@@ -345,10 +311,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
      * Handle the createrepo button execution on the Import RPMs page.
      */
     public class CreaterepoButtonListener extends SelectionAdapter {
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-         */
         @Override
         public void widgetSelected(SelectionEvent e) {
             Job executeCreaterepo = new Job(Messages.Createrepo_jobName) {
@@ -372,10 +334,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-     */
     @Override
     public void resourceChanged(IResourceChangeEvent event) {
         // might have to place the delete/close events to RepoMetadataFormEditor to
@@ -401,10 +359,6 @@ public class ImportRPMsPage extends FormPage implements IResourceChangeListener
      * Class to control what to do if something happens in the workspace.
      */
     class CreaterepoDeltaVisitor implements IResourceDeltaVisitor {
-        /*
-         * (non-Javadoc)
-         * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-         */
         @Override
         public boolean visit(IResourceDelta delta) {
             // exit if the project is being removed or closed
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/MetadataPage.java b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/MetadataPage.java
index ad552ac42c..681246d980 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/MetadataPage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/MetadataPage.java
@@ -86,7 +86,6 @@ public class MetadataPage extends FormPage {
         // setting up the form page
         super.createFormContent(managedForm);
         GridLayout layout = new GridLayout();
-        GridData data = new GridData();
         toolkit = managedForm.getToolkit();
         form = managedForm.getForm();
         form.setText(Messages.MetadataPage_formHeaderText);
@@ -108,7 +107,7 @@ public class MetadataPage extends FormPage {
         Section revSection = toolkit.createSection(form.getBody(), Section.DESCRIPTION
                 | ExpandableComposite.TITLE_BAR);
         layout = new GridLayout();
-        data = new GridData();
+        GridData data = new GridData();
         data.verticalAlignment = GridData.FILL;
         data.horizontalAlignment = GridData.FILL;
         data.grabExcessHorizontalSpace = true;
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/preference/CreaterepoPreferencePage.java b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/preference/CreaterepoPreferencePage.java
index 2d4432f501..a3cdec5a6b 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/preference/CreaterepoPreferencePage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/preference/CreaterepoPreferencePage.java
@@ -44,20 +44,12 @@ public class CreaterepoPreferencePage extends FieldEditorPreferencePage implemen
         super(GRID);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-     */
     @Override
     public void init(IWorkbench workbench) {
         setPreferenceStore(new ScopedPreferenceStore(InstanceScope.INSTANCE, Activator.PLUGIN_ID));
         setDescription(Messages.CreaterepoPreferencePage_description);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-     */
     @Override
     public void propertyChange(PropertyChangeEvent event) {
         if (event.getProperty().equals(FieldEditor.VALUE)) {
@@ -65,14 +57,9 @@ public class CreaterepoPreferencePage extends FieldEditorPreferencePage implemen
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
-     */
     @Override
     protected void createFieldEditors() {
         Composite parent = getFieldEditorParent();
-        GridData data = new GridData();
         // general group
         Group generalGroup = new Group(parent, SWT.SHADOW_ETCHED_IN);
         generalGroup.setText(Messages.CreaterepoPreferencePage_generalGroupLabel);
@@ -130,7 +117,7 @@ public class CreaterepoPreferencePage extends FieldEditorPreferencePage implemen
         // note of caution
         Label lblCheckTs = new Label(updatesGroup, SWT.WRAP);
         lblCheckTs.setText(Messages.CreaterepoPreferencePage_checkTSNote);
-        data = new GridData();
+        GridData data = new GridData();
         data.widthHint = 130;
         data.horizontalAlignment = SWT.FILL;
         data.grabExcessHorizontalSpace = true;
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/CreaterepoNewWizardPageTwo.java b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/CreaterepoNewWizardPageTwo.java
index 65fd8c6434..9dd85569c7 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/CreaterepoNewWizardPageTwo.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/CreaterepoNewWizardPageTwo.java
@@ -104,11 +104,10 @@ public class CreaterepoNewWizardPageTwo extends WizardPage {
      * @return The newly created text field.
      */
     protected Text createTextFieldWithLabel(Composite parent, String labelName, String tooltip) {
-        GridData layoutData = new GridData();
         // create the label
         Label respositoryBaseURLLbl = new Label(parent, SWT.NONE);
         respositoryBaseURLLbl.setText(labelName);
-        layoutData = new GridData();
+        GridData layoutData = new GridData();
         layoutData.horizontalAlignment = GridData.BEGINNING;
         layoutData.verticalAlignment = GridData.CENTER;
         respositoryBaseURLLbl.setToolTipText(tooltip);
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PerlMakefileParser.java b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PerlMakefileParser.java
index c2e028554e..8a7de9db42 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PerlMakefileParser.java
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PerlMakefileParser.java
@@ -186,10 +186,9 @@ public class PerlMakefileParser {
     public List<String> getValueList(String key) {
         List<String> rc = new ArrayList<>();
         String var = "";
-        String[] tmp = {};
         if (mMakefileDefinitions.containsKey(key)) {
             var = mMakefileDefinitions.get(key);
-            tmp = var.split(",");
+            String[] tmp = var.split(",");
             for (String str : tmp) {
                 str = cleanUpString(str);
                 rc.add(str);
@@ -368,11 +367,10 @@ public class PerlMakefileParser {
      */
     public static Map<String, String> extractKeyValueAssociation(String line) {
         Map<String, String> rc = new HashMap<>();
-        String[] keyValue = {};
         String key = "";
         String value = "";
         if (matchesAssociativeAssignment(line)) {
-            keyValue = line.split("=>");
+            String[] keyValue = line.split("=>");
             key = cleanUpString(keyValue[0].toLowerCase());
             value = cleanUpString(keyValue[1]);
             rc.put(key, value);
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java
index 2134a81272..9a53854106 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java
@@ -61,7 +61,6 @@ public class PythonEggParser {
         String line = "";
         String setupLine = "";
         List<String> vars = new ArrayList<>();
-        List<String> list = new ArrayList<>();
         int offset = 0;
         try {
             RandomAccessFile raf = new RandomAccessFile(file.getRawLocation().makeAbsolute().toFile(), "r");
@@ -104,7 +103,7 @@ public class PythonEggParser {
                 }
             }
 
-            list = prepareSetupOptions(setupLine);
+            List<String> list = prepareSetupOptions(setupLine);
 
             for (String str : vars) {
                 variables.putAll(parseLine(str));
@@ -172,12 +171,11 @@ public class PythonEggParser {
     public List<String> getValueList(String key) {
         List<String> rc = new ArrayList<>();
         Pattern pattern = Pattern.compile("^\\[(.*)\\]");
-        String[] temp = {};
 
         if (setupOptions.containsKey(key)) {
             Matcher variableMatcher = pattern.matcher(setupOptions.get(key).trim());
             if (variableMatcher.find()) {
-                temp = variableMatcher.group(1).replaceAll("('|\")", "").split(",");
+                String[] temp = variableMatcher.group(1).replaceAll("('|\")", "").split(",");
                 for (String str : temp) {
                     if (!str.isEmpty() && !str.trim().startsWith("#")) {
                         rc.add(str.trim());
@@ -197,7 +195,6 @@ public class PythonEggParser {
      */
     private static List<String> prepareSetupOptions(String setupLine) {
         List<String> rc = new ArrayList<>();
-        String[] tempList = {};
         // match the setup(...) pattern
         Pattern pattern = Pattern.compile("\\bsetup\\b(\\s+)?\\((.*)\\)");
         Matcher variableMatcher = pattern.matcher(setupLine);
@@ -206,7 +203,7 @@ public class PythonEggParser {
             setupLine = variableMatcher.group(2);
         }
 
-        tempList = setupLine.split("(?=,)");
+        String[] tempList = setupLine.split("(?=,)");
 
         for (String str : tempList) {
             if (isOptionLineKeyValuePair(str) && !str.trim().startsWith("#")) {
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/RubyGemParser.java b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/RubyGemParser.java
index c94f1a9428..30dff65b5d 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/RubyGemParser.java
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/RubyGemParser.java
@@ -68,7 +68,6 @@ public class RubyGemParser {
      */
     public void parse() {
         List<String> rawSetupDefinitions = new ArrayList<>();
-        List<String> lSetupDefinitions = new ArrayList<>();
         String line = "";
         long startPos;
         long endPos;
@@ -83,7 +82,7 @@ public class RubyGemParser {
                 rawSetupDefinitions.add(line);
             }
 
-            lSetupDefinitions = prepareOptions(rawSetupDefinitions);
+            List<String> lSetupDefinitions = prepareOptions(rawSetupDefinitions);
 
             for (String str : lSetupDefinitions) {
                 parseLine(str);