mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-29 11:55:40 +02:00
[183870] merged patch from Kevin Doyle
This commit is contained in:
parent
b5a98ae067
commit
4f814c3be1
1 changed files with 9 additions and 0 deletions
|
@ -11,6 +11,7 @@
|
||||||
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
|
* Kevin Doyle (IBM) - Fix 183870 - Display File Exists Error
|
||||||
* {Name} (company) - description of contribution.
|
* {Name} (company) - description of contribution.
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
|
@ -835,6 +836,10 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
|
||||||
if (status == null) return null;
|
if (status == null) return null;
|
||||||
if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS))
|
if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS))
|
||||||
return new DStoreHostFile(de);
|
return new DStoreHostFile(de);
|
||||||
|
else if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.FAILED_WITH_EXIST))
|
||||||
|
{
|
||||||
|
throw new SystemMessageException(getMessage("RSEF1303").makeSubstitution(remotePath)); //$NON-NLS-1$
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw new SystemMessageException(getMessage("RSEF1302").makeSubstitution(remotePath)); //$NON-NLS-1$
|
throw new SystemMessageException(getMessage("RSEF1302").makeSubstitution(remotePath)); //$NON-NLS-1$
|
||||||
|
@ -851,6 +856,10 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
|
||||||
if (status == null) return null;
|
if (status == null) return null;
|
||||||
if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS))
|
if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS))
|
||||||
return new DStoreHostFile(de);
|
return new DStoreHostFile(de);
|
||||||
|
else if(FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.FAILED_WITH_EXIST))
|
||||||
|
{
|
||||||
|
throw new SystemMessageException(getMessage("RSEF1309").makeSubstitution(remotePath)); //$NON-NLS-1$
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw new SystemMessageException(getMessage("RSEF1304").makeSubstitution(remotePath)); //$NON-NLS-1$
|
throw new SystemMessageException(getMessage("RSEF1304").makeSubstitution(remotePath)); //$NON-NLS-1$
|
||||||
|
|
Loading…
Add table
Reference in a new issue