mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 11:15:38 +02:00
Code Issues Wiki Activity

[416544] drag and drop of filter into filter doesn't merge filter

Browse source 
strings
This commit is contained in:
Dave McKnight 2013-09-04 12:26:23 -04:00
parent 5607f78548
commit 4f56bda362
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2012 IBM Corporation and others. * Copyright (c) 2002, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -29,6 +29,7 @@
* David McKnight (IBM) - [328148] Dropping resource onto Eclipse IFile causes RSEG1003U unexpected exception * David McKnight (IBM) - [328148] Dropping resource onto Eclipse IFile causes RSEG1003U unexpected exception
* David McKnight (IBM) - [231971] [dnd] Drag and Drop Filter Displays Error * David McKnight (IBM) - [231971] [dnd] Drag and Drop Filter Displays Error
* Martin Oberhuber (Wind River) - [357667] [dnd] Allow copy-onto-myself semantics * Martin Oberhuber (Wind River) - [357667] [dnd] Allow copy-onto-myself semantics
* David McKnight (IBM) - [416544] drag and drop of filter into filter doesn't merge filter strings
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -289,7 +290,7 @@ public class SystemDNDTransferRunnable extends WorkspaceJob
else else
{ {
// special case for filters // special case for filters
if (target instanceof ISystemFilterReference && targetSubSystem != null) if (target instanceof ISystemFilterReference && targetSubSystem != null && !(srcAdapter instanceof SystemViewFilterReferenceAdapter))
{ {
ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration();
if (factory.supportsDropInFilters()) if (factory.supportsDropInFilters())