[eclipse-poky][PATCH] OptionsPage.java: Allow BC Project name to be other than poky folder

[eclipse-poky][PATCH] OptionsPage.java: Allow BC Project name to be other than poky folder

[Jose Lamego]

Fixes [Yocto 8407]

This change allows a new Yocto Project Bitbake Commander project
to be named as desired, not as the poky folder.

Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
 .../src/org/yocto/bc/ui/wizards/install/OptionsPage.java     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 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 bd91ef9..582d301 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
@@ -130,7 +130,7 @@ public class OptionsPage extends FiniteStateWizardPage {
 	@Override
 	
 	protected void updateModel() {
-		model.put(InstallWizard.INSTALL_DIRECTORY, txtProjectLocation.getText()+File.separator+txtProjectName.getText());
+		model.put(InstallWizard.INSTALL_DIRECTORY, txtProjectLocation.getText());
 		model.put(InstallWizard.PROJECT_NAME, txtProjectName.getText());
 	}
 
@@ -166,13 +166,9 @@ public class OptionsPage extends FiniteStateWizardPage {
 			return false;
 		}
 
-		String projectPath = projectLoc + txtProjectName.getText();
-		File prj_dir=new File(projectPath);
-		if(!prj_dir.isDirectory() || !prj_dir.exists()) {
-			if(!new File(projectPath + File.separator + InstallWizard.VALIDATION_FILE).exists()) {
-				setErrorMessage("Directory " + txtProjectLocation.getText() + txtProjectName.getText() + " is an invalid poky directory.");
-				return false;
-			}
+		if(!new File(projectLoc + File.separator + InstallWizard.VALIDATION_FILE).exists()) {
+			setErrorMessage("Directory " + txtProjectLocation.getText() + " is an invalid poky directory.");
+			return false;
 		}
 
 		try {
-- 
1.8.4.5

Re: [eclipse-poky][PATCH] OptionsPage.java: Allow BC Project name to be other than poky folder

[Jose Lamego]

[-- Attachment #1: Type: text/plain, Size: 2051 bytes --]

Ping


On 11/30/2015 03:54 PM, Jose Lamego wrote:
> Fixes [Yocto 8407]
> 
> This change allows a new Yocto Project Bitbake Commander project
> to be named as desired, not as the poky folder.
> 
> Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
> ---
>  .../src/org/yocto/bc/ui/wizards/install/OptionsPage.java     | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 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 bd91ef9..582d301 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
> @@ -130,7 +130,7 @@ public class OptionsPage extends FiniteStateWizardPage {
>  	@Override
>  	
>  	protected void updateModel() {
> -		model.put(InstallWizard.INSTALL_DIRECTORY, txtProjectLocation.getText()+File.separator+txtProjectName.getText());
> +		model.put(InstallWizard.INSTALL_DIRECTORY, txtProjectLocation.getText());
>  		model.put(InstallWizard.PROJECT_NAME, txtProjectName.getText());
>  	}
>  
> @@ -166,13 +166,9 @@ public class OptionsPage extends FiniteStateWizardPage {
>  			return false;
>  		}
>  
> -		String projectPath = projectLoc + txtProjectName.getText();
> -		File prj_dir=new File(projectPath);
> -		if(!prj_dir.isDirectory() || !prj_dir.exists()) {
> -			if(!new File(projectPath + File.separator + InstallWizard.VALIDATION_FILE).exists()) {
> -				setErrorMessage("Directory " + txtProjectLocation.getText() + txtProjectName.getText() + " is an invalid poky directory.");
> -				return false;
> -			}
> +		if(!new File(projectLoc + File.separator + InstallWizard.VALIDATION_FILE).exists()) {
> +			setErrorMessage("Directory " + txtProjectLocation.getText() + " is an invalid poky directory.");
> +			return false;
>  		}
>  
>  		try {
> 

-- 
Jose Lamego | OTC Embedded Platforms & Tools | GDC


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]