svn commit: r1525009 - /sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java

[ro...@apache.org]

Author: rombert
Date: Fri Sep 20 13:59:57 2013
New Revision: 1525009

URL: http://svn.apache.org/r1525009
Log:
SLING-3066 - Remove local path from content import wizard

Set the hyperlink to change the content sync dir on the same row with
the displayed value.

Modified:
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java?rev=1525009&r1=1525008&r2=1525009&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java Fri Sep 20 13:59:57 2013
@@ -39,6 +39,7 @@ import org.eclipse.swt.events.SelectionE
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
@@ -183,12 +184,15 @@ public class ImportWizardPage extends Wi
         	setErrorMessage("Select a project first");
         }
         
-        adjustJcrRootText = new Label(composite, SWT.NONE);
+        Composite adjustComposite = new Composite(composite, SWT.NONE);
+        adjustComposite.setLayout(new RowLayout());
+
+        adjustJcrRootText = new Label(adjustComposite, SWT.NONE);
         adjustJcrRootText.setFont(containerGroup.getFont());
         adjustJcrRootText();
         
-        Link openPropertiesLink = new Link(composite, SWT.NONE);
-        openPropertiesLink.setText("<a>Modify location here</a>");
+        Link openPropertiesLink = new Link(adjustComposite, SWT.NONE);
+        openPropertiesLink.setText("(<a>change</a>)");
         openPropertiesLink.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(getShell(), project, 
@@ -199,8 +203,6 @@ public class ImportWizardPage extends Wi
 			}
 		});
         
-        
-        
         createOptionsGroup(composite);
         
         setControl(composite);
@@ -382,7 +384,7 @@ public class ImportWizardPage extends Wi
 		}
         if (project!=null && adjustJcrRootText!=null) {
             adjustJcrRootText();
-            adjustJcrRootText.pack();
+            adjustJcrRootText.getParent().pack();
         }
         if (repositoryCombo.getItemCount() == 0 && project != null) {
         	setErrorMessage("The selected project is not configured with/added to any Sling server");