diff options
author | Mikaël Barbero | 2013-03-12 07:03:31 +0000 |
---|---|---|
committer | Mikaël Barbero | 2013-03-12 07:06:43 +0000 |
commit | 96b1006b3c9ca1da1a4181a28618058e52c9a582 (patch) | |
tree | 58a3145456f0d5b862ebb16602fe8a736398e8a5 | |
parent | 1f9b238aeecef07e2133434cba00559d1dd2add5 (diff) | |
download | org.eclipse.emf.compare-96b1006b3c9ca1da1a4181a28618058e52c9a582.tar.gz org.eclipse.emf.compare-96b1006b3c9ca1da1a4181a28618058e52c9a582.tar.xz org.eclipse.emf.compare-96b1006b3c9ca1da1a4181a28618058e52c9a582.zip |
happy checkstyle
6 files changed, 19 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java b/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java index 166aa4ccc..eab9ca39c 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java @@ -52,7 +52,6 @@ import org.eclipse.emf.compare.diagram.ide.ui.internal.accessor.IDiagramDiffAcce import org.eclipse.emf.compare.diagram.ide.ui.internal.accessor.IDiagramNodeAccessor; import org.eclipse.emf.compare.diagram.internal.extensions.DiagramDiff; import org.eclipse.emf.compare.domain.ICompareEditingDomain; -import org.eclipse.emf.compare.ide.EMFCompareIDEPlugin; import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.EMFCompareContentMergeViewer; import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.TreeContentMergeViewerContentProvider; import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util.RedoAction; diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/structuremergeviewer/filters/GMFRefinedElementsFilter.java b/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/structuremergeviewer/filters/GMFRefinedElementsFilter.java index 8f56df68a..fb64346d3 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/structuremergeviewer/filters/GMFRefinedElementsFilter.java +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/structuremergeviewer/filters/GMFRefinedElementsFilter.java @@ -33,7 +33,7 @@ public class GMFRefinedElementsFilter extends AbstractDifferenceFilter { /** * The predicate use by this filter when it is selected. */ - private static final Predicate<? super EObject> predicateWhenSelected = new Predicate<EObject>() { + private static final Predicate<? super EObject> PREDICATE_WHEN_SELECTED = new Predicate<EObject>() { public boolean apply(EObject input) { if (input instanceof Diff) { Diff diff = (Diff)input; @@ -68,7 +68,7 @@ public class GMFRefinedElementsFilter extends AbstractDifferenceFilter { */ @Override public Predicate<? super EObject> getPredicateWhenSelected() { - return predicateWhenSelected; + return PREDICATE_WHEN_SELECTED; } } diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/.checkstyle b/plugins/org.eclipse.emf.compare.uml2.edit/.checkstyle index 89c72ff46..9d20703eb 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/.checkstyle +++ b/plugins/org.eclipse.emf.compare.uml2.edit/.checkstyle @@ -7,4 +7,7 @@ <fileset name="all" enabled="true" check-config-name="EMF Compare" local="true"> <file-match-pattern match-pattern="." include-pattern="true"/> </fileset> + <filter name="FilesFromPackage" enabled="true"> + <filter-data value="src-gen"/> + </filter> </fileset-config> diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/IPostProcessor.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/IPostProcessor.java index aa977a336..d336fd955 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/IPostProcessor.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/IPostProcessor.java @@ -99,13 +99,13 @@ public interface IPostProcessor { void postComparison(Comparison comparison, Monitor monitor);
/**
- * Wrapper describing the given post processor
+ * Wrapper describing the given post processor.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
*/
interface Descriptor {
/**
- * Returns the wrapped post processor
+ * Returns the wrapped post processor.
*
* @return the wrapped post processor
*/
@@ -128,7 +128,7 @@ public interface IPostProcessor { /**
* Returns the class name of the instance that will be returned by {@link #getPostProcessor()}.
*
- * @return
+ * @return the class name of the instance that will be returned by {@link #getPostProcessor()}.
*/
String getInstanceClassName();
@@ -142,8 +142,14 @@ public interface IPostProcessor { /**
* Adds a post processor to the registry.
*
+ * @param key
+ * key with which the specified descriptor is to be associated
* @param descriptor
* Post Processor that is to be added to this registry.
+ * @return the previous descriptor associated with <tt>key</tt>, or <tt>null</tt> if there was no
+ * mapping for <tt>key</tt>. (A <tt>null</tt> return can also indicate that the map
+ * previously associated <tt>null</tt> with <tt>key</tt>, if the implementation supports
+ * <tt>null</tt> values.)
*/
IPostProcessor.Descriptor put(K key, IPostProcessor.Descriptor descriptor);
@@ -164,8 +170,8 @@ public interface IPostProcessor { /**
* Removes a post processor from this registry.
*
- * @param postProcessorFactoryClassName
- * Qualified class name of the post processor that is to be removed from the registry.
+ * @param key
+ * key of the post processor descriptor that is to be removed from the registry.
* @return the previous value associated with <tt>key</tt>, or <tt>null</tt> if there was no
* mapping for <tt>key</tt>.
*/
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/PostProcessorDescriptorRegistryImpl.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/PostProcessorDescriptorRegistryImpl.java index 5b96a4b2f..2bb92dfa0 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/PostProcessorDescriptorRegistryImpl.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/PostProcessorDescriptorRegistryImpl.java @@ -22,6 +22,8 @@ import org.eclipse.emf.compare.scope.IComparisonScope; /**
* This will contain all of the EMF Compare extensions.
*
+ * @param <K>
+ * the type of the key of this registry
* @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a>
*/
public class PostProcessorDescriptorRegistryImpl<K> implements IPostProcessor.Descriptor.Registry<K> {
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java index b12eec482..ce3c91148 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java @@ -41,7 +41,6 @@ import org.eclipse.emf.compare.DifferenceState; import org.eclipse.emf.compare.EMFCompareMessages; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.ReferenceChange; -import org.eclipse.emf.compare.ResourceAttachmentChange; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; @@ -881,7 +880,7 @@ public final class DiffUtil { * When merging a {@link Diff}, returns the sub diffs of this given diff, and all associated diffs (see * {@link DiffUtil#getAssociatedDiffs(Iterable, boolean, Diff)}) of these sub diffs. * <p> - * If the diff is an {@link AttributeChange} or a {@link ResourceAttachmentChange}, this method will + * If the diff is an {@link AttributeChange} or a @{code ResourceAttachmentChange}, this method will * return an empty iterable. * </p> * <p> |