Attachment 166760 Details for Bug 310499 – Fix - now uses "Create links in workspace"

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix - now uses "Create links in workspace"

patch310499.txt (text/plain), 8.66 KB, created by Serge Beauchamp

on 2010-05-03 06:26:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Serge Beauchamp

Created: 2010-05-03 06:26:30 EDT

Size: 8.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java,v
>retrieving revision 1.19
>diff -u -r1.19 DataTransferMessages.java
>--- src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java	22 Apr 2010 19:38:26 -0000	1.19
>+++ src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java	3 May 2010 10:20:29 -0000
>@@ -56,9 +56,9 @@
> 	public static String FileImport_createVirtualFolders;
> 	public static String FileImport_importElementsAs;
> 	public static String FileImport_createVirtualFoldersTooltip;
>-	public static String FileImport_copyIntoWorkspace;
>+	public static String FileImport_createLinksInWorkspace;
> 	public static String FileImport_advanced;
>-	public static String FileImport_copyIntoWorkspaceTooltip;
>+	public static String FileImport_createLinksInWorkspaceTooltip;
> 	public static String FileImport_noneSelected;
> 	public static String FileImport_invalidSource;
> 	public static String FileImport_sourceEmpty;
>Index: src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java,v
>retrieving revision 1.24
>diff -u -r1.24 WizardFileSystemResourceImportPage1.java
>--- src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java	27 Apr 2010 18:19:44 -0000	1.24
>+++ src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java	3 May 2010 10:20:30 -0000
>@@ -86,7 +86,7 @@
> 
>     protected Button createVirtualFoldersButton;
> 
>-    protected Button copyIntoWorkspaceButton;
>+    protected Button createLinksInWorkspaceButton;
>     
> 	protected Button advancedButton;
> 
>@@ -116,7 +116,7 @@
> 
>     private final static String STORE_CREATE_VIRTUAL_FOLDERS_ID = "WizardFileSystemResourceImportPage1.STORE_CREATE_VIRTUAL_FOLDERS_ID";//$NON-NLS-1$
> 
>-    private final static String STORE_COPY_INTO_WORKSPACE_ID = "WizardFileSystemResourceImportPage1.STORE_COPY_INTO_WORKSPACE_ID";//$NON-NLS-1$
>+    private final static String STORE_CREATE_LINKS_IN_WORKSPACE_ID = "WizardFileSystemResourceImportPage1.STORE_CREATE_LINKS_IN_WORKSPACE_ID";//$NON-NLS-1$
> 
>     private final static String STORE_PATH_VARIABLE_SELECTED_ID = "WizardFileSystemResourceImportPage1.STORE_PATH_VARIABLE_SELECTED_ID";//$NON-NLS-1$
> 
>@@ -336,13 +336,13 @@
> 
> 
>         // create linked resource check
>-		copyIntoWorkspaceButton= new Button(linkedResourceComposite, SWT.CHECK);
>-		copyIntoWorkspaceButton.setFont(parent.getFont());
>-        copyIntoWorkspaceButton.setText(DataTransferMessages.FileImport_copyIntoWorkspace);
>-        copyIntoWorkspaceButton.setToolTipText(DataTransferMessages.FileImport_copyIntoWorkspaceTooltip);
>-        copyIntoWorkspaceButton.setSelection(true);
>+		createLinksInWorkspaceButton= new Button(linkedResourceComposite, SWT.CHECK);
>+		createLinksInWorkspaceButton.setFont(parent.getFont());
>+        createLinksInWorkspaceButton.setText(DataTransferMessages.FileImport_createLinksInWorkspace);
>+        createLinksInWorkspaceButton.setToolTipText(DataTransferMessages.FileImport_createLinksInWorkspaceTooltip);
>+        createLinksInWorkspaceButton.setSelection(false);
>         
>-        copyIntoWorkspaceButton.addSelectionListener(new SelectionAdapter() {
>+        createLinksInWorkspaceButton.addSelectionListener(new SelectionAdapter() {
>         	public void widgetSelected(SelectionEvent e) {
>         		updateWidgetEnablements();
>         	}
>@@ -425,7 +425,7 @@
> 		if (linkedResourceComposite != null) {
> 			linkedResourceComposite.dispose();
> 			linkedResourceComposite= null;
>-			copyIntoWorkspaceButton = null;
>+			createLinksInWorkspaceButton = null;
> 			createVirtualFoldersButton = null;
> 			relativePathVariableGroup = null;
> 			composite.layout();
>@@ -831,7 +831,7 @@
>         
>         boolean shouldImportTopLevelFoldersRecursively = allItemsAreChecked() &&
>         											createOnlySelectedButton.getSelection() &&
>-        											(copyIntoWorkspaceButton != null && copyIntoWorkspaceButton.getSelection() == false) &&
>+        											(createLinksInWorkspaceButton != null && createLinksInWorkspaceButton.getSelection()) &&
>         											(createVirtualFoldersButton != null && createVirtualFoldersButton.getSelection() == false);
> 		
>         if (shouldImportTopLevelFoldersRecursively)
>@@ -871,7 +871,7 @@
>                 .getSelection());
>         op.setOverwriteResources(overwriteExistingResourcesCheckbox
>                 .getSelection());
>-        if (copyIntoWorkspaceButton != null && copyIntoWorkspaceButton.getSelection() == false) {
>+        if (createLinksInWorkspaceButton != null && createLinksInWorkspaceButton.getSelection()) {
>         	op.setCreateLinks(true);
> 	        op.setVirtualFolders(createVirtualFoldersButton
> 	                .getSelection());
>@@ -958,8 +958,8 @@
> 	            createVirtualFoldersButton.setSelection(createVirtualFolders);
> 	
> 	            boolean createLinkedResources = settings
>-	    				.getBoolean(STORE_COPY_INTO_WORKSPACE_ID);
>-	            copyIntoWorkspaceButton.setSelection(createLinkedResources);
>+	    				.getBoolean(STORE_CREATE_LINKS_IN_WORKSPACE_ID);
>+	            createLinksInWorkspaceButton.setSelection(createLinkedResources);
> 	
> 	            boolean pathVariableSelected = settings
> 						.getBoolean(STORE_PATH_VARIABLE_SELECTED_ID);
>@@ -1000,8 +1000,8 @@
> 	            settings.put(STORE_CREATE_VIRTUAL_FOLDERS_ID,
> 	            		createVirtualFoldersButton.getSelection());
> 	
>-	            settings.put(STORE_COPY_INTO_WORKSPACE_ID,
>-	            		copyIntoWorkspaceButton.getSelection());
>+	            settings.put(STORE_CREATE_LINKS_IN_WORKSPACE_ID,
>+	            		createLinksInWorkspaceButton.getSelection());
> 	
> 	            settings.put(STORE_PATH_VARIABLE_SELECTED_ID,
> 	            		relativePathVariableGroup.getSelection());
>@@ -1186,17 +1186,17 @@
>         super.updateWidgetEnablements();
>         enableButtonGroup(ensureSourceIsValid());
> 
>-    	if (copyIntoWorkspaceButton != null) {
>+    	if (createLinksInWorkspaceButton != null) {
> 			IPath path = getContainerFullPath();
> 	    	if (path != null && relativePathVariableGroup != null) {
> 				IResource target = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
> 				if (target != null && target.isVirtual()) {
>-					copyIntoWorkspaceButton.setSelection(false);
>+					createLinksInWorkspaceButton.setSelection(true);
> 					createVirtualFoldersButton.setSelection(true);
> 				}
> 	    	}
>-			relativePathVariableGroup.setEnabled(!copyIntoWorkspaceButton.getSelection());
>-			createVirtualFoldersButton.setEnabled(!copyIntoWorkspaceButton.getSelection());
>+			relativePathVariableGroup.setEnabled(createLinksInWorkspaceButton.getSelection());
>+			createVirtualFoldersButton.setEnabled(createLinksInWorkspaceButton.getSelection());
> 	
> 			if ((!selectionGroup.getAllCheckedListItems().isEmpty() && !allItemsAreChecked()) ||
> 				(createOnlySelectedButton.getSelection() == false)) {
>Index: src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties,v
>retrieving revision 1.31
>diff -u -r1.31 messages.properties
>--- src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties	22 Apr 2010 19:38:26 -0000	1.31
>+++ src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties	3 May 2010 10:20:30 -0000
>@@ -54,9 +54,9 @@
> FileImport_createVirtualFolders = Create &virtual folders
> FileImport_importElementsAs=Create l&ink locations relative to:
> FileImport_createVirtualFoldersTooltip = This option needs to be set when a partial hierarchy is selected.
>-FileImport_copyIntoWorkspace= Copy into wor&kspace
>+FileImport_createLinksInWorkspace= Create links in wor&kspace
> FileImport_advanced=Advance&d
>-FileImport_copyIntoWorkspaceTooltip= If this option is not set, link files and folders will be created
>+FileImport_createLinksInWorkspaceTooltip= If this option is set, link files and folders will be created
> FileImport_noneSelected = There are no resources currently selected for import.
> FileImport_invalidSource = Source directory is not valid or has not been specified.
> FileImport_sourceEmpty = Source must not be empty.

Actions: View | Diff

Attachments on bug 310499: 166760 | 166811