diff options
| author | Laurent Goubet | 2013-06-20 11:14:29 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2013-06-20 12:01:36 +0000 |
| commit | 81c1c4e3f7b24d283c7cfe2fe5a27dfcaf282269 (patch) | |
| tree | 97b75528505d6377703324ae60f12c11d3a87b53 /plugins/org.eclipse.emf.compare.ide.ui/src | |
| parent | 27cec162b61b3047477c9a10d67c3dff7e164c5a (diff) | |
| download | org.eclipse.emf.compare-81c1c4e3f7b24d283c7cfe2fe5a27dfcaf282269.tar.gz org.eclipse.emf.compare-81c1c4e3f7b24d283c7cfe2fe5a27dfcaf282269.tar.xz org.eclipse.emf.compare-81c1c4e3f7b24d283c7cfe2fe5a27dfcaf282269.zip | |
Missing copyrights, typo
Change-Id: I920fd45c0d8011c25fcd5f65705dbe2402bb2e9d
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
3 files changed, 34 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java index 9fe42e95b..2aa36cb67 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2012, 2013 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util; import org.eclipse.emf.common.command.Command; diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java index 90fb2759b..cec44f164 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2012, 2013 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util; import org.eclipse.emf.common.command.Command; diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java index c01889f06..698a55dc7 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + * Matt McCutchen (hashproduct+eclipse@gmail.com) - Bug 35390 Three-way compare cannot select (mis-selects) )ancestor resource + * Aleksandra Wozniak (aleksandra.k.wozniak@gmail.com) - Bug 239959 + * Mikael Barbero (mikael.barbero@obeo.fr) - adapted to EMF Compare + *******************************************************************************/ package org.eclipse.emf.compare.ide.ui.internal.handler; import org.eclipse.compare.internal.CompareMessages; @@ -18,6 +31,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; +/* Initially copy/pasted from org.eclipse.compare.internal.ResourceCompareInput.SelectAncestorDialog. */ public class SelectAncestorDialog extends MessageDialog { private Notifier[] notifiers; |