Applied changes for SE.QA.09 compliance
This commit is contained in:
maj83
parent
bffd28d20d
commit
8a03c06357
11 changed files with 1021 additions and 0 deletions
4
dev/20200421/maj83/Match the meaning/.idea/encodings.xml
Normal file
4
dev/20200421/maj83/Match the meaning/.idea/encodings.xml
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
|
||||
</project>
|
||||
13
dev/20200421/maj83/Match the meaning/.idea/libraries/lib.xml
Normal file
13
dev/20200421/maj83/Match the meaning/.idea/libraries/lib.xml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="lib">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" />
|
||||
</SOURCES>
|
||||
<jarDirectory url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" recursive="false" />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/../javafx-sdk-14/lib" recursive="false" type="SOURCES" />
|
||||
</library>
|
||||
</component>
|
||||
6
dev/20200421/maj83/Match the meaning/.idea/misc.xml
Normal file
6
dev/20200421/maj83/Match the meaning/.idea/misc.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
8
dev/20200421/maj83/Match the meaning/.idea/modules.xml
Normal file
8
dev/20200421/maj83/Match the meaning/.idea/modules.xml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/Match the meaning.iml" filepath="$PROJECT_DIR$/Match the meaning.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
124
dev/20200421/maj83/Match the meaning/.idea/uiDesigner.xml
Normal file
124
dev/20200421/maj83/Match the meaning/.idea/uiDesigner.xml
Normal file
|
|
@ -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>
|
||||
489
dev/20200421/maj83/Match the meaning/.idea/workspace.xml
Normal file
489
dev/20200421/maj83/Match the meaning/.idea/workspace.xml
Normal file
|
|
@ -0,0 +1,489 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fbb2a4a0-47c2-4eac-8067-df2e585c83b3" name="Default Changelist" comment="" />
|
||||
<ignored path="$PROJECT_DIR$/out/" />
|
||||
<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="CoverageDataManager">
|
||||
<SUITE FILE_PATH="coverage/Match_the_meaning$Main.ic" NAME="Main Coverage Results" MODIFIED="1587467500364" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
|
||||
</component>
|
||||
<component name="CoverageViewManager">
|
||||
<option name="myElementSize" value="241" />
|
||||
</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.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<caret line="19" column="58" selection-start-line="19" selection-start-column="58" selection-end-line="19" selection-end-column="58" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/MyController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="801">
|
||||
<caret line="147" lean-forward="true" selection-start-line="147" selection-end-line="147" />
|
||||
<folding>
|
||||
<element signature="e#0#4821#0" expanded="true" />
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/DictionaryEntry.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="68">
|
||||
<caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#199#200#0" expanded="true" />
|
||||
<element signature="e#243#244#0" expanded="true" />
|
||||
<element signature="e#478#479#0" expanded="true" />
|
||||
<element signature="e#516#517#0" expanded="true" />
|
||||
<element signature="e#566#567#0" expanded="true" />
|
||||
<element signature="e#612#613#0" expanded="true" />
|
||||
<element signature="e#648#649#0" expanded="true" />
|
||||
<element signature="e#684#685#0" expanded="true" />
|
||||
<element signature="e#730#731#0" expanded="true" />
|
||||
<element signature="e#772#773#0" expanded="true" />
|
||||
<element signature="e#812#813#0" expanded="true" />
|
||||
<element signature="e#851#852#0" expanded="true" />
|
||||
<element signature="e#903#904#0" expanded="true" />
|
||||
<element signature="e#951#952#0" expanded="true" />
|
||||
<element signature="e#995#996#0" expanded="true" />
|
||||
<element signature="e#1038#1039#0" expanded="true" />
|
||||
<element signature="e#1100#1101#0" expanded="true" />
|
||||
<element signature="e#1156#1157#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/MatchTheMeaning.fxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<caret line="13" column="102" selection-start-line="13" selection-start-column="102" selection-end-line="13" selection-end-column="102" />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder" />
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="Class" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/src/DictionaryEntry.java" />
|
||||
<option value="$PROJECT_DIR$/src/DIctionaryController.java" />
|
||||
<option value="$PROJECT_DIR$/src/DictionaryController.java" />
|
||||
<option value="$PROJECT_DIR$/src/json/DictionaryEntry.java" />
|
||||
<option value="$PROJECT_DIR$/src/Main.java" />
|
||||
<option value="$PROJECT_DIR$/src/MatchTheMeaning.fxml" />
|
||||
<option value="$PROJECT_DIR$/src/MyController.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="953" />
|
||||
<option name="width" value="974" />
|
||||
<option name="height" value="1047" />
|
||||
</component>
|
||||
<component name="ProjectView">
|
||||
<navigator proportions="" version="1">
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
<path>
|
||||
<item name="Match the meaning" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Match the meaning" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Match the meaning" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Match the meaning" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587750914478" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/../javafx-sdk-14/lib" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="project.structure.last.edited" value="Libraries" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
</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 name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Main" />
|
||||
<module name="Match the meaning" />
|
||||
<option name="VM_PARAMETERS" value="--module-path C:\Users\Marcin\Desktop\javafx-sdk-14\lib --add-modules javafx.controls,javafx.fxml" />
|
||||
<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="fbb2a4a0-47c2-4eac-8067-df2e585c83b3" name="Default Changelist" comment="" />
|
||||
<created>1586778885037</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1586778885037</updated>
|
||||
<workItem from="1586778888266" duration="4356000" />
|
||||
<workItem from="1586790476649" duration="5671000" />
|
||||
<workItem from="1586796522495" duration="9386000" />
|
||||
<workItem from="1587035664037" duration="6621000" />
|
||||
<workItem from="1587208556418" duration="3298000" />
|
||||
<workItem from="1587465525325" duration="738000" />
|
||||
<workItem from="1587466534653" duration="11000" />
|
||||
<workItem from="1587466632811" duration="2922000" />
|
||||
<workItem from="1587469619025" duration="61000" />
|
||||
<workItem from="1587472629355" duration="3671000" />
|
||||
<workItem from="1587745044711" duration="5372000" />
|
||||
<workItem from="1587838078886" duration="112000" />
|
||||
<workItem from="1587903133242" duration="3080000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="45299000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="953" y="0" width="974" height="1047" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19146608" />
|
||||
<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 anchor="bottom" id="Run" order="2" weight="0.21776815" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.3163597" />
|
||||
<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="Docker" order="7" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Version Control" order="8" />
|
||||
<window_info anchor="bottom" id="Database Changes" order="9" />
|
||||
<window_info anchor="bottom" id="Terminal" order="10" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Messages" order="12" weight="0.32936078" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" 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="Database" order="4" />
|
||||
<window_info anchor="right" id="Theme Preview" order="5" />
|
||||
<window_info anchor="right" id="Maven" order="6" />
|
||||
<window_info anchor="right" id="Capture Analysis" order="7" />
|
||||
<window_info anchor="right" id="Palette	" order="8" />
|
||||
<window_info anchor="right" id="Coverage" order="9" side_tool="true" weight="0.32995737" />
|
||||
</layout>
|
||||
<layout-to-restore>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.08848614" />
|
||||
<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.21776815" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
||||
<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="Docker" order="7" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Version Control" order="8" />
|
||||
<window_info anchor="bottom" id="Database Changes" order="9" />
|
||||
<window_info anchor="bottom" id="Terminal" order="10" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Messages" order="12" weight="0.32936078" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" 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="Database" order="4" />
|
||||
<window_info anchor="right" id="Theme Preview" order="5" />
|
||||
<window_info anchor="right" id="Maven" order="6" />
|
||||
<window_info anchor="right" id="Capture Analysis" order="7" />
|
||||
<window_info anchor="right" id="Palette	" order="8" />
|
||||
</layout-to-restore>
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/out/production/Match the meaning/DictionaryEntry.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="306">
|
||||
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.base.jar!/javafx/beans/property/DoublePropertyBase.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="180">
|
||||
<caret line="70" selection-start-line="70" selection-end-line="70" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.graphics.jar!/javafx/stage/Window.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="163">
|
||||
<caret line="435" selection-start-line="435" selection-end-line="435" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.controls.jar!/javafx/scene/control/Labeled.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="202">
|
||||
<caret line="91" selection-start-line="91" selection-end-line="91" />
|
||||
<folding>
|
||||
<element signature="e#3123#3124#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.base.jar!/javafx/beans/binding/StringExpression.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="187">
|
||||
<caret line="16" selection-start-line="16" selection-end-line="16" />
|
||||
<folding>
|
||||
<element signature="e#460#461#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.base.jar!/javafx/beans/property/StringPropertyBase.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="219">
|
||||
<caret line="63" selection-start-line="63" selection-end-line="63" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/json/DictionaryEntry.class" />
|
||||
<entry file="file://$PROJECT_DIR$/src/App.class" />
|
||||
<entry file="file://$PROJECT_DIR$/src/DictionaryController$1.class" />
|
||||
<entry file="file://$PROJECT_DIR$/src/json/DictionaryEntry.java" />
|
||||
<entry file="file://$PROJECT_DIR$/src/secondary.fxml" />
|
||||
<entry file="file://$PROJECT_DIR$/src/primary.fxml" />
|
||||
<entry file="file://$PROJECT_DIR$/src/DictionaryController.class" />
|
||||
<entry file="file://$PROJECT_DIR$/src/json/DictionaryController.java" />
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.controls.jar!/javafx/scene/control/ComboBoxBase.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="247">
|
||||
<caret line="135" selection-start-line="135" selection-end-line="135" />
|
||||
<folding>
|
||||
<element signature="e#4575#4576#0" expanded="true" />
|
||||
<element signature="e#4608#4609#0" expanded="true" />
|
||||
<element signature="e#4778#4779#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.base.jar!/javafx/beans/property/ObjectPropertyBase.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="219">
|
||||
<caret line="63" selection-start-line="63" selection-end-line="63" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://$PROJECT_DIR$/../javafx-sdk-14/lib/javafx.fxml.jar!/javafx/fxml/FXMLLoader.class">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="185">
|
||||
<caret line="859" selection-start-line="859" selection-end-line="859" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<caret line="19" column="58" selection-start-line="19" selection-start-column="58" selection-end-line="19" selection-end-column="58" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/DictionaryEntry.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="68">
|
||||
<caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#199#200#0" expanded="true" />
|
||||
<element signature="e#243#244#0" expanded="true" />
|
||||
<element signature="e#478#479#0" expanded="true" />
|
||||
<element signature="e#516#517#0" expanded="true" />
|
||||
<element signature="e#566#567#0" expanded="true" />
|
||||
<element signature="e#612#613#0" expanded="true" />
|
||||
<element signature="e#648#649#0" expanded="true" />
|
||||
<element signature="e#684#685#0" expanded="true" />
|
||||
<element signature="e#730#731#0" expanded="true" />
|
||||
<element signature="e#772#773#0" expanded="true" />
|
||||
<element signature="e#812#813#0" expanded="true" />
|
||||
<element signature="e#851#852#0" expanded="true" />
|
||||
<element signature="e#903#904#0" expanded="true" />
|
||||
<element signature="e#951#952#0" expanded="true" />
|
||||
<element signature="e#995#996#0" expanded="true" />
|
||||
<element signature="e#1038#1039#0" expanded="true" />
|
||||
<element signature="e#1100#1101#0" expanded="true" />
|
||||
<element signature="e#1156#1157#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/MatchTheMeaning.fxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<caret line="13" column="102" selection-start-line="13" selection-start-column="102" selection-end-line="13" selection-end-column="102" />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/MyController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="801">
|
||||
<caret line="147" lean-forward="true" selection-start-line="147" selection-end-line="147" />
|
||||
<folding>
|
||||
<element signature="e#0#4821#0" expanded="true" />
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
<state key="ArtifactsStructureConfigurable.UI">
|
||||
<settings>
|
||||
<artifact-editor />
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="FacetStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>No facets are configured</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="GlobalLibrariesConfigurable.UI">
|
||||
<settings>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="JdkListConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>11</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="ModuleStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>Match the meaning</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
<option value="0.6" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="ProjectLibrariesConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>lib</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
</states>
|
||||
</component>
|
||||
</project>
|
||||
12
dev/20200421/maj83/Match the meaning/Match the meaning.iml
Normal file
12
dev/20200421/maj83/Match the meaning/Match the meaning.iml
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="lib" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
public class DictionaryEntry {
|
||||
|
||||
private String english;
|
||||
private String welsh;
|
||||
private String wordType;
|
||||
private boolean practiceWord;
|
||||
|
||||
|
||||
public DictionaryEntry(){
|
||||
practiceWord = false;
|
||||
}
|
||||
|
||||
public DictionaryEntry(String english, String welsh, String wordType ){
|
||||
this.english = english;
|
||||
this.welsh = welsh;
|
||||
this.wordType = wordType;
|
||||
}
|
||||
|
||||
public String getEnglish() {
|
||||
return english;
|
||||
}
|
||||
|
||||
public void setEnglish(String english) {
|
||||
this.english = english;
|
||||
}
|
||||
|
||||
public String getWelsh() {
|
||||
return welsh;
|
||||
}
|
||||
|
||||
public void setWelsh(String welsh) {
|
||||
this.welsh = welsh;
|
||||
}
|
||||
|
||||
|
||||
public String getWordType() {
|
||||
return wordType;
|
||||
}
|
||||
|
||||
public void setWordType(String wordType) {
|
||||
this.wordType = wordType;
|
||||
}
|
||||
|
||||
|
||||
public boolean isPracticeWord() {
|
||||
return practiceWord;
|
||||
}
|
||||
|
||||
|
||||
public void setPracticeWord(boolean practiceWord) {
|
||||
this.practiceWord = practiceWord;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "english='" + english + "'\t" +
|
||||
"welsh='" + welsh + "'\t" +
|
||||
"wordType='" + wordType + "'" +
|
||||
"practiceWord = " + practiceWord;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
32
dev/20200421/maj83/Match the meaning/src/Main.java
Normal file
32
dev/20200421/maj83/Match the meaning/src/Main.java
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
import javafx.application.Application;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
|
||||
public class Main extends Application{
|
||||
|
||||
public static LinkedList<DictionaryEntry> dictionary = new LinkedList();
|
||||
|
||||
public static void main(String[] args) {
|
||||
dictionary.add(new DictionaryEntry("abbey", "abaty", "nm"));
|
||||
dictionary.add(new DictionaryEntry("believe", "credu", "verb"));
|
||||
dictionary.add(new DictionaryEntry("concert", "cyngerdd", "nm"));
|
||||
dictionary.add(new DictionaryEntry("disease", "clefyd", "nm"));
|
||||
dictionary.add(new DictionaryEntry("extremely", "dros ben", "other"));
|
||||
dictionary.add(new DictionaryEntry("flu", "ffliw", "nm"));
|
||||
launch(args);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void start(Stage primaryStage) throws Exception{
|
||||
Pane mainPane = FXMLLoader.load(Main.class.getResource("MatchTheMeaning.fxml"));
|
||||
primaryStage.setScene(new Scene(mainPane));
|
||||
primaryStage.show();
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import java.lang.String?>
|
||||
<?import javafx.collections.FXCollections?>
|
||||
<?import javafx.scene.control.Button?>
|
||||
<?import javafx.scene.control.ComboBox?>
|
||||
<?import javafx.scene.control.Label?>
|
||||
<?import javafx.scene.layout.Pane?>
|
||||
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="MyController">
|
||||
<children>
|
||||
<Button fx:id="ConfirmButton" layoutX="271.0" layoutY="321.0" mnemonicParsing="false" text="Confirm" onAction="#checkAnswers" />
|
||||
<Label layoutX="248.0" layoutY="356.0" text="Match the meaning" />
|
||||
<ComboBox fx:id="word1" layoutX="448.0" layoutY="118.0" prefHeight="25.0" prefWidth="58.0" value="1">
|
||||
<items>
|
||||
<FXCollections fx:factory="observableArrayList">
|
||||
<String fx:value="1" />
|
||||
<String fx:value="2" />
|
||||
<String fx:value="3" />
|
||||
<String fx:value="4" />
|
||||
</FXCollections>
|
||||
</items>
|
||||
</ComboBox>
|
||||
<ComboBox fx:id="word2" layoutX="448.0" layoutY="153.0" prefHeight="25.0" prefWidth="58.0" value="1">
|
||||
<items>
|
||||
<FXCollections fx:factory="observableArrayList">
|
||||
<String fx:value="1" />
|
||||
<String fx:value="2" />
|
||||
<String fx:value="3" />
|
||||
<String fx:value="4" />
|
||||
</FXCollections>
|
||||
</items>
|
||||
</ComboBox>
|
||||
<ComboBox fx:id="word3" layoutX="448.0" layoutY="188.0" prefHeight="25.0" prefWidth="58.0" value="1">
|
||||
<items>
|
||||
<FXCollections fx:factory="observableArrayList">
|
||||
<String fx:value="1" />
|
||||
<String fx:value="2" />
|
||||
<String fx:value="3" />
|
||||
<String fx:value="4" />
|
||||
</FXCollections>
|
||||
</items>
|
||||
</ComboBox>
|
||||
<ComboBox fx:id="word4" layoutX="448.0" layoutY="223.0" prefHeight="25.0" prefWidth="58.0" value="1">
|
||||
<items>
|
||||
<FXCollections fx:factory="observableArrayList">
|
||||
<String fx:value="1" />
|
||||
<String fx:value="2" />
|
||||
<String fx:value="3" />
|
||||
<String fx:value="4" />
|
||||
</FXCollections>
|
||||
</items>
|
||||
</ComboBox>
|
||||
<Label fx:id="WelshWord1" layoutX="343.0" layoutY="122.0" text="Welsh word#3" />
|
||||
<Label fx:id="WelshWord2" layoutX="343.0" layoutY="157.0" text="Welsh word#2" />
|
||||
<Label fx:id="WelshWord3" layoutX="343.0" layoutY="192.0" text="Welsh word#1" />
|
||||
<Label fx:id="WelshWord4" layoutX="343.0" layoutY="227.0" text="Welsh word#4" />
|
||||
<Label fx:id="EngWord1" layoutX="115.0" layoutY="122.0" text="English Word #1" />
|
||||
<Label fx:id="EngWord2" layoutX="115.0" layoutY="157.0" text="English Word #2" />
|
||||
<Label fx:id="EngWord3" layoutX="115.0" layoutY="192.0" text="English Word #3" />
|
||||
<Label fx:id="EngWord4" layoutX="115.0" layoutY="227.0" text="English Word #4" />
|
||||
<Label layoutX="105.0" layoutY="122.0" text="1." />
|
||||
<Label layoutX="105.0" layoutY="157.0" text="2." />
|
||||
<Label layoutX="105.0" layoutY="192.0" text="3." />
|
||||
<Label layoutX="105.0" layoutY="227.0" text="4." />
|
||||
<Label layoutX="367.0" layoutY="23.0" text="Correct answers:" />
|
||||
<Label layoutX="368.0" layoutY="53.0" text="Wrong answers:" />
|
||||
<Label fx:id="CorrectAnswer" layoutX="463.0" layoutY="23.0" text="0" />
|
||||
<Label fx:id="WrongAnswer" layoutX="463.0" layoutY="53.0" text="0" />
|
||||
</children>
|
||||
</Pane>
|
||||
198
dev/20200421/maj83/Match the meaning/src/MyController.java
Normal file
198
dev/20200421/maj83/Match the meaning/src/MyController.java
Normal file
|
|
@ -0,0 +1,198 @@
|
|||
|
||||
/**
|
||||
* @(#) MyController.java 0,1 2020/04/07
|
||||
* <p>
|
||||
* Copyright (c) 2020 Aberystwyth University.
|
||||
* All rights reserved.
|
||||
*/
|
||||
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.Initializable;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* A class that generate questions and check answers for match the meaning test.
|
||||
*
|
||||
* @author Brad Corbett [brc9]
|
||||
* @author Henry Dugmore [hjd3]
|
||||
* @author Kain Bryan-Jones [kab74]
|
||||
* @author Luke Wybar [law39]
|
||||
* @author Marcin Jakobik [maj83]
|
||||
* @author Oscar Pocock [osp1]
|
||||
* @author Tom Perry [top1]
|
||||
* @author Waylen Watts [ncw]
|
||||
* @version 0.1 Initial development
|
||||
* @see Main
|
||||
*/
|
||||
|
||||
|
||||
public class MyController implements Initializable {
|
||||
|
||||
private Random rand = new Random();
|
||||
private LinkedList<DictionaryEntry> setOfQuestions=new LinkedList<>();
|
||||
private ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0,1,2,3));
|
||||
private int corAns = 0;
|
||||
private int wrongAns = 0;
|
||||
|
||||
|
||||
@FXML
|
||||
private ComboBox<String> word1;
|
||||
|
||||
@FXML
|
||||
private ComboBox<String> word2;
|
||||
|
||||
@FXML
|
||||
private ComboBox<String> word3;
|
||||
|
||||
@FXML
|
||||
private ComboBox<String> word4;
|
||||
|
||||
@FXML
|
||||
private Label EngWord1;
|
||||
|
||||
@FXML
|
||||
private Label EngWord2;
|
||||
|
||||
@FXML
|
||||
private Label EngWord3;
|
||||
|
||||
@FXML
|
||||
private Label EngWord4;
|
||||
|
||||
@FXML
|
||||
private Label WelshWord1;
|
||||
|
||||
@FXML
|
||||
private Label WelshWord2;
|
||||
|
||||
@FXML
|
||||
private Label WelshWord3;
|
||||
|
||||
@FXML
|
||||
private Label WelshWord4;
|
||||
|
||||
@FXML
|
||||
private Label CorrectAnswer;
|
||||
|
||||
@FXML
|
||||
private Label WrongAnswer;
|
||||
|
||||
|
||||
/**
|
||||
* Pick randomly dictionary entry and add it to question list where are stored questions for this test.
|
||||
*
|
||||
* @param dictionary main list of dictionary entries with words.
|
||||
*/
|
||||
private void getQuestions(LinkedList<DictionaryEntry> dictionary){
|
||||
|
||||
boolean isDuplicate = false;
|
||||
|
||||
do{
|
||||
int rand_q=rand.nextInt(dictionary.size()-1);
|
||||
|
||||
DictionaryEntry pickedQuestion = dictionary.get(rand_q);
|
||||
|
||||
//If size of list is greater than 1 check for duplicates...
|
||||
if(setOfQuestions.size()>=1){
|
||||
|
||||
for (DictionaryEntry setOfQuestion : setOfQuestions) {
|
||||
|
||||
//If it is duplicate change isDuplicate to true and break
|
||||
if (setOfQuestion.equals(pickedQuestion)) {
|
||||
isDuplicate = true;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//If duplicate wasn't found add entry to the list
|
||||
if(!isDuplicate){
|
||||
setOfQuestions.add(pickedQuestion);
|
||||
}
|
||||
|
||||
//... otherwise, add entry to the
|
||||
}else{
|
||||
setOfQuestions.add(pickedQuestion);
|
||||
}
|
||||
|
||||
isDuplicate =false;
|
||||
|
||||
}while(setOfQuestions.size()<5);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set chosen words from dictionary on the scene.
|
||||
*
|
||||
* @param questions list of dictionary entries chosen for this test.
|
||||
* @param orderList list of integers to change way of displaying welsh words.
|
||||
*/
|
||||
|
||||
|
||||
private void setWords(LinkedList<DictionaryEntry> questions, ArrayList<Integer> orderList){
|
||||
EngWord1.setText(questions.get(0).getEnglish());
|
||||
EngWord2.setText(questions.get(1).getEnglish());
|
||||
EngWord3.setText(questions.get(2).getEnglish());
|
||||
EngWord4.setText(questions.get(3).getEnglish());
|
||||
|
||||
Collections.shuffle(orderList);
|
||||
|
||||
WelshWord1.setText(questions.get(orderList.get(0)).getWelsh());
|
||||
WelshWord2.setText(questions.get(orderList.get(1)).getWelsh());
|
||||
WelshWord3.setText(questions.get(orderList.get(2)).getWelsh());
|
||||
WelshWord4.setText(questions.get(orderList.get(3)).getWelsh());
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if answers from users are correct.
|
||||
*/
|
||||
|
||||
public void checkAnswers(){
|
||||
int w1 = Integer.parseInt(word1.getValue())-1;
|
||||
int w2 = Integer.parseInt(word2.getValue())-1;
|
||||
int w3 = Integer.parseInt(word3.getValue())-1;
|
||||
int w4 = Integer.parseInt(word4.getValue())-1;
|
||||
|
||||
if(setOfQuestions.get(w1).getWelsh().equals(WelshWord1.getText())){
|
||||
corAns++;
|
||||
}else wrongAns++;
|
||||
|
||||
if(setOfQuestions.get(w2).getWelsh().equals(WelshWord2.getText())){
|
||||
corAns++;
|
||||
}else wrongAns++;
|
||||
|
||||
if(setOfQuestions.get(w3).getWelsh().equals(WelshWord3.getText())){
|
||||
corAns++;
|
||||
}else wrongAns++;
|
||||
|
||||
if(setOfQuestions.get(w4).getWelsh().equals(WelshWord4.getText())){
|
||||
corAns++;
|
||||
}else wrongAns++;
|
||||
|
||||
CorrectAnswer.setText(Integer.toString(corAns));
|
||||
|
||||
WrongAnswer.setText(Integer.toString(wrongAns));
|
||||
|
||||
setOfQuestions.clear();
|
||||
this.prepare();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Method responsible for preparing questions and scene.
|
||||
*/
|
||||
private void prepare(){
|
||||
getQuestions(Main.dictionary);
|
||||
setWords(setOfQuestions,orderList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(URL url, ResourceBundle resourceBundle) {
|
||||
|
||||
this.prepare();
|
||||
|
||||
}
|
||||
}
|
||||
Reference in a new issue