From 2d4c8b950b0b17a393c4a13ee4bf63ef5579e00d Mon Sep 17 00:00:00 2001 From: PedroRocha84 Date: Thu, 14 Nov 2024 10:53:56 +0000 Subject: [PATCH 1/3] Change simplegraphics picture allowing https --- .../org/academiadecodigo/simplegraphics/pictures/Picture.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java b/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java index a89f30d..8746d5c 100755 --- a/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java +++ b/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java @@ -81,7 +81,7 @@ public void load(String source) { this.source = source; // Load from the web - if (source.startsWith("http://")) { + if (source.startsWith("http://") || source.startsWith("https://")) { image = ImageIO.read(new URL(source).openStream()); From 42ad428efe990de3806dcb73bff4f6f67a4e7949 Mon Sep 17 00:00:00 2001 From: PedroRocha84 Date: Thu, 14 Nov 2024 10:57:21 +0000 Subject: [PATCH 2/3] revert code to test --- .../academiadecodigo/simplegraphics/pictures/Picture.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java b/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java index 8746d5c..4e06514 100755 --- a/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java +++ b/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java @@ -81,12 +81,9 @@ public void load(String source) { this.source = source; // Load from the web - if (source.startsWith("http://") || source.startsWith("https://")) { - + if (source.startsWith("http://")) { image = ImageIO.read(new URL(source).openStream()); - } else { - // Attempt to load from the class path (as in JAR file..) URL url = getClass().getResource(source.startsWith("/") ? source : "/" + source); if (url != null) { From 906eed00376203e27dec2018a414b59f2937a58d Mon Sep 17 00:00:00 2001 From: PedroRocha84 Date: Thu, 14 Nov 2024 10:58:48 +0000 Subject: [PATCH 3/3] Change simplegraphics picture allowing https --- .../org/academiadecodigo/simplegraphics/pictures/Picture.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java b/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java index 4e06514..fb7e97a 100755 --- a/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java +++ b/src/main/java/org/academiadecodigo/simplegraphics/pictures/Picture.java @@ -81,8 +81,10 @@ public void load(String source) { this.source = source; // Load from the web - if (source.startsWith("http://")) { + if (source.startsWith("http://") || source.startsWith("https://")) { + image = ImageIO.read(new URL(source).openStream()); + } else { // Attempt to load from the class path (as in JAR file..) URL url = getClass().getResource(source.startsWith("/") ? source : "/" + source);