[Esbox-commits] r1528 - branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-05-04 22:41:40 +0300 (Mon, 04 May 2009)
New Revision: 1528

Modified:
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/SDKTargetSelectionPage.java
Log:
Merge revs 1524:1527 from trunk

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java	2009-05-04 18:17:26 UTC (rev 1527)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java	2009-05-04 19:41:40 UTC (rev 1528)
@@ -33,6 +33,7 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 import org.maemo.esbox.internal.scratchbox.sb1.ui.process.ValidateNokiaBinariesInstallation;
+import org.maemo.mica.internal.api.common.core.GridLayoutWrappedTextUtils;
 
 /**
  * @author Fabrício S Epaminondas (UFCG)
@@ -85,15 +86,14 @@
 		setControl(composite);
 
 		
-		Link link = new Link(composite, SWT.NONE);
+		Link link = new Link(composite, SWT.WRAP);
 		final String url = "http://tablets-dev.nokia.com/eula/index.php";
+		//You need to accept a license and retrieve a repository token from a EULA page.  Please visit <...url here...> and accept the agreement, then copy and paste the "deb" repository line into this field:
 		String msg = MessageFormat
 				.format(
-						"Inorder to obtain Nokia-closed binaries, you are required to accept The End User\n" +
-						"License Agreement. Visit <a href=\"''{0}''\"> {0} </a> to do so.\n" +
-						"Upon acceptance, you are given a specific \"Token\" to access the Nokia binaries\nrepository."+
-						" Please note that such obtained token may not be re-distributed or \ndisclosed. Along with the"
-						+" token, you are also given a repository url.\nPlease, paste the url here:",url);
+						"You need to accept a license and retrieve a repository token from a EULA page." +
+						"  Please visit <a>{0}</a> and accept the agreement, then copy and paste the \"deb\"" +
+						" repository line into this field:",url);
 		link
 				.setText(msg);
 		
@@ -107,24 +107,24 @@
             }}
         );
         
+		GridData data = GridDataFactory.swtDefaults().span(2, 0).create();
+		GridLayoutWrappedTextUtils.setupLabel(getShell(), link, data);
 
-		GridDataFactory.fillDefaults().span(2,0).grab(true, false).applyTo(link);
 		
 		fRepository = new Text(composite, SWT.BORDER);
-		fRepository.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		fRepository.addModifyListener(new ModifyListener(){
 			public void modifyText(ModifyEvent e) {
 				validatePage();
 			}});
-		GridDataFactory.fillDefaults().span(2,0).grab(true, false).applyTo(fRepository);
+		GridDataFactory.fillDefaults().span(2,0).applyTo(fRepository);
 		
-		Label lb= new Label(composite, SWT.NONE);
+		Label lb= new Label(composite, SWT.WRAP);
 		lb.setText("The the wizard will automatically add the url to your /etc/apt/sources.list in scratchbox.");
-		GridData data = new GridData(GridData.FILL_HORIZONTAL
-				| GridData.GRAB_HORIZONTAL);
+		data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
 		data.horizontalSpan = 2;
 		data.widthHint = 150;
 		lb.setLayoutData(data);
+		GridLayoutWrappedTextUtils.setupLabel(getShell(), link, data);
 		
 	}
 	
@@ -171,6 +171,7 @@
 		if(repoURL == null || repoURL.length() == 0) return false;
 		
 		// It means the TOKEN was received
+		repoURL = repoURL.trim();//cleaning white spaces
 		Matcher	matcher = REPO_PATTERN.matcher(repoURL);
 
 		if (!matcher.find()) 

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/SDKTargetSelectionPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/SDKTargetSelectionPage.java	2009-05-04 18:17:26 UTC (rev 1527)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/SDKTargetSelectionPage.java	2009-05-04 19:41:40 UTC (rev 1528)
@@ -74,7 +74,7 @@
 	protected SDKTargetSelectionPage() {
 		super("sdk_target_page");
 		setTitle("Select Platform");
-		this.label = "Select targets in this platform in which you want to install binaries:";
+		this.label = "Select targets in this Platform in which you want to install binaries:";
 		setPageComplete(false);
 	}