parent
846a82f20c
commit
101365d90b
@ -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
|
||||
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"ProjectModuleManager\">\r\n <modules>\r\n <module fileurl=\"file://$PROJECT_DIR$/jisuan/First_Jisuan.iml\" filepath=\"$PROJECT_DIR$/jisuan/First_Jisuan.iml\" />\r\n <module fileurl=\"file://$PROJECT_DIR$/jinzhi/Second_Jinzhi.iml\" filepath=\"$PROJECT_DIR$/jinzhi/Second_Jinzhi.iml\" />\r\n <module fileurl=\"file://$PROJECT_DIR$/test6298.iml\" filepath=\"$PROJECT_DIR$/test6298.iml\" />\r\n </modules>\r\n </component>\r\n</project>
|
||||
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 @@
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
- <module fileurl="file://$PROJECT_DIR$/jisuan/First_Jisuan.iml" filepath="$PROJECT_DIR$/jisuan/First_Jisuan.iml" />
|
||||
- <module fileurl="file://$PROJECT_DIR$/jinzhi/Second_Jinzhi.iml" filepath="$PROJECT_DIR$/jinzhi/Second_Jinzhi.iml" />
|
||||
+ <module fileurl="file://$PROJECT_DIR$/First_Jisuan/First_Jisuan.iml" filepath="$PROJECT_DIR$/First_Jisuan/First_Jisuan.iml" />
|
||||
+ <module fileurl="file://$PROJECT_DIR$/Second_Jinzhi/Second_Jinzhi.iml" filepath="$PROJECT_DIR$/Second_Jinzhi/Second_Jinzhi.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/test6298.iml" filepath="$PROJECT_DIR$/test6298.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
Index: .idea/workspace.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
|
||||
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"240004e1-ef35-41dc-944d-01a893c69670\" name=\"Changes\" comment=\"\">\r\n <change afterPath=\"$PROJECT_DIR$/.idea/uiDesigner.xml\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/jinzhi/src/jinzhi2.java\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.idea/.gitignore\" beforeDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.idea/modules.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.idea/modules.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/jinzhi/jinzhi.iml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/jinzhi/Second_Jinzhi.iml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/jinzhi/src/JinZhi.java\" beforeDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/jisuan/jisuan.iml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/jisuan/First_Jisuan.iml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/out/production/jinzhi/JinZhi.class\" beforeDir=\"false\" />\r\n </list>\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"FileTemplateManagerImpl\">\r\n <option name=\"RECENT_TEMPLATES\">\r\n <list>\r\n <option value=\"Class\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n <map>\r\n <entry key=\"$PROJECT_DIR$\" value=\"main\" />\r\n </map>\r\n </option>\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"ProjectColorInfo\">{\r\n "associatedIndex": 5\r\n}</component>\r\n <component name=\"ProjectId\" id=\"2nFBmc5uTbrylp6kD7GKdOhgrTY\" />\r\n <component name=\"ProjectViewState\">\r\n <option name=\"autoscrollFromSource\" value=\"true\" />\r\n <option name=\"flattenPackages\" value=\"true\" />\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"Application.JinZhi.executor\": \"Run\",\r\n \"Application.jinzhi2.executor\": \"Run\",\r\n \"Application.mm.executor\": \"Run\",\r\n \"RunOnceActivity.ShowReadmeOnStart\": \"true\",\r\n \"SHARE_PROJECT_CONFIGURATION_FILES\": \"true\",\r\n \"git-widget-placeholder\": \"master\",\r\n \"kotlin-language-version-configured\": \"true\"\r\n }\r\n}]]></component>\r\n <component name=\"RunManager\" selected=\"Application.jinzhi2\">\r\n <configuration name=\"JinZhi\" type=\"Application\" factoryName=\"Application\" temporary=\"true\" nameIsGenerated=\"true\">\r\n <option name=\"MAIN_CLASS_NAME\" value=\"JinZhi\" />\r\n <module name=\"Second_Jinzhi\" />\r\n <method v=\"2\">\r\n <option name=\"Make\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n <configuration name=\"jinzhi2\" type=\"Application\" factoryName=\"Application\" temporary=\"true\" nameIsGenerated=\"true\">\r\n <option name=\"MAIN_CLASS_NAME\" value=\"jinzhi2\" />\r\n <module name=\"Second_Jinzhi\" />\r\n <method v=\"2\">\r\n <option name=\"Make\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n <recent_temporary>\r\n <list>\r\n <item itemvalue=\"Application.jinzhi2\" />\r\n <item itemvalue=\"Application.JinZhi\" />\r\n </list>\r\n </recent_temporary>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"240004e1-ef35-41dc-944d-01a893c69670\" name=\"Changes\" comment=\"\" />\r\n <created>1728559103908</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1728559103908</updated>\r\n </task>\r\n <servers />\r\n </component>\r\n</project>
|
||||
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 @@
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
- <list default="true" id="240004e1-ef35-41dc-944d-01a893c69670" name="Changes" comment="">
|
||||
- <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
|
||||
- <change afterPath="$PROJECT_DIR$/jinzhi/src/jinzhi2.java" afterDir="false" />
|
||||
- <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
|
||||
- <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
||||
- <change beforePath="$PROJECT_DIR$/jinzhi/jinzhi.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jinzhi/Second_Jinzhi.iml" afterDir="false" />
|
||||
- <change beforePath="$PROJECT_DIR$/jinzhi/src/JinZhi.java" beforeDir="false" />
|
||||
- <change beforePath="$PROJECT_DIR$/jisuan/jisuan.iml" beforeDir="false" afterPath="$PROJECT_DIR$/jisuan/First_Jisuan.iml" afterDir="false" />
|
||||
- <change beforePath="$PROJECT_DIR$/out/production/jinzhi/JinZhi.class" beforeDir="false" />
|
||||
+ <list default="true" id="240004e1-ef35-41dc-944d-01a893c69670" name="Changes" comment="第二题修改">
|
||||
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
+ <change beforePath="$PROJECT_DIR$/jinzhi/Second_Jinzhi.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Second_Jinzhi/Second_Jinzhi.iml" afterDir="false" />
|
||||
+ <change beforePath="$PROJECT_DIR$/jinzhi/src/jinzhi2.java" beforeDir="false" afterPath="$PROJECT_DIR$/Second_Jinzhi/src/jinzhi2.java" afterDir="false" />
|
||||
+ <change beforePath="$PROJECT_DIR$/jisuan/First_Jisuan.iml" beforeDir="false" afterPath="$PROJECT_DIR$/First_Jisuan/First_Jisuan.iml" afterDir="false" />
|
||||
+ <change beforePath="$PROJECT_DIR$/jisuan/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/First_Jisuan/src/Main.java" afterDir="false" />
|
||||
+ <change beforePath="$PROJECT_DIR$/jisuan/src/jisuan1.java" beforeDir="false" afterPath="$PROJECT_DIR$/First_Jisuan/src/jisuan1.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -27,6 +25,12 @@
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
+ <option name="PUSH_TAGS">
|
||||
+ <GitPushTagMode>
|
||||
+ <option name="argument" value="--tags" />
|
||||
+ <option name="title" value="All" />
|
||||
+ </GitPushTagMode>
|
||||
+ </option>
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="main" />
|
||||
@@ -44,17 +48,17 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
- <component name="PropertiesComponent"><![CDATA[{
|
||||
- "keyToString": {
|
||||
- "Application.JinZhi.executor": "Run",
|
||||
- "Application.jinzhi2.executor": "Run",
|
||||
- "Application.mm.executor": "Run",
|
||||
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||
- "git-widget-placeholder": "master",
|
||||
- "kotlin-language-version-configured": "true"
|
||||
+ <component name="PropertiesComponent">{
|
||||
+ "keyToString": {
|
||||
+ "Application.JinZhi.executor": "Run",
|
||||
+ "Application.jinzhi2.executor": "Run",
|
||||
+ "Application.mm.executor": "Run",
|
||||
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||
+ "git-widget-placeholder": "master",
|
||||
+ "kotlin-language-version-configured": "true"
|
||||
}
|
||||
-}]]></component>
|
||||
+}</component>
|
||||
<component name="RunManager" selected="Application.jinzhi2">
|
||||
<configuration name="JinZhi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="JinZhi" />
|
||||
@@ -86,6 +90,19 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1728559103908</updated>
|
||||
</task>
|
||||
+ <task id="LOCAL-00001" summary="第二题修改">
|
||||
+ <option name="closed" value="true" />
|
||||
+ <created>1729153009506</created>
|
||||
+ <option name="number" value="00001" />
|
||||
+ <option name="presentableId" value="LOCAL-00001" />
|
||||
+ <option name="project" value="LOCAL" />
|
||||
+ <updated>1729153009506</updated>
|
||||
+ </task>
|
||||
+ <option name="localTasksCounter" value="2" />
|
||||
<servers />
|
||||
</component>
|
||||
+ <component name="VcsManagerConfiguration">
|
||||
+ <MESSAGE value="第二题修改" />
|
||||
+ <option name="LAST_COMMIT_MESSAGE" value="第二题修改" />
|
||||
+ </component>
|
||||
</project>
|
||||
\ 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
|
||||
@ -0,0 +1,4 @@
|
||||
<changelist name="Uncommitted_changes_before_Update_at_2024_10_17_16_25_[Changes]" date="1729153537863" recycled="true" deleted="true">
|
||||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2024_10_17_16_25_[Changes]/shelved.patch" />
|
||||
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2024/10/17 16:25 [Changes]" />
|
||||
</changelist>
|
||||
@ -1,5 +0,0 @@
|
||||
public class Main {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello world!");
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue