[eclipse-poky][PATCH v2] OptionsPage.java: improved handling of path concatenation in new project

[eclipse-poky][PATCH v2] OptionsPage.java: improved handling of path concatenation in new project

[Humberto Ibarra]

When creating a new Yocto Bitbake Commander project, the folder
separator is not being handled corretly. The problem is a folder and
a file to be concatenated are joined as Strings instead of paths.

This patch solves the issue by using a path joioning mechanism instead
of simply concatenating strings.

[Yocto #9648]
---
 .../src/org/yocto/bc/ui/wizards/install/OptionsPage.java            | 6 +++---
 1 file changed, 3 insertions(+), 3 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..3a2caa0 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
@@ -166,17 +166,17 @@ public class OptionsPage extends FiniteStateWizardPage {
 			return false;
 		}
 
-		String projectPath = projectLoc + txtProjectName.getText();
+		String projectPath = new File(projectLoc,txtProjectName.getText()).getPath();
 		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.");
+				setErrorMessage("Directory " + projectPath + " is an invalid poky directory.");
 				return false;
 			}
 		}
 
 		try {
-			URI location = new URI("file://" + txtProjectLocation.getText()+File.separator+txtProjectName.getText());
+			URI location = new URI("file://" + projectPath);
 			IStatus status = ResourcesPlugin.getWorkspace().validateProjectLocationURI(proj, location);
 			if (!status.isOK()) {
 				setErrorMessage(status.getMessage());
-- 
2.4.11

Re: [eclipse-poky][PATCH v2] OptionsPage.java: improved handling of path concatenation in new project

[timothy.t.orling]

Please add your 'Signed-off-by:'
(e.g. use 'git commit -s')

--Tim

> When creating a new Yocto Bitbake Commander project, the folder
> separator is not being handled corretly. The problem is a folder and
> a file to be concatenated are joined as Strings instead of paths.
>
> This patch solves the issue by using a path joioning mechanism instead
> of simply concatenating strings.
>
> [Yocto #9648]
> ---
>  .../src/org/yocto/bc/ui/wizards/install/OptionsPage.java            | 6
> +++---
>  1 file changed, 3 insertions(+), 3 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..3a2caa0 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
> @@ -166,17 +166,17 @@ public class OptionsPage extends
> FiniteStateWizardPage {
>  			return false;
>  		}
>
> -		String projectPath = projectLoc + txtProjectName.getText();
> +		String projectPath = new
> File(projectLoc,txtProjectName.getText()).getPath();
>  		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.");
> +				setErrorMessage("Directory " + projectPath + " is an invalid poky
> directory.");
>  				return false;
>  			}
>  		}
>
>  		try {
> -			URI location = new URI("file://" +
> txtProjectLocation.getText()+File.separator+txtProjectName.getText());
> +			URI location = new URI("file://" + projectPath);
>  			IStatus status =
> ResourcesPlugin.getWorkspace().validateProjectLocationURI(proj,
> location);
>  			if (!status.isOK()) {
>  				setErrorMessage(status.getMessage());
> --
> 2.4.11
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>

Re: [eclipse-poky][PATCH v2] OptionsPage.java: improved handling of path concatenation in new project

[timothy.t.orling]

Tested for luna-master plugin branch and yocto-2.0.1 docs branch.

Tested-by: Tim Orling <timothy.t.orling@linux.intel.com>

> Please add your 'Signed-off-by:'
> (e.g. use 'git commit -s')
>
> --Tim
>
>> When creating a new Yocto Bitbake Commander project, the folder
>> separator is not being handled corretly. The problem is a folder and
>> a file to be concatenated are joined as Strings instead of paths.
>>
>> This patch solves the issue by using a path joioning mechanism instead
>> of simply concatenating strings.
>>
>> [Yocto #9648]
>> ---
>>  .../src/org/yocto/bc/ui/wizards/install/OptionsPage.java            | 6
>> +++---
>>  1 file changed, 3 insertions(+), 3 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..3a2caa0 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
>> @@ -166,17 +166,17 @@ public class OptionsPage extends
>> FiniteStateWizardPage {
>>  			return false;
>>  		}
>>
>> -		String projectPath = projectLoc + txtProjectName.getText();
>> +		String projectPath = new
>> File(projectLoc,txtProjectName.getText()).getPath();
>>  		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.");
>> +				setErrorMessage("Directory " + projectPath + " is an invalid poky
>> directory.");
>>  				return false;
>>  			}
>>  		}
>>
>>  		try {
>> -			URI location = new URI("file://" +
>> txtProjectLocation.getText()+File.separator+txtProjectName.getText());
>> +			URI location = new URI("file://" + projectPath);
>>  			IStatus status =
>> ResourcesPlugin.getWorkspace().validateProjectLocationURI(proj,
>> location);
>>  			if (!status.isOK()) {
>>  				setErrorMessage(status.getMessage());
>> --
>> 2.4.11
>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>>
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>