From 20daa6908acd8e1310ea8f6c2e7b6004abe1871b Mon Sep 17 00:00:00 2001 From: xdvrx1 Date: Sun, 16 Feb 2020 19:56:06 +0800 Subject: [PATCH 1/7] Update UI.java --- src/simplejavacalculator/UI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simplejavacalculator/UI.java b/src/simplejavacalculator/UI.java index b7a2633..ef586da 100644 --- a/src/simplejavacalculator/UI.java +++ b/src/simplejavacalculator/UI.java @@ -63,7 +63,7 @@ public class UI implements ActionListener { public UI() { frame = new JFrame("Calculator PH"); - image = new ImageIcon("icon/icon.png"); + image = new ImageIcon("..//icon/icon.png"); panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); From 4d1eef83b4a107268e372b6fa3daf16c1c4c77cc Mon Sep 17 00:00:00 2001 From: xdvrx1 Date: Sun, 16 Feb 2020 20:15:00 +0800 Subject: [PATCH 2/7] Update UI.java --- src/simplejavacalculator/UI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simplejavacalculator/UI.java b/src/simplejavacalculator/UI.java index ef586da..6327bf2 100644 --- a/src/simplejavacalculator/UI.java +++ b/src/simplejavacalculator/UI.java @@ -63,7 +63,7 @@ public class UI implements ActionListener { public UI() { frame = new JFrame("Calculator PH"); - image = new ImageIcon("..//icon/icon.png"); + image = new ImageIcon("..//Simple-Java-Calculator-master/icon/icon.png"); panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); From 48c2755370746c5564718e6b1ff364c6ae1544bf Mon Sep 17 00:00:00 2001 From: xdvrx1 Date: Sun, 16 Feb 2020 21:11:11 +0800 Subject: [PATCH 3/7] Update UI.java --- src/simplejavacalculator/UI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simplejavacalculator/UI.java b/src/simplejavacalculator/UI.java index 6327bf2..6777a06 100644 --- a/src/simplejavacalculator/UI.java +++ b/src/simplejavacalculator/UI.java @@ -63,7 +63,7 @@ public class UI implements ActionListener { public UI() { frame = new JFrame("Calculator PH"); - image = new ImageIcon("..//Simple-Java-Calculator-master/icon/icon.png"); + image = new ImageIcon("/icon/icon.png"); panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); From 24530f4376ce1f8b325cc501805ab3b28e586fb4 Mon Sep 17 00:00:00 2001 From: xdvrx1 Date: Mon, 17 Feb 2020 06:35:49 +0800 Subject: [PATCH 4/7] Update SimpleJavaCalculator.java --- .../SimpleJavaCalculator.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/simplejavacalculator/SimpleJavaCalculator.java b/src/simplejavacalculator/SimpleJavaCalculator.java index 238603c..cd11787 100644 --- a/src/simplejavacalculator/SimpleJavaCalculator.java +++ b/src/simplejavacalculator/SimpleJavaCalculator.java @@ -17,10 +17,15 @@ package simplejavacalculator; public class SimpleJavaCalculator { - - public static void main(String[] args) { - UI uiCal = new UI(); - uiCal.init(); - } - + + public static void main(String[] args) { + try { + UI uiCal = new UI(); + uiCal.init(); + } + catch (Exception e) { + System.out.println(e.getMessage()); + } + + } } From ed8de4e7c40b38f804834c9b91153206b4551f68 Mon Sep 17 00:00:00 2001 From: xdvrx1 Date: Mon, 17 Feb 2020 06:38:30 +0800 Subject: [PATCH 5/7] Update UI.java --- src/simplejavacalculator/UI.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/simplejavacalculator/UI.java b/src/simplejavacalculator/UI.java index 6777a06..f207e9a 100644 --- a/src/simplejavacalculator/UI.java +++ b/src/simplejavacalculator/UI.java @@ -29,9 +29,10 @@ import java.awt.Font; import javax.swing.Box; import javax.swing.BoxLayout; -import java.awt.Toolkit; + import java.awt.Image; import javax.swing.ImageIcon; +import java.io.*; public class UI implements ActionListener { @@ -58,12 +59,14 @@ public class UI implements ActionListener { private final Font font; private final Font textFont; - ImageIcon image; + private ImageIcon image; + private BufferedImageCustom imageReturn; - public UI() { + public UI() throws IOException { frame = new JFrame("Calculator PH"); - image = new ImageIcon("/icon/icon.png"); + imageReturn = new BufferedImageCustom(); + image = new ImageIcon(imageReturn.imageReturn()); panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); @@ -114,6 +117,7 @@ public void init() { frame.setLocationRelativeTo(null); frame.setResizable(false); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setIconImage(image.getImage()); text.setFont(textFont); From d10d5a0f94f779a2dafb50e8c4e72b30bb361d91 Mon Sep 17 00:00:00 2001 From: xdvrx1 Date: Mon, 17 Feb 2020 06:39:17 +0800 Subject: [PATCH 6/7] Add files via upload --- .../BufferedImageCustom.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/simplejavacalculator/BufferedImageCustom.java diff --git a/src/simplejavacalculator/BufferedImageCustom.java b/src/simplejavacalculator/BufferedImageCustom.java new file mode 100644 index 0000000..39d8ce2 --- /dev/null +++ b/src/simplejavacalculator/BufferedImageCustom.java @@ -0,0 +1,25 @@ +package simplejavacalculator; + +import java.io.*; +import java.awt.image.BufferedImage; +import javax.imageio.ImageIO; +import java.awt.*; + +/** + *This class will return an image + *from a binary data. + */ +class BufferedImageCustom { + public Image imageReturn() + throws IOException { + Image image; + + //the image here is not even an image file + //but rather a binary data + InputStream bis = getClass().getResourceAsStream("/icon/icon.png"); + BufferedImage bImage2 = ImageIO.read(bis); + image = bImage2; + + return image; + } +} \ No newline at end of file From 91c4782695321bc96cdf16826cd4b94e6292589d Mon Sep 17 00:00:00 2001 From: xdvrx1 Date: Mon, 17 Feb 2020 06:50:35 +0800 Subject: [PATCH 7/7] Update BufferedImageCustom.java --- src/simplejavacalculator/BufferedImageCustom.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/simplejavacalculator/BufferedImageCustom.java b/src/simplejavacalculator/BufferedImageCustom.java index 39d8ce2..196f440 100644 --- a/src/simplejavacalculator/BufferedImageCustom.java +++ b/src/simplejavacalculator/BufferedImageCustom.java @@ -14,12 +14,10 @@ public Image imageReturn() throws IOException { Image image; - //the image here is not even an image file - //but rather a binary data InputStream bis = getClass().getResourceAsStream("/icon/icon.png"); BufferedImage bImage2 = ImageIO.read(bis); image = bImage2; return image; } -} \ No newline at end of file +}