From 2af3c15c52152d4b5bb0e9944c86fba063c10406 Mon Sep 17 00:00:00 2001 From: "Judy N. Green" Date: Wed, 23 Oct 2002 19:57:36 +0000 Subject: [PATCH] CView overwrite files dialog text changed so that it is the same in the CView as in the Navigator --- .../cdt/internal/ui/CPluginResources.properties | 5 ++++- .../cdt/internal/ui/cview/CViewDropAdapter.java | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties index 1242cb7be7a..962ce623b64 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties @@ -264,4 +264,7 @@ ClearOutputAction.tooltip=Clear Console # ------- New menu items to overwrite superclass ---------- CreateFileAction.text = &File -CreateFolderAction.text = F&older \ No newline at end of file +CreateFolderAction.text = F&older + +# ------- Drag and Drop Message Text ----------- +CViewDragNDrop.txt = already exists. Would you like to overwrite it? \ No newline at end of file diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java index 3532a484ad2..751340d60da 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java @@ -10,6 +10,9 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.List; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.internal.ui.CPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceStatus; @@ -39,10 +42,7 @@ import org.eclipse.ui.dialogs.IOverwriteQuery; import org.eclipse.ui.part.PluginDropAdapter; import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; -import org.eclipse.ui.wizards.datatransfer.ImportOperation; - -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement;; +import org.eclipse.ui.wizards.datatransfer.ImportOperation;; /** * Implements drop behaviour for drag and drop operations @@ -413,7 +413,7 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery { */ public String queryOverwrite(String pathString) { final String returnCode[] = {CANCEL}; - final String msg = "overwrite Query"; //$NON-NLS-1$ + final String msg = pathString + " " + CPlugin.getResourceString("CViewDragNDrop.txt") ; //$NON-NLS-1$ final String[] options = {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.CANCEL_LABEL}; getDisplay().syncExec(new Runnable() { public void run() {