From bf62837e231447b8dba75e8cfd031ee187b7cca2 Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Tue, 1 Jun 2021 18:25:16 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E7=AE=80=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A1=E7=AE=97=E5=99=A8=E5=9F=BA=E7=A1=80=E7=89=88?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E8=AE=BE=E8=AE=A1=E5=92=8C=E5=8A=A0=E6=B3=95?=
 =?UTF-8?q?=E7=9A=84=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/Test.java       |  10 ---
 src/java2020spring/calculator.java | 121 +++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 10 deletions(-)
 delete mode 100644 src/java2020spring/Test.java
 create mode 100644 src/java2020spring/calculator.java

diff --git a/src/java2020spring/Test.java b/src/java2020spring/Test.java
deleted file mode 100644
index fc09c19..0000000
--- a/src/java2020spring/Test.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package java2020spring;
-
-public class Test {
-
-	public static void main(String[] args) {
-		System.out.println("Hello world!");
-
-	}
-
-}
diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
new file mode 100644
index 0000000..f1fcd41
--- /dev/null
+++ b/src/java2020spring/calculator.java
@@ -0,0 +1,121 @@
+package java2020spring;
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
+public class calculator implements ActionListener{
+	JTextArea wenben;
+	JButton anjian;
+	String ButtonText[]= {"％","CE","C","删除",
+				          "1/x","x²","√","÷",
+				          "7","8","9","×",
+				          "4","5","6","-",
+				          "1","2","3","+",
+				          "+/-","0",".","="};
+	String str1="";
+	String str2="";
+	String str3="";
+	double x;
+	double y;
+    double result=1;
+    int fuhao=43;
+	public static void main(String args[]) {
+		calculator frame=new calculator();
+		frame.jisuanqi();
+	}
+
+	 void jisuanqi() {
+	JFrame frame=new JFrame("计算器");
+	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+	wenben=new JTextArea(5,50);	
+	frame.getContentPane().add(wenben, BorderLayout.NORTH);
+	anjian=new JButton();
+	frame.getContentPane().add(anjian,BorderLayout.CENTER);
+	JPanel panel1=new JPanel();
+	panel1.setLayout(new GridLayout(6,4));
+	for(int i=0;i<24;i++) {
+		JButton anjian=new JButton(ButtonText[i]);
+		panel1.add(anjian);
+		anjian.addActionListener(this);
+	}
+	frame.getContentPane().add(panel1,BorderLayout.CENTER);
+	frame.setVisible(true);
+	frame.setSize(300, 350);
+	 }
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		String action =e.getActionCommand();
+		if(action==ButtonText[8]) {
+			str1+=7;
+		wenben.setText(str1);
+	}
+		else if(action==ButtonText[9]) {
+			str1+=8;
+			wenben.setText(str1);
+		}
+		else if(action==ButtonText[10]) {
+			str1+=9;
+			wenben.setText(str1);
+		}
+		else if(action==ButtonText[12]) {
+			str1+=4;
+			wenben.setText(str1);
+		}
+		else if(action==ButtonText[13]) {
+			str1+=5;
+			wenben.setText(str1);
+		}
+		else if(action==ButtonText[14]) {
+			str1+=6;
+			wenben.setText(str1);
+		}
+		else if(action==ButtonText[16]) {
+			str1+=1;
+			wenben.setText(str1);
+		}
+	 else if(action==ButtonText[17]) {
+		str1+=2;
+		wenben.setText(str1);
+	}
+	else if(action==ButtonText[18]) {
+		str1+=3;
+		wenben.setText(str1);
+	}
+	else if(action==ButtonText[21]) {
+		str1+=0;
+		wenben.setText(str1);
+	}	
+
+	else if(action==ButtonText[22]) {
+		str1+=".";
+		wenben.setText(str1);
+	}
+		if(action==ButtonText[19]&&str2==""){
+			if(str1!=""){
+			str2=str1;
+			str1="";
+			wenben.setText("+");
+			fuhao=1;
+			}
+			else{
+			}
+		}			
+		if(fuhao==1&&action==ButtonText[23]){
+			x=Double.parseDouble(str1); 
+			y=Double.parseDouble(str2);
+			result=x+y;
+			str1=""+result;
+			wenben.setText(str1);
+			fuhao=0;
+		}
+}
+}
-- 
Gitee


