diff --git a/.classpath b/.classpath
index 21978948803ca839b6b2778a4f478211edc5a4f1..151f11073a7997853cab8211382d3ecac9de0598 100644
--- a/.classpath
+++ b/.classpath
@@ -6,5 +6,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
+	<classpathentry kind="lib" path="miglayout15-swing.jar" sourcepath="miglayout-src.zip"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..26438fe82384544487f2191aef49d4b0ef346eb7
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/README.md=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index bb35fa0a87b032ee9d0b128004c1edbd464f07bf..56481d5e98a22b71e1dc350fe4fb16436d18469e 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,13 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -6,6 +15,98 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/README.md b/README.md
index 40fc824a82f8ab822a979d81b19d7815da7cfdc8..c484f00ef21865390933fecb1abaaa510eb0e469 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 # 科学计算器
 
 #### 系统目标
-简要介绍系统的用途
+	本应用程序为计算器，可用于计算生活中常见问题。
 
 #### 基本功能
-详细介绍系统各个模块的功能。
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
+1.  实现了基本的加减乘除运算，及其优先度的区分。
+2.  可计算指数、幂、三角函数、对数、阶乘计算。
+3.  记录输入内容。
+4.	可通过面板按钮输入符号，也可通过键盘键入。
+5.	具有清除文本框内容的功能。
 
 #### 码云特技
 
