From 324ff07796cce59e5c511ef796137aac2ed648c3 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Wed, 18 Apr 2007 08:31:06 +0000 Subject: [PATCH] Follow up for 182312, use different dialog settings for 'Open Type in Hierarchy...' and 'Open Type...' --- .../cdt/internal/ui/browser/opentype/OpenTypeAction.java | 1 + .../cdt/ui/browser/typeinfo/TypeSelectionDialog.java | 6 ++++-- .../cdt/internal/ui/callhierarchy/CHMessages.properties | 2 +- .../ui/callhierarchy/OpenElementInCallHierarchyAction.java | 1 + .../ui/typehierarchy/OpenTypeInHierarchyAction.java | 1 + .../cdt/internal/ui/typehierarchy/messages.properties | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java index 9f1cfe52a65..20c280c26f3 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java @@ -73,6 +73,7 @@ public class OpenTypeAction implements IWorkbenchWindowActionDelegate { } private void configureDialog(OpenTypeDialog dialog) { + dialog.setDialogSettings(getClass().getName()); if (fWorkbenchWindow != null) { IWorkbenchPage page= fWorkbenchWindow.getActivePage(); if (page != null) { diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java index db6dcb9e57f..765161e6029 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2007 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 @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * QNX Software Systems - adapted for use in CDT + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.ui.browser.typeinfo; @@ -206,13 +207,14 @@ public class TypeSelectionDialog extends TwoPaneElementSelector { private static final TypeInfoLabelProvider fElementRenderer = new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_TYPE_ONLY); private static final TypeInfoLabelProvider fQualifierRenderer = new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_ENCLOSING_TYPE_ONLY + TypeInfoLabelProvider.SHOW_PATH); - static final TypeFilterMatcher fFilterMatcher = new TypeFilterMatcher(); private static final StringComparator fStringComparator = new StringComparator(); private static final int[] fAllTypes = { ICElement.C_NAMESPACE, ICElement.C_CLASS, ICElement.C_STRUCT, ICElement.C_TYPEDEF, ICElement.C_ENUMERATION, ICElement.C_UNION }; + // the filter matcher contains state information, must not be static + private final TypeFilterMatcher fFilterMatcher = new TypeFilterMatcher(); private Set fKnownTypes = new HashSet(fAllTypes.length); private Text fTextWidget; private boolean fSelectFilterText = false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.properties index c4c884927d0..df8a319368d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMessages.properties @@ -48,4 +48,4 @@ OpenElementInCallHierarchyAction_errorDlgTitle=Open Element in Call Hierarchy OpenElementInCallHierarchyAction_title=Open Element in Call Hierarchy OpenElementInCallHierarchyAction_upperListLabel=&Matching Elements: OpenElementInCallHierarchyAction_message=&Choose an element (? = any character, * = any string): -OpenElementInCallHierarchyAction_errorNoDefinition=Could not locate definition of element '{0}' +OpenElementInCallHierarchyAction_errorNoDefinition=Could not locate definition of element ''{0}'' diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java index 824d6700229..b323232b1f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java @@ -68,6 +68,7 @@ public class OpenElementInCallHierarchyAction implements IWorkbenchWindowActionD } private void configureDialog(OpenTypeDialog dialog) { + dialog.setDialogSettings(getClass().getName()); dialog.setVisibleTypes(VISIBLE_TYPES); dialog.setTitle(CHMessages.OpenElementInCallHierarchyAction_title); dialog.setUpperListLabel(CHMessages.OpenElementInCallHierarchyAction_upperListLabel); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java index e9138a2d695..79984591ec1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeInHierarchyAction.java @@ -68,6 +68,7 @@ public class OpenTypeInHierarchyAction implements IWorkbenchWindowActionDelegate } private void configureDialog(OpenTypeDialog dialog) { + dialog.setDialogSettings(getClass().getName()); dialog.setVisibleTypes(VISIBLE_TYPES); dialog.setTitle(Messages.OpenTypeInHierarchyAction_title); dialog.setUpperListLabel(Messages.OpenTypeInHierarchyAction_upperListLabel); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/messages.properties index 982e464d8e0..9f2a231f93d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/messages.properties @@ -56,5 +56,5 @@ OpenTypeInHierarchyAction_title=Open Type in Hierarchy OpenTypeInHierarchyAction_message=&Choose a type (? = any character, * = any string): THInformationControl_regularTitle=Type Hierarchy of {0} THInformationControl_showDefiningTypesTitle=Types defining or implementing {0} -OpenTypeInHierarchyAction_errorNoDefinition=Could not locate definition of type '{0}' +OpenTypeInHierarchyAction_errorNoDefinition=Could not locate definition of type ''{0}'' OpenTypeInHierarchyAction_upperListLabel=&Matching Types: