[yocto] [RFC Refactor 3/5] Refactor and clean-up of OptionsPage fields

[Ioana Grigoropol]

- clean-up all unused fields
- rename fields to have consistent names

Signed-off-by: Ioana Grigoropol <ioanax.grigoropol at intel.com>
---
 .../yocto/bc/ui/wizards/install/OptionsPage.java   |   38 ++++----------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/OptionsPage.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/OptionsPage.java
index 2844fda..f5e6e0e 100644
--- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/OptionsPage.java
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/install/OptionsPage.java
@@ -45,19 +45,13 @@ import org.yocto.bc.ui.wizards.FiniteStateWizardPage.ValidationListener;
  */
 public class OptionsPage extends FiniteStateWizardPage {
 
-	private Map vars;
-	private Composite c1;
 	private Composite top;
 	
-	private List controlList;
-	private boolean controlsCreated = false;
-	
 	private Text txtProjectLocation;
 
-	private Text txtInit;
 	private ValidationListener validationListener;
 	private Text txtProjectName;
-	private Button gitButton;
+	private Button btnGit;
 
 	protected OptionsPage(Map model) {
 		super("Options", model);
@@ -125,10 +119,10 @@ public class OptionsPage extends FiniteStateWizardPage {
 		gl.marginWidth = 0;
 		gitComposite.setLayout(gl);
 
-		gitButton = new Button(gitComposite, SWT.CHECK);
-		gitButton.setText("Clone from Yocto Project &Git Repository");
-		gitButton.setEnabled(true);
-		gitButton.addSelectionListener(validationListener);
+		btnGit = new Button(gitComposite, SWT.CHECK);
+		btnGit.setText("Clone from Yocto Project &Git Repository");
+		btnGit.setEnabled(true);
+		btnGit.addSelectionListener(validationListener);
 
 		setControl(top);
 	}
@@ -155,7 +149,7 @@ public class OptionsPage extends FiniteStateWizardPage {
 	protected void updateModel() {
 		model.put(InstallWizard.INSTALL_DIRECTORY, txtProjectLocation.getText()+File.separator+txtProjectName.getText());
 		model.put(InstallWizard.PROJECT_NAME, txtProjectName.getText());
-		model.put(InstallWizard.GIT_CLONE, new Boolean(gitButton.getSelection()));
+		model.put(InstallWizard.GIT_CLONE, new Boolean(btnGit.getSelection()));
 	}
 
 	private boolean isValidProjectName(String projectName) {
@@ -192,7 +186,7 @@ public class OptionsPage extends FiniteStateWizardPage {
 		
 		String projectPath = projectLoc + File.separator+txtProjectName.getText();
 		File git_dir=new File(projectPath);
-		if(!gitButton.getSelection()) {
+		if(!btnGit.getSelection()) {
 			if(!git_dir.isDirectory() || !git_dir.exists()) {
 				setErrorMessage("Directory " + txtProjectLocation.getText()+File.separator+txtProjectName.getText() + " does not exist, please select git clone.");
 				return false;
@@ -226,22 +220,4 @@ public class OptionsPage extends FiniteStateWizardPage {
 		return true;
 	}
 	
-	private class FileOpenSelectionAdapter extends SelectionAdapter {
-		@Override
-		public void widgetSelected(SelectionEvent e) {
-			FileDialog fd = new FileDialog(PlatformUI.getWorkbench()
-					.getDisplay().getActiveShell(), SWT.OPEN);
-
-			fd.setText("Open Configuration Script");
-			fd.setFilterPath(txtProjectLocation.getText());
-
-			String selected = fd.open();
-
-			if (selected != null) {
-				txtInit.setText(selected);
-				updateModel();
-			}
-		}
-	}
-
 }
-- 
1.7.9.5