Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 158297 Details for
Bug 301144
[LinkedResources] "File and Folder Import" dialog polishing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
Patch
patch.txt (text/plain), 20.43 KB, created by
Serge Beauchamp
on 2010-02-05 07:15:10 EST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Serge Beauchamp
Created:
2010-02-05 07:15:10 EST
Size:
20.43 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.ui.ide >Index: src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java,v >retrieving revision 1.3 >diff -u -r1.3 ImportTypeDialog.java >--- src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java 25 Jan 2010 16:12:12 -0000 1.3 >+++ src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java 5 Feb 2010 12:14:13 -0000 >@@ -19,6 +19,7 @@ > import org.eclipse.swt.SWT; > import org.eclipse.swt.events.SelectionEvent; > import org.eclipse.swt.events.SelectionListener; >+import org.eclipse.swt.graphics.Image; > import org.eclipse.swt.layout.GridData; > import org.eclipse.swt.layout.GridLayout; > import org.eclipse.swt.widgets.Button; >@@ -30,6 +31,7 @@ > import org.eclipse.ui.internal.ide.IDEInternalPreferences; > import org.eclipse.ui.internal.ide.IDEWorkbenchMessages; > import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; >+import org.eclipse.ui.plugin.AbstractUIPlugin; > > /** > * @since 3.6 >@@ -38,12 +40,50 @@ > public class ImportTypeDialog extends MessageDialog implements SelectionListener { > > /** >+ * Do not perform an import operation >+ */ >+ public final static int IMPORT_NONE = 0; >+ /** >+ * Copy the files and folders to the destination >+ */ >+ public final static int IMPORT_COPY = 1; >+ /** >+ * Recreate the file and folder hierarchy using groups and links >+ */ >+ public final static int IMPORT_VIRTUAL_FOLDERS_AND_LINKS = 2; >+ /** >+ * Create linked resources for each file and folder >+ */ >+ public final static int IMPORT_LINK = 4; >+ /** >+ * Move the files and folders to the destination >+ */ >+ public final static int IMPORT_MOVE = 8; >+ /** >+ * Import only files >+ */ >+ public final static int IMPORT_FILES_ONLY = 16; >+ >+ private Image fileImage; >+ private Image linkedFileImage; >+ private Image folderAndFileImage; >+ private Image virtualFolderAndFileImage; >+ private Image linkedFolderAndFileImage; >+ >+ /** > * @param parentShell > * @param operationMask > */ > public ImportTypeDialog(Shell parentShell, int operationMask) { >- super(parentShell, IDEWorkbenchMessages.ImportTypeDialog_title, null, IDEWorkbenchMessages.ImportTypeDialog_question, >- MessageDialog.QUESTION, new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0); >+ super(parentShell, >+ (operationMask & IMPORT_FILES_ONLY) != 0 ? IDEWorkbenchMessages.ImportTypeDialog_titleFilesOnly: >+ IDEWorkbenchMessages.ImportTypeDialog_title, >+ null, >+ (operationMask & IMPORT_FILES_ONLY) != 0 ? IDEWorkbenchMessages.ImportTypeDialog_questionFilesOnly: >+ IDEWorkbenchMessages.ImportTypeDialog_question, >+ MessageDialog.QUESTION, >+ new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, >+ 0); > > this.operationMask = operationMask; > currentSelection = 0; >@@ -52,11 +92,31 @@ > currentSelection = Integer.parseInt(tmp); > currentSelection = currentSelection & operationMask; > if (currentSelection == 0) { >- if ((operationMask & IMPORT_COPY) != 0) >+ if (hasFlag(IMPORT_COPY)) > currentSelection = IMPORT_COPY; > else > currentSelection = IMPORT_MOVE; > } >+ fileImage = AbstractUIPlugin.imageDescriptorFromPlugin( >+ IDEWorkbenchPlugin.IDE_WORKBENCH, >+ "$nl$/icons/full/obj16/generic_file.gif").createImage(); //$NON-NLS-1$ >+ >+ linkedFileImage = AbstractUIPlugin.imageDescriptorFromPlugin( >+ IDEWorkbenchPlugin.IDE_WORKBENCH, >+ "$nl$/icons/full/obj16/linked_file.gif").createImage(); //$NON-NLS-1$ >+ >+ folderAndFileImage = AbstractUIPlugin.imageDescriptorFromPlugin( >+ IDEWorkbenchPlugin.IDE_WORKBENCH, >+ "$nl$/icons/full/obj16/folder_file.gif").createImage(); //$NON-NLS-1$ >+ >+ virtualFolderAndFileImage = AbstractUIPlugin.imageDescriptorFromPlugin( >+ IDEWorkbenchPlugin.IDE_WORKBENCH, >+ "$nl$/icons/full/obj16/virtual_folder_file.gif").createImage(); //$NON-NLS-1$ >+ >+ linkedFolderAndFileImage = AbstractUIPlugin.imageDescriptorFromPlugin( >+ IDEWorkbenchPlugin.IDE_WORKBENCH, >+ "$nl$/icons/full/obj16/linked_folder_file.gif").createImage(); //$NON-NLS-1$ >+ > } > > // the format of the context is operationMask,value:operationMask,value:operationMask,value >@@ -118,26 +178,6 @@ > return variable; > } > >- /** >- * Copy the files and folders to the destination >- */ >- public final static int IMPORT_COPY = 1; >- /** >- * Recreate the file and folder hierarchy using groups and links >- */ >- public final static int IMPORT_GROUPS_AND_LINKS = 2; >- /** >- * Create linked resources for each file and folder >- */ >- public final static int IMPORT_LINK = 4; >- /** >- * Move the files and folders to the destination >- */ >- public final static int IMPORT_MOVE = 8; >- /** >- * Do not perform an import operation >- */ >- public final static int IMPORT_NONE = 0; > > /** > * @return The current selection (one of IMPORT_COPY, IMPORT_GROUPS_AND_LINKS, IMPORT_LINK and IMPORT_MOVE) >@@ -180,42 +220,47 @@ > layout.marginTop = 0; > composite.setLayout(layout); > >- if ((operationMask & IMPORT_COPY) != 0) { >+ if (hasFlag(IMPORT_COPY)) { > copyButton = new Button(composite, SWT.RADIO); >- copyButton.setText(IDEWorkbenchMessages.ImportTypeDialog_copyFilesAndDirectories); >+ copyButton.setText(hasFlag(IMPORT_FILES_ONLY) ? IDEWorkbenchMessages.ImportTypeDialog_copyFiles: IDEWorkbenchMessages.ImportTypeDialog_copyFilesAndDirectories); > gridData = new GridData(GridData.FILL_HORIZONTAL); > copyButton.setLayoutData(gridData); > copyButton.setData(new Integer(IMPORT_COPY)); > copyButton.addSelectionListener(this); >+ if (hasFlag(IMPORT_VIRTUAL_FOLDERS_AND_LINKS | IMPORT_LINK)) >+ copyButton.setImage(hasFlag(IMPORT_FILES_ONLY) ? fileImage:folderAndFileImage); > } > >- if ((operationMask & IMPORT_MOVE) != 0) { >+ if (hasFlag(IMPORT_MOVE)) { > moveButton = new Button(composite, SWT.RADIO); >- moveButton.setText(IDEWorkbenchMessages.ImportTypeDialog_moveFilesAndDirectories); >+ moveButton.setText(hasFlag(IMPORT_FILES_ONLY) ? IDEWorkbenchMessages.ImportTypeDialog_moveFiles:IDEWorkbenchMessages.ImportTypeDialog_moveFilesAndDirectories); > gridData = new GridData(GridData.FILL_HORIZONTAL); > moveButton.setLayoutData(gridData); > moveButton.setData(new Integer(IMPORT_MOVE)); > moveButton.addSelectionListener(this); > } > >- if ((operationMask & IMPORT_GROUPS_AND_LINKS) != 0) { >- shadowCopyButton = new Button(composite, SWT.RADIO); >- shadowCopyButton.setText(IDEWorkbenchMessages.ImportTypeDialog_recreateFilesAndDirectories); >- gridData = new GridData(GridData.FILL_HORIZONTAL); >- shadowCopyButton.setLayoutData(gridData); >- shadowCopyButton.setData(new Integer(IMPORT_GROUPS_AND_LINKS)); >- shadowCopyButton.addSelectionListener(this); >- } >- if ((operationMask & IMPORT_LINK) != 0) { >+ if (hasFlag(IMPORT_LINK)) { > linkButton = new Button(composite, SWT.RADIO); >- linkButton.setText(IDEWorkbenchMessages.ImportTypeDialog_createLinks); >+ linkButton.setText(hasFlag(IMPORT_FILES_ONLY) ? IDEWorkbenchMessages.ImportTypeDialog_linkFiles:IDEWorkbenchMessages.ImportTypeDialog_createLinks); > gridData = new GridData(GridData.FILL_HORIZONTAL); > linkButton.setLayoutData(gridData); > linkButton.setData(new Integer(IMPORT_LINK)); > linkButton.addSelectionListener(this); >+ linkButton.setImage(hasFlag(IMPORT_FILES_ONLY) ? linkedFileImage:linkedFolderAndFileImage); >+ } >+ >+ if (hasFlag(IMPORT_VIRTUAL_FOLDERS_AND_LINKS) && !hasFlag(IMPORT_FILES_ONLY)) { >+ shadowCopyButton = new Button(composite, SWT.RADIO); >+ shadowCopyButton.setText(IDEWorkbenchMessages.ImportTypeDialog_recreateFilesAndDirectories); >+ gridData = new GridData(GridData.FILL_HORIZONTAL); >+ shadowCopyButton.setLayoutData(gridData); >+ shadowCopyButton.setData(new Integer(IMPORT_VIRTUAL_FOLDERS_AND_LINKS)); >+ shadowCopyButton.addSelectionListener(this); >+ shadowCopyButton.setImage(virtualFolderAndFileImage); > } > >- if ((operationMask & (IMPORT_GROUPS_AND_LINKS | IMPORT_LINK)) != 0) { >+ if (hasFlag(IMPORT_VIRTUAL_FOLDERS_AND_LINKS | IMPORT_LINK)) { > Composite variableGroup = new Composite(composite, 0); > gridData = new GridData(SWT.FILL, SWT.FILL, true, true); > variableGroup.setLayoutData(gridData); >@@ -259,6 +304,10 @@ > refreshSelection(); > return composite; > } >+ >+ private boolean hasFlag(int flag) { >+ return (operationMask & flag) != 0; >+ } > > private void editVariables() { > PathVariableEditDialog dialog = new PathVariableEditDialog(getShell()); >@@ -309,7 +358,7 @@ > pathVariableManager = receivingResource.getProject().getPathVariableManager(); > else > pathVariableManager = ResourcesPlugin.getWorkspace().getPathVariableManager(); >- String[] variables = pathVariableManager.getPathVariableNames(); >+ String[] variables = pathVariableManager.getPathVariableNames(receivingResource); > items = new String[variables.length + 3]; > items[0] = IDEWorkbenchMessages.ImportTypeDialog_automatic; > items[1] = IDEWorkbenchMessages.ImportTypeDialog_absolutePath; >@@ -344,15 +393,15 @@ > if (copyButton != null) > copyButton.setSelection(currentSelection == IMPORT_COPY); > if (shadowCopyButton != null) >- shadowCopyButton.setSelection(currentSelection == IMPORT_GROUPS_AND_LINKS); >+ shadowCopyButton.setSelection(currentSelection == IMPORT_VIRTUAL_FOLDERS_AND_LINKS); > if (linkButton != null) > linkButton.setSelection(currentSelection == IMPORT_LINK); > if (moveButton != null) > moveButton.setSelection(currentSelection == IMPORT_MOVE); > if (variableCombo != null) >- variableCombo.setEnabled((currentSelection & (IMPORT_GROUPS_AND_LINKS | IMPORT_LINK)) != 0); >+ variableCombo.setEnabled((currentSelection & (IMPORT_VIRTUAL_FOLDERS_AND_LINKS | IMPORT_LINK)) != 0); > if (variableLabel != null) >- variableLabel.setEnabled((currentSelection & (IMPORT_GROUPS_AND_LINKS | IMPORT_LINK)) != 0); >+ variableLabel.setEnabled((currentSelection & (IMPORT_VIRTUAL_FOLDERS_AND_LINKS | IMPORT_LINK)) != 0); > } > > /** Set the project that is the destination of the import operation >Index: src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java,v >retrieving revision 1.75 >diff -u -r1.75 IDEWorkbenchMessages.java >--- src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java 4 Feb 2010 13:15:02 -0000 1.75 >+++ src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java 5 Feb 2010 12:14:14 -0000 >@@ -723,11 +723,16 @@ > public static String PathVariableSelectionDialog_ExtensionDialog_description; > > public static String ImportTypeDialog_title; >+ public static String ImportTypeDialog_titleFilesOnly; > public static String ImportTypeDialog_question; >+ public static String ImportTypeDialog_questionFilesOnly; > public static String ImportTypeDialog_moveFilesAndDirectories; > public static String ImportTypeDialog_copyFilesAndDirectories; >+ public static String ImportTypeDialog_moveFiles; >+ public static String ImportTypeDialog_copyFiles; > public static String ImportTypeDialog_recreateFilesAndDirectories; > public static String ImportTypeDialog_createLinks; >+ public static String ImportTypeDialog_linkFiles; > public static String ImportTypeDialog_importElementsAs; > public static String ImportTypeDialog_automatic; > public static String ImportTypeDialog_absolutePath; >Index: src/org/eclipse/ui/internal/ide/messages.properties >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties,v >retrieving revision 1.186 >diff -u -r1.186 messages.properties >--- src/org/eclipse/ui/internal/ide/messages.properties 4 Feb 2010 13:15:02 -0000 1.186 >+++ src/org/eclipse/ui/internal/ide/messages.properties 5 Feb 2010 12:14:15 -0000 >@@ -745,16 +745,21 @@ > PathVariableSelectionDialog_ExtensionDialog_description = Choose extension to {0} > > ImportTypeDialog_title=File and Folder Import >+ImportTypeDialog_titleFilesOnly=File Import > ImportTypeDialog_question=Select how files and folders should be imported in the project: >-ImportTypeDialog_moveFilesAndDirectories=Move the files and directories >-ImportTypeDialog_copyFilesAndDirectories=Copy the files and directories. >-ImportTypeDialog_recreateFilesAndDirectories=Recreate the file and directory hierarchy with virtual folders and links. >-ImportTypeDialog_createLinks=Create links for each file and directory. >-ImportTypeDialog_importElementsAs=Create linked resources as relative to: >-ImportTypeDialog_automatic=<Automatic> >-ImportTypeDialog_absolutePath=<Absolute Path> >+ImportTypeDialog_questionFilesOnly=Select how files should be imported in the project: >+ImportTypeDialog_moveFilesAndDirectories=&Move folders and files >+ImportTypeDialog_copyFilesAndDirectories=&Copy folders and files >+ImportTypeDialog_moveFiles=&Move files >+ImportTypeDialog_copyFiles=&Copy files >+ImportTypeDialog_recreateFilesAndDirectories=Create &virtual folders and links to files >+ImportTypeDialog_createLinks=&Link to folders and files >+ImportTypeDialog_linkFiles=&Link to files >+ImportTypeDialog_importElementsAs=Create linked resources as &relative to: >+ImportTypeDialog_automatic=Default >+ImportTypeDialog_absolutePath=Absolute Path > ImportTypeDialog_editVariables=Edit Variables... >-ImportTypeDialog_alwaysPerformThisOperation=Always perform the selected operation in this context >+ImportTypeDialog_alwaysPerformThisOperation=&Always perform the selected operation in this context > > # ============================================================================== > # Editor Framework >Index: src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java,v >retrieving revision 1.15 >diff -u -r1.15 NavigatorDropAdapter.java >--- src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java 25 Jan 2010 16:12:13 -0000 1.15 >+++ src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java 5 Feb 2010 12:14:15 -0000 >@@ -10,6 +10,7 @@ > *******************************************************************************/ > package org.eclipse.ui.views.navigator; > >+import java.io.File; > import java.util.ArrayList; > import java.util.Iterator; > >@@ -277,9 +278,11 @@ > getShell()); > // if the target is a group and all sources are files, then automatically create links > int type; >- int mask = ImportTypeDialog.IMPORT_GROUPS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; >+ int mask = ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; > if (!target.isVirtual() && (getCurrentOperation() != DND.DROP_LINK)) > mask |= ImportTypeDialog.IMPORT_COPY; >+ if (areOnlyFiles(names)) >+ mask |= ImportTypeDialog.IMPORT_FILES_ONLY; > ImportTypeDialog dialog = new ImportTypeDialog(getShell(), mask); > dialog.setResource(target); > if (dialog.open() == Window.OK) >@@ -290,7 +293,7 @@ > case ImportTypeDialog.IMPORT_COPY: > operation.copyFiles(names, target); > break; >- case ImportTypeDialog.IMPORT_GROUPS_AND_LINKS: >+ case ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS: > if (dialog.getVariable() != null) > operation.setRelativeVariable(dialog.getVariable()); > operation.createGroupAndLinks(names, target); >@@ -308,7 +311,24 @@ > return problems; > } > >- /** >+ private boolean areOnlyFiles(String[] names) { >+ for (int i = 0; i < names.length; i++) { >+ File file = new File(names[i]); >+ if (file.exists() && !file.isFile()) >+ return false; >+ } >+ return true; >+ } >+ >+ private boolean areOnlyFiles(IResource[] resources) { >+ for (int i = 0; i < resources.length; i++) { >+ if (resources[i].getType() != IResource.FILE) >+ return false; >+ } >+ return true; >+ } >+ >+ /** > * Performs a resource copy > */ > private IStatus performResourceCopy(Shell shell, IResource[] sources) { >@@ -348,13 +368,15 @@ > } > // if all sources are either links or groups, copy then normally, don't show the dialog > if (!allSourceAreLinksOrGroups) { >- int mask = ImportTypeDialog.IMPORT_GROUPS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; >+ int mask = ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; > if (!target.isVirtual() && (getCurrentOperation() != DND.DROP_LINK)) > mask |= ImportTypeDialog.IMPORT_COPY; >+ if (areOnlyFiles(sources)) >+ mask |= ImportTypeDialog.IMPORT_FILES_ONLY; > ImportTypeDialog dialog = new ImportTypeDialog(getShell(), mask); > dialog.setResource(target); > if (dialog.open() == Window.OK) { >- if (dialog.getSelection() == ImportTypeDialog.IMPORT_GROUPS_AND_LINKS) >+ if (dialog.getSelection() == ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS) > operation.setCreateGroups(true); > if (dialog.getSelection() == ImportTypeDialog.IMPORT_LINK) > operation.setCreateLinks(true); >#P org.eclipse.ui.navigator.resources >Index: src/org/eclipse/ui/navigator/resources/ResourceDropAdapterAssistant.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/navigator/resources/ResourceDropAdapterAssistant.java,v >retrieving revision 1.11 >diff -u -r1.11 ResourceDropAdapterAssistant.java >--- src/org/eclipse/ui/navigator/resources/ResourceDropAdapterAssistant.java 25 Jan 2010 16:12:17 -0000 1.11 >+++ src/org/eclipse/ui/navigator/resources/ResourceDropAdapterAssistant.java 5 Feb 2010 12:14:18 -0000 >@@ -11,6 +11,7 @@ > > package org.eclipse.ui.navigator.resources; > >+import java.io.File; > import java.util.ArrayList; > import java.util.Iterator; > >@@ -400,13 +401,15 @@ > // if all sources are either links or groups, copy then normally, > // don't show the dialog > if (!allSourceAreLinksOrGroups) { >- int mask = ImportTypeDialog.IMPORT_GROUPS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; >+ int mask = ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; > if (!target.isVirtual() && (dropAdapter.getCurrentOperation() != DND.DROP_LINK)) > mask |= ImportTypeDialog.IMPORT_COPY; >+ if (areOnlyFiles(sources)) >+ mask |= ImportTypeDialog.IMPORT_FILES_ONLY; > ImportTypeDialog dialog = new ImportTypeDialog(getShell(), mask); > dialog.setResource(target); > if (dialog.open() == Window.OK) { >- if (dialog.getSelection() == ImportTypeDialog.IMPORT_GROUPS_AND_LINKS) >+ if (dialog.getSelection() == ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS) > operation.setCreateGroups(true); > if (dialog.getSelection() == ImportTypeDialog.IMPORT_LINK) > operation.setCreateLinks(true); >@@ -422,6 +425,23 @@ > return problems; > } > >+ private boolean areOnlyFiles(String[] names) { >+ for (int i = 0; i < names.length; i++) { >+ File file = new File(names[i]); >+ if (file.exists() && !file.isFile()) >+ return false; >+ } >+ return true; >+ } >+ >+ private boolean areOnlyFiles(IResource[] resources) { >+ for (int i = 0; i < resources.length; i++) { >+ if (resources[i].getType() != IResource.FILE) >+ return false; >+ } >+ return true; >+ } >+ > /** > * Performs a resource move > */ >@@ -485,9 +505,11 @@ > // if the target is a group and all sources are files, then > // automatically create links > int type; >- int mask = ImportTypeDialog.IMPORT_GROUPS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; >+ int mask = ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS | ImportTypeDialog.IMPORT_LINK; > if (!target.isVirtual() && (finalAdapter.getCurrentOperation() != DND.DROP_LINK)) > mask |= ImportTypeDialog.IMPORT_COPY; >+ if (areOnlyFiles(names)) >+ mask |= ImportTypeDialog.IMPORT_FILES_ONLY; > ImportTypeDialog dialog = new ImportTypeDialog(getShell(), mask); > dialog.setResource(target); > if (dialog.open() == Window.OK) >@@ -498,7 +520,7 @@ > case ImportTypeDialog.IMPORT_COPY: > operation.copyFiles(names, target); > break; >- case ImportTypeDialog.IMPORT_GROUPS_AND_LINKS: >+ case ImportTypeDialog.IMPORT_VIRTUAL_FOLDERS_AND_LINKS: > if (dialog.getVariable() != null) > operation.setRelativeVariable(dialog.getVariable()); > operation.createGroupAndLinks(names, target);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 301144
:
157530
|
158297
|
158298
|
158299
|
158300
|
158301
|
158302
|
158303
|
158459
|
158460
|
158461
|
158525
|
158526
|
158527
|
158528
|
158529
|
158530
|
158537
|
158688
|
158689
|
158690
|
158691
|
158692
|
158697
|
158698
|
158700
|
158701
|
159019
|
159020
|
159021
|
159022
|
159023
|
159024
|
159025
|
159761
|
159773
|
159774
|
159775
|
159776
|
159777
|
159778
|
159779
|
159830
|
159831