From e9c420402a5b23e5e3915c63288d7da603d87fe6 Mon Sep 17 00:00:00 2001
From: maj83 <maj83@aber.ac.uk>
Date: Tue, 14 Apr 2020 11:32:01 +0100
Subject: [PATCH] Match the meaning concept

---
 dev/20200407/maj83/.idea/.gitkeep             |   0
 dev/20200407/maj83/.idea/encodings.xml        |   4 +
 dev/20200407/maj83/.idea/libraries/lib.xml    |  13 +
 dev/20200407/maj83/.idea/misc.xml             |   6 +
 dev/20200407/maj83/.idea/modules.xml          |   8 +
 dev/20200407/maj83/.idea/workspace.xml        | 397 ++++++++++++++++++
 dev/20200407/maj83/Match the meaning.iml      |  12 +
 .../Match the meaning/DictionaryEntry.class   | Bin 0 -> 1947 bytes
 .../production/Match the meaning/Main.class   | Bin 0 -> 1044 bytes
 .../Match the meaning/MatchTheMeaning.fxml    |  67 +++
 .../Match the meaning/MyController.class      | Bin 0 -> 3626 bytes
 dev/20200407/maj83/src/DictionaryEntry.java   |  64 +++
 dev/20200407/maj83/src/Main.java              |  23 +
 dev/20200407/maj83/src/MatchTheMeaning.fxml   |  67 +++
 dev/20200407/maj83/src/MyController.java      |  98 +++++
 15 files changed, 759 insertions(+)
 delete mode 100644 dev/20200407/maj83/.idea/.gitkeep
 create mode 100644 dev/20200407/maj83/.idea/encodings.xml
 create mode 100644 dev/20200407/maj83/.idea/libraries/lib.xml
 create mode 100644 dev/20200407/maj83/.idea/misc.xml
 create mode 100644 dev/20200407/maj83/.idea/modules.xml
 create mode 100644 dev/20200407/maj83/.idea/workspace.xml
 create mode 100644 dev/20200407/maj83/Match the meaning.iml
 create mode 100644 dev/20200407/maj83/out/production/Match the meaning/DictionaryEntry.class
 create mode 100644 dev/20200407/maj83/out/production/Match the meaning/Main.class
 create mode 100644 dev/20200407/maj83/out/production/Match the meaning/MatchTheMeaning.fxml
 create mode 100644 dev/20200407/maj83/out/production/Match the meaning/MyController.class
 create mode 100644 dev/20200407/maj83/src/DictionaryEntry.java
 create mode 100644 dev/20200407/maj83/src/Main.java
 create mode 100644 dev/20200407/maj83/src/MatchTheMeaning.fxml
 create mode 100644 dev/20200407/maj83/src/MyController.java

