Bug 528881 - [Quality] Method modifier should follow convention order

 - replace "abstract public" by "public abstract"
 (see https://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.3
)
 - also remove some unused import

Change-Id: Ie1cf5ae7ae506b0cde5beef8ddfa9d56e4a2bdfd
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

5 files changed, 13 insertions, 18 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
index aa1b8cc4f44..7b261b3ca63 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/DiModelUtils.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
-import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.resource.IModel;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
index f6f44d9f54b..54ab1d181a9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
@@ -33,9 +33,8 @@ import org.eclipse.emf.ecore.resource.URIConverter;
 import org.eclipse.emf.ecore.xmi.XMIResource;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.papyrus.infra.core.Activator;
-import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescription;
-import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.resource.EMFLogicalModel;
 import org.eclipse.papyrus.infra.core.resource.IModel;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
@@ -328,10 +327,7 @@ public class SashModel extends EMFLogicalModel implements IModel {
 				Activator.log.error(ex);
 			}
 		}
-
-		URI preferenceStoreURI = getSashModelStoreURI(uriWithoutExtension);
-
-		return preferenceStoreURI;
+		return getSashModelStoreURI(uriWithoutExtension);
 	}
 
 	protected URI getLegacyURI(URI uriWithoutExtension) {
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
index 978ab4ea5d5..3c9943f69d4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceStartupEntry.java
@@ -54,7 +54,7 @@ public abstract class ServiceStartupEntry {
 	 *
 	 * @throws ServiceException
 	 */
-	abstract public void createService() throws ServiceException;
+	public abstract void createService() throws ServiceException;
 
 	/**
 	 * Init the associated service if not a Lazy Service.
@@ -64,14 +64,14 @@ public abstract class ServiceStartupEntry {
 	 *
 	 * @throws ServiceException
 	 */
-	abstract public void initService(ServicesRegistry servicesRegistry) throws ServiceException;
+	public abstract void initService(ServicesRegistry servicesRegistry) throws ServiceException;
 
 	/**
 	 * Start the associated service if not a Lazy Service.
 	 *
 	 * @throws ServiceException
 	 */
-	abstract public void startService() throws ServiceException;
+	public abstract void startService() throws ServiceException;
 
 	/**
 	 * Get the service instance.
@@ -79,12 +79,12 @@ public abstract class ServiceStartupEntry {
 	 * @return
 	 * @throws ServiceException
 	 */
-	abstract public Object getServiceInstance() throws ServiceException;
+	public abstract Object getServiceInstance() throws ServiceException;
 
 	/**
 	 * Dispose associated service.
 	 */
-	abstract public void disposeService() throws ServiceException;
+	public abstract void disposeService() throws ServiceException;
 
 	/**
 	 * Return the list of the {@link ServiceStartupEntry} required by this
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
index 5e617e9d46d..83dfda89d5c 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/internal/ServiceTypeEntry.java
@@ -177,14 +177,14 @@ public abstract class ServiceTypeEntry {
 	 * @return
 	 * @throws ServiceException
 	 */
-	abstract public Object getServiceInstance() throws ServiceException;
+	public abstract Object getServiceInstance() throws ServiceException;
 
 	/**
 	 * Create the associated service if not a Lazy Service.
 	 *
 	 * @throws ServiceException
 	 */
-	abstract public void createService() throws ServiceException;
+	public abstract void createService() throws ServiceException;
 
 	/**
 	 * Start the associated service if not a Lazy Service.
@@ -194,18 +194,18 @@ public abstract class ServiceTypeEntry {
 	 *
 	 * @throws ServiceException
 	 */
-	abstract public void initService(ServicesRegistry servicesRegistry) throws ServiceException;
+	public abstract void initService(ServicesRegistry servicesRegistry) throws ServiceException;
 
 	/**
 	 * Start the associated service if not a Lazy Service.
 	 *
 	 * @throws ServiceException
 	 */
-	abstract public void startService() throws ServiceException;
+	public abstract void startService() throws ServiceException;
 
 	/**
 	 * Dispose associated service.
 	 */
-	abstract public void disposeService() throws ServiceException;
+	public abstract void disposeService() throws ServiceException;
 
 }
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
index 5176b8d88d2..e2823a032d1 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/utils/AbstractServiceUtils.java
@@ -49,7 +49,7 @@ public abstract class AbstractServiceUtils<T> {
 	 * @param from
 	 * @return
 	 */
-	abstract public ServicesRegistry getServiceRegistry(T from) throws ServiceException;
+	public abstract ServicesRegistry getServiceRegistry(T from) throws ServiceException;
 
 	/**
 	 * Obtains the service registry determined automatically from the context of which