From: Laurentiu Palcu <laurentiu.palcu@intel.com>
To: Ioana Grigoropol <ioanax.grigoropol@intel.com>
Cc: yocto@yoctoproject.org
Subject: Re: [PATCH] [eclipse-poky-windows][branch:windows-build]Remove validate existing repository radio button
Date: Tue, 11 Dec 2012 15:27:47 +0200 [thread overview]
Message-ID: <50C734D3.20009@intel.com> (raw)
In-Reply-To: <1355223801-14269-1-git-send-email-ioanax.grigoropol@intel.com>
Why don't you remove the commented code completely? You can always look
into file's git history if you need to.
Thanks,
Laurentiu
On 12/11/2012 01:03 PM, Ioana Grigoropol wrote:
> - remove radio button for validating existing repository but keep performing the validation in the back
> - make 'clone' button a check button
>
> Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
> ---
> .../yocto/bc/ui/wizards/install/OptionsPage.java | 40 +++++++++-----------
> 1 file changed, 18 insertions(+), 22 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 9e94aea..9c01e4e 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
> @@ -54,7 +54,7 @@ public class OptionsPage extends FiniteStateWizardPage {
> private ValidationListener validationListener;
> private Text txtProjectName;
> private Button btnGit;
> - private Button btnValidate;
> +// private Button btnValidate;
>
> private RemoteProjectContentsLocationArea locationArea;
>
> @@ -67,7 +67,7 @@ public class OptionsPage extends FiniteStateWizardPage {
> public void createControl(Composite parent) {
> top = new Composite(parent, SWT.None);
> top.setLayout(new GridLayout());
> - top.setLayoutData(new GridData(GridData.FILL_BOTH));
> + top.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>
> GridData gdFillH = new GridData(GridData.FILL_HORIZONTAL);
>
> @@ -97,25 +97,26 @@ public class OptionsPage extends FiniteStateWizardPage {
>
> locationArea = new RemoteProjectContentsLocationArea(errorReporter, top, null);
>
> - Group locationValidationGroup = new Group(top, SWT.NONE);
> - locationValidationGroup.setText("Git repository");
> - GridData gd = new GridData(GridData.VERTICAL_ALIGN_END | GridData.FILL_HORIZONTAL);
> - locationValidationGroup.setLayoutData(gd);
> - GridLayout gl = new GridLayout(1, false);
> - locationValidationGroup.setLayout(gl);
> +// Group locationValidationGroup = new Group(top, SWT.NONE);
> +// locationValidationGroup.setText("Git repository");
> +// GridData gd = new GridData(GridData.VERTICAL_ALIGN_END | GridData.FILL_HORIZONTAL);
> +// locationValidationGroup.setLayoutData(gd);
> +// GridLayout gl = new GridLayout(1, false);
> +// locationValidationGroup.setLayout(gl);
>
> - btnGit = new Button(locationValidationGroup, SWT.RADIO);
> + btnGit = new Button(top, SWT.CHECK);
> btnGit.setText("Clone from Yocto Project &Git Repository into new location");
> btnGit.setEnabled(true);
> btnGit.setSelection(true);
> btnGit.addSelectionListener(validationListener);
> + GridData gd = new GridData(GridData.VERTICAL_ALIGN_END | GridData.FILL_HORIZONTAL);
> + btnGit.setLayoutData(gd);
>
> -
> - btnValidate = new Button(locationValidationGroup, SWT.RADIO);
> - btnValidate.setText("&Validate existing Git project location");
> - btnValidate.setEnabled(true);
> - btnValidate.setSelection(false);
> - btnValidate.addSelectionListener(validationListener);
> +// btnValidate = new Button(locationValidationGroup, SWT.RADIO);
> +// btnValidate.setText("&Validate existing Git project location");
> +// btnValidate.setEnabled(true);
> +// btnValidate.setSelection(false);
> +// btnValidate.addSelectionListener(validationListener);
>
> setControl(top);
> }
> @@ -165,16 +166,11 @@ public class OptionsPage extends FiniteStateWizardPage {
> String projectPath = projectLoc + separator + getProjectName();
> IHostFile repoDest = RemoteHelper.getRemoteHostFile(connection, projectPath, new NullProgressMonitor());
>
> - if(btnValidate.getSelection()) {
> + if(!btnGit.getSelection()) {
> if (repoDest == null || !repoDest.exists()) {
> setErrorMessage("Directory " + projectPath + " does not exist, please select git clone.");
> return false;
> }
> -// IHostFile gitDescr = RemoteHelper.getRemoteHostFile(connection, projectPath + "/.git", new NullProgressMonitor());
> -// if (gitDescr == null || !gitDescr.exists()) {
> -// setErrorMessage("Directory " + projectPath + " does not contain a git repository, please select git clone.");
> -// return false;
> -// }
>
> IHostFile validationFile = RemoteHelper.getRemoteHostFile(connection, projectPath + URI_SEPARATOR + InstallWizard.VALIDATION_FILE, new NullProgressMonitor());
> if (validationFile == null || !validationFile.exists()) {
> @@ -185,7 +181,7 @@ public class OptionsPage extends FiniteStateWizardPage {
> if (repoDest.exists() && repoDest.isDirectory()) {
> IHostFile gitDescr = RemoteHelper.getRemoteHostFile(connection, projectPath + "/.git", new NullProgressMonitor());
> if (gitDescr != null && gitDescr.exists()) {
> - setErrorMessage("Directory " + projectPath + " contains a repository, please select validate repository.");
> + setErrorMessage("Directory " + projectPath + " contains a repository, please choose another location or skip cloning the repository.");
> return false;
> }
> }
>
next prev parent reply other threads:[~2012-12-11 13:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-11 11:03 [PATCH] [eclipse-poky-windows][branch:windows-build]Remove validate existing repository radio button Ioana Grigoropol
2012-12-11 13:27 ` Laurentiu Palcu [this message]
2012-12-11 13:47 ` Grigoropol, IoanaX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50C734D3.20009@intel.com \
--to=laurentiu.palcu@intel.com \
--cc=ioanax.grigoropol@intel.com \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.