1 files changed, 153 insertions, 150 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
index 1b8bffb9923..334971d5feb 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
@@ -1,150 +1,153 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, 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:
- *  LIFL - Initial API and implementation
- *  Christian W. Damus - bug 434983
- *  Christian W. Damus - bug 469188
- *  Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.resource.sasheditor;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.ModelUtils;
-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-
-/**
- * Set of utility methods linked to Trace for ControlMode
- *
- * @author cedric dumoulin
- *
- */
-public class SashModelUtils {
-
-	/**
-	 * Gets the SashModel for the currently selected editor. <br>
-	 * Warning: This method is designed to be call from ui.handlers. It is not
-	 * designed to be call from Editors. This method can return null if called
-	 * during the MultiEditor initialization.
-	 *
-	 * @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
-	 *
-	 * @return The {@link SashModel} of the current editor, or null if not
-	 *         found.
-	 * @deprecated Use {@link #getSashModel(ModelSet)} or {@link #getSashModel(ServicesRegistry)} instead
-	 */
-	@Deprecated
-	public static SashModel getSashModel() {
-
-		try {
-			return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID);
-		} catch (ServiceException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Gets the SashModel for the currently selected editor. <br>
-	 * Warning: This method is designed to be call from ui.handlers. It is not
-	 * designed to be call from Editors. This method can return null if called
-	 * during the MultiEditor initialization.
-	 *
-	 * @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
-	 *
-	 * @return The {@link SashModel} of the current editor, or null if not
-	 *         found.
-	 * @throws ServiceException
-	 *             If an error occurs while getting or starting the service.
-	 * @deprecated Use {@link #getSashModelChecked(ServicesRegistry)} instead
-	 */
-	@Deprecated
-	public static SashModel getSashModelChecked() throws ServiceException {
-
-		return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID);
-	}
-
-	/**
-	 * Gets the SashModel from the {@link ModelSet}. <br>
-	 *
-	 * @param modelsManager
-	 *            The modelManager containing the requested model.
-	 *
-	 * @return The {@link SashModel} registered in modelManager, or null if not
-	 *         found.
-	 */
-	public static SashModel getSashModel(ModelSet modelsManager) {
-
-		return (SashModel) modelsManager.getModel(SashModel.MODEL_ID);
-	}
-
-	/**
-	 * Gets the SashModel from the {@link ModelSet}. <br>
-	 *
-	 * @param ServicesRegistry
-	 *            The servie registry under which the ModelSet is registered.
-	 *
-	 * @return The {@link SashModel} registered in modelManager, or null if not
-	 *         found.
-	 */
-	public static SashModel getSashModel(ServicesRegistry servicesRegistry) {
-
-		try {
-			return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID);
-		} catch (ServiceException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Gets the SashModel from the {@link ModelSet}. <br>
-	 *
-	 * @param ServicesRegistry
-	 *            The servie registry under which the ModelSet is registered.
-	 *
-	 * @return The {@link SashModel} registered in modelManager, or null if not
-	 *         found.
-	 * @throws ServiceException
-	 *             If the service can't be returned.
-	 */
-	public static SashModel getSashModelChecked(ServicesRegistry servicesRegistry) throws ServiceException {
-
-		return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID);
-	}
-
-	/**
-	 * Retrieve the uri of the initial di opened
-	 *
-	 * @param modelSet
-	 * @return
-	 */
-	public static URI getInitialURI(ModelSet modelSet) {
-		return SashModelUtils.getSashModel(modelSet).getResourceURI();
-	}
-
-	public static SashWindowsMngr getSashWindowsMngr(ModelSet modelSet) {
-		SashWindowsMngr result = null;
-
-		SashModel model = getSashModel(modelSet);
-		if (model != null) {
-			Resource resource = model.getResource();
-			if (resource != null) {
-				result = (SashWindowsMngr) EcoreUtil.getObjectByType(resource.getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR);
-			}
-		}
-
-		return result;
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 LIFL, CEA LIST, Christian W. Damus, 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:
+ *  LIFL - Initial API and implementation
+ *  Christian W. Damus - bug 434983
+ *  Christian W. Damus - bug 469188
+ *  Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource.sasheditor;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+
+/**
+ * Set of utility methods linked to Trace for ControlMode
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class SashModelUtils {
+
+	/**
+	 * Gets the SashModel for the currently selected editor. <br>
+	 * Warning: This method is designed to be call from ui.handlers. It is not
+	 * designed to be call from Editors. This method can return null if called
+	 * during the MultiEditor initialization.
+	 *
+	 * @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
+	 *
+	 * @return The {@link SashModel} of the current editor, or null if not
+	 *         found.
+	 * @deprecated Use {@link #getSashModel(ModelSet)} or {@link #getSashModel(ServicesRegistry)} instead
+	 */
+	@Deprecated
+	public static SashModel getSashModel() {
+
+		try {
+			return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID);
+		} catch (ServiceException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Gets the SashModel for the currently selected editor. <br>
+	 * Warning: This method is designed to be call from ui.handlers. It is not
+	 * designed to be call from Editors. This method can return null if called
+	 * during the MultiEditor initialization.
+	 *
+	 * @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
+	 *
+	 * @return The {@link SashModel} of the current editor, or null if not
+	 *         found.
+	 * @throws ServiceException
+	 *             If an error occurs while getting or starting the service.
+	 * @deprecated Use {@link #getSashModelChecked(ServicesRegistry)} instead
+	 */
+	@Deprecated
+	public static SashModel getSashModelChecked() throws ServiceException {
+
+		return (SashModel) ServiceUtils.getInstance().getModelSet(null).getModel(SashModel.MODEL_ID);
+	}
+
+	/**
+	 * Gets the SashModel from the {@link ModelSet}. <br>
+	 *
+	 * @param modelsManager
+	 *            The modelManager containing the requested model.
+	 *
+	 * @return The {@link SashModel} registered in modelManager, or null if not
+	 *         found.
+	 */
+	public static SashModel getSashModel(ModelSet modelsManager) {
+
+		return (SashModel) modelsManager.getModel(SashModel.MODEL_ID);
+	}
+
+	/**
+	 * Gets the SashModel from the {@link ModelSet}. <br>
+	 *
+	 * @param ServicesRegistry
+	 *            The servie registry under which the ModelSet is registered.
+	 *
+	 * @return The {@link SashModel} registered in modelManager, or null if not
+	 *         found.
+	 */
+	public static SashModel getSashModel(ServicesRegistry servicesRegistry) {
+
+		try {
+			return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID);
+		} catch (ServiceException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Gets the SashModel from the {@link ModelSet}. <br>
+	 *
+	 * @param ServicesRegistry
+	 *            The servie registry under which the ModelSet is registered.
+	 *
+	 * @return The {@link SashModel} registered in modelManager, or null if not
+	 *         found.
+	 * @throws ServiceException
+	 *             If the service can't be returned.
+	 */
+	public static SashModel getSashModelChecked(ServicesRegistry servicesRegistry) throws ServiceException {
+
+		return (SashModel) ModelUtils.getModelSetChecked(servicesRegistry).getModel(SashModel.MODEL_ID);
+	}
+
+	/**
+	 * Retrieve the uri of the initial di opened
+	 *
+	 * @param modelSet
+	 * @return
+	 */
+	public static URI getInitialURI(ModelSet modelSet) {
+		return SashModelUtils.getSashModel(modelSet).getResourceURI();
+	}
+
+	/**
+	 * @since 2.0
+	 */
+	public static SashWindowsMngr getSashWindowsMngr(ModelSet modelSet) {
+		SashWindowsMngr result = null;
+
+		SashModel model = getSashModel(modelSet);
+		if (model != null) {
+			Resource resource = model.getResource();
+			if (resource != null) {
+				result = (SashWindowsMngr) EcoreUtil.getObjectByType(resource.getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR);
+			}
+		}
+
+		return result;
+	}
+}