Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2015-05-27 07:54:13 +0000
committerAxel RICHARD2015-05-27 09:57:15 +0000
commit6ab75d8f223f729e5739f51abe5bb4f47329cd4c (patch)
treef7cabcbafafa35beb64bda05bc6d5822620a6bad /plugins
parent850ebafc3ca12b508fb8744fba60212d99d26a70 (diff)
downloadorg.eclipse.emf.compare-6ab75d8f223f729e5739f51abe5bb4f47329cd4c.tar.gz
org.eclipse.emf.compare-6ab75d8f223f729e5739f51abe5bb4f47329cd4c.tar.xz
org.eclipse.emf.compare-6ab75d8f223f729e5739f51abe5bb4f47329cd4c.zip
Fixes findbugs with test always true.
Findbugs message was "Correctness - No relationship between generic parameter and method argument". Change-Id: Ie0c2258aae522038955aa6d866200e434d6bac34 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java
index ef49e6367..f2e991f26 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 Obeo.
+ * Copyright (c) 2014, 2015 Obeo.
* 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
@@ -311,8 +311,7 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP
traceMessage.append(EMFComparePreferences.REQ_ENGINES).append(prefDelimiter).append(
getPreferenceStore().getString(EMFComparePreferences.REQ_ENGINES)).append(newLine);
traceMessage.append(EMFComparePreferences.CONFLICTS_DETECTOR).append(prefDelimiter).append(
- getPreferenceStore().getString(EMFComparePreferences.CONFLICTS_DETECTOR))
- .append(newLine);
+ getPreferenceStore().getString(EMFComparePreferences.CONFLICTS_DETECTOR)).append(newLine);
traceMessage.append(EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES).append(prefDelimiter)
.append(getPreferenceStore()
.getString(EMFComparePreferences.MATCH_ENGINE_DISABLE_ENGINES)).append(newLine);
@@ -470,7 +469,7 @@ public class EnginesPreferencePage extends PreferencePage implements IWorkbenchP
*/
private <T> void setEnginePreferences(String preferenceKey,
Set<IItemDescriptor<T>> currentSelectedEngine, Collection<IItemDescriptor<T>> defaultConf) {
- if (currentSelectedEngine != null && !currentSelectedEngine.contains(defaultConf)) {
+ if (currentSelectedEngine != null && !currentSelectedEngine.containsAll(defaultConf)) {
StringBuilder descriptorsKey = new StringBuilder();
for (Iterator<IItemDescriptor<T>> iterator = currentSelectedEngine.iterator(); iterator.hasNext();) {
IItemDescriptor<T> iItemDescriptor = iterator.next();

Back to the top