diff --git a/JAVA/.metadata/.lock b/JAVA/.metadata/.lock new file mode 100644 index 0000000..e69de29 diff --git a/JAVA/.metadata/.log b/JAVA/.metadata/.log new file mode 100644 index 0000000..7be051d --- /dev/null +++ b/JAVA/.metadata/.log @@ -0,0 +1,10 @@ +!SESSION 2019-05-14 10:18:43.838 ----------------------------------------------- +eclipse.buildId=4.11.0.I20190307-0500 +java.version=1.8.0_211 +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\Desktop\Projet_Java\JAVA -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.egit.core 1 0 2019-05-14 10:18:46.252 +!MESSAGE Using Apache MINA sshd as ssh client. diff --git a/JAVA/.metadata/.mylyn/.taskListIndex/segments_1 b/JAVA/.metadata/.mylyn/.taskListIndex/segments_1 new file mode 100644 index 0000000..141ca86 Binary files /dev/null and b/JAVA/.metadata/.mylyn/.taskListIndex/segments_1 differ diff --git a/JAVA/.metadata/.mylyn/.taskListIndex/write.lock b/JAVA/.metadata/.mylyn/.taskListIndex/write.lock new file mode 100644 index 0000000..e69de29 diff --git a/JAVA/.metadata/.mylyn/repositories.xml.zip b/JAVA/.metadata/.mylyn/repositories.xml.zip new file mode 100644 index 0000000..f46bf3e Binary files /dev/null and b/JAVA/.metadata/.mylyn/repositories.xml.zip differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version new file mode 100644 index 0000000..25cb955 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index new file mode 100644 index 0000000..ed9b514 Binary files /dev/null and b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version new file mode 100644 index 0000000..6b2aaa7 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree new file mode 100644 index 0000000..8a1fc9e Binary files /dev/null and b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources new file mode 100644 index 0000000..a355347 Binary files /dev/null and b/JAVA/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..dffc6b5 --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000..bc5573a --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,9 @@ +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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs new file mode 100644 index 0000000..d56c53f --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs new file mode 100644 index 0000000..67b1d96 --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs new file mode 100644 index 0000000..43e97e4 --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs new file mode 100644 index 0000000..8d462a6 --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 0000000..2b60c21 --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs new file mode 100644 index 0000000..293e0ed --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/JAVA/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs new file mode 100644 index 0000000..aa3dc02 --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/JAVA/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi new file mode 100644 index 0000000..13e3266 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -0,0 +1,2333 @@ + + + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration + ModelMigrationProcessor.001 + + + + + + + + topLevel + + + + + 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 + + + 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/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.jdt.core/index.db b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/index.db new file mode 100644 index 0000000..e69de29 diff --git a/JAVA/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat new file mode 100644 index 0000000..0edae4b Binary files /dev/null and b/JAVA/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat differ diff --git a/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml new file mode 100644 index 0000000..a4ee3cb --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml new file mode 100644 index 0000000..9e390f5 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml new file mode 100644 index 0000000..6f857d1 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -0,0 +1,10 @@ + +
+
+ + + + + +
+
diff --git a/JAVA/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/JAVA/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log new file mode 100644 index 0000000..c6d1a11 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -0,0 +1 @@ +2019-05-14 10:18:54,854 [Worker-4: 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/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.11.0.20190220-2119.xml b/JAVA/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.11.0.20190220-2119.xml new file mode 100644 index 0000000..e33758c --- /dev/null +++ b/JAVA/.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/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup b/JAVA/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup new file mode 100644 index 0000000..1f73e14 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup @@ -0,0 +1,6 @@ + + diff --git a/JAVA/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml b/JAVA/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml new file mode 100644 index 0000000..5ca0b77 --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml @@ -0,0 +1,3 @@ + +
+
diff --git a/JAVA/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/JAVA/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml new file mode 100644 index 0000000..3f87bef --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -0,0 +1,11 @@ + +
+
+ + +
+
+ + +
+
diff --git a/JAVA/.metadata/.plugins/org.eclipse.ui.intro/introstate b/JAVA/.metadata/.plugins/org.eclipse.ui.intro/introstate new file mode 100644 index 0000000..236d56c --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.ui.intro/introstate @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/JAVA/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/JAVA/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml new file mode 100644 index 0000000..c7ed1df --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -0,0 +1,15 @@ + +
+
+ + + + + + + + + + +
+
diff --git a/JAVA/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/JAVA/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml new file mode 100644 index 0000000..aae92ed --- /dev/null +++ b/JAVA/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/JAVA/.metadata/version.ini b/JAVA/.metadata/version.ini new file mode 100644 index 0000000..b58c3ae --- /dev/null +++ b/JAVA/.metadata/version.ini @@ -0,0 +1,3 @@ +#Tue May 14 10:18:45 CEST 2019 +org.eclipse.core.runtime=2 +org.eclipse.platform=4.11.0.v20190307-0500 diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.lock b/JAVA/PROJET-PMT_STRI1A/.metadata/.lock new file mode 100644 index 0000000..e69de29 diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.log b/JAVA/PROJET-PMT_STRI1A/.metadata/.log new file mode 100644 index 0000000..5e110b5 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.log @@ -0,0 +1,20 @@ +!SESSION 2019-05-14 10:15:38.745 ----------------------------------------------- +eclipse.buildId=4.11.0.I20190307-0500 +java.version=1.8.0_211 +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-14 10:16:45.803 +!MESSAGE Using Apache MINA sshd as ssh client. +!SESSION 2019-05-14 10:19:13.978 ----------------------------------------------- +eclipse.buildId=4.11.0.I20190307-0500 +java.version=1.8.0_211 +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 -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 -product org.eclipse.epp.package.java.product -data C:\Users\theo\Desktop\Projet_Java\JAVA\PROJET-PMT_STRI1A -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.egit.core 1 0 2019-05-14 10:19:16.764 +!MESSAGE Using Apache MINA sshd as ssh client. diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.taskListIndex/segments_1 b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.taskListIndex/segments_1 new file mode 100644 index 0000000..648fc35 Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.taskListIndex/segments_1 differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.taskListIndex/write.lock b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.taskListIndex/write.lock new file mode 100644 index 0000000..e69de29 diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.tasks.xml.zip b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.tasks.xml.zip new file mode 100644 index 0000000..53332ac Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/.tasks.xml.zip differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/repositories.xml.zip b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/repositories.xml.zip new file mode 100644 index 0000000..512ebbf Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/repositories.xml.zip differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/tasks.xml.zip b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/tasks.xml.zip new file mode 100644 index 0000000..f14e77e Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.mylyn/tasks.xml.zip differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version new file mode 100644 index 0000000..25cb955 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index new file mode 100644 index 0000000..ed9b514 Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version new file mode 100644 index 0000000..6b2aaa7 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree new file mode 100644 index 0000000..8a1fc9e Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources new file mode 100644 index 0000000..435f026 Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..dffc6b5 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000..bc5573a --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,9 @@ +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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs new file mode 100644 index 0000000..d56c53f --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs new file mode 100644 index 0000000..67b1d96 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs new file mode 100644 index 0000000..43e97e4 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs new file mode 100644 index 0000000..8d462a6 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 0000000..2b60c21 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs new file mode 100644 index 0000000..293e0ed --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs new file mode 100644 index 0000000..aa3dc02 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi new file mode 100644 index 0000000..331aa17 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -0,0 +1,2333 @@ + + + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration + ModelMigrationProcessor.001 + + + + + + + + topLevel + + + + + 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 + + + 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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/index.db b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/index.db new file mode 100644 index 0000000..e69de29 diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat new file mode 100644 index 0000000..0edae4b Binary files /dev/null and b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat differ diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml new file mode 100644 index 0000000..a4ee3cb --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml new file mode 100644 index 0000000..9e390f5 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml new file mode 100644 index 0000000..8b7646d --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -0,0 +1,10 @@ + +
+
+ + + + + +
+
diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log new file mode 100644 index 0000000..27e144a --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -0,0 +1,2 @@ +2019-05-14 10:17:21,870 [Worker-5: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update. +2019-05-14 10:19:23,807 [Worker-3: 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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.11.0.20190220-2119.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.11.0.20190220-2119.xml new file mode 100644 index 0000000..e33758c --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.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/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup new file mode 100644 index 0000000..1f73e14 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup @@ -0,0 +1,6 @@ + + diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml new file mode 100644 index 0000000..5ca0b77 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml @@ -0,0 +1,3 @@ + +
+
diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml new file mode 100644 index 0000000..6d0d959 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -0,0 +1,11 @@ + +
+
+ + +
+
+ + +
+
diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.intro/introstate b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.intro/introstate new file mode 100644 index 0000000..236d56c --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.intro/introstate @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml new file mode 100644 index 0000000..c7ed1df --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -0,0 +1,15 @@ + +
+
+ + + + + + + + + + +
+
diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml new file mode 100644 index 0000000..a76f265 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/JAVA/PROJET-PMT_STRI1A/.metadata/version.ini b/JAVA/PROJET-PMT_STRI1A/.metadata/version.ini new file mode 100644 index 0000000..aef0e27 --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/.metadata/version.ini @@ -0,0 +1,3 @@ +#Tue May 14 10:19:15 CEST 2019 +org.eclipse.core.runtime=2 +org.eclipse.platform=4.11.0.v20190307-0500 diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Arme.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Arme.java index 60c9fad..c88f2d0 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Arme.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Arme.java @@ -1,12 +1,9 @@ - package modeles; /** * @author flavien * */ - - public class Arme extends Objet { private int pArme; @@ -18,11 +15,12 @@ public class Arme extends Objet { public String getType() { return "Arme"; } - public 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,... */ + /* public void effectArme ? (poison, incinération, gel, saignement, paralysie,... */ } + diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Armure.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Armure.java index 2b46b9b..87ca8aa 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Armure.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Armure.java @@ -1,6 +1,4 @@ -/** - * - */ + package modeles; /** @@ -18,12 +16,13 @@ public class Armure extends Objet { public String getType () { return "Armure"; } - public Armure(){} - public Armure(String nm, int valeur, int resistance,int efficacite) { + + public Armure(String nm, int valeur, int resistance,int efficacité) { super(nm, valeur, resistance); - this.pArmure=efficacite; + this.pArmure=efficacité; } /* public armureEffect(...) */ } + diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Bourse.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Bourse.java index d084fc0..6532e7e 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Bourse.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Bourse.java @@ -1,12 +1,5 @@ -/** - * - */ package modeles; -/** - * @author flavien - * - */ public class Bourse extends Objet { private int valeur; diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Clavier.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Clavier.java index 38f2edd..ab7aa9a 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Clavier.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Clavier.java @@ -32,7 +32,7 @@ public class Clavier { try { bool = scanner.nextBoolean(); } catch (InputMismatchException e) { - System.out.println("La valeur lu au clavier n'est pas un bool�en"); + System.out.println("La valeur lu au clavier n'est pas un booléen"); } return bool; } diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/EtreVivant.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/EtreVivant.java index 4821bc5..c736260 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/EtreVivant.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/EtreVivant.java @@ -1,7 +1,3 @@ - -/** - * - */ package modeles; /** @@ -24,16 +20,13 @@ public class EtreVivant { * @param salle * @param vivant */ - public EtreVivant() { - - } - public EtreVivant(String nom, int pVieMax, int pAttaque,Salle salle) { + 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.salle = salle; this.vivant = true; } /** @@ -45,6 +38,9 @@ public class EtreVivant { /** * @param nom the nom to set */ + public void setNom(String nom) { + this.nom = nom; + } /** * @return the pVieMax */ @@ -83,15 +79,16 @@ public class EtreVivant { } /** * @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 */ @@ -108,5 +105,14 @@ public class EtreVivant { public int getPvMax() { return this.pVieMax; } - + + + + + + + + + } + diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Generateur.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Generateur.java new file mode 100644 index 0000000..7f1320f --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/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/PROJET-PMT_STRI1A/src/modeles/Labyrinthe.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Labyrinthe.java index 87f4f9b..c86894e 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Labyrinthe.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Labyrinthe.java @@ -1,5 +1,5 @@ /** - * + * */ package modeles; @@ -16,45 +16,104 @@ public class Labyrinthe { 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("épée en bois",5,10,2); - listeArme.add(arme); - Arme arme1=new Arme("épée en acier",15,10,4); - listeArme.add(arme1); - Arme arme2=new Arme("épée en acier solide",25,20,4); - listeArme.add(arme2); - Arme arme3=new Arme("épée 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,null); - listePersonnage.add(perso); - Personnage perso2=new Personnage("Boromis",8,2,null); - listePersonnage.add(perso2); - - Marche marche = new Marche(); - - } + /*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); + + Marche marche = new Marche(null); + + Listtable=new ArrayList(); + Random rd= new Random(); + for (int i = 0; itable2=new ArrayList(); + for (int i = 0; itable3=new ArrayList(); + for (int i = 0; itable4=new ArrayList(); + for (int i = 0; itable5=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/PROJET-PMT_STRI1A/src/modeles/Menu.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Menu.java index f46ea88..672a132 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Menu.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Menu.java @@ -1,56 +1,53 @@ -/** - * - */ package modeles; -/** - * @author nicolas - * - */ +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(); - 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 !"); - } - } - - } - }s + 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/PROJET-PMT_STRI1A/src/modeles/Monstre.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Monstre.java index 1f5b6f0..230da64 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Monstre.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Monstre.java @@ -8,27 +8,23 @@ package modeles; * */ public class Monstre extends EtreVivant { - /** * @param arme * @param armure * @param bourse */ - public Monstre(String nom, int pAttaque) { - super(nom, 5, pAttaque); - - } - public Monstre() { + 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/PROJET-PMT_STRI1A/src/modeles/Objet.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Objet.java index 0ba176b..52ae274 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Objet.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Objet.java @@ -1,16 +1,13 @@ package modeles; -/** - * @author flavien - * - */ + public abstract class Objet { private String nom; private int prix; private int usure; private Personnage proprietaire; - public Objet() {} + public Objet(String nm, int valeur, int resistance) { this.nom=nm; this.prix=valeur; @@ -29,9 +26,9 @@ public abstract class Objet { return this.usure; } - public void utilisation() { // diminue la r�sistance de l'objet + 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 !"); + if (this.usure == 0) System.out.println(this.nom+"s'est cassée !"); } public abstract String getType(); @@ -48,3 +45,4 @@ public abstract class Objet { this.proprietaire=null; } } + diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Personnage.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Personnage.java index afabc47..d759dc5 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Personnage.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Personnage.java @@ -1,85 +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, Salle salle) { - super(nom, pVieMax, pAttaque, salle); - } - - public void equiper(Arme arme) { - arme.setProprietaire(this); - this.arme=arme; - } + + 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; - } + 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; + + } - public void getValeurBourse() { - System.out.println(this.getBourse().getValeur()); - } - /* @return the arme - */ - public Arme getArme() { - return arme; - } + /** + * @return the armure + */ + public Armure getArmure() { + return armure; + } + + public void soin(int heal) { + if (pVie+heal > pVieMax)pVie=pVieMax; + else pVie+=heal; + } +} - /* @return the armure - */ - public Armure getArmure() { - return armure; - } - - public void soin(int heal) { - if (pVie+heal > pVieMax)pVie=pVieMax; - else pVie+=heal; - } -} \ No newline at end of file diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Porte.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Porte.java index c759daa..c323aaa 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Porte.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Porte.java @@ -1,44 +1,42 @@ -/** - * - */ package modeles; - -import java.util.ArrayList; - -/** +/* * @author flavien - * */ + public class Porte { - private int id; - 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=id; - } - + private int id =0; + private boolean ouvert; + private Salle salle1; + private Salle salle2; + + public Porte() { + + } + + public Porte(boolean ouvert, Salle salle,Salle salle2) { + super(); + this.ouvert = ouvert; + this.salle1 = salle; + this.salle2 = salle2; + this.id++; + } public boolean estOuverte() { return ouvert; } - public int getId(){ - return this.id; + public void ouverture() { + this.ouvert= true; + } + + public Salle prochainSaut(Salle s) { + if (s==this.salle1) { + return salle2; + } else return salle1; } - /** - * @param ouvert - * @param orientation - */ - + public int getId() { + return this.id; + } + } diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Potion.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Potion.java index 4ac8198..5d5036f 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Potion.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Potion.java @@ -8,6 +8,7 @@ package modeles; * */ public class Potion extends Objet { + public String getType() { return "Potion"; } diff --git a/JAVA/PROJET-PMT_STRI1A/src/modeles/Salle.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/Salle.java index 58964f4..ef6eab9 100644 --- a/JAVA/PROJET-PMT_STRI1A/src/modeles/Salle.java +++ b/JAVA/PROJET-PMT_STRI1A/src/modeles/Salle.java @@ -1,66 +1,52 @@ - package modeles; import java.util.ArrayList; import java.util.List; +import javafx.util.Pair; /** * @author flavien * */ public class Salle { - public static int positionX; - /** - * @param positionX - * @param positionY - * @param sortie - * @param listeEnnemie - * @param listePorte - */ - - public Salle(int positionX, int positionY, boolean sortie, List listeEnnemie) { - this.positionX=positionX; - this.positionY = positionY; - this.sortie = sortie; - this.listeEnnemie = listeEnnemie; + 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, Porte sal) { - this.positionX = positionX; - this.positionY = positionY; + + public Salle(int positionX, int positionY, boolean sortie, List listeEnnemie) { + this.coordonnees=new Pair(positionX,positionY); this.sortie = sortie; this.listeEnnemie = listeEnnemie; - this.listePorte.add(sal.getId()); - } - - public Salle() { - } - private static int positionY; - private static boolean sortie; - private static List listeEnnemie= new ArrayList(); - private static List listePorte = new ArrayList(); - public String getType(){ return "salle"; } - - public int getPositionX() { - return positionX; - } - public int getPositionY() { - return positionY; + 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/PROJET-PMT_STRI1A/src/modeles/main.java b/JAVA/PROJET-PMT_STRI1A/src/modeles/main.java new file mode 100644 index 0000000..cc38bbd --- /dev/null +++ b/JAVA/PROJET-PMT_STRI1A/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(""); + + }*/ + + +}