From 49a342f3f06ee1c7c6dd93adbfb84d46cf08aa78 Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Wed, 2 Jun 2021 22:54:18 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E5=AF=B9=E5=87=8F?=
 =?UTF-8?q?=E6=B3=95=E4=B9=98=E6=B3=95=E9=99=A4=E6=B3=95=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 57 ++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index f1fcd41..93dec94 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -117,5 +117,62 @@ public class calculator implements ActionListener{
 			wenben.setText(str1);
 			fuhao=0;
 		}
+		if(action==ButtonText[15]&&str2=="") {
+			if(str1!="") {
+				str2=str1;
+				str1="";
+				wenben.setText("-");
+				fuhao=2;
+			}
+			else {
+				
+			}
+		}
+		if(fuhao==2&&action==ButtonText[23]) {
+			x=Double.parseDouble(str1); 
+			y=Double.parseDouble(str2);
+			result=y-x;
+			str1=""+result;
+			wenben.setText(str1);
+			fuhao=0;
+		}
+		if(action==ButtonText[11]&&str2=="") {
+			if(str1!="") {
+				str2=str1;
+				str1="";
+				wenben.setText("×");
+				fuhao=3;
+			}
+			else {
+				
+			}
+		}
+		if(fuhao==3&&action==ButtonText[23]) {
+			x=Double.parseDouble(str1); 
+			y=Double.parseDouble(str2);
+			result=x*y;
+			str1=""+result;
+			wenben.setText(str1);
+			fuhao=0;
+}
+	if(action==ButtonText[7]&&str2=="") {
+		if(str1!="") {
+			str2=str1;
+			str1="";
+			wenben.setText("÷");
+			fuhao=4;
+		}
+		else {
+			
+		}
+	}
+	if(fuhao==4&&action==ButtonText[23]) {
+		x=Double.parseDouble(str1); 
+		y=Double.parseDouble(str2);
+		result=y/x;
+		str1=""+result;
+		wenben.setText(str1);
+		fuhao=0;
 }
 }
+}
\ No newline at end of file
-- 
Gitee


From 21f104004998ef92fd2c3b5a479c46b81d49296e Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Wed, 2 Jun 2021 22:54:51 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E5=87=8F=E6=B3=95?=
 =?UTF-8?q?=E4=B9=98=E6=B3=95=E9=99=A4=E6=B3=95=E7=9A=84=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .settings/org.eclipse.core.resources.prefs | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .settings/org.eclipse.core.resources.prefs

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..bad4292
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/java2020spring/calculator.java=UTF-8
-- 
Gitee


