Upstream/ImageOnMap
1
0
Fork 0
mirror of https://github.com/zDevelopers/ImageOnMap.git synced 2024-06-20 11:44:43 +02:00
Code Issues Projects Releases Wiki Activity

* NEW: Improved rendering error messages. Fixes #22.

Browse Source
This commit is contained in:
Adrien Prokopowicz 2016-04-02 21:45:03 +02:00
parent a2cdb02834
commit b5d41b25d0
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/moribus/imageonmap/commands/maptool/NewCommand.java
View File

@ -75,7 +75,10 @@ public class NewCommand extends IoMCommand
public void errored(Throwable exception)
{
player.sendMessage("§cMap rendering failed : " + exception.getMessage());
PluginLogger.warning("Rendering from '{0}' failed", exception, player.getName());
PluginLogger.warning("Rendering from {0} failed : {1} : {2}",
player.getName(),
exception.getClass().getCanonicalName(),
exception.getMessage());
}
});
}

18
src/main/java/fr/moribus/imageonmap/image/ImageRendererExecutor.java
View File

@ -29,7 +29,10 @@ import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
@ -58,7 +61,20 @@ public class ImageRendererExecutor extends Worker
@Override
public ImageMap run() throws Throwable
{
final BufferedImage image = ImageIO.read(url);
final URLConnection connection = url.openConnection();
connection.connect();
if(connection instanceof HttpURLConnection)
{
final HttpURLConnection httpConnection = (HttpURLConnection) connection;
final int httpCode = httpConnection.getResponseCode();
if((httpCode / 100) != 2)
{
throw new IOException("HTTP error : " + httpCode + " " + httpConnection.getResponseMessage());
}
}
final InputStream stream = connection.getInputStream();
final BufferedImage image = ImageIO.read(stream);
if (image == null) throw new IOException("The given URL is not a valid image");
if (scaling) return RenderSingle(image, playerUUID);