diff --git a/Task_B/.idea/misc.xml b/Task_B/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..ba93b15ba7e5b5458f67d078c4bee4d6da356cff --- /dev/null +++ b/Task_B/.idea/misc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/classes" /> + </component> +</project> \ No newline at end of file diff --git a/Task_B/.idea/modules.xml b/Task_B/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..f1a7dc5bbf9dcc63d82715b529085a2a7d219e66 --- /dev/null +++ b/Task_B/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/Task_B.iml" filepath="$PROJECT_DIR$/Task_B.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/Task_B/.idea/uiDesigner.xml b/Task_B/.idea/uiDesigner.xml new file mode 100644 index 0000000000000000000000000000000000000000..e96534fb27b68192f27f985d3879e173ec77adb8 --- /dev/null +++ b/Task_B/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> +</project> \ No newline at end of file diff --git a/Task_B/.idea/vcs.xml b/Task_B/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c0b8635858dc7ad44b93df54b762707ce49eefc --- /dev/null +++ b/Task_B/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/Task_B/.idea/workspace.xml b/Task_B/.idea/workspace.xml new file mode 100644 index 0000000000000000000000000000000000000000..4afa435c3099871c99ce81da33b7b525ba9f0e55 --- /dev/null +++ b/Task_B/.idea/workspace.xml @@ -0,0 +1,513 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ChangeListManager"> + <list default="true" id="f156cbe9-082f-424c-9e3b-b3a3ae20a8d2" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/src/main/MyBuildConfigReaderFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/MyBuildConfigReaderFactory.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/MyBuildFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/MyBuildFactory.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/MyXMLBuild.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/XMLBuildAdapter.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/MyXMLBuildConfigReader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/XMLBuildConfigReaderAdapter.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/MyYamlBuild.java" beforeDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/MyYamlBuildConfigReader.java" beforeDir="false" /> + <change beforePath="$PROJECT_DIR$/src/yaml/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/yaml/Compile.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/yaml/YamlBuildConfigurationReader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/yaml/YamlBuildConfigurationReader.java" afterDir="false" /> + </list> + <ignored path="$PROJECT_DIR$/bin/" /> + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> + <option name="SHOW_DIALOG" value="false" /> + <option name="HIGHLIGHT_CONFLICTS" value="true" /> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> + <option name="LAST_RESOLUTION" value="IGNORE" /> + </component> + <component name="FUSProjectUsageTrigger"> + <session id="-751653040"> + <usages-collector id="statistics.lifecycle.project"> + <counts> + <entry key="project.closed" value="2" /> + <entry key="project.open.time.11" value="1" /> + <entry key="project.open.time.8" value="2" /> + <entry key="project.opened" value="3" /> + </counts> + </usages-collector> + <usages-collector id="statistics.file.extensions.open"> + <counts> + <entry key="iml" value="1" /> + <entry key="java" value="38" /> + </counts> + </usages-collector> + <usages-collector id="statistics.file.types.open"> + <counts> + <entry key="IDEA_MODULE" value="1" /> + <entry key="JAVA" value="38" /> + </counts> + </usages-collector> + <usages-collector id="statistics.file.extensions.edit"> + <counts> + <entry key="dummy" value="44" /> + <entry key="java" value="229" /> + </counts> + </usages-collector> + <usages-collector id="statistics.file.types.edit"> + <counts> + <entry key="JAVA" value="229" /> + <entry key="PLAIN_TEXT" value="44" /> + </counts> + </usages-collector> + </session> + </component> + <component name="FileEditorManager"> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/Main.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="425"> + <caret line="30" selection-start-line="30" selection-end-line="30" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/MyBuildConfigReaderFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="170"> + <caret line="11" column="66" lean-forward="true" selection-start-line="11" selection-start-column="66" selection-end-line="11" selection-end-column="66" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/IBuild.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/yaml/Compile.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="11" column="38" selection-start-line="11" selection-start-column="38" selection-end-line="11" selection-end-column="38" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/IBuildFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/MyBuildFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="153"> + <caret line="11" column="48" lean-forward="true" selection-start-line="11" selection-start-column="48" selection-end-line="11" selection-end-column="48" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/XMLBuildAdapter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="272"> + <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/XMLBuildConfigReaderAdapter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="255"> + <caret line="18" selection-start-line="18" selection-end-line="18" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/yaml/YamlBuildConfigurationReader.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="230"> + <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" /> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> + </component> + <component name="IdeDocumentHistory"> + <option name="CHANGED_PATHS"> + <list> + <option value="$PROJECT_DIR$/src/main/MyXMLBuild.java" /> + <option value="$PROJECT_DIR$/src/yaml/YamlBuildConfigurationReader.java" /> + <option value="$PROJECT_DIR$/src/main/MyBuildConfigReaderFactory.java" /> + <option value="$PROJECT_DIR$/src/yaml/Compile.java" /> + <option value="$PROJECT_DIR$/src/main/MyBuildFactory.java" /> + <option value="$PROJECT_DIR$/src/main/MyYamlBuild.java" /> + <option value="$PROJECT_DIR$/src/main/XMLBuildAdapter.java" /> + </list> + </option> + </component> + <component name="ProjectFrameBounds" extendedState="6"> + <option name="x" value="-10" /> + <option name="y" value="-10" /> + <option name="width" value="1300" /> + <option name="height" value="185" /> + </component> + <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> + <component name="ProjectView"> + <navigator proportions="" version="1"> + <foldersAlwaysOnTop value="true" /> + </navigator> + <panes> + <pane id="ProjectPane"> + <subPane> + <expand> + <path> + <item name="Task_B" type="b2602c69:ProjectViewProjectNode" /> + <item name="Task_B" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="Task_B" type="b2602c69:ProjectViewProjectNode" /> + <item name="Task_B" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="Task_B" type="b2602c69:ProjectViewProjectNode" /> + <item name="Task_B" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="domain" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="Task_B" type="b2602c69:ProjectViewProjectNode" /> + <item name="Task_B" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="Task_B" type="b2602c69:ProjectViewProjectNode" /> + <item name="Task_B" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="xml" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="Task_B" type="b2602c69:ProjectViewProjectNode" /> + <item name="Task_B" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="yaml" type="462c0819:PsiDirectoryNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> + <pane id="PackagesPane" /> + <pane id="Scope" /> + </panes> + </component> + <component name="PropertiesComponent"> + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1568116764481" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="settings.editor.selected.configurable" value="vcs.Git" /> + </component> + <component name="RunDashboard"> + <option name="ruleStates"> + <list> + <RuleState> + <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> + </RuleState> + <RuleState> + <option name="name" value="StatusDashboardGroupingRule" /> + </RuleState> + </list> + </option> + </component> + <component name="RunManager"> + <configuration default="true" type="Applet" factoryName="Applet"> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> + <option name="MAIN_CLASS_NAME" value="main.Main" /> + <module name="Task_B" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <extension name="coverage"> + <pattern> + <option name="PATTERN" value="main.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration default="true" type="Application" factoryName="Application"> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration default="true" type="JUnit" factoryName="JUnit"> + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration default="true" type="TestNG" factoryName="TestNG"> + <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> + <properties /> + <listeners /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> + <module name="" /> + <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> + <option name="PROGRAM_PARAMETERS" /> + <predefined_log_file id="idea.log" enabled="true" /> + <method v="2"> + <option name="Make" enabled="true" /> + </method> + </configuration> + <recent_temporary> + <list> + <item itemvalue="Application.Main" /> + </list> + </recent_temporary> + </component> + <component name="SvnConfiguration"> + <configuration /> + </component> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="f156cbe9-082f-424c-9e3b-b3a3ae20a8d2" name="Default Changelist" comment="" /> + <created>1568033503283</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1568033503283</updated> + </task> + <servers /> + </component> + <component name="ToolWindowManager"> + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> + <editor active="true" /> + <layout> + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16845638" /> + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> + <window_info id="Image Layers" order="2" /> + <window_info id="Designer" order="3" /> + <window_info id="UI Designer" order="4" /> + <window_info id="Capture Tool" order="5" /> + <window_info id="Favorites" order="6" side_tool="true" /> + <window_info anchor="bottom" id="Message" order="0" /> + <window_info anchor="bottom" id="Find" order="1" /> + <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.25106382" /> + <window_info anchor="bottom" id="Debug" order="3" weight="0.23687944" /> + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> + <window_info anchor="bottom" id="TODO" order="6" /> + <window_info anchor="bottom" id="Terminal" order="7" /> + <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" /> + <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" /> + <window_info anchor="bottom" id="Messages" order="10" /> + <window_info anchor="right" id="Commander" order="0" weight="0.4" /> + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> + <window_info anchor="right" id="Palette" order="3" /> + <window_info anchor="right" id="Capture Analysis" order="4" /> + <window_info anchor="right" id="Theme Preview" order="5" /> + <window_info anchor="right" id="Palette	" order="6" /> + <window_info anchor="right" id="Maven Projects" order="7" /> + </layout> + </component> + <component name="VcsContentAnnotationSettings"> + <option name="myLimit" value="2678400000" /> + </component> + <component name="XDebuggerManager"> + <breakpoint-manager> + <breakpoints> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/Main.java</url> + <line>22</line> + <properties /> + <option name="timeStamp" value="1" /> + </line-breakpoint> + </breakpoints> + </breakpoint-manager> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/Task_B.iml"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/src/domain/Project.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="125"> + <caret line="97" selection-start-line="97" selection-end-line="97" /> + <folding> + <element signature="e#989#990#0" expanded="true" /> + <element signature="e#1007#1008#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/xml/Build.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="125"> + <caret line="28" selection-start-line="28" selection-end-line="28" /> + <folding> + <element signature="e#227#228#0" expanded="true" /> + <element signature="e#254#255#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/domain/Target.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-51"> + <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/domain/BuildConfig.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="34"> + <caret line="2" selection-start-line="2" selection-end-line="2" /> + <folding> + <element signature="e#101#102#0" expanded="true" /> + <element signature="e#122#123#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/IBuildConfigReaderFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="34"> + <caret line="2" column="42" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="42" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/IBuildConfigReader.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="jar://C:/Program Files/Java/jdk-11/lib/src.zip!/java.xml/jdk/xml/internal/SecuritySupport.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="132"> + <caret line="84" selection-start-line="84" selection-end-line="84" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/xml/XMLBuildConfigurationReader.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="299"> + <caret line="56" selection-start-line="56" selection-end-line="56" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/Main.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="425"> + <caret line="30" selection-start-line="30" selection-end-line="30" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/MyYamlBuildConfigReader.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/yaml/YamlBuildConfigurationReader.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="230"> + <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/IBuildFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/yaml/Compile.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="11" column="38" selection-start-line="11" selection-start-column="38" selection-end-line="11" selection-end-column="38" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/MyYamlBuild.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="221"> + <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/IBuild.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/XMLBuildConfigReaderAdapter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="255"> + <caret line="18" selection-start-line="18" selection-end-line="18" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/MyBuildConfigReaderFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="170"> + <caret line="11" column="66" lean-forward="true" selection-start-line="11" selection-start-column="66" selection-end-line="11" selection-end-column="66" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/MyBuildFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="153"> + <caret line="11" column="48" lean-forward="true" selection-start-line="11" selection-start-column="48" selection-end-line="11" selection-end-column="48" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/XMLBuildAdapter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="272"> + <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" /> + </state> + </provider> + </entry> + </component> + <component name="masterDetails"> + <states> + <state key="ProjectJDKs.UI"> + <settings> + <last-edited>1.8</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + </states> + </component> +</project> \ No newline at end of file diff --git a/Task_B/Task_B.iml b/Task_B/Task_B.iml new file mode 100644 index 0000000000000000000000000000000000000000..b7630725548dc261ac50983da01be50a643f9cd2 --- /dev/null +++ b/Task_B/Task_B.iml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="EclipseModuleManager"> + <libelement value="jar://$MODULE_DIR$/lib/yamlbeans-1.0.jar!/" /> + <src_description expected_position="0"> + <src_folder value="file://$MODULE_DIR$/src" expected_position="0" /> + <src_folder value="file://$MODULE_DIR$/test/src" expected_position="1" /> + </src_description> + </component> + <component name="NewModuleRootManager"> + <output url="file://$MODULE_DIR$/bin" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="false" /> + </content> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="module-library"> + <library name="yamlbeans-1.0.jar"> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/yamlbeans-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="junit4"> + <CLASSES> + <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + </component> +</module> \ No newline at end of file diff --git a/Task_B/src/main/MyBuildConfigReaderFactory.java b/Task_B/src/main/MyBuildConfigReaderFactory.java index 5dddcd888a57aaccd5450d8f595919175f536b05..7a7f2e7d11b00d6cd75081643fca2fa64792c574 100644 --- a/Task_B/src/main/MyBuildConfigReaderFactory.java +++ b/Task_B/src/main/MyBuildConfigReaderFactory.java @@ -9,10 +9,10 @@ public class MyBuildConfigReaderFactory implements IBuildConfigReaderFactory { public IBuildConfigReader createBuildConfigReader(String buildFileName) { String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf(".")); if (fileNameExtension.equals(".yaml")) { - return new MyYamlBuildConfigReader(new YamlBuildConfigurationReader(buildFileName)); + return new YamlBuildConfigurationReader(buildFileName); } else if (fileNameExtension.equals(".xml")) { - return new MyXMLBuildConfigReader(new XMLBuildConfigurationReader(buildFileName)); + return new XMLBuildConfigReaderAdapter(new XMLBuildConfigurationReader(buildFileName)); } else { return null; diff --git a/Task_B/src/main/MyBuildFactory.java b/Task_B/src/main/MyBuildFactory.java index 4d301e76ebf52466bcea22ce600d50bc95b880fe..f3401e7aaad70ca647dec61c5da913a03ad4000e 100644 --- a/Task_B/src/main/MyBuildFactory.java +++ b/Task_B/src/main/MyBuildFactory.java @@ -10,10 +10,10 @@ public class MyBuildFactory implements IBuildFactory { public IBuild createBuild(String buildFileName, BuildConfig buildConfig, String targetName) { String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf(".")); if (fileNameExtension.equals(".yaml")) { - return new MyYamlBuild(new Compile(buildConfig, targetName)); + return new Compile(buildConfig, targetName); } else if (fileNameExtension.equals(".xml")) { - return new MyXMLBuild(new Build(buildConfig.getProject()), targetName); + return new XMLBuildAdapter(new Build(buildConfig.getProject()), targetName); } else { return null; diff --git a/Task_B/src/main/MyYamlBuild.java b/Task_B/src/main/MyYamlBuild.java deleted file mode 100644 index 7e1027b6f3c68c99f9445f846c368768e45aae71..0000000000000000000000000000000000000000 --- a/Task_B/src/main/MyYamlBuild.java +++ /dev/null @@ -1,17 +0,0 @@ -package main; - -import yaml.Compile; - -public class MyYamlBuild implements IBuild { - - Compile adaptee; - - public MyYamlBuild(Compile yamlCompile) { - adaptee = yamlCompile; - } - - public void build(int debuglevel) { - adaptee.build(debuglevel); - } - -} diff --git a/Task_B/src/main/MyYamlBuildConfigReader.java b/Task_B/src/main/MyYamlBuildConfigReader.java deleted file mode 100644 index 9e4d4fd8c5460806e00c446e9857de6365808ee8..0000000000000000000000000000000000000000 --- a/Task_B/src/main/MyYamlBuildConfigReader.java +++ /dev/null @@ -1,20 +0,0 @@ -package main; - -import domain.BuildConfig; -import yaml.YamlBuildConfigurationReader; - -public class MyYamlBuildConfigReader implements IBuildConfigReader { - - private YamlBuildConfigurationReader adaptee; - - public MyYamlBuildConfigReader(YamlBuildConfigurationReader buildConfigReader) { - adaptee = buildConfigReader; - } - - @Override - public BuildConfig getBuildConfig() { - - return adaptee.getBuildConfig(); - } - -} diff --git a/Task_B/src/main/MyXMLBuild.java b/Task_B/src/main/XMLBuildAdapter.java similarity index 66% rename from Task_B/src/main/MyXMLBuild.java rename to Task_B/src/main/XMLBuildAdapter.java index 8d094a540fd5dced5d6e69709d5098b7bd6335ae..43aab2a7c7818255f0c655303af2831de5708b0a 100644 --- a/Task_B/src/main/MyXMLBuild.java +++ b/Task_B/src/main/XMLBuildAdapter.java @@ -2,12 +2,12 @@ package main; import xml.Build; -public class MyXMLBuild implements IBuild { +public class XMLBuildAdapter implements IBuild { Build adaptee; String targetName; - public MyXMLBuild(Build xmlBuild, String targetName) { + public XMLBuildAdapter(Build xmlBuild, String targetName) { adaptee = xmlBuild; this.targetName = targetName; } diff --git a/Task_B/src/main/MyXMLBuildConfigReader.java b/Task_B/src/main/XMLBuildConfigReaderAdapter.java similarity index 68% rename from Task_B/src/main/MyXMLBuildConfigReader.java rename to Task_B/src/main/XMLBuildConfigReaderAdapter.java index 4aad5be985c77bfd4b7362bf3dd7e8e2d5e2c11d..77672850d4f16294fc716f0ed43d9c76f8195014 100644 --- a/Task_B/src/main/MyXMLBuildConfigReader.java +++ b/Task_B/src/main/XMLBuildConfigReaderAdapter.java @@ -3,11 +3,11 @@ package main; import domain.BuildConfig; import xml.XMLBuildConfigurationReader; -public class MyXMLBuildConfigReader implements IBuildConfigReader { +public class XMLBuildConfigReaderAdapter implements IBuildConfigReader { private XMLBuildConfigurationReader adaptee; - public MyXMLBuildConfigReader(XMLBuildConfigurationReader buildConfigReader) { + public XMLBuildConfigReaderAdapter(XMLBuildConfigurationReader buildConfigReader) { adaptee = buildConfigReader; } diff --git a/Task_B/src/yaml/Compile.java b/Task_B/src/yaml/Compile.java index 3a8c682b3ab0da6b9f650de1752aee3ec5885b12..5fe941e8d4c6c98e9f7e697cbeab34383ab786ad 100644 --- a/Task_B/src/yaml/Compile.java +++ b/Task_B/src/yaml/Compile.java @@ -7,8 +7,9 @@ import java.util.Optional; import domain.BuildConfig; import domain.Project; import domain.Target; +import main.IBuild; -public class Compile { +public class Compile implements IBuild { private Project project; private String targetName; diff --git a/Task_B/src/yaml/YamlBuildConfigurationReader.java b/Task_B/src/yaml/YamlBuildConfigurationReader.java index 6069bd0740ef1c63f69b64ab71375532be60153d..a022b3deb2d501cc012de82238ce5d4c21c1030d 100755 --- a/Task_B/src/yaml/YamlBuildConfigurationReader.java +++ b/Task_B/src/yaml/YamlBuildConfigurationReader.java @@ -4,12 +4,13 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; +import main.IBuildConfigReader; import net.sourceforge.yamlbeans.YamlException; import net.sourceforge.yamlbeans.YamlReader; import domain.BuildConfig; import domain.Project; -public class YamlBuildConfigurationReader { +public class YamlBuildConfigurationReader implements IBuildConfigReader { private YamlReader yamlReader;