Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] C-View overwrite file dialog text changed to same as in Navigator View

The following change has been applied:

***
cvs diff -N -u "ChangeLog"
  Index: ChangeLog
  ===================================================================
  RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
  retrieving revision 1.8
  diff -u -r1.8 ChangeLog
  --- ChangeLog	23 Oct 2002 13:26:39 -0000	1.8
  +++ ChangeLog	23 Oct 2002 19:59:23 -0000
  @@ -1,3 +1,12 @@
  +2002-10-23 Judy N. Green
  +	CView overwrite files dialog text changed 
  +	so that it is the same in the CView as in the Navigator
  +	when dragging and dropping files
  +	
  +	src/../internal/ui/CPluginResources.properties
  +	src/../internal/ui/cview/CViewDropAdapter.java
  +	
  +
   2002-10-23 David Inglis
   	
   	* src/.../internal/ui/cview/CView.java:

Src patches
***
cvs diff -N -u "CViewDropAdapter.java"
  Index: CViewDropAdapter.java
  ===================================================================
  RCS file:
/home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDr
opAdapter.java,v
  retrieving revision 1.1
  diff -u -r1.1 CViewDropAdapter.java
  --- CViewDropAdapter.java	26 Jun 2002 20:55:44 -0000	1.1
  +++ CViewDropAdapter.java	23 Oct 2002 19:56:48 -0000
  @@ -10,6 +10,9 @@
   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.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 @@
   	 */
   	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() {
The server reported an error while performing the "cvs diff" command which
may only indicate that a difference exists. (took 0:00.280)
***

***
cvs diff -N -u "CPluginResources.properties"
  Index: CPluginResources.properties
  ===================================================================
  RCS file:
/home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResour
ces.properties,v
  retrieving revision 1.4
  diff -u -r1.4 CPluginResources.properties
  --- CPluginResources.properties	4 Sep 2002 15:12:06 -0000	1.4
  +++ CPluginResources.properties	23 Oct 2002 19:56:56 -0000
  @@ -264,4 +264,7 @@
   
   # ------- 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


¨¨¨°ºo§oº°¨¨¨¨°ºo§oº°¨¨¨¨°ºo§oº°¨¨¨¨°ºo§oº°¨¨¨
Judy N. Green 		  (w) 613 591-0931 x 9709
Software Engineer		  (c) 613 863-2791
QNX Software Systems Ltd. 75 Terence Matthews Cres.
www.qnx.com			  Kanata, Ont. K2M 1W8
¨¨¨°ºo§oº°¨¨¨¨°ºo§oº°¨¨¨¨°ºo§oº°¨¨¨¨°ºo§oº°¨¨¨


Back to the top