From 895465bd08c2c44a31aec4b7f33add2126a1e886 Mon Sep 17 00:00:00 2001 From: Kevin Doyle Date: Tue, 5 Aug 2008 04:07:01 +0000 Subject: [PATCH] [235223] Duplicate Filter Strings --- .../rse/ui/filters/SystemChangeFilterPane.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java index 57dd2c110a2..d67603450e9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java @@ -14,6 +14,7 @@ * Contributors: * David Dykstal (IBM) - [226561] add API markup to javadoc * David McKnight(IBM) - [239257] Tooltip for Filter Pool label is incorrect + * Kevin Doyle (IBM) - [235223] Duplicate Filter Strings *******************************************************************************/ package org.eclipse.rse.ui.filters; @@ -796,8 +797,10 @@ public class SystemChangeFilterPane extends SystemBaseForm { getMessageLine().clearMessage(); + applyPressed(); + // if error, do not change selection and we keep pending changes state - if (getFilterStringEditPane(getShell()).verify() != null) + if (getMessageLine().getErrorMessage() != null) { e.doit = false; // dang, this doesn't work! sm.setChangesMade(); @@ -807,15 +810,11 @@ public class SystemChangeFilterPane extends SystemBaseForm applyButton.setEnabled(false); // d45795 return; } - - // no errors - saveFilterString(getFilterStringEditPane(getShell()).getFilterString(), - getFilterStringEditPane(getShell()).getCurrentSelectionIndex()); } else { getMessageLine().clearMessage(); } - + // proceed with selection change request... processListSelect();