From 08deb41fa3ced3445aedb52813893317a3c39cb5 Mon Sep 17 00:00:00 2001 From: Vitalii M Date: Mon, 15 Jul 2019 20:47:42 +0300 Subject: [PATCH 1/2] Rectangle class --- .gitignore | 3 +++ src/pointer/rectangle/Main.java | 17 +++++++++++++++++ src/pointer/rectangle/Rectangle.java | 28 ++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 .gitignore create mode 100644 src/pointer/rectangle/Main.java create mode 100644 src/pointer/rectangle/Rectangle.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b590f2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea/ +*.iml +stale_outputs_checked diff --git a/src/pointer/rectangle/Main.java b/src/pointer/rectangle/Main.java new file mode 100644 index 0000000..b7d206c --- /dev/null +++ b/src/pointer/rectangle/Main.java @@ -0,0 +1,17 @@ +package pointer.rectangle; + +public class Main { + + public static void main(String[] args) { + Rectangle rectangle1 = new Rectangle(10,6); + Rectangle rectangle2 = new Rectangle(4); + + print(rectangle1); + print(rectangle2); + } + + public static void print(Rectangle rectangle) { + System.out.println("Площа прямокутника = " + rectangle.square()); + System.out.println("Периметр прямокутника = " + rectangle.perimeter()); + } +} diff --git a/src/pointer/rectangle/Rectangle.java b/src/pointer/rectangle/Rectangle.java new file mode 100644 index 0000000..0a20cbe --- /dev/null +++ b/src/pointer/rectangle/Rectangle.java @@ -0,0 +1,28 @@ +package pointer.rectangle; + +public class Rectangle { + private int width; + private int length; + + public Rectangle(int width, int length) { + this.width = width; + this.length = length; + } + + public Rectangle(int a) { + this(a, a); + } + + public Rectangle() { + this(1); + } + + public int square() { + return width*length; + } + + public int perimeter() { + int p = (width + length) << 1; // or p =*2; + return p; + } +} From 7f8660302148faec6235b79a49a08fc124ef0871 Mon Sep 17 00:00:00 2001 From: Vitalii M Date: Tue, 16 Jul 2019 22:47:29 +0300 Subject: [PATCH 2/2] Removed redundant variable --- src/pointer/rectangle/Rectangle.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pointer/rectangle/Rectangle.java b/src/pointer/rectangle/Rectangle.java index 0a20cbe..c616924 100644 --- a/src/pointer/rectangle/Rectangle.java +++ b/src/pointer/rectangle/Rectangle.java @@ -4,12 +4,12 @@ public class Rectangle { private int width; private int length; - public Rectangle(int width, int length) { + Rectangle(int width, int length) { this.width = width; this.length = length; } - public Rectangle(int a) { + Rectangle(int a) { this(a, a); } @@ -17,12 +17,11 @@ public Rectangle() { this(1); } - public int square() { + int square() { return width*length; } - public int perimeter() { - int p = (width + length) << 1; // or p =*2; - return p; + int perimeter() { + return (width + length) << 1; // or p =*2; } }