From bbf8ddf16bbd0caffa5a5d93b0893bdd6a99c304 Mon Sep 17 00:00:00 2001 From: WJY-7 <2541095587@qq.com> Date: Mon, 6 May 2024 11:06:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animal.java" | 10 ++++++++++ .../\347\254\254\344\270\200\351\242\230/Cat.java" | 7 +++++++ .../\347\254\254\344\270\200\351\242\230/Dog.java" | 7 +++++++ .../Main.java" | 14 ++++++++++++++ .../Circle.java" | 4 ++++ .../Main.java" | 7 +++++++ .../Rectangle.java" | 4 ++++ .../Shape.java" | 9 +++++++++ 8 files changed, 62 insertions(+) create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java" create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java" diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java" new file mode 100644 index 00000000..0d42df7d --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java" @@ -0,0 +1,10 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题; + +public class Animal { + String name; + int age; + + public void showInfo(){ + System.out.println("这是父类Animal"); + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java" new file mode 100644 index 00000000..0d3cde55 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java" @@ -0,0 +1,7 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题; + +public class Cat extends Animal { + public void showInfo(){ + System.out.println("这是子类Cat"); + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java" new file mode 100644 index 00000000..294d555c --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java" @@ -0,0 +1,7 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题; + +public class Dog extends Animal { + public void showInfo(){ + System.out.println("这是子类Dog"); + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java" new file mode 100644 index 00000000..dc0b6c63 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java" @@ -0,0 +1,14 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题; + +public class Main { + public static void main(String[] args) { + Animal animal = new Animal(); + animal.showInfo(); + + Cat cat = new Cat(); + cat.showInfo(); + + Dog dog = new Dog(); + dog.showInfo(); + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java" new file mode 100644 index 00000000..b0a856b7 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java" @@ -0,0 +1,4 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题; + +public abstract class Circle extends Shape{ +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java" new file mode 100644 index 00000000..7fd8088c --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java" @@ -0,0 +1,7 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题; + +public class Main { + public static void main(String[] args) { + + } +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java" new file mode 100644 index 00000000..e7b77d30 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java" @@ -0,0 +1,4 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题; + +public abstract class Rectangle extends Shape { +} diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java" new file mode 100644 index 00000000..863647f1 --- /dev/null +++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java" @@ -0,0 +1,9 @@ +package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题; + +public abstract class Shape { + String color; + double area; + public abstract void calculateArea(){ + System.out.println(); + }; +} -- Gitee From 098f3891fc524a05593b417b3dfeecfb4df8ebe1 Mon Sep 17 00:00:00 2001 From: WJY-7 <2541095587@qq.com> Date: Mon, 6 May 2024 20:41:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:0506=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirPlane.java" | 26 +++++++++ .../Car.java" | 25 +++++++++ .../Test.java" | 18 ++++++ .../Vehicles.java" | 56 +++++++++++++++++++ 4 files changed, 125 insertions(+) create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java" create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java" create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java" diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java" new file mode 100644 index 00000000..3849eaaa --- /dev/null +++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java" @@ -0,0 +1,26 @@ +package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138; + +public class AirPlane extends Vehicles { + AirPlane() { + } + + AirPlane(String type, String brand, String color, String place) { + super(type, brand, color, place); + } + + @Override + public void travel() { + System.out.println("坐着" + color + brand + type + "前往" + place + "旅游"); + } + + // 编写带有飞机颜色和品牌两个参数及String返回值的方法 combination(); + public String combination(String color, String brand) { + return color + brand; + } + + // 编写带有品牌参数及String返回值的方法 combination(); + public String combination(String brand) { + return brand; + } + +} diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java" new file mode 100644 index 00000000..c138af6e --- /dev/null +++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java" @@ -0,0 +1,25 @@ +package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138; + +public class Car extends Vehicles { + Car() { + } + + Car(String type, String brand, String color, String place) { + super(type, brand, color, place); + } + + @Override + public void travel() { + System.out.println("开着" + color +brand + type + "前往" + place + "旅游"); + } + + // 编写带有汽车颜色和品牌两个参数及String返回值的方法 combination(); + public String combination(String color, String brand) { + return color + brand; + } + + // 编写带有品牌参数及String返回值的方法 combination(); + public String combination(String brand) { + return brand; + } +} diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" new file mode 100644 index 00000000..4626b7c6 --- /dev/null +++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" @@ -0,0 +1,18 @@ +package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138; + +public class Test { + public static void main(String[] args) { +// 开着白色大众汽车前往北京旅游； + Car car1 = new Car("汽车","大众","白色","北京"); + car1.travel(); +// 开着奔驰汽车前往东山岛旅游； + Car car2 = new Car("汽车","奔驰","","东山岛"); + car2.travel(); +// 坐着蓝色波音客机前往大理旅游； + AirPlane airPlane1 = new AirPlane("客机","波音","蓝色","大理"); + airPlane1.travel(); +// 坐着空客客机前往哈尔滨岛旅游； + AirPlane airPlane2 = new AirPlane("客机","空客","","哈尔滨岛"); + airPlane2.travel(); + } +} diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java" new file mode 100644 index 00000000..c4971035 --- /dev/null +++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java" @@ -0,0 +1,56 @@ +package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138; + +import sun.awt.OverrideNativeWindowHandle; + +public class Vehicles { + String type; + String brand; + String color; + String place; + + Vehicles() { + } + + Vehicles(String type, String brand, String color,String place) { + this.type = type; + this.brand = brand; + this.color = color; + this.place = place; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getPlace() { + return place; + } + + public void setPlace() { + this.place = place; + } + + public void travel() { + + } +} -- Gitee From c2277ab513b081f8eb1e2785b235739d08c7db19 Mon Sep 17 00:00:00 2001 From: WJY-7 <2541095587@qq.com> Date: Tue, 7 May 2024 14:55:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Test.java" | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" index 4626b7c6..6e34fe04 100644 --- "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" +++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" @@ -3,16 +3,16 @@ package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138; public class Test { public static void main(String[] args) { // 开着白色大众汽车前往北京旅游； - Car car1 = new Car("汽车","大众","白色","北京"); + Vehicles car1 = new Car("汽车","大众","白色","北京"); car1.travel(); // 开着奔驰汽车前往东山岛旅游； - Car car2 = new Car("汽车","奔驰","","东山岛"); + Vehicles car2 = new Car("汽车","奔驰","","东山岛"); car2.travel(); // 坐着蓝色波音客机前往大理旅游； - AirPlane airPlane1 = new AirPlane("客机","波音","蓝色","大理"); + Vehicles airPlane1 = new AirPlane("客机","波音","蓝色","大理"); airPlane1.travel(); // 坐着空客客机前往哈尔滨岛旅游； - AirPlane airPlane2 = new AirPlane("客机","空客","","哈尔滨岛"); + Vehicles airPlane2 = new AirPlane("客机","空客","","哈尔滨岛"); airPlane2.travel(); } } -- Gitee