diff --git a/jgoodies-forms-1.8.0-sources.jar b/jgoodies-forms-1.8.0-sources.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5d2a0518431e83a73a2ea1579127cc3cae427a88
Binary files /dev/null and b/jgoodies-forms-1.8.0-sources.jar differ
diff --git a/jgoodies-forms-1.8.0.jar b/jgoodies-forms-1.8.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d5cdefbde65991cdcf3845875cf8de18272e4a81
Binary files /dev/null and b/jgoodies-forms-1.8.0.jar differ
diff --git a/miglayout-src.zip b/miglayout-src.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9c51c327fd6586c393641fb1fe64d85310370248
Binary files /dev/null and b/miglayout-src.zip differ
diff --git a/miglayout15-swing.jar b/miglayout15-swing.jar
new file mode 100644
index 0000000000000000000000000000000000000000..835545d033d6ae5ddeb8ea5bb752a1f9d61decd6
Binary files /dev/null and b/miglayout15-swing.jar differ
diff --git a/src/java2020spring/Calculator.java b/src/java2020spring/Calculator.java
new file mode 100644
index 0000000000000000000000000000000000000000..f8ecb3d892e2525cad3cafc689b5699a6cdcbea7
--- /dev/null
+++ b/src/java2020spring/Calculator.java
@@ -0,0 +1,330 @@
+package java2020spring;
+
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+
+import javax.swing.JTextArea;
+
+
+public class Calculator implements ActionListener{
+	
+	/*
+	 * ʹ���¼��������ӿ�
+	 * 1.��ȡ��������ݡ�
+	 * 	��1����ȡ����
+	 * 		�ٲ���Stringת��Ϊdouble���͡�
+	 * 	��2����ȡ����
+	 * 2.���ݷ��ŵ�����Ӧ����������
+	 * 3.�������ʾ�������
+	 * */
+	
+	JTextArea textArea;
+	
+	String enterRegex="[\\n]+";
+	String numbersRegex="[^0123456789.]+";
+	String signRegex="[\\d\56]+";
+	//�������ʽ
+	
+	String string=null;
+	String lastLineStrings=null;
+	//����ı�������
+	
+	ArrayList<String> signs=new ArrayList<String>();
+	ArrayList<Double> numbers=new ArrayList<Double>();
+	double result;
+	//�����������֡������
+	
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		if(e.getActionCommand()=="����") {
+			textArea.append("=");
+			string=textArea.getText();
+			//��ȡ�ı����ڵ����ݡ�
+			separate();
+			calculate();
+			showResult();
+		}
+		
+		else {
+			string=textArea.getText();
+			//����ʽ��
+			separate();
+			//�ж��������
+			if(e.getActionCommand()=="����")
+				getSqrt();
+			else if(e.getActionCommand()=="����")
+				getInverse();
+			else if(e.getActionCommand()=="ƽ��")
+				getSquare();
+			else if(e.getActionCommand()=="����ֵ")
+				getAbs();
+			else if(e.getActionCommand()=="sin")
+				getSin();
+			else if(e.getActionCommand()=="cos")
+				getCos();
+			else if(e.getActionCommand()=="tan")
+				getTan();
+			else if(e.getActionCommand()=="sec")
+				getSec();
+			else if(e.getActionCommand()=="csc")
+				getCsc();
+			else if(e.getActionCommand()=="cot")
+				getCot();
+			else if(e.getActionCommand()=="!")
+				getFactorial();
+			else if(e.getActionCommand()=="lg")
+				getlg();
+			else if(e.getActionCommand()=="ln")
+				getln();
+			//����ı��������η���ʽ��
+			textArea.setText("");
+			for(int i=0,j=0;i<numbers.size();i++,j++) {
+				if(signs.size()!=0)
+					textArea.append(signs.get(j));
+				textArea.append(""+numbers.get(i));
+				if(j==signs.size())
+					j--;
+			}
+			//��ʼ��numbers
+			numbers.clear();
+		}
+
+		
+	}
+
+	//����textArea
+	public void setTextArea(JTextArea t) {
+		textArea=t;
+	}
+
+	//���ڷ���ʽ���е����ּ�����
+	public void separate() {
+		
+		numbers.clear();
+		signs.clear();
+		//��ʼ��numbers��
+		
+		lastLineStrings=string;
+		//Ĭ���ı����������Ϊĩ�����ݡ�
+		
+		if(string.contains(enterRegex)) {
+		String[] lineStrings=string.split(enterRegex);
+		lastLineStrings=lineStrings[lineStrings.length];
+		}
+		//��ȡ�ı���ĩ�����ݡ�
+
+
+		for(int i=0;i<lastLineStrings.split(numbersRegex).length;i++) {
+			numbers.add(Double.parseDouble(lastLineStrings.split(numbersRegex)[i]));
+		}
+		
+		//��lastLineStrings�е������ַ���ת��Ϊdouble���Ͳ������numbers��
+		
+		for(int i=0;i<lastLineStrings.split(signRegex).length;i++) {
+			signs.add(lastLineStrings.split(signRegex)[i]);
+		}
+
+		//��lastLineStrings�еı����ŷ��벢�����signStrings��
+
+	}
+	
+	public void calculate() {
+
+		double t = 0;
+		if(signs.size()!=0) {
+			//���ȼ���ָ��������󽫽�������i�Ľڵ㣬����i+1�ڵ�ɾ����
+			for(int i=0;i<numbers.size()-1;i++) {
+				if(signs.get(i+1).equals("^")) {
+					t=Math.pow(numbers.get(i),numbers.get(i+1));
+					numbers.set(i, t);
+					numbers.remove(i+1);
+					signs.remove(i+1);
+				}
+			}
+			
+			//��μ���˳���ͬ����
+			for(int i=0;i<numbers.size()-1;i++) {
+				if(signs.get(i+1).equals("*")) {
+					t=numbers.get(i)*numbers.get(i+1);
+					numbers.set(i, t);
+					numbers.remove(i+1);
+					signs.remove(i+1);
+				}
+				if(signs.get(i+1).equals("/")) {
+					t=numbers.get(i)/numbers.get(i+1);
+					numbers.set(i, t);
+					numbers.remove(i+1);
+					signs.remove(i+1);
+				}
+			}
+			
+			//������Ӽ���
+			for(int i=0;i<numbers.size()-1;i++) {
+				if(signs.get(i+1).equals("+")) {
+					t=numbers.get(i)+numbers.get(i+1);
+					numbers.set(i, t);
+					numbers.remove(i+1);
+					signs.remove(i+1);
+				}
+				if(signs.get(i+1).equals("-")) {
+					t=numbers.get(i)-numbers.get(i+1);
+					numbers.set(i, t);
+					numbers.remove(i+1);
+					signs.remove(i+1);
+				}
+			}
+
+		}
+
+		
+		//���������result��
+		result=numbers.get(numbers.size()-1);
+		numbers.clear();
+	}
+	
+	public void showResult() {
+		numbers.clear();
+		if(!textArea.getText().equals("������"))
+			textArea.append("\n"+result);
+		//����������ʾ���ı������һ�С�
+		numbers.clear();
+	}
+
+	
+	//����Ϊ�������㡣
+	public double plus(double num1,double num2) {
+		return num1+num2;
+	}
+	
+	public double minus(double num1,double num2) {
+		return num1-num2;
+	}
+
+	public double division(double num1,double num2) {
+		return num1/num2;
+	}
+	
+	public double multiple(double num1,double num2) {
+		return num1*num2;
+	}
+	
+	//ȡnumbers�����һ����������
+	public void getSqrt() {
+		//���ı����������һ�����ֽ��п�ƽ�����㡣
+		double t=numbers.get(numbers.size()-1);
+		t=Math.sqrt(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ�����ĵ���
+	public void getInverse() {
+		//���ı����������һ�����ֽ��е������㡣
+		double t=numbers.get(numbers.size()-1);
+		t=1/t;
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������ƽ��
+	public void getSquare() {
+		//���ı����������һ�����ֽ���ƽ�����㡣
+		double t=numbers.get(numbers.size()-1);
+		t=Math.pow(t,2);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ�����ľ���ֵ
+	public void getAbs() {
+		//ȡ���һ����ǰ�ķ��ţ���Ϊ���������Ϊ���š�
+		if(signs.get(signs.size()-1).equals("-"))
+			signs.set(signs.size()-1, "+");
+	}
+	
+	//ȡnumbers�����һ������sin
+	public void getSin() {
+		//���ı����������һ�����ֽ���sin���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=Math.sin(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������cos
+	public void getCos() {
+		//���ı����������һ�����ֽ���cos���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=Math.cos(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������tan
+	public void getTan() {
+		//���ı����������һ�����ֽ���tan���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=Math.tan(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������sec
+	public void getSec() {
+		//���ı����������һ�����ֽ���sec���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=1/Math.cos(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������csc
+	public void getCsc() {
+		//���ı����������һ�����ֽ���csc���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=1/Math.sin(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������cot
+	public void getCot() {
+		//���ı����������һ�����ֽ���cot���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=1/Math.tan(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+
+	//ȡnumbers�����һ������factorial
+	public void getFactorial() {
+		textArea.append("!");
+		//���ı����������һ�����ֽ��н׳˼��㡣
+		int t=1;
+		for(int i=1;i<=numbers.get(numbers.size()-1).intValue();i++)
+			t=t*i;
+		double temp=t;
+		numbers.set(numbers.size()-1, temp);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������lg
+	public void getlg() {
+		//���ı����������һ�����ֽ���lg���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=Math.log10(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+	
+	//ȡnumbers�����һ������ln
+	public void getln() {
+		//���ı����������һ�����ֽ���ln���㡣
+		double t=numbers.get(numbers.size()-1);
+		t=Math.log(t);
+		numbers.set(numbers.size()-1, t);
+		//����ı�����д��
+	}
+}
diff --git a/src/java2020spring/Frame.java b/src/java2020spring/Frame.java
new file mode 100644
index 0000000000000000000000000000000000000000..1a3481b1e309af62ee3624862e9642ebb472f6b8
--- /dev/null
+++ b/src/java2020spring/Frame.java
@@ -0,0 +1,377 @@
+package java2020spring;
+
+import javax.swing.*;
+import javax.swing.GroupLayout.Alignment;
+
+import java.awt.*;
+import java.awt.event.*;
+
+
+public class Frame extends JFrame{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3524180568992785905L;
+	Calculator calculator = new Calculator();
+
+	
+	Frame(){
+		//ʹ���ڲ��ɸı��С��ȷ������λ�ã�����ر�ֹͣ���У���������ɫ����Ϊ��ɫ�����ñ��⡣
+		setResizable(false);
+		setBounds(100, 200, 480, 580);
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		getContentPane().setBackground(Color.WHITE);
+		setTitle("������");
+		
+
+
+		/*
+		 * ����Ϊʹ��eclipse��WindowBuilder���ɵ�ҳ�沼�֡�
+		 */
+		
+		JPanel panel = new JPanel();
+		
+		JScrollPane scrollPane = new JScrollPane();
+		GroupLayout groupLayout = new GroupLayout(getContentPane());
+		groupLayout.setHorizontalGroup(
+			groupLayout.createParallelGroup(Alignment.LEADING)
+				.addGroup(groupLayout.createSequentialGroup()
+					.addGap(20)
+					.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+						.addComponent(scrollPane, GroupLayout.PREFERRED_SIZE, 435, GroupLayout.PREFERRED_SIZE)
+						.addComponent(panel, GroupLayout.DEFAULT_SIZE, 436, Short.MAX_VALUE))
+					.addGap(20))
+		);
+		groupLayout.setVerticalGroup(
+			groupLayout.createParallelGroup(Alignment.LEADING)
+				.addGroup(groupLayout.createSequentialGroup()
+					.addContainerGap()
+					.addComponent(scrollPane, GroupLayout.PREFERRED_SIZE, 103, GroupLayout.PREFERRED_SIZE)
+					.addGap(12)
+					.addComponent(panel, GroupLayout.PREFERRED_SIZE, 370, GroupLayout.PREFERRED_SIZE)
+					.addContainerGap(31, Short.MAX_VALUE))
+		);
+		
+		
+		JTextArea textArea = new JTextArea();
+		textArea.setFont(new Font("΢���ź�", Font.BOLD, 37));
+		textArea.setBackground(SystemColor.control);
+		textArea.setText("0");
+		scrollPane.setViewportView(textArea);
+		panel.setLayout(new GridLayout(6, 4));
+		calculator.setTextArea(textArea);
+
+		FramePlus framePlus=new FramePlus(textArea,calculator);
+		
+		//�������ɰ�ť�ֱ�ʵ������0-9�����֣�С���㣬������ż������
+		
+		//ȡ������
+		JButton btnNewButton = new JButton("%");
+		btnNewButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				textArea.append("%");
+			}
+		});
+		btnNewButton.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(btnNewButton);
+		
+		//���
+		JButton btnNewButton_1 = new JButton("CE");
+		btnNewButton_1.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				String t="";
+				String temp=textArea.getText();
+				String regex="[\n]+";
+				//���ı��������ݷ��У���ȥ���һ�е����ݱ��������t
+				for(int i=0;i<temp.split(regex).length-1;i++) {
+					if(i!=0)
+						t=t+"\n";
+					t=t+temp.split(regex)[i];
+				}
+				if(!t.equals("0"))
+					t=t+"\n";
+				textArea.setText(t);
+				if(textArea.getText().equals(""))
+					textArea.setText("0");
+			}
+		});
+		btnNewButton_1.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(btnNewButton_1);
+		
+		//���
+		JButton btnC = new JButton("C");
+		btnC.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				textArea.setText("0");
+			}
+		});
+		btnC.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(btnC);
+		
+		//�˸�
+		JButton button_1 = new JButton("\u2190");
+		button_1.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		button_1.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				String string=textArea.getText();
+				string=string.substring(0, string.length()-1);
+				textArea.setText(string);
+			}
+		});
+		panel.add(button_1);
+		
+		//ȡ����
+		JButton btnx = new JButton("1/x");
+		btnx.addActionListener(calculator);
+		btnx.setActionCommand("����");
+		btnx.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(btnx);
+		
+		//ȡƽ��
+		JButton btnX = new JButton("x^2");
+		btnX.addActionListener(calculator);
+		btnX.setActionCommand("ƽ��");
+		btnX.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(btnX);
+		
+		//ȡƽ����
+		JButton btnx_1 = new JButton("\u221Ax");
+		btnx_1.setActionCommand("����");
+		btnx_1.addActionListener(calculator);
+		btnx_1.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(btnx_1);
+		
+		//ȡ����ֵ
+		JButton button_5 = new JButton("|x|");
+		button_5.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		button_5.addActionListener(calculator);
+		button_5.setActionCommand("����ֵ");
+		panel.add(button_5);
+		
+		//����1
+		JButton buttonNUM1 = new JButton("1");
+		buttonNUM1.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("1");
+			}
+		});
+		
+		buttonNUM1.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM1);
+		
+		//����2
+		JButton buttonNUM2 = new JButton("2");
+		buttonNUM2.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("2");
+			}
+		});
+		buttonNUM2.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM2);
+		
+		//����3
+		JButton buttonNUM3 = new JButton("3");
+		buttonNUM3.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("3");
+			}
+		});
+		buttonNUM3.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM3);
+		
+		//����ӷ�
+		JButton buttonJIAFA = new JButton("+");
+		buttonJIAFA.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				//�ж�ǰһ���ַ��Ƿ�Ӽ��˳�ָ�����������ɾȥ�ַ����ϼӺţ�������ֱ�Ӽ��ϼӺţ���ͬ��
+				if(textArea.getText().substring(textArea.getText().length()-1).equals("+")||textArea.getText().substring(textArea.getText().length()-1).equals("-")||textArea.getText().substring(textArea.getText().length()-1).equals("/")||textArea.getText().substring(textArea.getText().length()-1).equals("*")||textArea.getText().substring(textArea.getText().length()-1).equals("^"))
+					textArea.setText(textArea.getText().substring(0,textArea.getText().length()-1)+"+");
+				else
+					textArea.append("+");
+			}
+		});
+		buttonJIAFA.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonJIAFA);
+
+		//����4
+		JButton buttonNUM4 = new JButton("4");
+		buttonNUM4.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("4");
+			}
+		});
+		buttonNUM4.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM4);
+		
+		//����5
+		JButton buttonNUM5 = new JButton("5");
+		buttonNUM5.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("5");
+			}
+		});
+		buttonNUM5.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM5);
+		
+		//����6
+		JButton buttonNUM6 = new JButton("6");
+		buttonNUM6.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("6");
+			}
+		});
+		buttonNUM6.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM6);
+		
+		//�������
+		JButton buttonJIANFA = new JButton("-");
+		buttonJIANFA.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().substring(textArea.getText().length()-1).equals("+")||textArea.getText().substring(textArea.getText().length()-1).equals("-")||textArea.getText().substring(textArea.getText().length()-1).equals("/")||textArea.getText().substring(textArea.getText().length()-1).equals("*")||textArea.getText().substring(textArea.getText().length()-1).equals("^"))
+					textArea.setText(textArea.getText().substring(0,textArea.getText().length()-1)+"-");
+				else
+					textArea.append("-");
+			}
+		});
+		buttonJIANFA.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonJIANFA);
+		
+		//����7
+		JButton buttonNUM7 = new JButton("7");
+		buttonNUM7.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("7");
+			}
+		});
+		
+		buttonNUM7.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM7);
+		
+		//����8
+		JButton buttonNUM8 = new JButton("8");
+		buttonNUM8.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		buttonNUM8.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("8");
+			}
+		});
+		panel.add(buttonNUM8);
+		
+		//����9
+		JButton buttonNUM9 = new JButton("9");
+		buttonNUM9.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("9");
+			}
+		});
+		buttonNUM9.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM9);
+		
+		//����˺�
+		JButton buttonCHENGFA = new JButton("\u00D7");
+		buttonCHENGFA.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().substring(textArea.getText().length()-1).equals("+")||textArea.getText().substring(textArea.getText().length()-1).equals("-")||textArea.getText().substring(textArea.getText().length()-1).equals("/")||textArea.getText().substring(textArea.getText().length()-1).equals("*")||textArea.getText().substring(textArea.getText().length()-1).equals("^"))
+					textArea.setText(textArea.getText().substring(0,textArea.getText().length()-1)+"*");
+				else
+					textArea.append("*");
+			}
+		});
+		buttonCHENGFA.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonCHENGFA);
+		
+		//��������
+		JButton buttonPOINT = new JButton(".");
+		buttonPOINT.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().substring(textArea.getText().length()-1).equals("+")||textArea.getText().substring(textArea.getText().length()-1).equals("-")||textArea.getText().substring(textArea.getText().length()-1).equals("/")||textArea.getText().substring(textArea.getText().length()-1).equals("*")||textArea.getText().substring(textArea.getText().length()-1).equals("^"))
+					textArea.append("0.");
+			}
+		});
+		buttonPOINT.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonPOINT);
+		
+		//����0
+		JButton buttonNUM0 = new JButton("0");
+		buttonNUM0.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().equals("0"))
+					textArea.setText("");
+				textArea.append("0");
+			}
+		});
+		buttonNUM0.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonNUM0);
+		
+		//����ȺŲ�ʹ��calculator����
+		JButton buttonDENGYU = new JButton("=");
+		buttonDENGYU.setActionCommand("����");
+		buttonDENGYU.addActionListener(calculator);
+		buttonDENGYU.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonDENGYU);
+		
+		//�������
+		JButton buttonCHUFA = new JButton("\u00F7");
+		buttonCHUFA.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().substring(textArea.getText().length()-1).equals("+")||textArea.getText().substring(textArea.getText().length()-1).equals("-")||textArea.getText().substring(textArea.getText().length()-1).equals("/")||textArea.getText().substring(textArea.getText().length()-1).equals("*")||textArea.getText().substring(textArea.getText().length()-1).equals("^"))
+					textArea.setText(textArea.getText().substring(0,textArea.getText().length()-1)+"/");
+				else
+					textArea.append("/");
+			}
+		});
+		buttonCHUFA.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		panel.add(buttonCHUFA);
+		
+		getContentPane().setLayout(groupLayout);
+		
+		//����Ϊ�˵�����ѡ�
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("\u9009\u9879");
+		mnNewMenu.setFont(new Font("΢���ź�", Font.BOLD, 16));
+		menuBar.add(mnNewMenu);
+		
+		//�л�Ϊ�����͵�ѡ�
+		JMenuItem mntmNewMenuItem = new JMenuItem("\u6807\u51C6");
+		mntmNewMenuItem.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				framePlus.setVisible(false);
+			}
+		});
+		mntmNewMenuItem.setFont(new Font("΢���ź�", Font.BOLD, 16));
+		mntmNewMenuItem.setSelected(true);
+		mnNewMenu.add(mntmNewMenuItem);
+		
+		//�л�Ϊ��ѧ�͵�ѡ�
+		JMenuItem mntmNewMenuItem_1 = new JMenuItem("\u79D1\u5B66");
+		mntmNewMenuItem_1.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+
+				framePlus.setVisible(true);
+			}
+		});
+		mntmNewMenuItem_1.setFont(new Font("΢���ź�", Font.BOLD, 16));
+		mnNewMenu.add(mntmNewMenuItem_1);
+		setVisible(true);
+	}
+}
diff --git a/src/java2020spring/FramePlus.java b/src/java2020spring/FramePlus.java
new file mode 100644
index 0000000000000000000000000000000000000000..bedd3e75c9825a1f466db49d0dc643cd2aee2d5b
--- /dev/null
+++ b/src/java2020spring/FramePlus.java
@@ -0,0 +1,139 @@
+package java2020spring;
+
+import javax.swing.JFrame;
+import java.awt.GridLayout;
+import javax.swing.JButton;
+import java.awt.Font;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JTextArea;
+
+public class FramePlus extends JFrame{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6932619654740365856L;
+
+	JTextArea textArea;
+	Calculator calculator;
+	
+	public void setTextArea(JTextArea t) {
+		textArea=t;
+	}
+	
+	public void setCalculator(Calculator c) {
+
+	}
+	
+	FramePlus(JTextArea t, Calculator c){
+		//��frame���ڵ�textArea��calculator������FramePlus���������롣
+		textArea=t;
+		calculator=c;
+		calculator.setTextArea(textArea);
+		
+		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+		setBounds(580, 200, 200, 580);
+		
+		getContentPane().setLayout(new GridLayout(6, 2));
+		
+		//����Ϊʹ��eclipse��WindowBuilder�Զ����ɵİ�ť
+		
+		//����sin
+		JButton btnNewButton = new JButton("sin");
+		btnNewButton.setActionCommand("sin");
+		btnNewButton.addActionListener(calculator);
+		btnNewButton.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton);
+		
+		//����e
+		JButton btnNewButton_2 = new JButton("e");
+		btnNewButton_2.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				textArea.append(""+Math.E);
+			}
+		});
+		btnNewButton_2.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_2);
+		
+		//����cos
+		JButton btnNewButton_3 = new JButton("cos");
+		btnNewButton_3.addActionListener(calculator);
+		btnNewButton_3.setActionCommand("cos");
+		btnNewButton_3.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_3);
+		
+		//�����
+		JButton btnNewButton_4 = new JButton("\u03C0");
+		btnNewButton_4.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				textArea.append(""+Math.PI);
+			}
+		});
+		btnNewButton_4.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_4);
+		
+		//����tan
+		JButton btnNewButton_5 = new JButton("tan");
+		btnNewButton_5.addActionListener(calculator);
+		btnNewButton_5.setActionCommand("tan");
+		btnNewButton_5.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_5);
+		
+		//����ָ��
+		JButton btnNewButton_6 = new JButton("x^y");
+		btnNewButton_6.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(textArea.getText().substring(textArea.getText().length()-1).equals("+")||textArea.getText().substring(textArea.getText().length()-1).equals("-")||textArea.getText().substring(textArea.getText().length()-1).equals("/")||textArea.getText().substring(textArea.getText().length()-1).equals("*")||textArea.getText().substring(textArea.getText().length()-1).equals("^"))
+					textArea.setText(textArea.getText().substring(0,textArea.getText().length()-1)+"^");
+				else
+					textArea.append("^");
+			}
+		});
+		btnNewButton_6.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_6);
+		
+		//����sec
+		JButton btnNewButton_1 = new JButton("sec");
+		btnNewButton_1.addActionListener(calculator);
+		btnNewButton_1.setActionCommand("sec");
+		btnNewButton_1.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_1);
+		
+		//����׳�
+		JButton btnNewButton_8 = new JButton("x!");
+		btnNewButton_8.addActionListener(calculator);
+		btnNewButton_8.setActionCommand("!");
+		btnNewButton_8.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_8);
+		
+		//����csc
+		JButton btnNewButton_7 = new JButton("csc");
+		btnNewButton_7.addActionListener(calculator);
+		btnNewButton_7.setActionCommand("csc");
+		btnNewButton_7.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_7);
+		
+		//����lg
+		JButton btnNewButton_10 = new JButton("lg");
+		btnNewButton_10.setActionCommand("lg");
+		btnNewButton_10.addActionListener(calculator);
+		btnNewButton_10.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_10);
+		
+		//����cot
+		JButton btnNewButton_9 = new JButton("cot");
+		btnNewButton_9.addActionListener(calculator);
+		btnNewButton_9.setActionCommand("cot");
+		btnNewButton_9.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_9);
+		
+		//����ln
+		JButton btnNewButton_11 = new JButton("ln");
+		btnNewButton_11.setActionCommand("ln");
+		btnNewButton_11.addActionListener(calculator);
+		btnNewButton_11.setFont(new Font("΢���ź�", Font.BOLD, 12));
+		getContentPane().add(btnNewButton_11);
+
+	}
+}
diff --git a/src/java2020spring/Test.java b/src/java2020spring/MainClass.java
similarity index 51%
rename from src/java2020spring/Test.java
rename to src/java2020spring/MainClass.java
index fc09c195f566d0e707f5e8a2f05fd168069c73a7..1ee69838eb5905066d4a142f2f50f00eb78ded0c 100644
--- a/src/java2020spring/Test.java
+++ b/src/java2020spring/MainClass.java
@@ -1,10 +1,9 @@
 package java2020spring;
 
-public class Test {
+public class MainClass {
 
 	public static void main(String[] args) {
-		System.out.println("Hello world!");
-
+		Frame calculatorFrame=new Frame();
 	}
 
 }