From 4f17539d6be54a75fc9e9855e763768054197fa9 Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Thu, 3 Jun 2021 23:01:49 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index 93dec94..8f38e37 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -14,7 +14,7 @@ import javax.swing.JTextArea;
 public class calculator implements ActionListener{
 	JTextArea wenben;
 	JButton anjian;
-	String ButtonText[]= {"％","CE","C","删除",
+	String ButtonText[]= {"％","CE","C","退格",
 				          "1/x","x²","√","÷",
 				          "7","8","9","×",
 				          "4","5","6","-",
@@ -26,7 +26,7 @@ public class calculator implements ActionListener{
 	double x;
 	double y;
     double result=1;
-    int fuhao=43;
+    int fuhao=1;
 	public static void main(String args[]) {
 		calculator frame=new calculator();
 		frame.jisuanqi();
@@ -54,6 +54,7 @@ public class calculator implements ActionListener{
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		String action =e.getActionCommand();
+
 		if(action==ButtonText[8]) {
 			str1+=7;
 		wenben.setText(str1);
@@ -174,5 +175,11 @@ public class calculator implements ActionListener{
 		wenben.setText(str1);
 		fuhao=0;
 }
+	if(action==ButtonText[2]) {
+	str1="";
+	str2="";
+	fuhao=0;
+	wenben.setText(str1);
+	}
 }
 }
\ No newline at end of file
-- 
Gitee


From b9d9f758516bcf2053ee15375589289ff377dba2 Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Sat, 5 Jun 2021 22:04:31 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E7=AC=AC=E5=9B=9B=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E9=80=80=E6=A0=BC?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E6=AD=A3=E8=B4=9F=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=B9=8B=E9=97=B4=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E5=AF=B9=E4=BA=8E=E6=AD=A3=E8=B4=9F?=
 =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E7=9A=84=E5=8A=9F=E8=83=BD=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E8=BF=98=E4=B8=8D=E6=98=AF=E5=BE=88=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index 8f38e37..5b7f577 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -181,5 +181,20 @@ public class calculator implements ActionListener{
 	fuhao=0;
 	wenben.setText(str1);
 	}
+	if(action==ButtonText[3]) {
+		str1=wenben.getText();
+		if(str1.length()>0)
+			wenben.setText(str1.substring(0,str1.length()-1));
+	}
+   if(action==ButtonText[20]) {
+	   if(str1!="") {
+	str1="-"+str1;
+	wenben.setText(str1);
+   }
+	   else {
+		str1=str1;
+	   wenben.setText(str1);
+	   }
+   }
 }
 }
\ No newline at end of file
-- 
Gitee


From 31769a80750e6914252d70acc693478463f21fa0 Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Sun, 6 Jun 2021 22:50:25 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86CE=E9=94=AE=20?=
 =?UTF-8?q?=EF=BC=8C1/x=E9=94=AE=E4=BB=A5=E5=8F=8A=E7=99=BE=E5=88=86?=
 =?UTF-8?q?=E5=8F=B7=E9=94=AE=E7=9A=84=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E4=BD=86=E7=99=BE=E5=88=86=E5=8F=B7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B0=9A=E6=9C=89=E7=91=95=E7=96=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 36 +++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index 5b7f577..92b01ed 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -196,5 +196,39 @@ public class calculator implements ActionListener{
 	   wenben.setText(str1);
 	   }
    }
+   if(action==ButtonText[1]){
+		if(str2==""){
+			str1="";
+			wenben.setText("0");
+		}
+		if(str2!=""&&str1==""){
+			str2="";
+			wenben.setText("0");
+		}
+		if(str2!=""&&str1!=""){
+			str1="";
+			wenben.setText("0");
+		}
+	}
+   if(action==ButtonText[0]) {
+	   if(str1!="") {
+			x=Double.parseDouble(str1); 
+			x=x/100;
+			str1=""+x;
+			wenben.setText(str1);
+			}
+   else{
+		wenben.setText("不可以在符号后面加%，请按下C重新开始");
+	}
 }
-}
\ No newline at end of file
+   if(action==ButtonText[4]) {
+	   x=Double.parseDouble(str1); 
+	   result=1/x;
+		str1=""+result;
+		wenben.setText(str1);
+		wenben.setVisible(true);
+   }
+}
+}
+
+
-- 
Gitee


From 22a80b53aef7fecf52babe8989748a6fddee4f7b Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Mon, 7 Jun 2021 23:20:27 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E7=AC=AC=E5=85=AD=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E5=B9=B3=E6=96=B9?=
 =?UTF-8?q?=E5=92=8C=E5=BC=80=E6=A0=B9=E5=8F=B7=E7=AC=A6=E5=8F=B7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 87 +++++++++++++++++++++---------
 1 file changed, 63 insertions(+), 24 deletions(-)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index 92b01ed..8ecd086 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -34,27 +34,28 @@ public class calculator implements ActionListener{
 
 	 void jisuanqi() {
 	JFrame frame=new JFrame("计算器");
-	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+	frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); 
 	wenben=new JTextArea(5,50);	
-	frame.getContentPane().add(wenben, BorderLayout.NORTH);
+	frame.getContentPane().add(wenben, BorderLayout.NORTH); //计算器文本框的布置
 	anjian=new JButton();
-	frame.getContentPane().add(anjian,BorderLayout.CENTER);
+	frame.getContentPane().add(anjian,BorderLayout.CENTER); //计算器按键的布置
 	JPanel panel1=new JPanel();
 	panel1.setLayout(new GridLayout(6,4));
 	for(int i=0;i<24;i++) {
 		JButton anjian=new JButton(ButtonText[i]);
 		panel1.add(anjian);
-		anjian.addActionListener(this);
-	}
+		anjian.addActionListener(this); //给每个按键都注册监视器
+	}  //将按键上的数字符号输入到键盘上
 	frame.getContentPane().add(panel1,BorderLayout.CENTER);
 	frame.setVisible(true);
