diff --git a/.idea/modules.xml b/.idea/modules.xml index 1c7b03d..9175927 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2024_10_17_16_25_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_2024_10_17_16_25_[Changes]/shelved.patch new file mode 100644 index 0000000..2d73b74 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_2024_10_17_16_25_[Changes]/shelved.patch @@ -0,0 +1,157 @@ +Index: jinzhi/src/jinzhi2.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/jinzhi/src/jinzhi2.java b/Second_Jinzhi/src/jinzhi2.java +rename from jinzhi/src/jinzhi2.java +rename to Second_Jinzhi/src/jinzhi2.java +--- a/jinzhi/src/jinzhi2.java (revision 750ee041e6c7dddb3e19241d224a19832b7199fe) ++++ b/Second_Jinzhi/src/jinzhi2.java (date 1729153446429) +@@ -28,7 +28,7 @@ + //图形化界面函数 + public void mainFrame() { + //设置窗口的参数 +- setBounds(500,50,530,500); ++ setBounds(500,50,530,530); + //禁用重新调整窗口大小的功能 + setResizable(false); + //关闭窗口的右上角的叉的同时关闭程序 +Index: jisuan/src/Main.java +=================================================================== +diff --git a/jisuan/src/Main.java b/jisuan/src/Main.java +deleted file mode 100644 +--- a/jisuan/src/Main.java (revision 750ee041e6c7dddb3e19241d224a19832b7199fe) ++++ /dev/null (revision 750ee041e6c7dddb3e19241d224a19832b7199fe) +@@ -1,5 +0,0 @@ +-public class Main { +- public static void main(String[] args) { +- System.out.println("Hello world!"); +- } +-} +\ No newline at end of file +Index: .idea/modules.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/modules.xml b/.idea/modules.xml +--- a/.idea/modules.xml (revision 750ee041e6c7dddb3e19241d224a19832b7199fe) ++++ b/.idea/modules.xml (date 1729153446565) +@@ -2,8 +2,8 @@ + + + +- +- ++ ++ + + + +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {\r\n "associatedIndex": 5\r\n}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1728559103908\r\n \r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml (revision 750ee041e6c7dddb3e19241d224a19832b7199fe) ++++ b/.idea/workspace.xml (date 1729153446592) +@@ -4,15 +4,13 @@ + +\ No newline at end of file +diff --git a/jisuan/First_Jisuan.iml b/First_Jisuan/First_Jisuan.iml +rename from jisuan/First_Jisuan.iml +rename to First_Jisuan/First_Jisuan.iml +diff --git a/jisuan/src/jisuan1.java b/First_Jisuan/src/jisuan1.java +rename from jisuan/src/jisuan1.java +rename to First_Jisuan/src/jisuan1.java +diff --git a/jinzhi/Second_Jinzhi.iml b/Second_Jinzhi/Second_Jinzhi.iml +rename from jinzhi/Second_Jinzhi.iml +rename to Second_Jinzhi/Second_Jinzhi.iml diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2024_10_17_16_25__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_2024_10_17_16_25__Changes_.xml new file mode 100644 index 0000000..289c62d --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_2024_10_17_16_25__Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ff9fc31..bd760bc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,15 +4,15 @@ \ No newline at end of file diff --git a/jisuan/First_Jisuan.iml b/First_Jisuan/First_Jisuan.iml similarity index 100% rename from jisuan/First_Jisuan.iml rename to First_Jisuan/First_Jisuan.iml diff --git a/jisuan/src/jisuan1.java b/First_Jisuan/src/jisuan1.java similarity index 100% rename from jisuan/src/jisuan1.java rename to First_Jisuan/src/jisuan1.java diff --git a/jinzhi/Second_Jinzhi.iml b/Second_Jinzhi/Second_Jinzhi.iml similarity index 100% rename from jinzhi/Second_Jinzhi.iml rename to Second_Jinzhi/Second_Jinzhi.iml diff --git a/jinzhi/src/jinzhi2.java b/Second_Jinzhi/src/jinzhi2.java similarity index 100% rename from jinzhi/src/jinzhi2.java rename to Second_Jinzhi/src/jinzhi2.java diff --git a/jisuan/src/Main.java b/jisuan/src/Main.java deleted file mode 100644 index 3e59c38..0000000 --- a/jisuan/src/Main.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file