X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Fimage%2Fimpl%2FImageURLFactory.java;fp=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Fimage%2Fimpl%2FImageURLFactory.java;h=bd3d3e56959e914fd7aeb570eac15fc4a0dec28f;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=f0938296a4c456792e1210549edf00a8a0363f44;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/ImageURLFactory.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/ImageURLFactory.java index f0938296a..bd3d3e569 100644 --- a/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/ImageURLFactory.java +++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/ImageURLFactory.java @@ -1,78 +1,78 @@ -/******************************************************************************* - * Copyright (c) 2007, 2010 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.g2d.image.impl; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.net.URL; - -import javax.imageio.ImageIO; - -import org.simantics.g2d.image.Image; -import org.simantics.g2d.image.ImageUtils; -import org.simantics.g2d.svg.SVGImage; -import org.simantics.utils.datastructures.cache.IFactory; -import org.simantics.utils.datastructures.cache.ProvisionException; - -/** - * Creates images at an URL. - * - * @See {@link ImageUtils} - * @author Toni Kalajainen - * @deprecated does not work with org.simantics.scenegraph - */ -@Deprecated -public class ImageURLFactory implements IFactory { - - URL url; - - public ImageURLFactory(URL url) - { - if (url==null) throw new IllegalArgumentException("null arg"); - this.url = url; - } - - @Override - public Image get() throws ProvisionException { - boolean svg = url.getFile().toLowerCase().endsWith(".svg"); - - if (svg) { - try { - // FIXME: provide nodeIdentifier argument from outside of the factory - return SVGImage.loadFromURL(url.toString(), url); - } catch (IOException e) { - throw new ProvisionException(e); - } - } - - // Try opening with ImageIO - try { - BufferedImage bi = ImageIO.read(url); - return new AWTImage(bi); - } catch (IOException e) { - throw new ProvisionException(e); - } - } - - @Override - public int hashCode() { - return url.hashCode() + 243243243; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) return false; - if (!obj.getClass().equals(getClass())) return false; - return ((ImageURLFactory)obj).url.equals(url); - } - -} +/******************************************************************************* + * Copyright (c) 2007, 2010 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.g2d.image.impl; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.net.URL; + +import javax.imageio.ImageIO; + +import org.simantics.g2d.image.Image; +import org.simantics.g2d.image.ImageUtils; +import org.simantics.g2d.svg.SVGImage; +import org.simantics.utils.datastructures.cache.IFactory; +import org.simantics.utils.datastructures.cache.ProvisionException; + +/** + * Creates images at an URL. + * + * @See {@link ImageUtils} + * @author Toni Kalajainen + * @deprecated does not work with org.simantics.scenegraph + */ +@Deprecated +public class ImageURLFactory implements IFactory { + + URL url; + + public ImageURLFactory(URL url) + { + if (url==null) throw new IllegalArgumentException("null arg"); + this.url = url; + } + + @Override + public Image get() throws ProvisionException { + boolean svg = url.getFile().toLowerCase().endsWith(".svg"); + + if (svg) { + try { + // FIXME: provide nodeIdentifier argument from outside of the factory + return SVGImage.loadFromURL(url.toString(), url); + } catch (IOException e) { + throw new ProvisionException(e); + } + } + + // Try opening with ImageIO + try { + BufferedImage bi = ImageIO.read(url); + return new AWTImage(bi); + } catch (IOException e) { + throw new ProvisionException(e); + } + } + + @Override + public int hashCode() { + return url.hashCode() + 243243243; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) return false; + if (!obj.getClass().equals(getClass())) return false; + return ((ImageURLFactory)obj).url.equals(url); + } + +}