Skip to content

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

Finished the Engine package

parent fa45fb1e
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 68 deletions
garage/.idea/workspace.xml
View file @ 96a0604c
...@@ -2,11 +2,11 @@ ...@@ -2,11 +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$/src/Option/Option.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/package-info.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/DieselEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/DieselEngine.java" 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/Engine/Engine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Engine/Engine.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" />
...@@ -50,12 +50,8 @@ ...@@ -50,12 +50,8 @@
<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="435"> <state relative-caret-position="480">
<caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" /> <caret line="34" column="9" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
<folding>
<element signature="e#446#447#0" expanded="true" />
<element signature="e#472#473#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -77,8 +73,8 @@ ...@@ -77,8 +73,8 @@
<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">
<state relative-caret-position="30"> <state relative-caret-position="150">
<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="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -86,8 +82,8 @@ ...@@ -86,8 +82,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Engine/ElectricEngine.java"> <entry file="file://$PROJECT_DIR$/src/Engine/ElectricEngine.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="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" /> <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="12" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -95,8 +91,8 @@ ...@@ -95,8 +91,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Engine/PetrolEngine.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="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" /> <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>
...@@ -105,11 +101,7 @@ ...@@ -105,11 +101,7 @@
<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="165"> <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" /> <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<folding>
<element signature="e#234#235#0" expanded="true" />
<element signature="e#255#256#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -139,15 +131,18 @@ ...@@ -139,15 +131,18 @@
<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/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/HybridEngine.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" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="21" /> <option name="x" value="1941" />
<option name="y" value="28" /> <option name="y" value="45" />
<option name="width" value="1878" /> <option name="width" value="1878" />
<option name="height" value="1031" /> <option name="height" value="1014" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -157,8 +152,6 @@ ...@@ -157,8 +152,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -205,6 +198,8 @@ ...@@ -205,6 +198,8 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -269,10 +264,9 @@ ...@@ -269,10 +264,9 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="21" y="28" width="1878" height="1031" 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.13671024" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13344227" />
<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" />
...@@ -334,6 +328,7 @@ ...@@ -334,6 +328,7 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Option.java" />
<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">
...@@ -348,70 +343,55 @@ ...@@ -348,70 +343,55 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/HybridEngine.java"> <entry file="file://$PROJECT_DIR$/src/Option/Option.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
</state>
</provider>
</entry>
<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="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" selection-start-line="4" selection-end-line="4" />
</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/Option.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> <state relative-caret-position="165">
<caret column="13" selection-start-column="13" selection-end-column="13" /> <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/Option/Option.java"> <entry file="file://$PROJECT_DIR$/src/Engine/ElectricEngine.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" selection-start-line="4" selection-end-line="4" /> <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="12" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/ElectricEngine.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">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" /> <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Engine/EngineType.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="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/DieselEngine.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="165"> <state relative-caret-position="150">
<caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" /> <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
<folding>
<element signature="e#234#235#0" expanded="true" />
<element signature="e#255#256#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/Engine/Engine.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435"> <state relative-caret-position="480">
<caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" /> <caret line="34" column="9" selection-start-line="34" selection-start-column="9" selection-end-line="34" selection-end-column="9" />
<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/ElectricEngine.java
View file @ 96a0604c
package Engine; package Engine;
public class ElectricEngine { public class ElectricEngine extends Engine {
public ElectricEngine(String _cylindre, Double _price) {
super(_cylindre, _price);
this.type = EngineType.ELECTRIC;
}
public String toString() {
return "Electric Engine";
}
} }
garage/src/Engine/Engine.java
View file @ 96a0604c
...@@ -3,13 +3,13 @@ package Engine; ...@@ -3,13 +3,13 @@ package Engine;
public class Engine { public class Engine {
protected EngineType type; protected EngineType type;
private String cylindre; protected String cylindre;
private Double price; protected Double price;
public Engine (String _cylindre, Double _price) { public Engine (String _cylindre, Double _price) {
this.cylindre = _cylindre; this.cylindre = _cylindre;
this.price = _price; this.price = getPrice();
} }
...@@ -22,7 +22,17 @@ public class Engine { ...@@ -22,7 +22,17 @@ public class Engine {
} }
public Double getPrice() { public Double getPrice() {
if (this.getClass() == DieselEngine.class) {
return 2000d;
} else if (this.getClass() == ElectricEngine.class) {
return 1800d;
} else if (this.getClass() == HybridEngine.class) {
return 3000d;
} else if (this.getClass() == PetrolEngine.class) {
return 1400d;
} else {
return 0d;
}
} }
......
garage/src/Engine/HybridEngine.java
View file @ 96a0604c
package Engine; package Engine;
public class HybridEngine { public class HybridEngine extends Engine {
public HybridEngine(String _cylindre, Double _price) {
super(_cylindre, _price);
this.type = EngineType.HYBRID;
}
public String toString() {
return "Hybrid Engine";
}
} }
garage/src/Engine/PetrolEngine.java
View file @ 96a0604c
package Engine; package Engine;
public class PetrolEngine { public class PetrolEngine extends Engine {
public PetrolEngine(String _cylindre, Double _price) {
super(_cylindre, _price);
this.type = EngineType.PETROL;
}
public String toString() {
return "Petrol Engine";
}
} }
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