Skip to content

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

Modify engine type and add interface Option

parent 60366711
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 63 deletions
garage/.idea/workspace.xml
View file @ fa45fb1e
...@@ -2,19 +2,11 @@ ...@@ -2,19 +2,11 @@
<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$/.idea/uiDesigner.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/Option/Option.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Engine/DieselEngine.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/package-info.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Engine/ElectricEngine.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Engine/Engine.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Engine/HybridEngine.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Engine/PetrolEngine.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/Garage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/TestEngine.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/TestVehicle.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/main/Brand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Vehicle/Brand.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Engine/DieselEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/DieselEngine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/EngineType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/EngineType.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/main/Vehicle.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Vehicle/Vehicle.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" />
...@@ -28,15 +20,6 @@ ...@@ -28,15 +20,6 @@
</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">
<entry file="file://$PROJECT_DIR$/src/Vehicle/Vehicle.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Engine/EngineType.java"> <entry file="file://$PROJECT_DIR$/src/Engine/EngineType.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -46,15 +29,6 @@ ...@@ -46,15 +29,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/TestVehicle.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
</state>
</provider>
</entry>
</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/test/TestEngine.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -76,12 +50,30 @@ ...@@ -76,12 +50,30 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Engine/Engine.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="150"> <state relative-caret-position="435">
<caret line="10" selection-start-line="10" selection-end-line="10" /> <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
<folding>
<element signature="e#446#447#0" expanded="true" />
<element signature="e#472#473#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Option/Option.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/package-info.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Engine/HybridEngine.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">
...@@ -112,8 +104,12 @@ ...@@ -112,8 +104,12 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Engine/DieselEngine.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="30"> <state relative-caret-position="165">
<caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> <caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
<folding>
<element signature="e#234#235#0" expanded="true" />
<element signature="e#255#256#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -123,6 +119,7 @@ ...@@ -123,6 +119,7 @@
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="package-info" />
<option value="Class" /> <option value="Class" />
</list> </list>
</option> </option>
...@@ -139,16 +136,18 @@ ...@@ -139,16 +136,18 @@
<option value="$PROJECT_DIR$/src/main/EngineType.java" /> <option value="$PROJECT_DIR$/src/main/EngineType.java" />
<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/Engine/Engine.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/Engine.java" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="21" /> <option name="x" value="21" />
<option name="y" value="1108" /> <option name="y" value="28" />
<option name="width" value="1878" /> <option name="width" value="1878" />
<option name="height" value="1014" /> <option name="height" value="1031" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -158,6 +157,7 @@ ...@@ -158,6 +157,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
...@@ -183,6 +183,12 @@ ...@@ -183,6 +183,12 @@
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="garage" type="b2602c69:ProjectViewProjectNode" />
<item name="garage" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="Option" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="garage" type="b2602c69:ProjectViewProjectNode" /> <item name="garage" type="b2602c69:ProjectViewProjectNode" />
<item name="garage" type="462c0819:PsiDirectoryNode" /> <item name="garage" type="462c0819:PsiDirectoryNode" />
...@@ -199,7 +205,6 @@ ...@@ -199,7 +205,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -264,10 +269,10 @@ ...@@ -264,10 +269,10 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="21" y="1108" width="1878" height="1014" extended-state="0" /> <frame x="21" y="28" width="1878" height="1031" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13562092" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13671024" />
<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" />
...@@ -275,7 +280,7 @@ ...@@ -275,7 +280,7 @@
<window_info id="Capture Tool" order="5" /> <window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" /> <window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" visible="true" weight="0.3297062" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3292683" /> <window_info anchor="bottom" id="Run" order="2" weight="0.3292683" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <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="Cvs" order="4" weight="0.25" />
...@@ -315,10 +320,10 @@ ...@@ -315,10 +320,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/EngineType.java"> <entry file="file://$PROJECT_DIR$/src/Vehicle/Vehicle.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="60">
<caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" /> <caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -329,45 +334,48 @@ ...@@ -329,45 +334,48 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/HybridEngine.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">
<caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> <caret line="2" column="23" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/PetrolEngine.java"> <entry file="file://$PROJECT_DIR$/src/main/Main.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="60">
<caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> <caret line="4" column="44" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
</state> </state>
</provider> </provider>
</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="30"> <state relative-caret-position="30">
<caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/test/TestEngine.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="30">
<caret line="2" column="23" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" /> <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/Main.java"> <entry file="file://$PROJECT_DIR$/src/package-info.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Option.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state>
<caret line="4" column="44" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" /> <caret column="13" selection-start-column="13" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Vehicle/Vehicle.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="60"> <state relative-caret-position="60">
<caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" /> <caret line="4" selection-start-line="4" selection-end-line="4" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -378,10 +386,32 @@ ...@@ -378,10 +386,32 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/EngineType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Engine/DieselEngine.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
<folding>
<element signature="e#234#235#0" expanded="true" />
<element signature="e#255#256#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Engine/Engine.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="150"> <state relative-caret-position="435">
<caret line="10" selection-start-line="10" selection-end-line="10" /> <caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
<folding>
<element signature="e#446#447#0" expanded="true" />
<element signature="e#472#473#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
garage/src/Engine/DieselEngine.java
View file @ fa45fb1e
package Engine; package Engine;
public class DieselEngine { public class DieselEngine extends Engine {
public DieselEngine(String _cylindre, Double _price) {
super(_cylindre, _price);
this.type = EngineType.DIESEL;
}
public String toString() {
return "Diesel Engine";
}
} }
garage/src/Engine/Engine.java
View file @ fa45fb1e
...@@ -2,18 +2,23 @@ package Engine; ...@@ -2,18 +2,23 @@ package Engine;
public class Engine { public class Engine {
private EngineType type; protected EngineType type;
private String cylindre; private String cylindre;
private Double price; private Double price;
public Engine (EngineType _type, String _cylindyre, Double price) { public Engine (String _cylindre, Double _price) {
this.cylindre = _cylindre;
this.price = _price;
} }
public String toString() { public String toString() {
return "This vehicle has a " + cylindre + "engine, it's a " + type + " engine and it costs " + price + " €.";
}
public String getCylindre() {
return this.cylindre;
} }
public Double getPrice() { public Double getPrice() {
......
garage/src/Option/Option.java 0 → 100644
View file @ fa45fb1e
package Option;
public class Option {
}
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