-	frame.setSize(300, 350);
+	frame.setSize(300, 350); //计算器整体的布置
 	 }
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
+		// TODO 自动生成的方法存根
 		String action =e.getActionCommand();
-
+		//监视器创建完成，接下来实现相关功能
 		if(action==ButtonText[8]) {
 			str1+=7;
 		wenben.setText(str1);
@@ -99,7 +100,7 @@ public class calculator implements ActionListener{
 	else if(action==ButtonText[22]) {
 		str1+=".";
 		wenben.setText(str1);
-	}
+	} //完成了十个数字和一个符号.的监视器
 		if(action==ButtonText[19]&&str2==""){
 			if(str1!=""){
 			str2=str1;
@@ -117,7 +118,7 @@ public class calculator implements ActionListener{
 			str1=""+result;
 			wenben.setText(str1);
 			fuhao=0;
-		}
+		} //完成了一次加法的运算
 		if(action==ButtonText[15]&&str2=="") {
 			if(str1!="") {
 				str2=str1;
@@ -129,14 +130,14 @@ public class calculator implements ActionListener{
 				
 			}
 		}
-		if(fuhao==2&&action==ButtonText[23]) {
+		 if(fuhao==2&&action==ButtonText[23]) {
 			x=Double.parseDouble(str1); 
 			y=Double.parseDouble(str2);
 			result=y-x;
 			str1=""+result;
 			wenben.setText(str1);
 			fuhao=0;
-		}
+		} //完成了一次减法的运算
 		if(action==ButtonText[11]&&str2=="") {
 			if(str1!="") {
 				str2=str1;
@@ -144,8 +145,7 @@ public class calculator implements ActionListener{
 				wenben.setText("×");
 				fuhao=3;
 			}
-			else {
-				
+			else {				
 			}
 		}
 		if(fuhao==3&&action==ButtonText[23]) {
@@ -155,8 +155,8 @@ public class calculator implements ActionListener{
 			str1=""+result;
 			wenben.setText(str1);
 			fuhao=0;
-}
-	if(action==ButtonText[7]&&str2=="") {
+}//完成了一次乘法的运算
+		if(action==ButtonText[7]&&str2=="") {
 		if(str1!="") {
 			str2=str1;
 			str1="";
@@ -164,7 +164,6 @@ public class calculator implements ActionListener{
 			fuhao=4;
 		}
 		else {
-			
 		}
 	}
 	if(fuhao==4&&action==ButtonText[23]) {
@@ -174,7 +173,7 @@ public class calculator implements ActionListener{
 		str1=""+result;
 		wenben.setText(str1);
 		fuhao=0;
-}
+} //完成了一次除法的运算
 	if(action==ButtonText[2]) {
 	str1="";
 	str2="";
@@ -185,7 +184,7 @@ public class calculator implements ActionListener{
 		str1=wenben.getText();
 		if(str1.length()>0)
 			wenben.setText(str1.substring(0,str1.length()-1));
-	}
+	}//完成了退格键的功能的实现
    if(action==ButtonText[20]) {
 	   if(str1!="") {
 	str1="-"+str1;
@@ -195,7 +194,7 @@ public class calculator implements ActionListener{
 		str1=str1;
 	   wenben.setText(str1);
 	   }
-   }
+   }//完成了正负符号的功能的实现
    if(action==ButtonText[1]){
 		if(str2==""){
 			str1="";
@@ -209,7 +208,7 @@ public class calculator implements ActionListener{
 			str1="";
 			wenben.setText("0");
 		}
-	}
+	}//完成了CE键的功能的实现
    if(action==ButtonText[0]) {
 	   if(str1!="") {
 			x=Double.parseDouble(str1); 
@@ -218,16 +217,56 @@ public class calculator implements ActionListener{
 			wenben.setText(str1);
 			}
    else{
-		wenben.setText("不可以在符号后面加%，请按下C重新开始");
+		wenben.setText("不可以在符号后面加%，请按下C重新开始");//如果输入的不是数字然后按了%是不会有结果的
 	}
-}
+}//完成了%号的功能的实现
    if(action==ButtonText[4]) {
 	   x=Double.parseDouble(str1); 
 	   result=1/x;
 		str1=""+result;
 		wenben.setText(str1);
-		wenben.setVisible(true);
-   }
+   }//完成了倒数符号功能的实现
+   if(action==ButtonText[5]) {
+	   x=Double.parseDouble(str1); 
+	   result=x*x;
+	   str1=""+result;
+	   wenben.setText(str1);
+   }//完成了平方功能的实现
+   if(action==ButtonText[6]) {
+	   if(x>=0) {
+	x=Double.parseDouble(str1); 
+	result=Math.sqrt(x);
+	str1=""+result;
+	wenben.setText(str1);
+	}
+	else {
+		wenben.setText("数值小于零，不可以开根号");//如果数字小于零，是无法开根号的
+	   }
+   }//完成了开根号功能的实现
+if(str1!=""&&str2!="") {
+	x=Double.parseDouble(str1); 
+	y=Double.parseDouble(str2); 
+	switch(fuhao) {
+	case 1:
+		result=x+y;
+		break;
+	case 2:
+		result=x-y;
+		break;
+	case 3:
+		result=x*y;
+		break;
+	case 4:
+		result=x/y;
+		break;
+		default:
+			break;
+	}
+	str1=""+result;
+	wenben.setText(str1);
+	str2=str1;
+	return;
+}
 }
 }
 
-- 
Gitee


From f568329599d4b047717b2be6f8b37329aa59e45a Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Tue, 8 Jun 2021 23:23:53 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=AC=AC=E4=B8=83=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E8=BF=9E=E7=BB=AD?=
 =?UTF-8?q?=E8=BF=90=E7=AE=97=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 106 ++++++++++++++++++++++++++++-
 1 file changed, 103 insertions(+), 3 deletions(-)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index 8ecd086..357289f 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -244,30 +244,130 @@ public class calculator implements ActionListener{
 	   }
    }//完成了开根号功能的实现
 if(str1!=""&&str2!="") {
+	if(action==ButtonText[19]) {
 	x=Double.parseDouble(str1); 
 	y=Double.parseDouble(str2); 
 	switch(fuhao) {
 	case 1:
 		result=x+y;
+		wenben.setText("+");
 		break;
 	case 2:
-		result=x-y;
+		result=y-x;
+		wenben.setText("-");
 		break;
 	case 3:
 		result=x*y;
+		wenben.setText("×");
 		break;
 	case 4:
-		result=x/y;
+		result=y/x;
+		wenben.setText("÷");
 		break;
 		default:
 			break;
 	}
+	
 	str1=""+result;
 	wenben.setText(str1);
 	str2=str1;
+	str1="";
+	fuhao=1;
 	return;
+	}
+	if(action==ButtonText[15]) {
+	x=Double.parseDouble(str1); 
+	y=Double.parseDouble(str2); 
+	switch(fuhao) {
+	case 1:
+		result=x+y;
+		wenben.setText("+");
+		break;
+	case 2:
+		result=y-x;
+		wenben.setText("-");
+		break;
+	case 3:
+		result=x*y;
+		wenben.setText("×");
+		break;
+	case 4:
+		result=y/x;
+		wenben.setText("÷");
+		break;
+		default:
+			break;
+	}
+	
+	str1=""+result;
+	wenben.setText(str1);
+	str2=str1;
+	str1="";
+	fuhao=2;
+	return;
+	}
+	if(action==ButtonText[11]) {
+		x=Double.parseDouble(str1); 
+		y=Double.parseDouble(str2); 
+		switch(fuhao) {
+		case 1:
+			result=x+y;
+			wenben.setText("+");
+			break;
+		case 2:
+			result=y-x;
+			wenben.setText("-");
+			break;
+		case 3:
+			result=x*y;
+			wenben.setText("×");
+			break;
+		case 4:
+			result=y/x;
+			wenben.setText("÷");
+			break;
+			default:
+				break;
+		}
+		str1=""+result;
+		wenben.setText(str1);
+		str2=str1;
+		str1="";
+		fuhao=3;
+		return;
+		}
+		if(action==ButtonText[7]) {
+			x=Double.parseDouble(str1); 
+			y=Double.parseDouble(str2); 
+			switch(fuhao) {
+			case 1:
+				result=x+y;
+				wenben.setText("+");
+				break;
+			case 2:
+				result=y-x;
+				wenben.setText("-");
+				break;
+			case 3:
+				result=x*y;
+				wenben.setText("×");
+				break;
+			case 4:
+				result=y/x;
+				wenben.setText("÷");
+				break;
+				default:
+					break;
+			}
+			str1=""+result;
+			wenben.setText(str1);
+			str2=str1;
+			str1="";
+			fuhao=4;
+			return;
+	}
 }
 }
-}
+}//完成了连续运算的功能的实现
 
 
-- 
Gitee


