This commit is contained in:
dex_moth 2023-11-18 14:40:19 +04:00
parent 2ab74c38dc
commit 28963e2235
2 changed files with 119 additions and 21 deletions

105
.gitignore vendored
View File

@ -12,3 +12,108 @@
# Built Visual Studio Code Extensions # Built Visual Studio Code Extensions
*.vsix *.vsix
# ---> Java
*.class
*.idea
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*
# ---> JetBrains
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# AWS User-specific
.idea/**/aws.xml
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# SonarLint plugin
.idea/sonarlint/
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

View File

@ -4,26 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4ad590c0-5ac3-4af8-9d5f-82f5c307cd9c" name="Changes" comment=""> <list default="true" id="4ad590c0-5ac3-4af8-9d5f-82f5c307cd9c" name="Changes" comment="lab2">
<change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPlane.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPortholesHeart.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPortholesSquare.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Drawnings/IDrawningPortholes.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Entities/EntityPlane.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/AbstractStrategy.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/DrawningObjectAirbus.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/IMoveableObject.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/MoveToBorder.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/MoveToCenter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/ObjectParameters.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/Status.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Drawnings/DrawingAirbus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Drawnings/DrawningAirbus.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Drawnings/DrawingPortholes.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Drawnings/DrawningPortholesCircle.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Entities/EntityAirbus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entities/EntityAirbus.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/FormAirbus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/FormAirbus.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -65,6 +48,7 @@
<recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard\src\Drawnings" /> <recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard\src\Drawnings" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard\src\Drawnings" />
<recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard" /> <recent name="E:\GitLab\PIbd-22_Isaeva_A.I._Airbus_Hard" />
</key> </key>
</component> </component>
@ -99,11 +83,20 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1700296643884</updated> <updated>1700296643884</updated>
</task> </task>
<option name="localTasksCounter" value="2" /> <task id="LOCAL-00002" summary="lab2">
<option name="closed" value="true" />
<created>1700303718300</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1700303718300</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="clean" /> <MESSAGE value="clean" />
<option name="LAST_COMMIT_MESSAGE" value="" /> <MESSAGE value="lab2" />
<option name="LAST_COMMIT_MESSAGE" value="lab2" />
</component> </component>
</project> </project>