This commit is contained in:
Dawit Gulino 20013954
2018-05-31 16:00:00 +02:00
parent b79a7615d2
commit 2f5b7826d9
11 changed files with 252 additions and 90 deletions

245
.idea/workspace.xml generated
View File

@@ -2,14 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="bf16df42-e8f6-4a52-a6da-5bff747a1a87" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_main.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules/SeniorAssistant_test.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/SeniorAssistant.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/device/Hue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/device/Hue.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/tests/TestLights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestLights.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/TestLights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestLights.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.gradle/" />
<ignored path="$PROJECT_DIR$/build/" />
@@ -31,11 +34,10 @@
<file leaf-file-name="TestLights.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
<state relative-caret-position="221">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#351#359#0" expanded="true" />
</folding>
</state>
</provider>
@@ -44,21 +46,8 @@
<file leaf-file-name="Hue.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
<folding>
<element signature="e#520#521#0" expanded="true" />
<element signature="e#551#552#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Rest.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/manage/Rest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<state relative-caret-position="301">
<caret line="59" column="56" lean-forward="true" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
</state>
</provider>
</entry>
@@ -85,7 +74,7 @@
<component name="GradleLocalSettings">
<option name="myGradleHomes">
<map>
<entry key="$PROJECT_DIR$" value="C:\Users\f19st\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" />
<entry key="$PROJECT_DIR$" value="C:\Users\Dawit\.gradle\wrapper\dists\gradle-4.4-all\9br9xq1tocpiv8o6njlyu5op1\gradle-4.4" />
</map>
</option>
<option name="myGradleVersions">
@@ -260,6 +249,7 @@
</option>
<option name="modificationStamps">
<map>
<entry key="$PROJECT_DIR$" value="6111089685131" />
<entry key="$PROJECT_DIR$/.gradle" value="0" />
<entry key="$PROJECT_DIR$/build.gradle" value="2680631353" />
<entry key="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" value="2083459160" />
@@ -439,6 +429,7 @@
</option>
<option name="projectSyncType">
<map>
<entry key="$PROJECT_DIR$" value="RE_IMPORT" />
<entry key="$PROJECT_DIR$/../Spark-rest" value="PREVIEW" />
<entry key="$PROJECT_DIR$/../mqtt-intro" value="PREVIEW" />
</map>
@@ -447,8 +438,8 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/device/Hue.java" />
<option value="$PROJECT_DIR$/src/test/java/TestLights.java" />
<option value="$PROJECT_DIR$/src/main/java/device/Hue.java" />
</list>
</option>
</component>
@@ -478,68 +469,52 @@
<subPane>
<expand>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name=".gradle" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name=".gradle" type="462c0819:PsiDirectoryNode" />
<item name="4.4" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="gradle" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="device" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="manage" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant2" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant2" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
@@ -557,6 +532,9 @@
<property name="aspect.path.notification.shown" value="true" />
<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="Modules" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
@@ -655,65 +633,100 @@
<servers />
</component>
<component name="TestHistory">
<history-entry file="TestLights - 2018.05.29 at 09h 57m 50s.xml">
<history-entry file="TestLights - 2018.05.31 at 15h 15m 54s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 00m 46s.xml">
<history-entry file="TestLights - 2018.05.31 at 15h 19m 10s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 02m 22s.xml">
<history-entry file="TestLights - 2018.05.31 at 15h 20m 54s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 09m 06s.xml">
<history-entry file="TestLights - 2018.05.31 at 15h 24m 15s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 31m 26s.xml">
<history-entry file="TestLights - 2018.05.31 at 15h 29m 17s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 33m 54s.xml">
<history-entry file="TestLights - 2018.05.31 at 15h 32m 23s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.29 at 10h 35m 52s.xml">
<history-entry file="TestLights - 2018.05.31 at 15h 33m 01s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.31 at 15h 34m 38s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.31 at 15h 36m 59s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
<history-entry file="TestLights - 2018.05.31 at 15h 39m 18s.xml">
<configuration name="TestLights" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3638000" />
<option name="totallyTimeSpent" value="7123000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info anchor="right" id="Palette" />
<window_info anchor="right" id="sbt" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="right" id="Maven Projects" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info id="Capture Tool" />
<window_info id="Designer" />
<window_info anchor="bottom" id="Build" weight="0.3290938" />
<window_info anchor="bottom" id="Build" weight="0.32965517" />
<window_info anchor="right" id="Database" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Messages" />
<window_info anchor="bottom" id="Messages" order="7" />
<window_info anchor="right" id="Palette&#9;" />
<window_info id="Image Layers" />
<window_info anchor="right" id="Capture Analysis" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290938" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32965517" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Terminal" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24963397" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="bottom" id="sbt-shell-toolwindow" />
<window_info id="Learn" />
<window_info anchor="right" id="Gradle" />
<window_info anchor="right" id="Theme Preview" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="Build" order="7" weight="0.3290938" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="Palette" order="3" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290938" />
<window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="2" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24963397" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="right" id="Gradle" order="3" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -722,6 +735,9 @@
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<option name="LAST_COMMIT_MESSAGE" value="" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor" />
@@ -735,22 +751,17 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
<folding>
<element signature="e#520#521#0" expanded="true" />
<element signature="e#551#552#0" expanded="true" />
</folding>
<state relative-caret-position="301">
<caret line="59" column="56" lean-forward="true" selection-start-line="59" selection-start-column="56" selection-end-line="59" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
<state relative-caret-position="221">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#351#359#0" expanded="true" />
</folding>
</state>
</provider>
@@ -758,6 +769,66 @@
</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>1.8</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>SeniorAssistant_test|SeniorAssistant</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.6" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.8</last-edited>
@@ -770,6 +841,18 @@
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>