From ce1ff8c0ca341df46903ae7e71059525a031b7c7 Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Tue, 8 Jun 2021 23:29:57 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=AC=AC=E4=B8=83=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86=E8=BF=9E=E7=BB=AD?=
 =?UTF-8?q?=E8=BF=90=E7=AE=97=E7=9A=84=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index 357289f..ebbf511 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -365,7 +365,7 @@ if(str1!=""&&str2!="") {
 			str1="";
 			fuhao=4;
 			return;
-	}
+}
 }
 }
 }//完成了连续运算的功能的实现
-- 
Gitee


From e332ee9b1e00f6e0bf94e2b6fa7c3c76b9b906de Mon Sep 17 00:00:00 2001
From: 86130 <86130@DESKTOP-IAAHL3I>
Date: Wed, 9 Jun 2021 21:18:38 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E7=AC=AC=E5=85=AB=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=88=B6=E4=BD=9C=E4=BA=86=E7=AE=80=E6=98=93?=
 =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/calculator.java | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/java2020spring/calculator.java b/src/java2020spring/calculator.java
index ebbf511..0b0b886 100644
--- a/src/java2020spring/calculator.java
+++ b/src/java2020spring/calculator.java
@@ -8,21 +8,22 @@ import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
 
 public class calculator implements ActionListener{
 	JTextArea wenben;
 	JButton anjian;
-	String ButtonText[]= {"％","CE","C","退格",
+	String ButtonText[]= {"％","CE","C","退格",			      
 				          "1/x","x²","√","÷",
 				          "7","8","9","×",
 				          "4","5","6","-",
 				          "1","2","3","+",
-				          "+/-","0",".","="};
+				          "+/-","0",".","="};//输入的数字与符号
 	String str1="";
 	String str2="";
-	String str3="";
 	double x;
 	double y;
     double result=1;
@@ -49,8 +50,21 @@ public class calculator implements ActionListener{
 	frame.getContentPane().add(panel1,BorderLayout.CENTER);
 	frame.setVisible(true);
 	frame.setSize(300, 350); //计算器整体的布置
+	JMenuBar menuBar = new JMenuBar();
+	frame.setJMenuBar(menuBar);
+	
+	JMenu J1= new JMenu("编辑");
+	menuBar.add(J1);
+	J1.addActionListener(this);
+	
+	JMenu J2 = new JMenu("查看");
+	menuBar.add(J2);
+	J2.addActionListener(this);
+	
+	JMenu J3 = new JMenu("帮助");
+	menuBar.add(J3);
+	J3.addActionListener(this);  //计算器菜单栏的设计以及给他们都注册监视器；
 	 }
-
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		// TODO 自动生成的方法存根
@@ -179,7 +193,7 @@ public class calculator implements ActionListener{
 	str2="";
 	fuhao=0;
 	wenben.setText(str1);
-	}
+	}//完成了C键的功能
 	if(action==ButtonText[3]) {
 		str1=wenben.getText();
 		if(str1.length()>0)
@@ -368,6 +382,4 @@ if(str1!=""&&str2!="") {
 }
 }
 }
-}//完成了连续运算的功能的实现
-
-
+}//完成了连续运算的功能的实现；
\ No newline at end of file
-- 
Gitee