diff options
| author | Jeremy Flicker | 2012-11-28 11:03:52 +0000 |
|---|---|---|
| committer | Malgorzata Janczarska | 2013-04-15 12:06:24 +0000 |
| commit | 5755d15895e8d471924809f783feb9a95718d240 (patch) | |
| tree | 19f7a73d05c76c071c5f8bde2ecbeb81491617dd /bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java | |
| parent | 1ddeb74cb0186cd27c3d909f02e726f979c4254e (diff) | |
| download | eclipse.platform.team-5755d15895e8d471924809f783feb9a95718d240.tar.gz eclipse.platform.team-5755d15895e8d471924809f783feb9a95718d240.tar.xz eclipse.platform.team-5755d15895e8d471924809f783feb9a95718d240.zip | |
Bug 382427 - Mechanism to inject line compare strategies into merge and
structure viewers
Change-Id: Iec597bd9582933b90f67de94547b4ccdaef9a319
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java index f4fe72b73..2a5814923 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 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 @@ -327,7 +327,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP new ModifyListener() { public void modifyText(ModifyEvent e) { String filters= fFilters.getText(); - String message= CompareFilter.validateResourceFilters(filters); + String message= CompareResourceFilter.validateResourceFilters(filters); setValid(message == null); setMessage(null); setErrorMessage(message); |