Skip to content

P
Projet GORDYJAN_BAGNOLY_GARCIA_POIGNONNEC
Commit 97b957a8 authored by Théo GORDYJAN's avatar Théo GORDYJAN
Browse files
Options

Add all the options

parent 96a0604c
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 45 deletions
garage/.idea/workspace.xml
View file @ 97b957a8
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="b9f7e8e0-35d9-4b18-a962-7ed056e3a2a5" name="Default Changelist" comment=""> <list default="true" id="b9f7e8e0-35d9-4b18-a962-7ed056e3a2a5" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Option/Aircon.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Option/CareerBars.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Option/ElectricGlass.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Option/GPS.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Option/HotSeat.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/Engine/ElectricEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/ElectricEngine.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Option/Option.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Option/Option.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Engine/Engine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/Engine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Engine/HybridEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/HybridEngine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Engine/PetrolEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/PetrolEngine.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -20,54 +22,88 @@ ...@@ -20,54 +22,88 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Engine/EngineType.java"> <entry file="file://$PROJECT_DIR$/src/Option/Option.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="75">
<caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" /> <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/TestEngine.java"> <entry file="file://$PROJECT_DIR$/src/Option/ElectricGlass.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="75">
<caret line="2" column="23" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" /> <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
<folding>
<element signature="e#97#98#0" expanded="true" />
<element signature="e#121#122#0" expanded="true" />
<element signature="e#159#160#0" expanded="true" />
<element signature="e#222#223#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/Main.java"> <entry file="file://$PROJECT_DIR$/src/Option/HotSeat.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="75">
<caret line="4" column="44" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" /> <caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
<folding>
<element signature="e#143#144#0" expanded="true" />
<element signature="e#169#170#0" expanded="true" />
<element signature="e#201#202#0" expanded="true" />
<element signature="e#268#269#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Engine/Engine.java"> <entry file="file://$PROJECT_DIR$/src/Option/Aircon.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="135">
<caret line="34" column="9" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" /> <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
<folding>
<element signature="e#86#87#0" expanded="true" />
<element signature="e#120#121#0" expanded="true" />
<element signature="e#156#157#0" expanded="true" />
<element signature="e#225#226#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Option/Option.java"> <entry file="file://$PROJECT_DIR$/src/Option/CareerBars.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="120">
<caret line="4" selection-start-line="4" selection-end-line="4" /> <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
<folding>
<element signature="e#89#90#0" expanded="true" />
<element signature="e#123#124#0" expanded="true" />
<element signature="e#159#160#0" expanded="true" />
<element signature="e#228#229#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/package-info.java"> <entry file="file://$PROJECT_DIR$/src/Option/GPS.java">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
<folding>
<element signature="e#88#89#0" expanded="true" />
<element signature="e#122#123#0" expanded="true" />
<element signature="e#158#159#0" expanded="true" />
<element signature="e#227#228#0" expanded="true" />
</folding>
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
...@@ -129,12 +165,17 @@ ...@@ -129,12 +165,17 @@
<option value="$PROJECT_DIR$/src/main/Vehicle.java" /> <option value="$PROJECT_DIR$/src/main/Vehicle.java" />
<option value="$PROJECT_DIR$/src/Vehicle/Brand.java" /> <option value="$PROJECT_DIR$/src/Vehicle/Brand.java" />
<option value="$PROJECT_DIR$/src/Vehicle/Vehicle.java" /> <option value="$PROJECT_DIR$/src/Vehicle/Vehicle.java" />
<option value="$PROJECT_DIR$/src/Option/Option.java" />
<option value="$PROJECT_DIR$/src/Engine/DieselEngine.java" /> <option value="$PROJECT_DIR$/src/Engine/DieselEngine.java" />
<option value="$PROJECT_DIR$/src/Engine/ElectricEngine.java" /> <option value="$PROJECT_DIR$/src/Engine/ElectricEngine.java" />
<option value="$PROJECT_DIR$/src/Engine/HybridEngine.java" /> <option value="$PROJECT_DIR$/src/Engine/HybridEngine.java" />
<option value="$PROJECT_DIR$/src/Engine/PetrolEngine.java" /> <option value="$PROJECT_DIR$/src/Engine/PetrolEngine.java" />
<option value="$PROJECT_DIR$/src/Engine/Engine.java" /> <option value="$PROJECT_DIR$/src/Engine/Engine.java" />
<option value="$PROJECT_DIR$/src/Option/Option.java" />
<option value="$PROJECT_DIR$/src/Option/GPS.java" />
<option value="$PROJECT_DIR$/src/Option/ElectricGlass.java" />
<option value="$PROJECT_DIR$/src/Option/HotSeat.java" />
<option value="$PROJECT_DIR$/src/Option/Aircon.java" />
<option value="$PROJECT_DIR$/src/Option/CareerBars.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -152,6 +193,7 @@ ...@@ -152,6 +193,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -198,7 +240,6 @@ ...@@ -198,7 +240,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
</panes> </panes>
</component> </component>
...@@ -265,8 +306,9 @@ ...@@ -265,8 +306,9 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1941" y="45" width="1878" height="1014" extended-state="0" /> <frame x="1941" y="45" width="1878" height="1014" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13344227" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13562092" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
...@@ -329,6 +371,13 @@ ...@@ -329,6 +371,13 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Option.java" /> <entry file="file://$PROJECT_DIR$/src/Option.java" />
<entry file="file://$PROJECT_DIR$/src/Engine/EngineType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="28" selection-start-line="28" selection-end-line="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/TestEngine.java"> <entry file="file://$PROJECT_DIR$/src/test/TestEngine.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
...@@ -343,20 +392,20 @@ ...@@ -343,20 +392,20 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Option/Option.java"> <entry file="file://$PROJECT_DIR$/src/Engine/Engine.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="480">
<caret line="4" selection-start-line="4" selection-end-line="4" /> <caret line="34" column="9" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/package-info.java"> <entry file="file://$PROJECT_DIR$/src/package-info.java">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/DieselEngine.java"> <entry file="file://$PROJECT_DIR$/src/Engine/HybridEngine.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="150">
<caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" /> <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -367,31 +416,89 @@ ...@@ -367,31 +416,89 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/EngineType.java"> <entry file="file://$PROJECT_DIR$/src/Engine/PetrolEngine.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="150">
<caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" /> <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/HybridEngine.java"> <entry file="file://$PROJECT_DIR$/src/Engine/DieselEngine.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="165">
<caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" /> <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/PetrolEngine.java"> <entry file="file://$PROJECT_DIR$/src/Option/Aircon.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="135">
<caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" /> <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
<folding>
<element signature="e#86#87#0" expanded="true" />
<element signature="e#120#121#0" expanded="true" />
<element signature="e#156#157#0" expanded="true" />
<element signature="e#225#226#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/Engine.java"> <entry file="file://$PROJECT_DIR$/src/Option/ElectricGlass.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="75">
<caret line="34" column="9" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" /> <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
<folding>
<element signature="e#97#98#0" expanded="true" />
<element signature="e#121#122#0" expanded="true" />
<element signature="e#159#160#0" expanded="true" />
<element signature="e#222#223#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Option/CareerBars.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
<folding>
<element signature="e#89#90#0" expanded="true" />
<element signature="e#123#124#0" expanded="true" />
<element signature="e#159#160#0" expanded="true" />
<element signature="e#228#229#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Option/GPS.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
<folding>
<element signature="e#88#89#0" expanded="true" />
<element signature="e#122#123#0" expanded="true" />
<element signature="e#158#159#0" expanded="true" />
<element signature="e#227#228#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Option/HotSeat.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
<folding>
<element signature="e#143#144#0" expanded="true" />
<element signature="e#169#170#0" expanded="true" />
<element signature="e#201#202#0" expanded="true" />
<element signature="e#268#269#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Option/Option.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
garage/src/Option/Aircon.java 0 → 100644
View file @ 97b957a8
package Option;
public class Aircon implements Option {
public double getPrice() {
return 300d;
}
public String toString() {
return "Aircon (" + this.getPrice() + " €)";
}
}
garage/src/Option/CareerBars.java 0 → 100644
View file @ 97b957a8
package Option;
public class CareerBars implements Option{
public double getPrice() {
return 100;
}
public String toString() {
return "Career bars (" + this.getPrice() + " €)";
}
}
garage/src/Option/ElectricGlass.java 0 → 100644
View file @ 97b957a8
package Option;
public class ElectricGlass implements Option{
public double getPrice() {
return 200d;
}
public String toString() {
return "Electric glass (" + this.getPrice() + " €)";
}
}
garage/src/Option/GPS.java 0 → 100644
View file @ 97b957a8
package Option;
public class GPS implements Option {
public double getPrice() {
return 50d;
}
public String toString() {
return "GPS (" + this.getPrice() + " €)";
}
}
garage/src/Option/HotSeat.java 0 → 100644
View file @ 97b957a8
package Option;
public class HotSeat implements Option {
public double getPrice() {
return 150d;
}
public String toString() {
return "Hot seat (" + this.getPrice() + " €)";
}
}
}
garage/src/Option/Option.java
View file @ 97b957a8
package Option; package Option;
public class Option { public interface Option {
double getPrice();
String toString();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment