a.puchkina/PIbd-22_Puchkina_A.A_AirplaneWithRadar._HARD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22 Puchkina A.A. LabWork_02_HARD #2

Closed
a.puchkina wants to merge 3 commits from LabWork_02 into LabWork_01
pull from: LabWork_02
merge into: a.puchkina:LabWork_01
Conversation 0 Commits 3 Files Changed 22 +13 -27
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9acb7d93eb - Show all commits

38
.idea/workspace.xml
View File

@ -4,29 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="d76a7414-ef61-4559-85d8-aee9cbb6c975" name="Changes" comment="лаба 1, готовая">
<change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/DrawningObjects/DrawningAirplaneWithRadar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/DrawningObjects/DrawningIlluminatorsCirc.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/DrawningObjects/DrawningIlluminatorsQuad.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/DrawningObjects/IDraw.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Entities/EntityAirplane.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Entities/EntityAirplaneWithRadar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/FormAirplaneWithRadar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/AbstractStrategy.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/MovementStrategy/DrawningObjectAirplane.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" />
<list default="true" id="d76a7414-ef61-4559-85d8-aee9cbb6c975" name="Changes" comment="лаба 2, готовая">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/DirectionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/DirectionType.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/DrawningAirplaneWithRadar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/DrawningObjects/DrawningAirplane.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/DrawningIlluminators.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/DrawningObjects/DrawningIlluminators.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/EntityAirplaneWithRadar.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/NumberType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/NumberType.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/DrawningObjects/DrawningAirplane.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/DrawningObjects/DrawningAirplane.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -62,7 +42,7 @@
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"last_opened_file_path": "D:/Проекты Idea/ProjectAirplaneWithRadar_HARD/src"
"last_opened_file_path": "D:/Проекты Idea/PIbd-23_Nasyrov_A_G_AirplaneWithRadar_hard-lab3_hard"
}
}]]></component>
<component name="RecentsManager">
@ -95,12 +75,20 @@
<option name="project" value="LOCAL" />
<updated>1703428105944</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="лаба 2, готовая">
<created>1703432982438</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1703432982438</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Создание проекта" />
<MESSAGE value="лаба 1, готовая" />
<option name="LAST_COMMIT_MESSAGE" value="лаба 1, готовая" />
<MESSAGE value="лаба 2, готовая" />
<option name="LAST_COMMIT_MESSAGE" value="лаба 2, готовая" />
</component>
</project>

2
src/DrawningObjects/IDraw.java
View File

@ -2,9 +2,7 @@ package DrawningObjects;
import java.awt.*;
public interface IDraw {
public void ChangeIlluminatorNumb(int x);
//public NumberType IlluminatorNumb();
public void DrawIlluminators(Graphics2D g2d);
//public void DrawIlluminatorsQuad(Graphics2D g2d);
public void ChangeX(int x);
public void ChangeY(int y);
}