Skip to content

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

first_push

parent b13f4fb0
Show whitespace changes
Inline Side-by-side
Showing with 240 additions and 51 deletions
garage/.idea/workspace.xml
View file @ 7968a17a
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager">
<list default="true" id="f5344ca5-83cd-466f-ae68-5dd61b35174d" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/Brand.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/Vehicle.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/engineType.java" 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/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/Main.java" afterDir="false" />
</list>
<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="DefaultGradleProjectSettings">
<option name="testRunner" value="GRADLE" />
<option name="delegatedBuild" value="true" />
</component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Main.java" pinned="false" current="true" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/Main.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 line="0" column="14" selection-start="14" selection-end="14" vertical-scroll-proportion="0.0"> <state relative-caret-position="120">
<folding /> <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/Vehicle.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/Brand.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/engineType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
<option value="Enum" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/Vehicle.java" />
<option value="$PROJECT_DIR$/src/main/Main.java" />
<option value="$PROJECT_DIR$/src/main/Brand.java" />
<option value="$PROJECT_DIR$/src/main/engineType.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="21" /> <option name="x" value="21" />
<option name="y" value="45" /> <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 name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5"> <navigator proportions="" version="1">
<flattenPackages /> <foldersAlwaysOnTop value="true" />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <expand>
<PATH_ELEMENT> <path>
<option name="myItemId" value="untitled104" /> <item name="garage" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <item name="garage" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> </path>
</PATH> <path>
<PATH> <item name="garage" type="b2602c69:ProjectViewProjectNode" />
<PATH_ELEMENT> <item name="garage" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="untitled104" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </path>
</PATH_ELEMENT> <path>
<PATH_ELEMENT> <item name="garage" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemId" value="untitled104" /> <item name="garage" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
</PATH> </path>
<PATH> </expand>
<PATH_ELEMENT> <select />
<option name="myItemId" value="untitled104" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="untitled104" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="company" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
</panes> </panes>
...@@ -77,6 +123,18 @@ ...@@ -77,6 +123,18 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
</component> </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"> <component name="RunManager">
<configuration name="Main" type="Application" factoryName="Application" temporary="true"> <configuration name="Main" type="Application" factoryName="Application" temporary="true">
<option name="MAIN_CLASS_NAME" value="main.Main" /> <option name="MAIN_CLASS_NAME" value="main.Main" />
...@@ -94,4 +152,79 @@ ...@@ -94,4 +152,79 @@
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="f5344ca5-83cd-466f-ae68-5dd61b35174d" name="Default Changelist" comment="" />
<created>1557215426089</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1557215426089</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="21" y="28" width="1878" height="1031" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Image Layers" />
<window_info id="Designer" />
<window_info id="UI Designer" />
<window_info id="Capture Tool" />
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Messages" />
<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.32317737" />
<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="right" id="Palette" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="right" id="Maven" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Palette&#9;" />
<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" />
</layout>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/Main.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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/engineType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/Brand.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/Vehicle.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
</state>
</provider>
</entry>
</component>
</project> </project>
\ No newline at end of file
garage/src/main/Brand.java 0 → 100644
View file @ 7968a17a
package main;
public enum Brand {
RENAULT,
PEUGEOT,
CITROEN;
}
garage/src/main/Main.java
View file @ 7968a17a
...@@ -3,6 +3,11 @@ package main; ...@@ -3,6 +3,11 @@ package main;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
// write your code here
// CREATE vehicle LAGUNA
// CREATE vehicle D4
// CREATE vehicle A300B
} }
} }
garage/src/main/Vehicle.java 0 → 100644
View file @ 7968a17a
package main;
public class Vehicle {
private Double price;
private String name;
// private options List<Option>
// private brandName Brand
// METHODS
// Print the name of the car with the options and the price.
// public String toString()
// return "\t" + this.brandName + "is a " + name + " with that options : + " ?? " + ". Price : " + price.
// Add an option
// public void addOption(opt : Option)
// GETTER
// Get the brand of the car
// public Brand getBrand()
// Get the options of the car
// public List<Option> getOptions()
// Get the price of the car
// public Double getPrice();
}
garage/src/main/engineType.java 0 → 100644
View file @ 7968a17a
package main;
public enum engineType {
DIESEL,
PETROL,
HYBRID,
ELECTRIC;
}
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