diff options
author | ptessier | 2014-02-11 17:14:36 +0000 |
---|---|---|
committer | ptessier | 2014-02-11 17:14:36 +0000 |
commit | 60f47747e04d732eb5d8b446a792cf86161db977 (patch) | |
tree | 69fd70901dbcba4896fd84b5fdf313f54a8b215e /plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration | |
parent | df1d4d493dc8ea4b4a81ad8da993f91df220431a (diff) | |
parent | 74df1a9a52ad683d15a09cd9db1931c95f11b80a (diff) | |
download | org.eclipse.papyrus-60f47747e04d732eb5d8b446a792cf86161db977.tar.gz org.eclipse.papyrus-60f47747e04d732eb5d8b446a792cf86161db977.tar.xz org.eclipse.papyrus-60f47747e04d732eb5d8b446a792cf86161db977.zip |
Merged master into EMF Facet integration
Diffstat (limited to 'plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration')
-rw-r--r-- | plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java index 2580fdae5da..3fff0e46641 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/helper/XtextStylesheetHelper.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2012 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,15 +25,15 @@ import org.eclipse.xtext.resource.XtextResourceSet; /**
* A helper for XText stylesheets
- *
+ *
* @author Camille Letavernier
- *
+ *
*/
public class XtextStylesheetHelper {
/**
* Loads and returns a Resource containing an XText Stylesheet
- *
+ *
* @param stylesheet
* The object representing the Stylesheet's path or contents
* @param resourceSet
@@ -47,7 +47,7 @@ public class XtextStylesheetHelper { */
public static Resource loadStylesheet(StyleSheet stylesheet, ResourceSet resourceSet, View contextView, Shell parentShell) {
if(stylesheet instanceof StyleSheetReference) {
- return loadStylesheet(stylesheet, resourceSet, contextView, parentShell);
+ return loadStylesheet((StyleSheetReference)stylesheet, resourceSet, contextView, parentShell);
} else if(stylesheet instanceof EmbeddedStyleSheet) {
//TODO: Edit EmbeddedStyleSheets with XText
throw new UnsupportedOperationException();
@@ -57,7 +57,7 @@ public class XtextStylesheetHelper { /**
* Loads and returns a Resource containing an XText Stylesheet
- *
+ *
* @param stylesheet
* The object representing the Stylesheet's path
* @param resourceSet
|