diff options
author | lgoubet | 2010-04-19 08:55:58 +0000 |
---|---|---|
committer | lgoubet | 2010-04-19 08:55:58 +0000 |
commit | 47c62aa6e441c22722c3895f9f427a75741cd55a (patch) | |
tree | 00186d1ce90bb001666a3fb5cff8ac7c30ff16f2 | |
parent | 75f527900510514de6fdb220b6df47b7e393b8c8 (diff) | |
download | org.eclipse.emf.compare-47c62aa6e441c22722c3895f9f427a75741cd55a.tar.gz org.eclipse.emf.compare-47c62aa6e441c22722c3895f9f427a75741cd55a.tar.xz org.eclipse.emf.compare-47c62aa6e441c22722c3895f9f427a75741cd55a.zip |
javadoc
3 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/editor/ModelCompareEditorInput.java b/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/editor/ModelCompareEditorInput.java index b64614a7d..d2f0bc3ce 100644 --- a/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/editor/ModelCompareEditorInput.java +++ b/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/editor/ModelCompareEditorInput.java @@ -55,7 +55,7 @@ public class ModelCompareEditorInput extends CompareEditorInput { */ protected ModelContentMergeViewer contentMergeViewer; - /** {@link ModelInputSnapshot} result of the underlying comparison. */ + /** {@link ComparisonSnapshot} result of the underlying comparison. */ protected final ComparisonSnapshot inputSnapshot; /** This is the input that will be used throughout. */ @@ -74,10 +74,10 @@ public class ModelCompareEditorInput extends CompareEditorInput { private final ICompareInputChangeListener inputListener; /** - * This constructor takes a {@link ModelInputSnapshot} as input. + * This constructor takes a {@link ComparisonSnapshot} as input. * * @param snapshot - * The {@link ModelInputSnapshot} loaded from an emfdiff. + * The {@link ComparisonSnapshot} loaded from an emfdiff. */ public ModelCompareEditorInput(ComparisonSnapshot snapshot) { super(new CompareConfiguration()); diff --git a/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/ModelComparator.java b/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/ModelComparator.java index 8851761da..d2aa6b2e3 100644 --- a/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/ModelComparator.java +++ b/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/ModelComparator.java @@ -224,7 +224,7 @@ public final class ModelComparator implements ICompareInputDetailsProvider { } /** - * This will run the comparison process and return the resulting {@link ModelInputSnapshot snapshot}. + * This will run the comparison process and return the resulting {@link ComparisonSnapshot snapshot}. * * @param configuration * Compared configuration of this comparison. Properties will be set on this to hold comparison diff --git a/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/wizard/SaveDeltaWizard.java b/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/wizard/SaveDeltaWizard.java index 7b9c78f94..6cc73a315 100755 --- a/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/wizard/SaveDeltaWizard.java +++ b/plugins/org.eclipse.emf.compare.ui/src/org/eclipse/emf/compare/ui/internal/wizard/SaveDeltaWizard.java @@ -28,7 +28,8 @@ import org.eclipse.ui.dialogs.WizardNewFileCreationPage; import org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard; /** - * Wizard used by the "save" action of the {@link ModelStructureMergeViewer}. + * Wizard used by the "save" action of the + * {@link org.eclipse.emf.compare.ui.viewer.structure.ModelStructureMergeViewer}. * * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a> */ @@ -75,7 +76,7 @@ public class SaveDeltaWizard extends BasicNewFileResourceWizard { * @param workbench * Current workbench. * @param inputSnapshot - * The {@link ModelInputSnapshot} to save. + * The {@link ComparisonSnapshot} to save. */ public void init(IWorkbench workbench, ComparisonSnapshot inputSnapshot) { super.init(workbench, new StructuredSelection()); |