mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

[160769] Move Resource dialog allows user to continue on invalid destination

Browse source
This commit is contained in:
Kevin Doyle 2007-11-02 14:15:10 +00:00
parent ab1ed2580b
commit d1e082c015
3 changed files with 53 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java
View file

@ -15,6 +15,7 @@
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Kevin Doyle (IBM) - [198007] Moving multiple folders allows moving to themselves
* Kevin Doyle (IBM) - [160769] Move Resource dialog allows user to continue on invalid destination
********************************************************************************/
package org.eclipse.rse.internal.files.ui.actions;
@ -23,6 +24,7 @@ import java.util.Vector;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@ -44,6 +46,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
{
private SystemMessage targetEqualsSrcMsg = null;
private SystemMessage targetDescendsFromSrcMsg = null;
private SystemMessage invalidFilterMsg = null;
protected Vector movedFiles = new Vector();
/**
@ -121,8 +124,11 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
//if (selectedConnection != sourceConnection) {} // someday, but can't happen today.
IRemoteFile[] files = getSelectedFiles();
Object selectedObject = selectedObjects[0];
if (!(selectedObject instanceof IRemoteFile) || files == null)
if (!(selectedObject instanceof IRemoteFile || selectedObject instanceof ISystemFilterReference) || files == null) {
return null;
}
if (selectedObject instanceof IRemoteFile) {
IRemoteFile selectedFolder = (IRemoteFile)selectedObject;
String selectedFolderPath = selectedFolder.getAbsolutePath();
@ -151,6 +157,20 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
}
}
}
} else if (selectedObject instanceof ISystemFilterReference) {
ISystemFilterReference filter = (ISystemFilterReference) selectedObject;
String[] filterStrings = filter.getReferencedFilter().getFilterStrings();
String firstFilterString = filterStrings[0];
// Check only first filter string as by convention we move files only
// to the first filter string. * and /* are invalid as they represent
// Drives and Root Filters which we can't Move files to.
if (firstFilterString.equals("*") || firstFilterString.equals("/*")) { //$NON-NLS-1$ //$NON-NLS-2$
if (invalidFilterMsg == null) {
invalidFilterMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_MOVE_FILTER_NOT_VALID);
}
return invalidFilterMsg;
}
}
return null;
}

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java
View file

@ -13,6 +13,7 @@
* Contributors:
* David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
* API to the user actions plugin
* Kevin Doyle (IBM) - [160769] Added FILEMSG_MOVE_FILTER_NOT_VALID
********************************************************************************/
package org.eclipse.rse.ui;
@ -261,6 +262,7 @@ public interface ISystemMessages
public static final String FILEMSG_MOVE_FILE_FAILED = "RSEF1307"; //$NON-NLS-1$
public static final String FILEMSG_MOVE_TARGET_EQUALS_SOURCE = "RSEF1308"; //$NON-NLS-1$
public static final String FILEMSG_MOVE_TARGET_DESCENDS_FROM_SOURCE = "RSEF1312"; //$NON-NLS-1$
public static final String FILEMSG_MOVE_FILTER_NOT_VALID = "RSEF1313"; //$NON-NLS-1$
public static final String FILEMSG_DELETING = "RSEF1315"; //$NON-NLS-1$
// -------------------------

5
rse/plugins/org.eclipse.rse.ui/systemmessages.xml
View file

@ -14,6 +14,7 @@ Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
Contributors:
Martin Oberhuber (Wind River) - Rename Remote Systems Explorer to Remote System Explorer for consistency
Uwe Stieber (Wind River) - [175153][175316] Fix messages for new connection dlg
Kevin Doyle (IBM) - [160769] Added message for invalid filter when moving files
-->
<!DOCTYPE MessageFile SYSTEM "messageFile.dtd">
@ -990,6 +991,10 @@ Uwe Stieber (Wind River) - [175153][175316] Fix messages for new connection dlg
<Message ID="1312" Indicator="E">
<LevelOne>Target folder cannot descend from source folder</LevelOne>
<LevelTwo>It is impossible to move a folder to one of its subfolders.</LevelTwo>
</Message>
<Message ID="1313" Indicator="E">
<LevelOne>Selected filter is not a valid destination.</LevelOne>
<LevelTwo>Some filters, such as the Root or Drives filter, do not designate locations on the remote file system and cannot have files moved into them.</LevelTwo>
</Message>
<Message ID="1315" Indicator="I">
<LevelOne>Deleting %1...</LevelOne>