diff --git a/dev/20200407/maj83/.idea/.gitkeep b/dev/20200407/maj83/.idea/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/dev/20200407/maj83/.idea/encodings.xml b/dev/20200407/maj83/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/dev/20200407/maj83/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/dev/20200407/maj83/.idea/libraries/lib.xml b/dev/20200407/maj83/.idea/libraries/lib.xml
new file mode 100644
index 0000000..a54ea18
--- /dev/null
+++ b/dev/20200407/maj83/.idea/libraries/lib.xml
@@ -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>
\ No newline at end of file
diff --git a/dev/20200407/maj83/.idea/misc.xml b/dev/20200407/maj83/.idea/misc.xml
new file mode 100644
index 0000000..e0844bc
--- /dev/null
+++ b/dev/20200407/maj83/.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" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/dev/20200407/maj83/.idea/modules.xml b/dev/20200407/maj83/.idea/modules.xml
new file mode 100644
index 0000000..300bb9a
--- /dev/null
+++ b/dev/20200407/maj83/.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$/Match the meaning.iml" filepath="$PROJECT_DIR$/Match the meaning.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/dev/20200407/maj83/.idea/workspace.xml b/dev/20200407/maj83/.idea/workspace.xml
new file mode 100644
index 0000000..781e04a
--- /dev/null
+++ b/dev/20200407/maj83/.idea/workspace.xml
@@ -0,0 +1,397 @@
+<?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="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="391">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/MyController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-34">
+              <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+              <folding>
+                <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="442">
+              <caret line="26" column="30" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="30" />
+              <folding>
+                <element signature="e#234#235#0" expanded="true" />
+                <element signature="e#278#279#0" expanded="true" />
+                <element signature="e#513#514#0" expanded="true" />
+                <element signature="e#551#552#0" expanded="true" />
+                <element signature="e#601#602#0" expanded="true" />
+                <element signature="e#647#648#0" expanded="true" />
+                <element signature="e#683#684#0" expanded="true" />
+                <element signature="e#719#720#0" expanded="true" />
+                <element signature="e#765#766#0" expanded="true" />
+                <element signature="e#807#808#0" expanded="true" />
+                <element signature="e#847#848#0" expanded="true" />
+                <element signature="e#886#887#0" expanded="true" />
+                <element signature="e#938#939#0" expanded="true" />
+                <element signature="e#986#987#0" expanded="true" />
+                <element signature="e#1030#1031#0" expanded="true" />
+                <element signature="e#1073#1074#0" expanded="true" />
+                <element signature="e#1135#1136#0" expanded="true" />
+                <element signature="e#1191#1192#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/MatchTheMeaning.fxml">
+          <provider editor-type-id="JavaFX-Scene-Builder" />
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="374">
+              <caret line="22" column="17" lean-forward="true" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
+            </state>
+          </provider>
+        </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/MyController.java" />
+        <option value="$PROJECT_DIR$/src/Main.java" />
+        <option value="$PROJECT_DIR$/src/MatchTheMeaning.fxml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-9" />
+    <option name="y" value="-9" />
+    <option name="width" value="1938" />
+    <option name="height" value="1058" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <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="out" 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>
+      <pane id="PackagesPane" />
+    </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="1586814345266" />
+    <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" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="19413000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" 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 anchor="bottom" id="Run" order="2" weight="0.21776815" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.24485373" />
+      <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&#9;" order="8" />
+    </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&#9;" 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="file://$PROJECT_DIR$/src/MyController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-34">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+          <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="442">
+          <caret line="26" column="30" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="30" />
+          <folding>
+            <element signature="e#234#235#0" expanded="true" />
+            <element signature="e#278#279#0" expanded="true" />
+            <element signature="e#513#514#0" expanded="true" />
+            <element signature="e#551#552#0" expanded="true" />
+            <element signature="e#601#602#0" expanded="true" />
+            <element signature="e#647#648#0" expanded="true" />
+            <element signature="e#683#684#0" expanded="true" />
+            <element signature="e#719#720#0" expanded="true" />
+            <element signature="e#765#766#0" expanded="true" />
+            <element signature="e#807#808#0" expanded="true" />
+            <element signature="e#847#848#0" expanded="true" />
+            <element signature="e#886#887#0" expanded="true" />
+            <element signature="e#938#939#0" expanded="true" />
+            <element signature="e#986#987#0" expanded="true" />
+            <element signature="e#1030#1031#0" expanded="true" />
+            <element signature="e#1073#1074#0" expanded="true" />
+            <element signature="e#1135#1136#0" expanded="true" />
+            <element signature="e#1191#1192#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/MatchTheMeaning.fxml">
+      <provider editor-type-id="JavaFX-Scene-Builder" />
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="17" lean-forward="true" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
+        </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>
\ No newline at end of file
diff --git a/dev/20200407/maj83/Match the meaning.iml b/dev/20200407/maj83/Match the meaning.iml
new file mode 100644
index 0000000..fb8e866
--- /dev/null
+++ b/dev/20200407/maj83/Match the meaning.iml	
@@ -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>
\ No newline at end of file
diff --git a/dev/20200407/maj83/out/production/Match the meaning/DictionaryEntry.class b/dev/20200407/maj83/out/production/Match the meaning/DictionaryEntry.class
new file mode 100644
index 0000000000000000000000000000000000000000..b3dddef476f23ccc3c8d359279b98c2cfb14fc96
GIT binary patch
literal 1947
zcma)+ZBNrs6vxlqy63?*90LRq6l5z;3Me8E8WEy#J|qxG@KqTNE0mVB1+s7Ahwz0a
z5))qd0sK(L|7q)1wqktIbMHMn_uSt-=YRL>_tj4#TBPS`O45TAC1`?8nN5X_+=Jg|
z5;U8jhk_ESaj0u{T~JT;NI6$#b;UTG-Eu6=I9wJKyHIuhF?nHH2iuKPRZ#ZSQfiJ?
zQ+MGKB=!WwS2RO&)&xb%l^sFSx_N-WTvapF_h%>js<o}`>+tkc&6=X`D3-=+-zhnD
z%@$OszS5A^G!(0`VK`O;r!SQ|nf}Ma5a~nJ+4y_6V!6_}4>5KirZ?m;PLxEVUB3#5
z_oo^5HfxgMADXLf&Hi|;Mkoualta*Uzf|6HPjF1H;2_#E&#aodsd2fAZ55f}24yKn
z`7Cu&ca~C=&QgX=mePXqFHO_29ZNZVr#f}>z|O_#QIh7eG*1gSzbzd$v^xG_|46Ml
zX?jdg1kL%PSe+0PDOUmB%)cQof+84M9T9^1PLyMH-85>7v#U9E%xp(79JKarNM$?Q
z(dpR>X<C97`8p8CSPNb=&dp=hSFMMz35}XoBSEW>XVo;1&rTuTH-@2F>$+mwD!4ue
zx%?bn<z6esfv(zP-p1ulw1DT@Mt&k8;hzHWUZt0Vck@%ME4sd=IqGtP@Rr6q?ia=;
zX!zf8G>SK$#FLjO!h*pp!kTeM$i^L^CX5+^NGK0mz-k3?0%KbKK|+pRQskQ(%YPr;
z6opM8XBsv`x3J23(Nv^ftT<E2&!i)h1Ygn3G<iu;dFqlRdHRxKt(+x_A*KtF-N>1P
z%_DEY%`JQT{oKgp-h}Cj?p-48jBgXgnSIpnpFE3^qhj)Rihji;LX01Goy7oltcg89
zxBbm)h~~s`nUPzdY1i8i+yOU3$%|^j#eFzIgP|Z&JIGKd$WS<l)DAKNkkK1JxX)aH
zJE0)4c98K<kl}EUK<m7UQ~)C10K%<dkh?SjTR>HVt%-bTYt2k3$SB?OH@8|dcukic
z$UHz6ZUAAWGsyjBMP5K#tdSCH1fPVD^%A*)PN=;^O98Ty-|{Gpx%}hw3?pCkDPGSK
O<S~hL66+~^(|-VYjA?%W

literal 0
HcmV?d00001

diff --git a/dev/20200407/maj83/out/production/Match the meaning/Main.class b/dev/20200407/maj83/out/production/Match the meaning/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..bf3ec4d5edd3926a53a9532ac58f528c271d0b21
GIT binary patch
literal 1044
zcmZuwTTj$L7(K%-bSV{dfdx^yd0Q@074IMkA@bB!0!TDI4Q1FZ>9(7;tMIdYS%@aa
zXMdFOOuJGsJaoR9Z@zQB%bEWA{p|;U=U6jgVb(+ew+-AW;jW2$xNoA0IRo<s7EF||
zXyO5u^kN%$DA2d+1zxfyP^ixB2^2TN10^uzc!7G`ZtkmSSMK}tl%3F({+^6HeeODo
zNyCfD;nbuTtPtI#6{u7{IY;udw0#-W?VTj@g8E9zE~7f*hcCGn=#3K@B?4pB6nuDW
z(@|H%b4}q^EApB$I!QeOBbUVqlynhWGGNgY=Mk<76w5gY+lj63SgiTx*j25>3xn9e
zBc6A{cI2u}Pq*8zJ6h6BSh#{g3y(3%{<N2gYcg>gyA4%SGGK2@hsRCdz_NuWcxvF8
zMKN9ojBB`V<NxHG=7p;r9ia2PH1Nv83RW$=#-PAtH%zu#zUN9^tG%A@IY}LmjrqJA
z>fy_F;5H~@e!bz#n4=%4t7KcnX{Q3S*{Cn-lt~w;#D2f+a88wO5xPlx^Fz&XLV2Jf
zPQ&LWC;5w*%Lr2K-|ZhMHzCP*E^0cBEg7jGNmV_cMXokQj8&43<-&VNp{YB2PH`jr
zf*C$|i$4Hpg%*qJ5KlI(pzWPMh4{)%53X|UOPwWL<KD^wP{uG%{TRV0JsP}Bn}N^J
zlY>o?fH{iH@-IOJWAw94TxWzP@EB8|ohlc~#SVJU(DxHYZQ(mg9~V#2-+{T%!9Y%3
tCIGBskX1~uj!9I~6w?_^w?-23_6Aew0&e0K(@hdrq-ToXH1|E2`2){a=(GR;

literal 0
HcmV?d00001

diff --git a/dev/20200407/maj83/out/production/Match the meaning/MatchTheMeaning.fxml b/dev/20200407/maj83/out/production/Match the meaning/MatchTheMeaning.fxml
new file mode 100644
index 0000000..ffa4d88
--- /dev/null
+++ b/dev/20200407/maj83/out/production/Match the meaning/MatchTheMeaning.fxml	
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.collections.*?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Pane?>
+
+<?import java.lang.String?>
+<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"/>
+      <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">
+              <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" promptText="#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" promptText="#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" promptText="#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="192.0" text="Welsh word#2" />
+      <Label fx:id="WelshWord3" layoutX="343.0" layoutY="157.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." />
+   </children>
+</Pane>
diff --git a/dev/20200407/maj83/out/production/Match the meaning/MyController.class b/dev/20200407/maj83/out/production/Match the meaning/MyController.class
new file mode 100644
index 0000000000000000000000000000000000000000..d70acfc4c9769473870f8dc85f8cfa9bb2030323
GIT binary patch
literal 3626
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
K&e3cH=RXIL@KzcC

literal 0
HcmV?d00001

diff --git a/dev/20200407/maj83/src/DictionaryEntry.java b/dev/20200407/maj83/src/DictionaryEntry.java
new file mode 100644
index 0000000..9829506
--- /dev/null
+++ b/dev/20200407/maj83/src/DictionaryEntry.java
@@ -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;
+        }
+
+}
+
diff --git a/dev/20200407/maj83/src/Main.java b/dev/20200407/maj83/src/Main.java
new file mode 100644
index 0000000..09e948f
--- /dev/null
+++ b/dev/20200407/maj83/src/Main.java
@@ -0,0 +1,23 @@
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
+
+
+public class Main extends Application{
+
+    public static void main(String[] args) {
+
+
+        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();
+     }
+}
diff --git a/dev/20200407/maj83/src/MatchTheMeaning.fxml b/dev/20200407/maj83/src/MatchTheMeaning.fxml
new file mode 100644
index 0000000..ffa4d88
--- /dev/null
+++ b/dev/20200407/maj83/src/MatchTheMeaning.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.collections.*?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Pane?>
+
+<?import java.lang.String?>
+<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"/>
+      <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">
+              <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" promptText="#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" promptText="#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" promptText="#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="192.0" text="Welsh word#2" />
+      <Label fx:id="WelshWord3" layoutX="343.0" layoutY="157.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." />
+   </children>
+</Pane>
diff --git a/dev/20200407/maj83/src/MyController.java b/dev/20200407/maj83/src/MyController.java
new file mode 100644
index 0000000..ed8b544
--- /dev/null
+++ b/dev/20200407/maj83/src/MyController.java
@@ -0,0 +1,98 @@
+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.*;
+
+public class MyController implements Initializable {
+
+    private Random rand = new Random();
+    public LinkedList<DictionaryEntry> setOfQuestions=new LinkedList<>();
+    private ArrayList<Integer> temp1 = new ArrayList<>(Arrays.asList(0,1,2,3));
+
+    @FXML
+    private ComboBox<?> word1;
+
+    @FXML
+    private ComboBox<?> word2;
+
+    @FXML
+    private ComboBox<?> word3;
+
+    @FXML
+    private ComboBox<?> 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;
+
+    private void TestLabel(LinkedList<DictionaryEntry> questions, ArrayList<Integer> randOrder){
+        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(randOrder);
+
+        WelshWord1.setText(questions.get(randOrder.get(0)).getWelsh());
+        WelshWord2.setText(questions.get(randOrder.get(1)).getWelsh());
+        WelshWord3.setText(questions.get(randOrder.get(2)).getWelsh());
+        WelshWord4.setText(questions.get(randOrder.get(3)).getWelsh());
+    }
+
+    private LinkedList<DictionaryEntry> getQuestions(LinkedList<DictionaryEntry> dictionary){
+
+        do{
+            int rand_q=rand.nextInt(dictionary.size()-1);
+            DictionaryEntry pickedQuestion = dictionary.get(rand_q);
+            if(setOfQuestions.size()>1){
+                for(int i=0;i<setOfQuestions.size();i++){
+                    if(setOfQuestions.get(i).equals(pickedQuestion)){
+                        break;
+                    }else {
+                        setOfQuestions.add(pickedQuestion);
+                    }
+                }
+            }else{
+                setOfQuestions.add(pickedQuestion);
+            }
+
+        }while(setOfQuestions.size()<5);
+        return setOfQuestions;
+    }
+
+    private void fill(){
+        setOfQuestions.add(new DictionaryEntry("abbey", "abaty", "nm"));
+        setOfQuestions.add(new DictionaryEntry("believe", "credu", "verb"));
+        setOfQuestions.add(new DictionaryEntry("concert", "cyngerdd", "nm"));
+        setOfQuestions.add(new DictionaryEntry("disease", "clefyd", "nm"));
+    }
+
+    @Override
+    public void initialize(URL url, ResourceBundle resourceBundle) {
+        this.fill();
+        TestLabel(setOfQuestions,temp1);
+    }
+}