diff --git a/JAVA/javaProject/.classpath b/JAVA/javaProject/.classpath
new file mode 100755
index 0000000..4386ee4
--- /dev/null
+++ b/JAVA/javaProject/.classpath
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JAVA/javaProject/.metadata/.lock b/JAVA/javaProject/.metadata/.lock
new file mode 100755
index 0000000..e69de29
diff --git a/JAVA/javaProject/.metadata/.log b/JAVA/javaProject/.metadata/.log
new file mode 100755
index 0000000..35d3826
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.log
@@ -0,0 +1,104 @@
+!SESSION 2019-05-07 14:13:38.893 -----------------------------------------------
+eclipse.buildId=4.11.0.I20190307-0500
+java.version=1.8.0_201
+java.vendor=Oracle Corporation
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=fr_FR
+Framework arguments: -product org.eclipse.epp.package.java.product
+Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product
+
+!ENTRY org.eclipse.egit.core 1 0 2019-05-07 14:14:51.214
+!MESSAGE Using Apache MINA sshd as ssh client.
+
+!ENTRY org.eclipse.ui 4 0 2019-05-07 14:15:25.587
+!MESSAGE Unhandled event loop exception
+!STACK 0
+org.eclipse.swt.SWTException: Widget is disposed
+ at org.eclipse.swt.SWT.error(SWT.java:4699)
+ at org.eclipse.swt.SWT.error(SWT.java:4614)
+ at org.eclipse.swt.SWT.error(SWT.java:4585)
+ at org.eclipse.swt.widgets.Widget.error(Widget.java:451)
+ at org.eclipse.swt.widgets.Widget.checkWidget(Widget.java:350)
+ at org.eclipse.swt.widgets.Composite.getChildren(Composite.java:469)
+ at org.eclipse.epp.internal.mpc.ui.wizards.MarketplaceDropAdapter.lambda$0(MarketplaceDropAdapter.java:136)
+ at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:40)
+ at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:185)
+ at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3919)
+ at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3550)
+ at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1173)
+ at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+ at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1062)
+ at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+ at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:644)
+ at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+ at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:566)
+ at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:150)
+ at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:155)
+ at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+ at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:137)
+ at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:107)
+ at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:400)
+ at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
+ at java.lang.reflect.Method.invoke(Unknown Source)
+ at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:661)
+ at org.eclipse.equinox.launcher.Main.basicRun(Main.java:597)
+ at org.eclipse.equinox.launcher.Main.run(Main.java:1476)
+
+!ENTRY org.eclipse.ui 4 0 2019-05-07 14:15:25.598
+!MESSAGE Unhandled event loop exception
+!STACK 0
+org.eclipse.swt.SWTException: Widget is disposed
+ at org.eclipse.swt.SWT.error(SWT.java:4699)
+ at org.eclipse.swt.SWT.error(SWT.java:4614)
+ at org.eclipse.swt.SWT.error(SWT.java:4585)
+ at org.eclipse.swt.widgets.Widget.error(Widget.java:451)
+ at org.eclipse.swt.widgets.Widget.checkWidget(Widget.java:350)
+ at org.eclipse.swt.widgets.Composite.getChildren(Composite.java:469)
+ at org.eclipse.epp.internal.mpc.ui.wizards.MarketplaceDropAdapter.lambda$0(MarketplaceDropAdapter.java:136)
+ at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:40)
+ at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:185)
+ at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3919)
+ at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3550)
+ at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$5.run(PartRenderingEngine.java:1173)
+ at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+ at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:1062)
+ at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:155)
+ at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:644)
+ at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338)
+ at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:566)
+ at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:150)
+ at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:155)
+ at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203)
+ at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:137)
+ at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:107)
+ at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:400)
+ at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
+ at java.lang.reflect.Method.invoke(Unknown Source)
+ at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:661)
+ at org.eclipse.equinox.launcher.Main.basicRun(Main.java:597)
+ at org.eclipse.equinox.launcher.Main.run(Main.java:1476)
+!SESSION 2019-05-07 14:17:10.480 -----------------------------------------------
+eclipse.buildId=4.11.0.I20190307-0500
+java.version=1.8.0_201
+java.vendor=Oracle Corporation
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=fr_FR
+Framework arguments: -product org.eclipse.epp.package.java.product -product org.eclipse.epp.package.java.product
+Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product -data file:/C:/Users/theo/Documents/Java/Projet/javaProject/ -product org.eclipse.epp.package.java.product
+
+!ENTRY org.eclipse.egit.core 1 0 2019-05-07 14:17:13.291
+!MESSAGE Using Apache MINA sshd as ssh client.
+!SESSION 2019-05-07 14:18:23.681 -----------------------------------------------
+eclipse.buildId=4.11.0.I20190307-0500
+java.version=1.8.0_201
+java.vendor=Oracle Corporation
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=fr_FR
+Framework arguments: -product org.eclipse.epp.package.java.product -product org.eclipse.epp.package.java.product -product org.eclipse.epp.package.java.product
+Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product -product org.eclipse.epp.package.java.product -data C:\Users\theo\Documents\Java\Projet\javaProject -product org.eclipse.epp.package.java.product
+
+!ENTRY org.eclipse.egit.core 1 0 2019-05-07 14:18:26.153
+!MESSAGE Using Apache MINA sshd as ssh client.
diff --git a/JAVA/javaProject/.metadata/.mylyn/.taskListIndex/segments_1 b/JAVA/javaProject/.metadata/.mylyn/.taskListIndex/segments_1
new file mode 100755
index 0000000..e88f623
Binary files /dev/null and b/JAVA/javaProject/.metadata/.mylyn/.taskListIndex/segments_1 differ
diff --git a/JAVA/javaProject/.metadata/.mylyn/.taskListIndex/write.lock b/JAVA/javaProject/.metadata/.mylyn/.taskListIndex/write.lock
new file mode 100755
index 0000000..e69de29
diff --git a/JAVA/javaProject/.metadata/.mylyn/.tasks.xml.zip b/JAVA/javaProject/.metadata/.mylyn/.tasks.xml.zip
new file mode 100755
index 0000000..007536b
Binary files /dev/null and b/JAVA/javaProject/.metadata/.mylyn/.tasks.xml.zip differ
diff --git a/JAVA/javaProject/.metadata/.mylyn/repositories.xml.zip b/JAVA/javaProject/.metadata/.mylyn/repositories.xml.zip
new file mode 100755
index 0000000..7d619b3
Binary files /dev/null and b/JAVA/javaProject/.metadata/.mylyn/repositories.xml.zip differ
diff --git a/JAVA/javaProject/.metadata/.mylyn/tasks.xml.zip b/JAVA/javaProject/.metadata/.mylyn/tasks.xml.zip
new file mode 100755
index 0000000..57a7c49
Binary files /dev/null and b/JAVA/javaProject/.metadata/.mylyn/tasks.xml.zip differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.projects/projet_Java/.markers b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.projects/projet_Java/.markers
new file mode 100755
index 0000000..eed599f
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.projects/projet_Java/.markers differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.projects/projet_Java/org.eclipse.jdt.core/state.dat b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.projects/projet_Java/org.eclipse.jdt.core/state.dat
new file mode 100755
index 0000000..e2d78da
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.projects/projet_Java/org.eclipse.jdt.core/state.dat differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
new file mode 100755
index 0000000..25cb955
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
new file mode 100755
index 0000000..3bd8cfc
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
new file mode 100755
index 0000000..6b2aaa7
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree
new file mode 100755
index 0000000..5f621a1
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
new file mode 100755
index 0000000..1587489
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
new file mode 100755
index 0000000..77fe583
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+version=1
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
new file mode 100755
index 0000000..8ab469c
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\r\n\r\n
+preferredTargets=default\:default|
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.mpc.ui.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.mpc.ui.prefs
new file mode 100755
index 0000000..07fc8d3
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.mpc.ui.prefs
@@ -0,0 +1,2 @@
+CatalogDescriptor=http\://marketplace.eclipse.org
+eclipse.preferences.version=1
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 0000000..32e4387
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.junit.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.junit.prefs
new file mode 100755
index 0000000..847fa5c
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.junit.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.junit.content_assist_favorite_static_members_migrated=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
new file mode 100755
index 0000000..a430a94
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n\r\n\r\n\r\n\r\n
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
new file mode 100755
index 0000000..4da0c99
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,10 @@
+content_assist_number_of_computers=16
+content_assist_proposals_background=255,255,255
+content_assist_proposals_foreground=0,0,0
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.formatterprofiles.version=16
+org.eclipse.jdt.ui.text.code_templates_migrated=true
+org.eclipse.jdt.ui.text.custom_code_templates=
+spelling_locale_initialized=true
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs
new file mode 100755
index 0000000..2579ab0
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jsch.core.hasChangedDefaultWin32SshHome=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
new file mode 100755
index 0000000..c05c14c
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.m2e.discovery.pref.projects=
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
new file mode 100755
index 0000000..e5a71f2
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+mylyn.attention.migrated=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
new file mode 100755
index 0000000..e0b8c16
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100755
index 0000000..46ef804
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+migrated.task.repositories.secure.store=true
+org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
+org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true
+org.eclipse.mylyn.tasks.ui.welcome.message=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
new file mode 100755
index 0000000..a6c2629
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+overviewRuler_migration=migrated_3.1
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
new file mode 100755
index 0000000..e0a1065
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
@@ -0,0 +1,5 @@
+PROBLEMS_FILTERS_MIGRATE=true
+eclipse.preferences.version=1
+platformState=1557231219850
+quickStart=false
+tipsAndTricks=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
new file mode 100755
index 0000000..79c86fd
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
@@ -0,0 +1,3 @@
+//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false
+PLUGINS_NOT_ACTIVATED_ON_STARTUP=;org.eclipse.m2e.discovery;
+eclipse.preferences.version=1
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs
new file mode 100755
index 0000000..1524aaf
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.ui.prefs
@@ -0,0 +1,4 @@
+content_assist_number_of_computers=3
+eclipse.preferences.version=1
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
new file mode 100755
index 0000000..df765b5
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
@@ -0,0 +1,16 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/JAVA/javaProject/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
new file mode 100755
index 0000000..b25c88b
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
@@ -0,0 +1,2337 @@
+
+
+
+ activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration
+ ModelMigrationProcessor.001
+
+
+
+
+
+
+
+ topLevel
+ shellMaximized
+
+
+
+
+ persp.actionSet:org.eclipse.mylyn.doc.actionSet
+ persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation
+ persp.actionSet:org.eclipse.ui.cheatsheets.actionSet
+ persp.actionSet:org.eclipse.search.searchActionSet
+ persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation
+ persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation
+ persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo
+ persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet
+ persp.actionSet:org.eclipse.ui.actionSet.keyBindings
+ persp.actionSet:org.eclipse.ui.actionSet.openFiles
+ persp.actionSet:org.eclipse.debug.ui.launchActionSet
+ persp.actionSet:org.eclipse.jdt.ui.JavaActionSet
+ persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet
+ persp.actionSet:org.eclipse.ui.NavigateActionSet
+ persp.viewSC:org.eclipse.jdt.ui.PackageExplorer
+ persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy
+ persp.viewSC:org.eclipse.jdt.ui.SourceView
+ persp.viewSC:org.eclipse.jdt.ui.JavadocView
+ persp.viewSC:org.eclipse.search.ui.views.SearchView
+ persp.viewSC:org.eclipse.ui.console.ConsoleView
+ persp.viewSC:org.eclipse.ui.views.ContentOutline
+ persp.viewSC:org.eclipse.ui.views.ProblemView
+ persp.viewSC:org.eclipse.ui.views.ResourceNavigator
+ persp.viewSC:org.eclipse.ui.views.TaskList
+ persp.viewSC:org.eclipse.ui.views.ProgressView
+ persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer
+ persp.viewSC:org.eclipse.ui.texteditor.TemplatesView
+ persp.viewSC:org.eclipse.pde.runtime.LogView
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard
+ persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard
+ persp.newWizSC:org.eclipse.ui.wizards.new.folder
+ persp.newWizSC:org.eclipse.ui.wizards.new.file
+ persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard
+ persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective
+ persp.perspSC:org.eclipse.debug.ui.DebugPerspective
+ persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks
+ persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task
+ persp.showIn:org.eclipse.jdt.ui.PackageExplorer
+ persp.showIn:org.eclipse.team.ui.GenericHistoryView
+ persp.showIn:org.eclipse.ui.views.ResourceNavigator
+ persp.showIn:org.eclipse.ui.navigator.ProjectExplorer
+ persp.actionSet:org.eclipse.debug.ui.breakpointActionSet
+ persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet
+ persp.actionSet:org.eclipse.eclemma.ui.CoverageActionSet
+ persp.showIn:org.eclipse.eclemma.ui.CoverageView
+ persp.showIn:org.eclipse.egit.ui.RepositoriesView
+ persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard
+ persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet
+ persp.viewSC:org.eclipse.ant.ui.views.AntView
+
+
+
+ org.eclipse.e4.primaryNavigationStack
+ active
+
+ View
+ categoryTag:Java
+
+
+ View
+ categoryTag:Java
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Git
+
+
+
+
+
+
+
+
+
+ View
+ categoryTag:Mylyn
+
+
+
+ org.eclipse.e4.secondaryNavigationStack
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:Ant
+
+
+
+
+
+ org.eclipse.e4.secondaryDataStack
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:Java
+
+
+ View
+ categoryTag:Java
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:General
+
+
+
+
+
+
+
+
+ View
+ categoryTag:Help
+
+
+ View
+ categoryTag:General
+
+
+ View
+ categoryTag:Help
+
+
+
+
+
+
+ View
+ categoryTag:Help
+
+
+
+
+
+ View
+ categoryTag:General
+
+ ViewMenu
+ menuContribution:menu
+
+
+
+
+
+
+ View
+ categoryTag:Help
+
+
+
+ org.eclipse.e4.primaryDataStack
+ EditorStack
+
+
+
+
+
+
+ View
+ categoryTag:Java
+ active
+ activeOnClose
+
+ ViewMenu
+ menuContribution:menu
+
+
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+
+ View
+ categoryTag:General
+
+ ViewMenu
+ menuContribution:menu
+
+
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+
+ View
+ categoryTag:General
+
+ ViewMenu
+ menuContribution:menu
+
+
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+
+ View
+ categoryTag:Mylyn
+
+ ViewMenu
+ menuContribution:menu
+
+
+
+
+
+
+ View
+ categoryTag:Git
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Ant
+
+
+
+ toolbarSeparator
+
+
+
+ Draggable
+
+
+
+ toolbarSeparator
+
+
+
+ Draggable
+
+
+ toolbarSeparator
+
+
+
+ Draggable
+
+
+ Draggable
+
+
+ Draggable
+
+
+ Draggable
+
+
+ toolbarSeparator
+
+
+
+ Draggable
+
+
+
+ toolbarSeparator
+
+
+
+ toolbarSeparator
+
+
+
+ Draggable
+
+
+ stretch
+ SHOW_RESTORE_MENU
+
+
+ Draggable
+ HIDEABLE
+ SHOW_RESTORE_MENU
+
+
+
+
+ stretch
+
+
+ Draggable
+
+
+ Draggable
+
+
+
+
+ TrimStack
+ Draggable
+
+
+
+
+
+
+ platform:win32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ locale:fr
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ platform:win32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Editor
+
+
+
+
+ View
+ categoryTag:Ant
+
+
+
+
+ View
+ categoryTag:Gradle
+
+
+
+
+ View
+ categoryTag:Gradle
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Git
+
+
+
+
+ View
+ categoryTag:Git
+
+
+
+
+ View
+ categoryTag:Git
+
+
+
+
+ View
+ categoryTag:Git
+ NoRestore
+
+
+
+
+ View
+ categoryTag:Git
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:Help
+
+
+
+
+ View
+ categoryTag:Debug
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Java Browsing
+
+
+
+
+ View
+ categoryTag:Java Browsing
+
+
+
+
+ View
+ categoryTag:Java Browsing
+
+
+
+
+ View
+ categoryTag:Java Browsing
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Java
+
+
+
+
+ View
+ categoryTag:Maven
+
+
+
+
+ View
+ categoryTag:Maven
+
+
+
+
+ View
+ categoryTag:Mylyn
+
+
+
+
+ View
+ categoryTag:Mylyn
+
+
+
+
+ View
+ categoryTag:Mylyn
+
+
+
+
+ View
+ categoryTag:Mylyn
+
+
+
+
+ View
+ categoryTag:Oomph
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:Team
+
+
+
+
+ View
+ categoryTag:Team
+
+
+ View
+ categoryTag:Help
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:Help
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:General
+
+
+
+
+ View
+ categoryTag:XML
+
+
+
+
+ View
+ categoryTag:XML
+
+
+
+
+
+
+ glue
+ move_after:PerspectiveSpacer
+ SHOW_RESTORE_MENU
+
+
+ move_after:Spacer Glue
+ HIDEABLE
+ SHOW_RESTORE_MENU
+
+
+ glue
+ move_after:SearchField
+ SHOW_RESTORE_MENU
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.epp.mpc.ui/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.epp.mpc.ui/dialog_settings.xml
new file mode 100755
index 0000000..6b968e6
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.epp.mpc.ui/dialog_settings.xml
@@ -0,0 +1,10 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/2178533069.index b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/2178533069.index
new file mode 100755
index 0000000..08bf42d
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/2178533069.index differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache
new file mode 100755
index 0000000..593f470
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
new file mode 100755
index 0000000..593f470
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
new file mode 100755
index 0000000..593f470
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/index.db b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/index.db
new file mode 100755
index 0000000..e69de29
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
new file mode 100755
index 0000000..8586397
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
@@ -0,0 +1 @@
+java
\ No newline at end of file
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
new file mode 100755
index 0000000..593f470
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
new file mode 100755
index 0000000..be42bd1
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
@@ -0,0 +1,2 @@
+INDEX VERSION 1.131+C:\Users\theo\Documents\Java\Projet\javaProject\.metadata\.plugins\org.eclipse.jdt.core
+2178533069.index
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
new file mode 100755
index 0000000..437efd7
Binary files /dev/null and b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat differ
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.debug.ui/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.debug.ui/dialog_settings.xml
new file mode 100755
index 0000000..f92d971
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.debug.ui/dialog_settings.xml
@@ -0,0 +1,7 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
new file mode 100755
index 0000000..04cde52
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
new file mode 100755
index 0000000..8b041e5
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
new file mode 100755
index 0000000..6cd9562
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
new file mode 100755
index 0000000..8c365b7
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
new file mode 100755
index 0000000..0657d28
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
@@ -0,0 +1,18 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2019/5/19/refactorings.history b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2019/5/19/refactorings.history
new file mode 100755
index 0000000..650ddeb
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2019/5/19/refactorings.history
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2019/5/19/refactorings.index b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2019/5/19/refactorings.index
new file mode 100755
index 0000000..ad2282f
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2019/5/19/refactorings.index
@@ -0,0 +1,2 @@
+1557232596087 Delete resource 'projet java'
+1557232599612 Delete resource 'projet_Java'
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
new file mode 100755
index 0000000..f55b514
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
@@ -0,0 +1,7 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/JAVA/javaProject/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
new file mode 100755
index 0000000..113514a
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
@@ -0,0 +1,3 @@
+2019-05-07 14:15:22,176 [Worker-1: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is not available. Remote download required.
+2019-05-07 14:17:19,303 [Worker-0: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
+2019-05-07 14:18:32,085 [Worker-1: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.11.0.20190220-2119.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.11.0.20190220-2119.xml
new file mode 100755
index 0000000..e33758c
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.11.0.20190220-2119.xml
@@ -0,0 +1,43 @@
+
+
+
+ %date [%thread] %-5level %logger{35} - %msg%n
+
+
+ OFF
+
+
+
+
+ ${org.eclipse.m2e.log.dir}/0.log
+
+ ${org.eclipse.m2e.log.dir}/%i.log
+ 1
+ 10
+
+
+ 100MB
+
+
+ %date [%thread] %-5level %logger{35} - %msg%n
+
+
+
+
+
+ WARN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup b/JAVA/javaProject/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup
new file mode 100755
index 0000000..a1ef8f5
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup
@@ -0,0 +1,6 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml
new file mode 100755
index 0000000..1ef2b05
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml
@@ -0,0 +1,3 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
new file mode 100755
index 0000000..3a7ee68
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
@@ -0,0 +1,16 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.intro/introstate b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.intro/introstate
new file mode 100755
index 0000000..bc63a5b
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.intro/introstate
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
new file mode 100755
index 0000000..78b3033
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
@@ -0,0 +1,21 @@
+
+
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
new file mode 100755
index 0000000..4d08d35
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/JAVA/javaProject/.metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml b/JAVA/javaProject/.metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml
new file mode 100755
index 0000000..e153bf9
--- /dev/null
+++ b/JAVA/javaProject/.metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml
@@ -0,0 +1,5 @@
+
+
diff --git a/JAVA/javaProject/.metadata/version.ini b/JAVA/javaProject/.metadata/version.ini
new file mode 100755
index 0000000..1051028
--- /dev/null
+++ b/JAVA/javaProject/.metadata/version.ini
@@ -0,0 +1,3 @@
+#Tue May 07 14:18:25 CEST 2019
+org.eclipse.core.runtime=2
+org.eclipse.platform=4.11.0.v20190307-0500
diff --git a/JAVA/javaProject/.project b/JAVA/javaProject/.project
new file mode 100755
index 0000000..ced0293
--- /dev/null
+++ b/JAVA/javaProject/.project
@@ -0,0 +1,17 @@
+
+
+ javaProject
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/JAVA/javaProject/.settings/org.eclipse.jdt.core.prefs b/JAVA/javaProject/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 0000000..6ed4d3e
--- /dev/null
+++ b/JAVA/javaProject/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,112 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/JAVA/javaProject/bin/modeles/Arme.class b/JAVA/javaProject/bin/modeles/Arme.class
new file mode 100755
index 0000000..cab12b8
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Arme.class differ
diff --git a/JAVA/javaProject/bin/modeles/Armure.class b/JAVA/javaProject/bin/modeles/Armure.class
new file mode 100755
index 0000000..706abee
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Armure.class differ
diff --git a/JAVA/javaProject/bin/modeles/Bourse.class b/JAVA/javaProject/bin/modeles/Bourse.class
new file mode 100755
index 0000000..62ff6db
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Bourse.class differ
diff --git a/JAVA/javaProject/bin/modeles/Clavier.class b/JAVA/javaProject/bin/modeles/Clavier.class
new file mode 100755
index 0000000..b2bce85
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Clavier.class differ
diff --git a/JAVA/javaProject/bin/modeles/EtreVivant.class b/JAVA/javaProject/bin/modeles/EtreVivant.class
new file mode 100755
index 0000000..f730bdc
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/EtreVivant.class differ
diff --git a/JAVA/javaProject/bin/modeles/Generateur.class b/JAVA/javaProject/bin/modeles/Generateur.class
new file mode 100755
index 0000000..5a22ec9
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Generateur.class differ
diff --git a/JAVA/javaProject/bin/modeles/Labyrinthe.class b/JAVA/javaProject/bin/modeles/Labyrinthe.class
new file mode 100755
index 0000000..3a1921a
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Labyrinthe.class differ
diff --git a/JAVA/javaProject/bin/modeles/Marche.class b/JAVA/javaProject/bin/modeles/Marche.class
new file mode 100755
index 0000000..0e480c2
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Marche.class differ
diff --git a/JAVA/javaProject/bin/modeles/Menu.class b/JAVA/javaProject/bin/modeles/Menu.class
new file mode 100755
index 0000000..ba1b6b7
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Menu.class differ
diff --git a/JAVA/javaProject/bin/modeles/Monstre.class b/JAVA/javaProject/bin/modeles/Monstre.class
new file mode 100755
index 0000000..4526493
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Monstre.class differ
diff --git a/JAVA/javaProject/bin/modeles/Objet.class b/JAVA/javaProject/bin/modeles/Objet.class
new file mode 100755
index 0000000..f13ce65
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Objet.class differ
diff --git a/JAVA/javaProject/bin/modeles/Personnage.class b/JAVA/javaProject/bin/modeles/Personnage.class
new file mode 100755
index 0000000..469988b
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Personnage.class differ
diff --git a/JAVA/javaProject/bin/modeles/Porte.class b/JAVA/javaProject/bin/modeles/Porte.class
new file mode 100755
index 0000000..c43c80a
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Porte.class differ
diff --git a/JAVA/javaProject/bin/modeles/Potion.class b/JAVA/javaProject/bin/modeles/Potion.class
new file mode 100755
index 0000000..0c445d7
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Potion.class differ
diff --git a/JAVA/javaProject/bin/modeles/Salle.class b/JAVA/javaProject/bin/modeles/Salle.class
new file mode 100755
index 0000000..b94a619
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/Salle.class differ
diff --git a/JAVA/javaProject/bin/modeles/lab.json b/JAVA/javaProject/bin/modeles/lab.json
new file mode 100755
index 0000000..131841a
--- /dev/null
+++ b/JAVA/javaProject/bin/modeles/lab.json
@@ -0,0 +1,36 @@
+
+{
+"listePersonnage":[
+ {
+ "nom":"test",
+ "pVieMax":10,
+ "pVie":10,
+ "pAttaque":20,
+ "arme":"",
+ "armure":"",
+ "bourse":100
+ }
+],
+"listeSalle":[
+
+ {"positionX":0,
+ "positionY":0,
+ "sortie":false,
+ "monstre":[{"nom":"premiermonstre",
+ "pAttaque":5}
+ ],
+ "porte":[{"ouvert":true,
+ "position":"H"}]
+ }
+ ],
+"listeArme":[
+ {"nom":"arme1",
+ "prix":10,
+ "resistance":10,
+ "pArme":10}],
+"listeArmure":[ {"nom":"armure1",
+ "prix":10,
+ "resistance":10,
+ "pArmure":10}]
+
+}
diff --git a/JAVA/javaProject/bin/modeles/main.class b/JAVA/javaProject/bin/modeles/main.class
new file mode 100755
index 0000000..1c72e58
Binary files /dev/null and b/JAVA/javaProject/bin/modeles/main.class differ
diff --git a/JAVA/javaProject/bin/test/Test.class b/JAVA/javaProject/bin/test/Test.class
new file mode 100755
index 0000000..066a399
Binary files /dev/null and b/JAVA/javaProject/bin/test/Test.class differ
diff --git a/JAVA/javaProject/src/modeles/Arme.java b/JAVA/javaProject/src/modeles/Arme.java
new file mode 100755
index 0000000..ec30777
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Arme.java
@@ -0,0 +1,26 @@
+package modeles;
+
+/**
+ * @author flavien
+ *
+ */
+public class Arme extends Objet {
+
+ private int pArme;
+
+ public int getpArme() {
+ return this.pArme;
+ }
+
+ public String getType() {
+ return "Arme";
+ }
+
+ public Arme(String nm, int valeur, int resistance, int attaque) {
+ super(nm, valeur, resistance);
+ this.pArme=attaque;
+ }
+
+ /* public void effectArme ? (poison, incinération, gel, saignement, paralysie,... */
+}
+
diff --git a/JAVA/javaProject/src/modeles/Armure.java b/JAVA/javaProject/src/modeles/Armure.java
new file mode 100755
index 0000000..18a99e7
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Armure.java
@@ -0,0 +1,28 @@
+
+package modeles;
+
+/**
+ * @author flavien
+ *
+ */
+public class Armure extends Objet {
+
+ private int pArmure;
+
+ public int getpArmure() {
+ return this.pArmure;
+ }
+
+ public String getType () {
+ return "Armure";
+ }
+
+ public Armure(String nm, int valeur, int resistance,int efficacité) {
+ super(nm, valeur, resistance);
+ this.pArmure=efficacité;
+ }
+
+
+ /* public armureEffect(...) */
+}
+
diff --git a/JAVA/javaProject/src/modeles/Bourse.java b/JAVA/javaProject/src/modeles/Bourse.java
new file mode 100755
index 0000000..6aa3d40
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Bourse.java
@@ -0,0 +1,33 @@
+package modeles;
+
+public class Bourse extends Objet {
+ private int valeur;
+
+ public Bourse(int somme) {
+ super("bourse",somme,99999999);
+
+ }
+
+ public int getValeur() {
+ return this.valeur;
+ }
+
+ public String getType() {
+ return "Bourse";
+ }
+
+ public int Achat(int cout) { //commande pour vérifier si la personne peut acheter un objet et pour faire le décompte de la thunasse
+ if (cout <= this.valeur) return (this.valeur=this.valeur-cout);
+ else {
+ int manque = cout-this.valeur;
+ System.out.println("L'achat est impossible, il vous manque : "+manque);
+ return manque;
+ }
+ }
+
+ public int fusionBourse(Bourse sacPiece) {
+ this.valeur += sacPiece.valeur;
+ return this.valeur;
+ }
+
+}
diff --git a/JAVA/javaProject/src/modeles/Clavier.java b/JAVA/javaProject/src/modeles/Clavier.java
new file mode 100755
index 0000000..de39ec3
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Clavier.java
@@ -0,0 +1,40 @@
+package modeles;
+
+import java.util.InputMismatchException;
+import java.util.Scanner;
+
+public class Clavier {
+ private static Scanner scanner = new Scanner(System.in);
+
+ public static String entrerClavierString() {
+ String chaine="";
+
+ try {
+ chaine = scanner.next();
+ } catch (InputMismatchException e) {
+ System.out.println("La valeur lu au clavier n'est pas une chaine");
+ }
+ return chaine;
+ }
+
+ public static int entrerClavierInt() {
+ int entier=0;
+ try {
+ entier = scanner.nextInt();
+ } catch (InputMismatchException e) {
+ System.out.println("La valeur lu au clavier n'est pas un entier");
+ }
+ return entier;
+ }
+
+ public static boolean entrerClavierBoolean() {
+ boolean bool=true;
+ try {
+ bool = scanner.nextBoolean();
+ } catch (InputMismatchException e) {
+ System.out.println("La valeur lu au clavier n'est pas un booléen");
+ }
+ return bool;
+ }
+
+}
diff --git a/JAVA/javaProject/src/modeles/EtreVivant.java b/JAVA/javaProject/src/modeles/EtreVivant.java
new file mode 100755
index 0000000..ef09736
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/EtreVivant.java
@@ -0,0 +1,118 @@
+package modeles;
+
+/**
+ * @author Nicolas
+ *
+ */
+public class EtreVivant {
+
+ private String nom;
+ protected int pVieMax;
+ protected int pVie;
+ private int pAttaque;
+ protected Salle salle;
+ private boolean vivant;
+ /**
+ * @param nom
+ * @param pVieMax
+ * @param pVie
+ * @param pAttaque
+ * @param salle
+ * @param vivant
+ */
+ public EtreVivant(String nom, int pVieMax, int pAttaque) {
+ super();
+ this.nom = nom;
+ this.pVieMax = pVieMax;
+ this.pVie = pVieMax;
+ this.pAttaque = pAttaque;
+ this.salle = salle;
+ this.vivant = true;
+ }
+ /**
+ * @return the nom
+ */
+ public String getNom() {
+ return nom;
+ }
+ /**
+ * @param nom the nom to set
+ */
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+ /**
+ * @return the pVieMax
+ */
+ public int getpVieMax() {
+ return pVieMax;
+ }
+ /**
+ * @param pVieMax the pVieMax to set
+ */
+ public void setpVieMax(int pVieMax) {
+ this.pVieMax = pVieMax;
+ }
+ /**
+ * @return the pVie
+ */
+ public int getpVie() {
+ return pVie;
+ }
+ /**
+ * @param pVie the pVie to set
+ */
+ public void setpVie(int pVie) {
+ this.pVie = pVie;
+ }
+ /**
+ * @return the pAttaque
+ */
+ public int getpAttaque() {
+ return pAttaque;
+ }
+ /**
+ * @param pAttaque the pAttaque to set
+ */
+ public void setpAttaque(int pAttaque) {
+ this.pAttaque = pAttaque;
+ }
+ /**
+ * @return the salle
+ */
+ public Salle getSalle() {
+ return salle;
+ }
+ /**
+ * @param salle the salle to set
+ */
+ public void setSalle(Salle salle) {
+ this.salle = salle;
+ }
+ /**
+ * @return the vivant
+ */
+ public boolean isVivant() {
+ return vivant;
+ }
+ /**
+ * @param vivant the vivant to set
+ */
+ public void setVivant(boolean vivant) {
+ this.vivant = vivant;
+ }
+
+ public int getPvMax() {
+ return this.pVieMax;
+ }
+
+
+
+
+
+
+
+
+
+}
+
diff --git a/JAVA/javaProject/src/modeles/Generateur.java b/JAVA/javaProject/src/modeles/Generateur.java
new file mode 100755
index 0000000..b2fc4a2
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Generateur.java
@@ -0,0 +1,28 @@
+package modeles;
+
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+
+import com.google.gson.Gson;
+
+public class Generateur {
+
+ public Labyrinthe labyrithe() {
+ BufferedReader bfr= null;
+ try {
+ bfr = new BufferedReader(new FileReader("C:\\Users\\theo\\Documents\\Java\\Projet\\javaProject\\src\\modeles\\lab.json"));
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ //FileReader file = new FileReader(json);
+ Gson gson = new Gson();
+ //String str="{\"positionX\":0,\"positionY\":0,\"sortie\":false,\"monstre\":[{\"nom\":\"premier monstre\",\"pAttaque\":5}],\"porte\":[{\"ouvert\":true, \"position\":\"H\"}]}";
+ Labyrinthe labyrithe = gson.fromJson(bfr, Labyrinthe.class);
+ return labyrithe;
+ }
+
+
+}
diff --git a/JAVA/javaProject/src/modeles/Labyrinthe.java b/JAVA/javaProject/src/modeles/Labyrinthe.java
new file mode 100755
index 0000000..6f48da3
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Labyrinthe.java
@@ -0,0 +1,78 @@
+/**
+ *
+ */
+package modeles;
+
+import java.util.*;
+
+/**
+ * @author flavien
+ *
+ */
+public class Labyrinthe {
+ protected List listePersonnage=new ArrayList();
+ protected List listeArme= new ArrayList();
+ protected List listeArmure=new ArrayList();
+ protected List listePorte=new ArrayList();
+ protected List listeMonstre=new ArrayList();
+
+ public void generateLabyrinthe(int nInstance) {
+ /*switch (nInstance)
+ case 1 :
+ return Labyrinthe1();
+ break;
+ }*/
+ labyrinthe1();
+ }
+
+ public void labyrinthe1() {
+ Arme arme=new Arme("Epee en bois",5,10,2);
+ listeArme.add(arme);
+ Arme arme1=new Arme("Epee en acier",15,10,4);
+ listeArme.add(arme1);
+ Arme arme2=new Arme("Epee en acier solide",25,20,4);
+ listeArme.add(arme2);
+ Arme arme3=new Arme("Epee de cristal",30,5,7);
+ listeArme.add(arme3);
+ Arme arme4=new Arme("Lame Blanche",200,30,10);
+ listeArme.add(arme4);
+
+ Armure armure1=new Armure("armure de cuir",10,10,5);
+ listeArmure.add(armure1);
+ Armure armure=new Armure("armure en papier",5,5,2);
+ listeArmure.add(armure);
+ Armure armure2=new Armure("armure de fer",30,10,5);
+ listeArmure.add(armure2);
+ Armure armure3=new Armure("Le kevlar",150,15,8);
+ listeArmure.add(armure3);
+
+ Personnage perso=new Personnage("Aramis",10,1);
+ listePersonnage.add(perso);
+ Personnage perso2=new Personnage("Boromis",8,2);
+ listePersonnage.add(perso2);
+
+ Monstre mons = new Monstre("pantin en bois",5, 1);
+ Monstre mons2= new Monstre("araignee geante agressive", 7, 5);
+ Monstre mons3=new Monstre("pantin de fer",40,1);
+ Monstre mons4 = new Monstre("Golem de Jade",40, 3);
+ Monstre mons5 = new Monstre("Neltharion le Gardeterre",100,10);
+ Monstre mons6 = new Monstre("Neltharion, le Destructeur", 80,20);
+
+ this.listeMonstre.add(mons);
+ this.listeMonstre.add(mons2);
+ this.listeMonstre.add(mons3);
+ this.listeMonstre.add(mons4);
+ this.listeMonstre.add(mons5);
+ this.listeMonstre.add(mons6);
+
+ List listeEnnemie=new ArrayList();
+ for (int i =0; i listeObjet=new ArrayList();
+ public Marche(List listeEnnemie) {
+ super(0,0, false, listeEnnemie);
+ // TODO Auto-generated constructor stub
+ }
+
+
+ //methode pour enregistrer la liste objet (il faudra sans doute changer le type de listeObjet) settingListeObjet(Labyrinthe lab)
+}
diff --git a/JAVA/javaProject/src/modeles/Menu.java b/JAVA/javaProject/src/modeles/Menu.java
new file mode 100755
index 0000000..951e95e
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Menu.java
@@ -0,0 +1,53 @@
+package modeles;
+
+import java.util.Random;
+
+public class Menu {
+
+ public String menuCombat(Monstre mons, Personnage perso) {
+ int degat;
+ int reponse = 0;
+ System.out.println("Un monstre du nom de "+mons.getNom()+" se présente devant vous et il est très en colère :");
+ while (true){
+ System.out.println("\t - 1° attaquer\n\t - 2° Potion \n\t- 3° Fuir");
+ reponse=Clavier.entrerClavierInt();
+ switch (reponse) {
+ case 1:
+ degat = perso.attaquer(mons);
+ System.out.println("Vous avez infligé "+degat+" à votre adversaire.");
+ if (!mons.isVivant()) {
+ perso.salle.cle();
+ System.out.println(perso.obtenirBourse());
+ return "Votre ennemie trépasse et vous obtenez la clé des portes de la salle.";
+ } else {
+ System.out.println("Au tour de votre adversaire. Il attaque préparez vous ! ");
+ System.out.println("il vous inflige "+ mons.attaquer(perso)+".");
+ if (!perso.isVivant()) {
+ return "C'est ainsi que vous trépassez sous les coups des ténèbres. Reposez vous héros... Vous avez l'éternité.";
+ }
+ else System.out.println("votre ennemie n'est pas encore à bout achever le !");
+ }
+ break;
+
+ case 2 :
+ if (!perso.getPotion().isEmpty()) {
+ perso.utiliser(perso.getPotion().remove(0));
+ System.out.println("Vous avez utilisé une potion. Votre vie est maintenant au maximum.");
+ } else {
+ System.out.println("Il ne vous reste plus de potion. Désolé.");
+ }
+ break;
+
+ case 3 :
+ System.out.println("Vous tentez de fuir.");
+ Random rd = new Random();
+ if (rd.nextInt(100)<50) {
+ return "Vous avez fuit.";
+ } else {
+ System.out.println("Ce fut un échec !");
+ }
+ }
+
+ }
+ }
+}
diff --git a/JAVA/javaProject/src/modeles/Monstre.java b/JAVA/javaProject/src/modeles/Monstre.java
new file mode 100755
index 0000000..57cb8d2
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Monstre.java
@@ -0,0 +1,31 @@
+/**
+ *
+ */
+package modeles;
+
+/**
+ * @author Nicolas
+ *
+ */
+public class Monstre extends EtreVivant {
+ /**
+ * @param arme
+ * @param armure
+ * @param bourse
+ */
+ public Monstre(String nom,int pVimax, int pAttaque) {
+ super(nom, pVimax, pAttaque);
+
+ }
+
+ public int attaquer(Personnage def) {
+ int pAttaqueLoc;
+ pAttaqueLoc=this.getpAttaque()-(def.getArmure().getpArmure());
+ def.pVie=pAttaqueLoc;
+ return pAttaqueLoc;
+
+}
+
+
+
+}
diff --git a/JAVA/javaProject/src/modeles/Objet.java b/JAVA/javaProject/src/modeles/Objet.java
new file mode 100755
index 0000000..141d5a4
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Objet.java
@@ -0,0 +1,48 @@
+package modeles;
+
+
+public abstract class Objet {
+ private String nom;
+ private int prix;
+ private int usure;
+ private Personnage proprietaire;
+
+
+ public Objet(String nm, int valeur, int resistance) {
+ this.nom=nm;
+ this.prix=valeur;
+ this.usure=resistance;
+ }
+
+ public int getPrix() {
+ return this.prix;
+ }
+
+ public String getNom() {
+ return this.nom;
+ }
+
+ public int getUsure() {
+ return this.usure;
+ }
+
+ public void utilisation() { // diminue la résistance de l'objet
+ this.usure--;
+ if (this.usure == 0) System.out.println(this.nom+"s'est cassée !");
+ }
+
+ public abstract String getType();
+
+ public Personnage getProprietaire() {
+ return this.proprietaire;
+ }
+
+ public void setProprietaire(Personnage perso) {
+ this.proprietaire=perso;
+ }
+
+ public void lacher() {
+ this.proprietaire=null;
+ }
+}
+
diff --git a/JAVA/javaProject/src/modeles/Personnage.java b/JAVA/javaProject/src/modeles/Personnage.java
new file mode 100755
index 0000000..bf850da
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Personnage.java
@@ -0,0 +1,98 @@
+
+package modeles;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+public class Personnage extends EtreVivant {
+
+ private Arme arme;
+ private Armure armure;
+ private Bourse bourse;
+ private List listepotion= new ArrayList();
+
+ public Personnage(String nom, int pVieMax,int pAttaque) {
+ super(nom, pVieMax, pAttaque);
+ }
+
+ public void equiper(Arme arme) {
+ arme.setProprietaire(this);
+ this.arme=arme;
+ }
+public void equiper(Armure armure) {
+ armure.setProprietaire(this);
+ this.armure=armure;
+ }
+
+ public void utiliser(Potion potion) {
+ soin();
+ }
+
+ public void seDeplacer(Salle salle) {
+ this.salle=salle;
+ }
+
+ public void allerMarche(Salle marche){
+ this.salle=marche;
+ }
+
+ public List getPotion() {
+ return this.listepotion;
+ }
+
+ public void gagnerUnePotion() {
+ Potion potion=new Potion(100);
+ listepotion.add(potion);
+ }
+
+ public void soin() {
+ this.pVie=this.pVieMax;
+ }
+
+ public int attaquer(Monstre monstre) {
+ if(arme!=null) {
+ monstre.pVie=monstre.pVie-(arme.getpArme()+getpAttaque());
+ return arme.getpArme()+getpAttaque();
+ }
+ else {
+ monstre.pVie=monstre.pVie=getpAttaque();
+ return getpAttaque();
+ }
+ }
+
+ public Bourse getBourse() {
+ return this.bourse;
+ }
+
+ public int getValeurBourse() {
+ return this.getBourse().getValeur();
+ }
+ /**
+ * @return the arme
+ */
+ public Arme getArme() {
+ return arme;
+ }
+
+ public String obtenirBourse() {
+ Random rd = new Random();
+ this.bourse.fusionBourse(new Bourse(rd.nextInt(20)));
+ String str="Vous avez gagnez une bourse. Vous comptez vos pièces... Genial !! Vous avez désormais ".concat(String.valueOf(this.getValeurBourse()).concat(" pièces d'argent !"));
+ return str;
+
+ }
+
+ /**
+ * @return the armure
+ */
+ public Armure getArmure() {
+ return armure;
+ }
+
+ public void soin(int heal) {
+ if (pVie+heal > pVieMax)pVie=pVieMax;
+ else pVie+=heal;
+ }
+}
+
diff --git a/JAVA/javaProject/src/modeles/Porte.java b/JAVA/javaProject/src/modeles/Porte.java
new file mode 100755
index 0000000..d65e2f8
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Porte.java
@@ -0,0 +1,42 @@
+package modeles;
+/*
+ * @author flavien
+ */
+
+public class Porte {
+ private int id =0;
+ private boolean ouvert;
+ private Salle salle1;
+ private Salle salle2;
+
+ public Porte() {
+
+ }
+
+ public Porte(int id,boolean ouvert, Salle salle,Salle salle2) {
+ super();
+ this.ouvert = ouvert;
+ this.salle1 = salle;
+ this.salle2 = salle2;
+ this.id++;
+ }
+ public boolean estOuverte() {
+ return ouvert;
+ }
+
+ public void ouverture() {
+ this.ouvert= true;
+ }
+
+ public Salle prochainSaut(Salle s) {
+ if (s==this.salle1) {
+ return salle2;
+ } else return salle1;
+ }
+
+ public int getId() {
+ return this.id;
+ }
+
+
+}
diff --git a/JAVA/javaProject/src/modeles/Potion.java b/JAVA/javaProject/src/modeles/Potion.java
new file mode 100755
index 0000000..5a9e2c0
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Potion.java
@@ -0,0 +1,26 @@
+/**
+ *
+ */
+package modeles;
+
+/**
+ * @author flavien
+ *
+ */
+public class Potion extends Objet {
+
+ public String getType() {
+ return "Potion";
+ }
+
+ public Potion(int valeur) {
+ super("potion", valeur, 1);
+ }
+
+ public void utilisation() {
+ super.utilisation();
+ this.getProprietaire().soin(this.getProprietaire().getpVieMax());
+ }
+
+
+}
diff --git a/JAVA/javaProject/src/modeles/Salle.java b/JAVA/javaProject/src/modeles/Salle.java
new file mode 100755
index 0000000..cbb5481
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/Salle.java
@@ -0,0 +1,60 @@
+package modeles;
+
+import java.util.ArrayList;
+import java.util.List;
+import javafx.util.Pair;
+
+/**
+ * @author flavien
+ *
+ */
+public class Salle {
+ private Pair coordonnees;
+ private boolean sortie;
+ private List listePorte= new ArrayList();
+ private List listeEnnemie= new ArrayList(); //indice de monstre
+
+ public Salle(int x, int y, boolean out) {
+ this.coordonnees=new Pair(x,y);
+ this.sortie=out;
+
+ }
+
+ public Salle(int positionX, int positionY, boolean sortie, List listeEnnemie) {
+ this.coordonnees=new Pair(positionX,positionY);
+ this.sortie = sortie;
+ this.listeEnnemie = listeEnnemie;
+}
+
+public Salle(int positionX, int positionY, boolean sortie, List listeEnnemie, Porte sal) {
+ this.coordonnees=new Pair(positionX,positionY);
+ this.sortie = sortie;
+ this.listeEnnemie = listeEnnemie;
+ this.listePorte.add(sal);
+}
+
+
+ public String getType(){
+ return "salle";
+ }
+
+ public Pair getCoordonnes() {
+ return this.coordonnees;
+ }
+
+ public boolean estSortie() {
+ return sortie;
+ }
+
+ public void cle() {
+ if (listeEnnemie.isEmpty()) {
+ for (Porte p : listePorte) {
+ p.ouverture();
+ }
+ }
+ }
+
+ public boolean estVide() {
+ return listeEnnemie.isEmpty();
+ }
+}
diff --git a/JAVA/javaProject/src/modeles/lab.json b/JAVA/javaProject/src/modeles/lab.json
new file mode 100755
index 0000000..131841a
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/lab.json
@@ -0,0 +1,36 @@
+
+{
+"listePersonnage":[
+ {
+ "nom":"test",
+ "pVieMax":10,
+ "pVie":10,
+ "pAttaque":20,
+ "arme":"",
+ "armure":"",
+ "bourse":100
+ }
+],
+"listeSalle":[
+
+ {"positionX":0,
+ "positionY":0,
+ "sortie":false,
+ "monstre":[{"nom":"premiermonstre",
+ "pAttaque":5}
+ ],
+ "porte":[{"ouvert":true,
+ "position":"H"}]
+ }
+ ],
+"listeArme":[
+ {"nom":"arme1",
+ "prix":10,
+ "resistance":10,
+ "pArme":10}],
+"listeArmure":[ {"nom":"armure1",
+ "prix":10,
+ "resistance":10,
+ "pArmure":10}]
+
+}
diff --git a/JAVA/javaProject/src/modeles/main.java b/JAVA/javaProject/src/modeles/main.java
new file mode 100755
index 0000000..d7f9197
--- /dev/null
+++ b/JAVA/javaProject/src/modeles/main.java
@@ -0,0 +1,17 @@
+package modeles;
+
+public class main {
+
+ /*public static void main(String[] args) {
+
+ Generateur gene = new Generateur();
+ Labyrinthe lab = gene.labyrithe();
+ //lab.getListeSalle();
+
+ Arme arme = new Arme("arme1", 10, 10, 10);
+ System.out.println("");
+
+ }*/
+
+
+}
diff --git a/JAVA/javaProject/src/modeles/modeles.7z b/JAVA/javaProject/src/modeles/modeles.7z
new file mode 100755
index 0000000..b0aa97b
Binary files /dev/null and b/JAVA/javaProject/src/modeles/modeles.7z differ
diff --git a/JAVA/javaProject/src/test/Test.java b/JAVA/javaProject/src/test/Test.java
new file mode 100755
index 0000000..fe9b5c8
--- /dev/null
+++ b/JAVA/javaProject/src/test/Test.java
@@ -0,0 +1,12 @@
+/**
+ *
+ */
+package test;
+
+/**
+ * @author flavien
+ *
+ */
+public class Test {
+
+}