Attachment 87363 Details for Bug 206511 – Updated patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch

Bugzilla206511.txt (text/plain), 6.82 KB, created by Alex Nan

on 2008-01-20 16:34:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Nan

Created: 2008-01-20 16:34:17 EST

Size: 6.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.common.ui
>Index: src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/CommonUITraceMessages.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/CommonUITraceMessages.java,v
>retrieving revision 1.1
>diff -u -r1.1 CommonUITraceMessages.java
>--- src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/CommonUITraceMessages.java	27 Nov 2007 04:52:13 -0000	1.1
>+++ src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/CommonUITraceMessages.java	20 Jan 2008 21:31:17 -0000
>@@ -1,5 +1,5 @@
> /********************************************************************** 
>- * Copyright (c) 2006, 2007 IBM Corporation and others. 
>+ * Copyright (c) 2006, 2008 IBM Corporation and others. 
>  * All rights reserved.   This program and the accompanying materials 
>  * are made available under the terms of the Eclipse Public License v1.0 
>  * which accompanies this distribution, and is available at 
>@@ -29,6 +29,7 @@
> 	public static String DEL_TITLE;
> 	public static String CONFIRM_DELM;
> 	public static String CONFIRM_LOG_DEL;
>+	public static String CONFIRM_SYMPTOMCATALOG_DEL;
> 	public static String DEL_RSP;
> 	public static String NDEL_RSP;
> 	public static String DEL;
>Index: src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/messages.properties,v
>retrieving revision 1.1
>diff -u -r1.1 messages.properties
>--- src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/messages.properties	27 Nov 2007 04:52:13 -0000	1.1
>+++ src-common-external/org/eclipse/tptp/platform/common/ui/trace/internal/messages.properties	20 Jan 2008 21:31:17 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006, 2007 IBM Corporation and others.
>+# Copyright (c) 2006, 2008 IBM Corporation and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -17,8 +17,9 @@
> LOG_MSG									= Logging Message
> PRO_LOG_MSG								= Profiling/Logging Message
> DEL_TITLE								= Confirmation Message
>-CONFIRM_DELM							= Delete selected resource?
>+CONFIRM_DELM							= Delete selected resource(s)?
> CONFIRM_LOG_DEL							= Delete the selected log file(s)?\nThe original log file(s) will not be affected.
>+CONFIRM_SYMPTOMCATALOG_DEL				= Delete the selected symptom catalog file(s)?
> DEL_RSP									= &Also delete contents in file system
> NDEL_RSP                     			= &Do not delete contents
> DEL										= De&lete
>#P org.eclipse.tptp.platform.common.ui.trace
>Index: src/org/eclipse/hyades/trace/ui/internal/actions/DeleteAction.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui.trace/src/org/eclipse/hyades/trace/ui/internal/actions/DeleteAction.java,v
>retrieving revision 1.11
>diff -u -r1.11 DeleteAction.java
>--- src/org/eclipse/hyades/trace/ui/internal/actions/DeleteAction.java	27 Nov 2007 04:47:10 -0000	1.11
>+++ src/org/eclipse/hyades/trace/ui/internal/actions/DeleteAction.java	20 Jan 2008 21:31:18 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
>  * All rights reserved.   This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -18,6 +18,7 @@
> import java.util.Vector;
> 
> import org.eclipse.core.resources.IContainer;
>+import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IResourceStatus;
> import org.eclipse.core.resources.ResourcesPlugin;
>@@ -71,6 +72,9 @@
> 
> 	private ArrayList deletedPaths = new ArrayList();
> 
>+	public final static String SD_FILE_EXTENSION = "trcdbxmi";
>+	public final static String SYMPTOM_FILE_EXTENSION = "symptom";
>+
> 	/**
> 	 * This dialog box asks the user whether they also want to delete the files saved on the 
> 	 * file system.  This dialog box is only presented when the user saves their data and tries
>@@ -206,6 +210,9 @@
> 		/* true if only log files are being deleted, false otherwise */
> 		boolean LogDeleteDialog = true;
> 		
>+		boolean isSymptomCatalogResourceIncluded = false;
>+		boolean isOnlyDeletingSymptomCatalogResource = true;
>+
> 		/* Navid Mehregani - bugzilla 158564: A different dialog box should be displayed if we're only deleting
> 		 * log files.  This was brought up as a usability issue in the RCP log analyzer. */
> 		for (int i = 0; i < fSelections.length; i++)
>@@ -214,6 +221,8 @@
> 
> 			if ((sel != null) && (sel instanceof EObject))
> 			{
>+				isOnlyDeletingSymptomCatalogResource = false;
>+
> 				Vector agentTypeList = new Vector();
> 				
> 				if (sel instanceof TRCMonitor)
>@@ -239,6 +248,20 @@
> 						break;  /* Break out of the first loop */
> 					}
> 				}
>+			} else if ((sel != null) && (sel instanceof IFile)) {
>+				IFile file = (IFile) sel;
>+				String ext = file.getFileExtension();
>+				if (ext != null) {
>+					if (ext.equals(SD_FILE_EXTENSION) || ext.equals(SYMPTOM_FILE_EXTENSION)) {
>+						isSymptomCatalogResourceIncluded = true;
>+					} else {
>+						isOnlyDeletingSymptomCatalogResource = false;
>+					}
>+				} else {
>+					isOnlyDeletingSymptomCatalogResource = false;
>+				}
>+			} else {
>+				isOnlyDeletingSymptomCatalogResource = false;
> 			}
> 		}
> 		/* End of bugzilla 158564 */
>@@ -307,7 +330,17 @@
> 		if (LogDeleteDialog)
> 		{
> 			/* N.M - bugzilla 158564 */
>-			ConfirmDeletionDialog confirmDeletionDialog = new ConfirmDeletionDialog(fViewer.getViewSite().getShell(), CommonUITraceMessages.DEL_TITLE, CommonUITraceMessages.CONFIRM_LOG_DEL);
>+			String message = null;
>+			if (isSymptomCatalogResourceIncluded) {
>+				if (isOnlyDeletingSymptomCatalogResource) {
>+					message = CommonUITraceMessages.CONFIRM_SYMPTOMCATALOG_DEL;
>+				} else {
>+					message = CommonUITraceMessages.CONFIRM_DELM;
>+				}
>+			} else {
>+				message = CommonUITraceMessages.CONFIRM_LOG_DEL;
>+			}
>+			ConfirmDeletionDialog confirmDeletionDialog = new ConfirmDeletionDialog(fViewer.getViewSite().getShell(), CommonUITraceMessages.DEL_TITLE, message);
> 			if (confirmDeletionDialog.open() != 0)
> 				return;
>

Actions: View | Diff

Attachments on bug 206511: 87251 | 87363