Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoVisibleItemContentViewer.java')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoVisibleItemContentViewer.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoVisibleItemContentViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoVisibleItemContentViewer.java
index ccf9bd759..7d50acced 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoVisibleItemContentViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/NoVisibleItemContentViewer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 Obeo.
+ * Copyright (c) 2014, 2018 Obeo 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
@@ -7,10 +7,12 @@
*
* Contributors:
* Obeo - initial API and implementation
+ * Philip Langer - bug 514079
*******************************************************************************/
package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.label;
import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages;
+import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
import org.eclipse.swt.widgets.Composite;
/**
@@ -26,8 +28,8 @@ public class NoVisibleItemContentViewer extends LabelContentViewer {
* @param parent
* the parent of the control of this viewer.
*/
- public NoVisibleItemContentViewer(Composite parent) {
+ public NoVisibleItemContentViewer(Composite parent, EMFCompareConfiguration configuration) {
super(parent, EMFCompareIDEUIMessages.getString("no.visible.item.viewer.title"), //$NON-NLS-1$
- EMFCompareIDEUIMessages.getString("no.visible.item.viewer.desc")); //$NON-NLS-1$
+ EMFCompareIDEUIMessages.getString("no.visible.item.viewer.desc"), configuration); //$NON-NLS-1$
}
}

Back to the top