From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Tue, 12 Nov 2019 11:26:22 +0000 (+0200)
Subject: Use FileLocator.toFileURL to get access to image files
X-Git-Tag: v1.43.0~129
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=44a50a069b398c1830f49d4c0af361220b43069d;p=simantics%2F3d.git

Use FileLocator.toFileURL to get access to image files

gitlab #52

Change-Id: I307a0042b7131502452949d79005d24f198c4cca
---

diff --git a/org.simantics.g3d/src/org/simantics/g3d/tools/PluginTools.java b/org.simantics.g3d/src/org/simantics/g3d/tools/PluginTools.java
index 296f1a11..7d4fa67b 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/tools/PluginTools.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/tools/PluginTools.java
@@ -1,39 +1,39 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 Association for Decentralized Information Management in
- * Industry THTH ry.
- * 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:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.g3d.tools;
-
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.osgi.framework.Bundle;
-
-public class PluginTools {
-	
-	public static String getAbsolutePath(Bundle inBundle, String fullpath) {
-		IPath path = new Path(fullpath);
-		URL u = FileLocator.find(inBundle, path, null);
-		if (u != null) {
-			try {
-				u = FileLocator.resolve(u);
-				if ("file".equals(u.getProtocol())) {
-					return new File(u.getFile()).getAbsolutePath();
-				}
-			} catch (Exception e) {
-			}
-		}
-		return null;
-	}
-
-}
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * 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:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.g3d.tools;
+
+import java.io.File;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.osgi.framework.Bundle;
+
+public class PluginTools {
+	
+	public static String getAbsolutePath(Bundle inBundle, String fullpath) {
+		IPath path = new Path(fullpath);
+		URL u = FileLocator.find(inBundle, path, null);
+		if (u != null) {
+			try {
+				u = FileLocator.toFileURL(u);
+				if ("file".equals(u.getProtocol())) {
+					return new File(u.getFile()).getAbsolutePath();
+				}
+			} catch (Exception e) {
+			}
+		}
+		return null;
+	}
+
+}