[Code style] Apply clean-up and formatter on Main plug-ins

5 files changed, 41 insertions, 43 deletions

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
index 19b93228fb1..438d09be0dd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- * 

+ *

  * 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

@@ -34,7 +34,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Gets the context.

-	 * 

+	 *

 	 * @return the context

 	 */

 	static BundleContext getContext() {

@@ -48,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
 	 */

 	/**

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 * 

+	 *

 	 * @param bundleContext

 	 * @throws Exception

 	 */

@@ -66,7 +66,7 @@ public class Activator extends AbstractUIPlugin {
 	 */

 	/**

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 * 

+	 *

 	 * @param bundleContext

 	 * @throws Exception

 	 */

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java
index 4af537658ec..a415fa69713 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/IViewerSearcher.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- * 

+ *

  * 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

@@ -25,33 +25,33 @@ public interface IViewerSearcher {
 

 	/**

 	 * Gets the modelElements's viewers in a collection of modelSet.

-	 * 

+	 *

 	 * @param modelElements

-	 *        the model elements to find viewers for

+	 *            the model elements to find viewers for

 	 * @param models

-	 *        the collection of modelSet to search in

+	 *            the collection of modelSet to search in

 	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)

 	 */

 	Map<Object, Map<Object, Object>> getViewers(Collection<Object> modelElements, Collection<ModelSet> models);

 

 	/**

 	 * Gets the modelElements's viewers in a modelSet.

-	 * 

+	 *

 	 * @param modelElements

-	 *        the model elements to find viewers for

+	 *            the model elements to find viewers for

 	 * @param model

-	 *        the modelSet to search in

+	 *            the modelSet to search in

 	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)

 	 */

 	Map<Object, Map<Object, Object>> getViewers(Collection<Object> modelElements, ModelSet model);

 

 	/**

 	 * Gets the modelElement's viewers in a modelSet.

-	 * 

+	 *

 	 * @param modelElement

-	 *        the model element to find viewers for

+	 *            the model element to find viewers for

 	 * @param model

-	 *        the modelSet to search in

+	 *            the modelSet to search in

 	 * @return (modelset, (viewer, modelElement)): for each modelset, a map of (viewer, modelElement)

 	 */

 	Map<Object, Map<Object, Object>> getViewers(Object modelElement, ModelSet model);

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java
index 98a410c97ec..fb56f749813 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Messages.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- * 

+ *

  * 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

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/AbstractViewerSearcher.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/AbstractViewerSearcher.java
index dc43ef2d37e..496e3a8f193 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/AbstractViewerSearcher.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/AbstractViewerSearcher.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- * 

+ *

  * 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

@@ -28,10 +28,9 @@ public abstract class AbstractViewerSearcher implements IViewerSearcher {
 

 	/**

 	 * Generic implementation of this method that shouldn't be overridden

-	 * 

-	 * @see org.eclipse.papyrus.infra.services.viewersearch.IViewerSearcher#getViewers(java.util.Collection,

-	 *      org.eclipse.papyrus.infra.core.resource.ModelSet)

-	 * 

+	 *

+	 * @see org.eclipse.papyrus.infra.services.viewersearch.IViewerSearcher#getViewers(java.util.Collection, org.eclipse.papyrus.infra.core.resource.ModelSet)

+	 *

 	 * @param modelElements

 	 * @param modelSet

 	 * @return

@@ -47,10 +46,9 @@ public abstract class AbstractViewerSearcher implements IViewerSearcher {
 

 	/**

 	 * Generic implementation of this method that shouldn't be overridden

-	 * 

-	 * @see org.eclipse.papyrus.infra.services.viewersearch.IViewerSearcher#getViewers(java.lang.Object,

-	 *      org.eclipse.papyrus.infra.core.resource.ModelSet)

-	 * 

+	 *

+	 * @see org.eclipse.papyrus.infra.services.viewersearch.IViewerSearcher#getViewers(java.lang.Object, org.eclipse.papyrus.infra.core.resource.ModelSet)

+	 *

 	 * @param modelElement

 	 * @param modelSet

 	 * @return

@@ -68,7 +66,7 @@ public abstract class AbstractViewerSearcher implements IViewerSearcher {
 

 	/**

 	 * @see org.eclipse.papyrus.infra.services.viewersearch.IViewerSearcher#getViewers(java.util.Collection, java.util.Collection)

-	 * 

+	 *

 	 * @param modelElements

 	 * @param models

 	 * @return

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java
index 1bfd617599b..f31f4068b91 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/impl/ViewerSearchService.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

  *

- * 

+ *

  * 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

@@ -47,7 +47,7 @@ public class ViewerSearchService extends AbstractViewerSearcher implements IServ
 

 	/**

 	 * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)

-	 * 

+	 *

 	 * @param servicesRegistry

 	 * @throws ServiceException

 	 */

@@ -58,7 +58,7 @@ public class ViewerSearchService extends AbstractViewerSearcher implements IServ
 

 	/**

 	 * @see org.eclipse.papyrus.infra.core.services.IService#startService()

-	 * 

+	 *

 	 * @throws ServiceException

 	 */

 

@@ -70,29 +70,29 @@ public class ViewerSearchService extends AbstractViewerSearcher implements IServ
 

 	/**

 	 * Parses the available viewerSearcher from the extension point.

-	 * 

+	 *

 	 * @param configurations

-	 *        The extension point IConfigurationElements

+	 *            The extension point IConfigurationElements

 	 */

 	private void readViewerSearchers(IConfigurationElement[] configurations) {

 		viewerSearchers.clear();

 

-		for(IConfigurationElement config : configurations) {

+		for (IConfigurationElement config : configurations) {

 			try {

-				if("viewerSearcher".equals(config.getName())) { //$NON-NLS-1$

+				if ("viewerSearcher".equals(config.getName())) { //$NON-NLS-1$

 					String viewerSearcherId = config.getAttribute(VIEWER_SEARCHER_ID);

-					if(viewerSearcherId == null) {

+					if (viewerSearcherId == null) {

 						Activator.log.warn(Messages.ViewerSearcherService_2 + config.getContributor() + Messages.ViewerSearcherService_3 + EXTENSION_ID + Messages.ViewerSearcherService_4 + VIEWER_SEARCHER_ID + Messages.ViewerSearcherService_5);

 						continue;

 					}

 

-					IViewerSearcher viewerSearcherClass = (IViewerSearcher)config.createExecutableExtension(VIEWER_SEARCHER_CLASS);

-					if(viewerSearcherClass == null) {

+					IViewerSearcher viewerSearcherClass = (IViewerSearcher) config.createExecutableExtension(VIEWER_SEARCHER_CLASS);

+					if (viewerSearcherClass == null) {

 						Activator.log.warn(Messages.ViewerSearcherService_6 + config.getContributor() + Messages.ViewerSearcherService_7 + EXTENSION_ID + Messages.ViewerSearcherService_8 + VIEWER_SEARCHER_CLASS + Messages.ViewerSearcherService_9);

 						continue;

 					}

 

-					if(viewerSearchers.containsKey(viewerSearcherId)) {

+					if (viewerSearchers.containsKey(viewerSearcherId)) {

 						Activator.log.warn(Messages.ViewerSearcherService_10 + viewerSearcherId + Messages.ViewerSearcherService_11);

 						continue;

 					}

@@ -108,7 +108,7 @@ public class ViewerSearchService extends AbstractViewerSearcher implements IServ
 

 	/**

 	 * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()

-	 * 

+	 *

 	 * @throws ServiceException

 	 */

 

@@ -119,9 +119,9 @@ public class ViewerSearchService extends AbstractViewerSearcher implements IServ
 

 	/**

 	 * Collects viewers from the difference viewerSearcher contributors

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.infra.services.viewersearch.impl.AbstractViewerSearcher#getViewers(java.util.Collection, java.util.Collection)

-	 * 

+	 *

 	 * @param modelElements

 	 * @param models

 	 * @return

@@ -131,14 +131,14 @@ public class ViewerSearchService extends AbstractViewerSearcher implements IServ
 	public Map<Object, Map<Object, Object>> getViewers(Collection<Object> modelElements, Collection<ModelSet> models) {

 		Map<Object, Map<Object, Object>> results = new HashMap<Object, Map<Object, Object>>();

 

-		for(String key : viewerSearchers.keySet()) {

+		for (String key : viewerSearchers.keySet()) {

 			IViewerSearcher viewerSearcher = viewerSearchers.get(key);

 

 			Map<Object, Map<Object, Object>> subResults = viewerSearcher.getViewers(modelElements, models);

-			if(subResults != null) {

-				for(Object viewer : subResults.keySet()) {

+			if (subResults != null) {

+				for (Object viewer : subResults.keySet()) {

 

-					if(results.containsKey(viewer)) {

+					if (results.containsKey(viewer)) {

 						Map<Object, Object> viewMappings = subResults.get(viewer);

 						Map<Object, Object> resultViewMappings = results.get(viewer);

 						resultViewMappings.putAll(viewMappings);