[yocto] [RFC refactor 10/21] Break handlePopulate into remote and local functions

Ioana Grigoropol ioanax.grigoropol at intel.com
Wed Jun 5 10:00:11 PDT 2013


Signed-off-by: Ioana Grigoropol <ioanax.grigoropol at intel.com>
---
 .../ui/wizards/NewBitBakeFileRecipeWizardPage.java |   31 ++++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizardPage.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizardPage.java
index 4ee6b9c..9db0608 100644
--- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizardPage.java
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/ui/wizards/NewBitBakeFileRecipeWizardPage.java
@@ -264,28 +264,33 @@ public class NewBitBakeFileRecipeWizardPage extends WizardPage {
 		String src_uri = txtSrcURI.getText();
 		if ((src_uri.startsWith("http://") || src_uri.startsWith("ftp://")) 
 			&& (src_uri.endsWith("tar.gz") || src_uri.endsWith("tar.bz2"))) {
-		
-			HashMap<String, String> mirror_map = createMirrorLookupTable();
-		
-			populateRecipeName(src_uri);
-			populateSrcuriChecksum(src_uri);
-			String extractDir = extractPackage(src_uri);
-			populateLicensefileChecksum(extractDir);
-			updateSrcuri(mirror_map, src_uri);
-			populateInheritance(extractDir);
+			handleRemotePopulate(src_uri);
 		} else if (src_uri.startsWith("file://")) {
 			String path_str = src_uri.substring(7);
 			File package_dir = new File(path_str);
 			if (package_dir.isDirectory()) {
-				String package_name = path_str.substring(path_str.lastIndexOf("/")+1);
-				fileText.setText(package_name+".bb");
-				populateLicensefileChecksum(path_str);
-				populateInheritance(path_str);
+				handleLocalPopulate(path_str);
 			}
 		}
 		
 	}
+
+	private void handleRemotePopulate(String src_uri) {
+		HashMap<String, String> mirror_map = createMirrorLookupTable();
+		populateRecipeName(src_uri);
+		populateSrcuriChecksum(src_uri);
+		String extractDir = extractPackage(src_uri);
+		populateLicensefileChecksum(extractDir);
+		updateSrcuri(mirror_map, src_uri);
+		populateInheritance(extractDir);
+	}
 	
+	private void handleLocalPopulate(String path_str) {
+		String package_name = path_str.substring(path_str.lastIndexOf("/")+1);
+		fileText.setText(package_name+".bb");
+		populateLicensefileChecksum(path_str);
+		populateInheritance(path_str);
+	}
 	private String extractPackage(String src_uri) {
 		try {
 			File working_dir = new File(metaDirLoc+"/temp");
-- 
1.7.9.5




More information about the yocto mailing list