Remove unused parameter.

Also fix formatting a bit and don't catch Exception.



Change-Id: Idcce468de1c669d18ad7030d3d7434255c5bc424
Reviewed-on: https://git.eclipse.org/r/9968
Tested-by: Hudson CI
Reviewed-by: Camilo Bernal <cabernal@redhat.com>
IP-Clean: Camilo Bernal <cabernal@redhat.com>
Tested-by: Camilo Bernal <cabernal@redhat.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportPage.java
index b7b88f6e25..3b5503f635 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportPage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportPage.java
@@ -12,6 +12,7 @@ package org.eclipse.linuxtools.internal.rpm.ui;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -37,7 +38,6 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
 
 /**
  * RPM GUI import page. Defines the page the is shown to the user when they
@@ -54,13 +54,9 @@ public class SRPMImportPage extends WizardPage {
 	private RPMDetailsPanel detailsPanel;
 
 	/**
-	 * @see java.lang.Object#Object()
-	 * 
-	 *      Constructor for SRPMImportPage class
-	 * @param aWorkbench
-	 *            - Workbench
+	 * Constructor for SRPMImportPage class
 	 */
-	public SRPMImportPage(IWorkbench aWorkbench) {
+	public SRPMImportPage() {
 		super(
 				Messages.getString("SRPMImportPage.Import_SRPM"), //$NON-NLS-1$
 				Messages.getString("SRPMImportPage.Select_project_to_import"), null); //$NON-NLS-1$
@@ -132,8 +128,9 @@ public class SRPMImportPage extends WizardPage {
 				String selectedSRPM_name = srpmBrowseDialog.open();
 				if (selectedSRPM_name != null) {
 					File testSRPMfilename = new File(selectedSRPM_name);
-					if (testSRPMfilename.isFile())
+					if (testSRPMfilename.isFile()) {
 						sourceSRPM.setText(selectedSRPM_name);
+					}
 				}
 			}
 		});
@@ -164,8 +161,7 @@ public class SRPMImportPage extends WizardPage {
 		// Make sure an srpm name has been provided
 		String sourceSRPMName = sourceSRPM.getText();
 		if (!sourceSRPMName.isEmpty()
-				&& sourceSRPM.getText().lastIndexOf(".src.rpm") == -1) //$NON-NLS-1$
-		{
+				&& sourceSRPM.getText().lastIndexOf(".src.rpm") == -1) {//$NON-NLS-1$
 			setErrorMessage(Messages.getString("SRPMImportPage.No_src_rpm_ext")); //$NON-NLS-1$
 			return false;
 		}
@@ -224,7 +220,13 @@ public class SRPMImportPage extends WizardPage {
 						sourceRPMFile, detailsPanel.getSelectedLayout());
 			}
 			getContainer().run(true, true, srpmImportOp);
-		} catch (Exception e) {
+		} catch (InterruptedException e) {
+			setErrorMessage(e.toString());
+			return false;
+		} catch (InvocationTargetException e) {
+			setErrorMessage(e.toString());
+			return false;
+		} catch (MalformedURLException e) {
 			setErrorMessage(e.toString());
 			return false;
 		}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportWizard.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportWizard.java
index 2cb1cb0d7e..8f34a2d59e 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportWizard.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/SRPMImportWizard.java
@@ -23,14 +23,12 @@ import org.eclipse.ui.IWorkbench;
  * for the import rpm plug-in.
  */
 public class SRPMImportWizard extends Wizard implements IImportWizard {
-	private IWorkbench workbench;
 	private SRPMImportPage mainPage;
 
 	/**
 	 * @see org.eclipse.ui.IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
 	 */
 	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		this.workbench = workbench;
 		setWindowTitle(Messages.getString("SRPMImportwizard.Import_an_SRPM")); //$NON-NLS-1$
 		setNeedsProgressMonitor(true);
 	}
@@ -63,7 +61,7 @@ public class SRPMImportWizard extends Wizard implements IImportWizard {
 	// Add the SRPMImportPage as the only page in this wizard.
 	@Override
 	public void addPages() {
-		mainPage = new SRPMImportPage(workbench);
+		mainPage = new SRPMImportPage();
 		addPage(mainPage);
 		super.addPages();
 	}