Added a constructor without URIConverter to MImageImpl.

ObeoNetwork · Aug 8, 2017 · b54a8c7 · b54a8c7
1 parent 79619aa
commit b54a8c7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...eonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/M2DocSiriusServices.java b/...eonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/M2DocSiriusServices.java
@@ -18,7 +18,6 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.URIConverter;
 import org.eclipse.sirius.business.api.dialect.DialectManager;
 import org.eclipse.sirius.business.api.dialect.command.CreateRepresentationCommand;
 import org.eclipse.sirius.business.api.query.DRepresentationDescriptorQuery;
@@ -281,7 +280,7 @@ public void run() {
             exportDiagUnitOfWork.run();
         }
 
-        res = new MImageImpl(URIConverter.INSTANCE, URI.createFileURI(tmpFile.getAbsolutePath()));
+        res = new MImageImpl(URI.createFileURI(tmpFile.getAbsolutePath()));
 
         return res;
     }

diff --git a/plugins/org.obeonetwork.m2doc/src/org/obeonetwork/m2doc/element/impl/MImageImpl.java b/plugins/org.obeonetwork.m2doc/src/org/obeonetwork/m2doc/element/impl/MImageImpl.java
@@ -71,6 +71,20 @@ public class MImageImpl implements MImage {
      * default.
      * </p>
      * 
+     * @param uri
+     *            the {@link URI}
+     */
+    public MImageImpl(URI uri) {
+        this(URIConverter.INSTANCE, uri, PictureType.toType(uri));
+    }
+
+    /**
+     * Constructor.
+     * <p>
+     * The image type is deducted from the image {@link URI} file extension. If the extension is unknown, jpeg format will be selected by
+     * default.
+     * </p>
+     * 
      * @param uriConverter
      *            the {@link URIConverter uri converter} to use.
      * @param uri