Modif structure

JAVA/PROJET-PMT_STRI1A/.classpath

@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="/home/nicolas/Bureau/jdbc-support-1.0.23-sources.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="/home/nicolas/Téléchargements/gson-2.8.5.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

JAVA/PROJET-PMT_STRI1A/bin/.classpath

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="src/" kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/nicolas/Bureau/jdbc-support-1.0.23-sources.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/gson">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/nicolas/Téléchargements"/>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/nicolas/Téléchargements/gson-2.8.5.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/nicolas/Bureau/java-json.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

JAVA/PROJET-PMT_STRI1A/bin/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>projet</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

JAVA/PROJET-PMT_STRI1A/bin/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+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.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.log

@@ -0,0 +1,79 @@
+!SESSION 2019-05-05 11:22:39.686 -----------------------------------------------
+eclipse.buildId=4.10.0.I20181206-0815
+java.version=11.0.2
+java.vendor=Oracle Corporation
+BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=fr_FR
+Framework arguments:  -product org.eclipse.epp.package.java.product
+Command-line arguments:  -data /home/nicolas/Bureau/PROJET-PMT_STRI1A/JAVA/PROJET-PMT_STRI1A/src/json -os linux -ws gtk -arch x86_64 -product org.eclipse.epp.package.java.product
+
+!ENTRY org.eclipse.mylyn.bugzilla.core 4 0 2019-05-05 11:22:40.315
+!MESSAGE FrameworkEvent ERROR
+!STACK 0
+org.osgi.framework.BundleException: Could not resolve module: org.eclipse.mylyn.bugzilla.core [262]
+  Unresolved requirement: Require-Bundle: org.apache.xmlrpc
+    -> Bundle-SymbolicName: org.apache.xmlrpc; bundle-version="3.0.0.v20100427-1100"
+       org.apache.xmlrpc [54]
+         Unresolved requirement: Import-Package: javax.xml.bind
+  Unresolved requirement: Require-Bundle: org.eclipse.mylyn.commons.xmlrpc; bundle-version="[3.8.0,4.0.0)"
+    -> Bundle-SymbolicName: org.eclipse.mylyn.commons.xmlrpc; bundle-version="3.24.2.v20180904-2231"; singleton:="true"
+       org.eclipse.mylyn.commons.xmlrpc [279]
+         Unresolved requirement: Require-Bundle: org.apache.xmlrpc; bundle-version="[3.0.0,4.0.0)"
+           -> Bundle-SymbolicName: org.apache.xmlrpc; bundle-version="3.0.0.v20100427-1100"
+
+	at org.eclipse.osgi.container.Module.start(Module.java:451)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1783)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1762)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1725)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1656)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1)
+	at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:233)
+	at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:343)
+
+!ENTRY org.eclipse.mylyn.bugzilla.ui 4 0 2019-05-05 11:22:40.320
+!MESSAGE FrameworkEvent ERROR
+!STACK 0
+org.osgi.framework.BundleException: Could not resolve module: org.eclipse.mylyn.bugzilla.ui [264]
+  Unresolved requirement: Require-Bundle: org.eclipse.mylyn.bugzilla.core; bundle-version="[3.8.0,4.0.0)"
+    -> Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.core; bundle-version="3.24.2.v20180905-0003"; singleton:="true"
+       org.eclipse.mylyn.bugzilla.core [262]
+         Unresolved requirement: Require-Bundle: org.apache.xmlrpc
+           -> Bundle-SymbolicName: org.apache.xmlrpc; bundle-version="3.0.0.v20100427-1100"
+              org.apache.xmlrpc [54]
+                Unresolved requirement: Import-Package: javax.xml.bind
+         Unresolved requirement: Require-Bundle: org.eclipse.mylyn.commons.xmlrpc; bundle-version="[3.8.0,4.0.0)"
+           -> Bundle-SymbolicName: org.eclipse.mylyn.commons.xmlrpc; bundle-version="3.24.2.v20180904-2231"; singleton:="true"
+              org.eclipse.mylyn.commons.xmlrpc [279]
+                Unresolved requirement: Require-Bundle: org.apache.xmlrpc; bundle-version="[3.0.0,4.0.0)"
+                  -> Bundle-SymbolicName: org.apache.xmlrpc; bundle-version="3.0.0.v20100427-1100"
+
+	at org.eclipse.osgi.container.Module.start(Module.java:451)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1783)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1762)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1725)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1656)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1)
+	at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:233)
+	at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:343)
+
+!ENTRY org.eclipse.mylyn.commons.xmlrpc 4 0 2019-05-05 11:22:40.325
+!MESSAGE FrameworkEvent ERROR
+!STACK 0
+org.osgi.framework.BundleException: Could not resolve module: org.eclipse.mylyn.commons.xmlrpc [279]
+  Unresolved requirement: Require-Bundle: org.apache.xmlrpc; bundle-version="[3.0.0,4.0.0)"
+    -> Bundle-SymbolicName: org.apache.xmlrpc; bundle-version="3.0.0.v20100427-1100"
+       org.apache.xmlrpc [54]
+         Unresolved requirement: Import-Package: javax.xml.bind
+
+	at org.eclipse.osgi.container.Module.start(Module.java:451)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1783)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.incStartLevel(ModuleContainer.java:1762)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1725)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1656)
+	at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.dispatchEvent(ModuleContainer.java:1)
+	at org.eclipse.osgi.framework.eventmgr.EventManager.dispatchEvent(EventManager.java:233)
+	at org.eclipse.osgi.framework.eventmgr.EventManager$EventThread.run(EventManager.java:343)
+
+!ENTRY org.eclipse.mylyn.tasks.core 4 0 2019-05-05 11:22:43.007
+!MESSAGE Unexpected error while loading repository template extensions
+!SUBENTRY 1 org.eclipse.mylyn.tasks.core 4 0 2019-05-05 11:22:43.007
+!MESSAGE Could not load repository template extension contributed by 'org.eclipse.mylyn.bugzilla.ide' with connectorKind 'bugzilla'

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version

@@ -0,0 +1 @@
+

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version

@@ -0,0 +1 @@
+

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+version=1

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,9 @@
+content_assist_proposals_background=252,252,252
+content_assist_proposals_foreground=35,38,39
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.formatterprofiles.version=15
+org.eclipse.jdt.ui.text.code_templates_migrated=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
+spelling_locale_initialized=true
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true

JAVA/PROJET-PMT_STRI1A/src/json/.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=

JAVA/PROJET-PMT_STRI1A/src/json/.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

JAVA/PROJET-PMT_STRI1A/src/json/.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

JAVA/PROJET-PMT_STRI1A/src/json/.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

JAVA/PROJET-PMT_STRI1A/src/json/.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=1548420157012
+quickStart=false
+tipsAndTricks=true

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+showIntro=false

JAVA/PROJET-PMT_STRI1A/src/json/.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

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<typeInfoHistroy/>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<qualifiedTypeNameHistroy/>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
+		<item value="2" key="layout"/>
+		<item value="true" key="group_libraries"/>
+		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;Aggregate for window 1557048163961&quot;&gt;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0A;&lt;xmlDefinedFilters&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.buildship.ui.packageexplorer.filter.gradle.buildfolder&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.mylyn.java.ui.MembersFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.m2e.MavenModuleFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.buildship.ui.packageexplorer.filter.gradle.subProject&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.DeprecatedMembersFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0A;&lt;/customFilters&gt;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
+		<item value="1" key="rootMode"/>
+		<item value="false" key="linkWithEditor"/>
+	</section>
+	<section name="JavaElementSearchActions">
+	</section>
+</section>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log

@@ -0,0 +1 @@
+2019-05-05 11:22:44,020 [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.

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.10.0.20181127-2120.xml

@@ -0,0 +1,43 @@
+<configuration scan="true">
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>OFF</level> <!-- change to DEBUG to mimic '-consolelog' behaviour -->
+    </filter>
+  </appender>
+
+  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <File>${org.eclipse.m2e.log.dir}/0.log</File>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
+      <MinIndex>1</MinIndex>
+      <MaxIndex>10</MaxIndex>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <MaxFileSize>100MB</MaxFileSize>
+    </triggeringPolicy>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>WARN</level>
+    </filter>
+  </appender>
+
+  <appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
+  </appender>
+        
+  <root level="INFO">
+    <appender-ref ref="FILE" />
+    <appender-ref ref="STDOUT" />
+    <appender-ref ref="EclipseLog" />
+    <appender-ref ref="MavenConsoleLog" />
+  </root>
+
+  <logger name="com.ning.http.client" level="INFO" />
+</configuration>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Workspace
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    name="workspace"/>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+</section>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="WORKBENCH_SETTINGS">
+		<list key="ENABLED_TRANSFERS">
+		</list>
+	</section>
+	<section name="ChooseWorkspaceDialogSettings">
+		<item value="185" key="DIALOG_X_ORIGIN"/>
+		<item value="114" key="DIALOG_Y_ORIGIN"/>
+	</section>
+</section>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.ui.intro/introstate

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<state reopen="false"/>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="org.eclipse.ui.internal.QuickAccess">
+		<item value="-1" key="dialogHeight"/>
+		<item value="-1" key="dialogWidth"/>
+		<list key="textEntries">
+		</list>
+		<list key="orderedElements">
+		</list>
+		<list key="orderedProviders">
+		</list>
+		<list key="textArray">
+		</list>
+	</section>
+</section>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workingSetManager>
+<workingSet editPageId="org.eclipse.jdt.internal.ui.DynamicSourcesWorkingSet" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1557048163502_0" label="Java Main Sources" name="Java Main Sources"/>
+<workingSet editPageId="org.eclipse.jdt.internal.ui.DynamicSourcesWorkingSet" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1557048163509_1" label="Java Test Sources" name="Java Test Sources"/>
+<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1557048163961_2" label="Window Working Set" name="Aggregate for window 1557048163961"/>
+</workingSetManager>

JAVA/PROJET-PMT_STRI1A/src/json/.metadata/version.ini

@@ -0,0 +1,3 @@
+#Sun May 05 11:22:40 CEST 2019
+org.eclipse.core.runtime=2
+org.eclipse.platform=4.10.0.v20181206-0815

JAVA/PROJET-PMT_STRI1A/src/json/Generateur.java

@@ -0,0 +1,29 @@
+package json;
+
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+
+import com.google.gson.Gson;
+
+import modeles.*;
+public class Generateur {
+
+	public Labyrinthe labyrithe() {
+		BufferedReader bfr= null;
+		 try {
+			bfr = new BufferedReader(new FileReader("/home/nicolas/workspqce_eclipse/projet/src/json/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;
+	}
+	
+	
+}

JAVA/PROJET-PMT_STRI1A/src/json/gsonGenerator.java

@@ -0,0 +1,30 @@
+package json;
+import modeles.Salle;
+import com.google.gson.Gson;
+
+public class gsonGenerator {
+		String chaineJson;
+
+		/**
+		 * @param chaineJson
+		 */
+		public gsonGenerator() {
+			
+			
+		}
+		/*chaine json =
+		"{'positionX':0,
+		'positionY':0,
+		'sortie':false,
+		'monstre':[{'nom':premier monstre,'pAttaque':5}],
+		'porte':[{'ouvert':=true, 'position':"H"}]}"
+		*/
+		public Salle generate(String chaine) {
+			Gson gson = new Gson();
+			Salle salle = gson.fromJson(chaine, Salle.class);
+			System.out.println(salle.estVide());
+			return salle;
+		}
+		
+		
+}

JAVA/PROJET-PMT_STRI1A/src/json/lab.json

@@ -0,0 +1,49 @@
+
+{
+"listePersonnage":[
+      {
+        "nom":"test",
+        "pVieMax":10,
+        "pVie":10,
+        "pAttaque":20,
+        "arme":null,
+        "armure":null,
+        "bourse":null
+       
+      }
+],
+"listeSalle":[
+    
+    {
+    "positionX":0,
+    "positionY":0,
+    "sortie":false,
+    "listeEnnemie":[{"nom":"premiermonstre",
+              "pAttaque":5}
+              ],
+    "listePorte":[{"ouvert":true,
+          "orientation":"H"}]
+    
+    }
+    ],
+"listeArme":[
+  {"nom":"arme1",
+    "prix":10,
+     "resistance":10,
+     "pArme":10}],
+"listeArmure":[  {"nom":"armure1",
+    "prix":10,
+     "resistance":10,
+     "pArmure":10}],
+
+"listePorte":[
+            {
+            "id":1,
+            "ouvert":false,
+            "orientation":"Z",
+            }
+
+],
+"listeMonstre":[{"nom":"premiermonstre",
+              "pAttaque":5}]
+}

JAVA/PROJET-PMT_STRI1A/src/json/main.java

@@ -0,0 +1,22 @@
+package json;
+
+
+import modeles.Arme;
+import modeles.Labyrinthe;
+import modeles.Monstre;
+
+public class main {
+
+	public static void main(String[] args) {
+		gsonGenerator generateur = new gsonGenerator();
+		
+		Generateur gene = new Generateur();
+		Labyrinthe lab =  gene.labyrithe();
+		//lab.getListeSalle();
+		Monstre monstre =new Monstre("test",5);
+		Arme arme = new Arme("arme1", 10, 10, 10);
+		System.out.println("");
+
+	}
+
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Arme.java

@@ -1,12 +1,28 @@
-
+
-package modeles;
+package modeles;
-
+
-/**
+/**
- * @author flavien
+ * @author flavien
- *
+ *
- */
+ */
-public class Arme extends Objet {
+
-	
+
-	private int pArme;
+public class Arme extends Objet {
-
+	
-}
+	private int pArme;
+	
+	public int getpArme() {
+		return this.pArme;
+	}
+
+	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<69>ration, gel, saignement, paralysie,... */
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Armure.java

@@ -1,14 +1,29 @@
-/**
+/**
- * 
+ * 
- */
+ */
-package modeles;
+package modeles;
-
+
-/**
+/**
- * @author flavien
+ * @author flavien
- *
+ *
- */
+ */
-public class Armure extends Objet {
+public class Armure extends Objet {
-	
+	
-	private int pArmure;
+	private int pArmure;
-
+
-}
+	public int getpArmure() {
+		return this.pArmure;
+	}
+	
+	public String getType () {
+		return "Armure";
+	}
+    public Armure(){}
+	public Armure(String nm, int valeur, int resistance,int efficacite) {
+		super(nm, valeur, resistance);
+		this.pArmure=efficacite;
+	}
+	
+	
+	/* public armureEffect(...) */
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Bourse.java

@@ -1,13 +1,40 @@
-/**
+/**
- * 
+ * 
- */
+ */
-package modeles;
+package modeles;
-
+
-/**
+/**
- * @author flavien
+ * @author flavien
- *
+ *
- */
+ */
-public class Bourse extends Objet {
+public class Bourse extends Objet {
-	private int valeur;
+	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;
+	}
+	
+}

JAVA/PROJET-PMT_STRI1A/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<6F>en");
+		}
+		return bool;		
+	}
+
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/EtreVivant.java

@@ -1,17 +1,112 @@
-/**
+
- * 
+/**
- */
+ * 
-package modeles;
+ */
-
+package modeles;
-/**
+
- * @author flavien
+/**
- *
+ * @author Nicolas
- */
+ *
-public class EtreVivant {
+ */
-	private int pVieMax;
+public class EtreVivant {
-	private int pVie;
+	
-	private int pAttaque;
+	private String nom;
-	private Salle salle;
+	protected int pVieMax;
-	private boolean vivant;
+	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() {
+		
+	}
+	public EtreVivant(String nom, int pVieMax, int pAttaque,Salle salle) {
+		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
+	 */
+	/**
+	 * @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;
+	}
+	
+	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;
+	}
+		
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Labyrinthe.java

@@ -1,12 +1,60 @@
-/**
+/**
- * 
+ * 
- */
+ */
-package modeles;
+package modeles;
-
+
-/**
+import java.util.*;
- * @author flavien
+
- *
+/**
- */
+ * @author flavien
-public class Labyrinthe {
+ *
-
+ */
-}
+public class Labyrinthe {
+	protected List<Personnage> listePersonnage=new ArrayList<Personnage>();
+	protected List<Arme> listeArme= new ArrayList<Arme>();
+	protected List<Armure> listeArmure=new ArrayList<Armure>();
+	protected List<Porte> listePorte=new ArrayList<Porte>();
+	protected List<Monstre> listeMonstre=new ArrayList<Monstre>();
+	
+	
+	
+	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();
+	    
+	  }
+	
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Marche.java

@@ -1,12 +1,19 @@
-/**
+/**
- * 
+ * 
- */
+ */
-package modeles;
+package modeles;
-
+
-/**
+import java.util.List;
- * @author flavien
+
- *
+/**
- */
+ * @author flavien
-public class Marche extends Salle {
+ *
-
+ */
-}
+public class Marche extends Salle {
+
+	public Marche(int positionX, int positionY, boolean sortie, List listeEnnemie, List listePorte) {
+		super(positionX, positionY, sortie, listeEnnemie, listePorte);
+		// TODO Auto-generated constructor stub
+	}
+		
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Menu.java

@@ -0,0 +1,56 @@
+/**
+ * 
+ */
+package modeles;
+
+/**
+ * @author nicolas
+ *
+ */
+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
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Monstre.java

@@ -1,12 +1,35 @@
-/**
+/**
- * 
+ * 
- */
+ */
-package modeles;
+package modeles;
-
+
-/**
+/**
- * @author flavien
+ * @author Nicolas
- *
+ *
- */
+ */
-public class Monstre extends EtreVivant {
+public class Monstre extends EtreVivant {
-
+
-}
+	/**
+	 * @param arme
+	 * @param armure
+	 * @param bourse
+	 */
+	public Monstre(String nom,  int pAttaque) {
+		super(nom, 5, pAttaque);
+		
+	}
+	public Monstre() {
+		
+	}
+	/*
+	public int attaquer(Personnage def) {
+		int pAttaqueLoc;
+		pAttaqueLoc=this.getpAttaque()-(def.getArmure().getpArmure());
+	 	def.pVie=pAttaqueLoc;
+	 	return pAttaqueLoc;
+	 	
+}*/
+	
+	
+	
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Objet.java

@@ -1,15 +1,50 @@
-/**
+package modeles;
- * 
+
- */
+/**
-package modeles;
+ * @author flavien
-
+ *
-/**
+ */
- * @author flavien
+public abstract class Objet {
- *
+	private String nom;
- */
+	private int prix;
-public class Objet {
+	private int usure;
-	private String nom;
+	private Personnage proprietaire;
-	private int prix;
+	
-	private int usure;
+	public Objet() {}
-
+	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<73>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;
+	}
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Personnage.java

@@ -1,22 +1,85 @@
 package modeles;
 
-/**
+import java.util.ArrayList;
- * @author flavien
+import java.util.List;
- *
+
- */
 public class Personnage extends EtreVivant {
-	public void equiper(Arme arme, Armure armure) {
+  
-		
+  private Arme arme;
-	}
+  private Armure armure;
-	
+  private Bourse bourse;
-	public void utiliser(Potion potion) {
+  private List<Potion> listepotion= new ArrayList<Potion>();
-		
+  
-	}
+  public Personnage(String nom, int pVieMax,int pAttaque, Salle salle) {
-	public void seDeplacer() {
+    super(nom, pVieMax, pAttaque, salle);
-		
+  }
-	}
+  
-	public void allerMarche(Salle salle){
+  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<Potion> 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 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;
+  }
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Porte.java

@@ -1,22 +1,44 @@
-/**
+/**
- * 
+ * 
- */
+ */
-package modeles;
+package modeles;
-
+
-/**
+import java.util.ArrayList;
- * @author flavien
+
- *
+/**
- */
+ * @author flavien
-public class Porte {
+ *
-	private boolean ouvert;
+ */
-	private char orientation;
+public class Porte {
-	
+	private int id; 
-	public boolean estOuverte() {
+	private boolean ouvert;
-		return ouvert;
+	private Salle salle1;
-	}
+	private Salle salle2;
-
+	
-	public char getOrientation() {
+	public Porte() {
-		return orientation;
+		
-	}
+	}
-
+	
-}
+	public Porte(int id,boolean ouvert, Salle salle,Salle salle2) {
+		super();
+		this.ouvert = ouvert;
+		this.salle1 = salle;
+		this.salle2 = salle2;
+		this.id=id;
+	}
+	
+	public boolean estOuverte() {
+		return ouvert;
+	}
+
+	public int getId(){
+		return this.id;
+	}
+	
+	/**
+	 * @param ouvert
+	 * @param orientation
+	 */
+	
+
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Potion.java

@@ -1,12 +1,25 @@
-/**
+/**
- * 
+ * 
- */
+ */
-package modeles;
+package modeles;
-
+
-/**
+/**
- * @author flavien
+ * @author flavien
- *
+ *
- */
+ */
-public class Potion extends Objet {
+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()); 		
+	}
+	
+	
+}

JAVA/PROJET-PMT_STRI1A/src/modeles/Salle.java

@@ -1,19 +1,66 @@
-/**
+
- * 
+package modeles;
- */
+
-package modeles;
+import java.util.ArrayList;
-
+import java.util.List;
-/**
+
- * @author flavien
+/**
- *
+ * @author flavien
- */
+ *
-public class Salle {
+ */
-	private int positionX;
+public class Salle {
-	private int positionY;
+	public static int positionX;
-	private boolean sortie;
+	/**
-	
+	 * @param positionX
-	public String getType(){
+	 * @param positionY
-		return"type";
+	 * @param sortie
-	}
+	 * @param listeEnnemie
-
+	 * @param listePorte
-}
+	 */
+	
+	public Salle(int positionX, int positionY, boolean sortie, List<Integer> listeEnnemie) {
+		this.positionX=positionX;
+		this.positionY = positionY;
+		this.sortie = sortie;
+		this.listeEnnemie = listeEnnemie;		
+	}
+	
+	public Salle(int positionX, int positionY, boolean sortie, List<Integer> listeEnnemie, Porte sal) {
+		this.positionX = positionX;
+		this.positionY = 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<Integer> listeEnnemie= new ArrayList<Integer>();
+	private static List<Integer> listePorte = new ArrayList<Integer>();
+	
+	public String getType(){
+		return "salle";
+	}
+	
+	public int getPositionX() {
+		return positionX;
+	}
+
+	public int getPositionY() {
+		return positionY;
+	}
+	
+	public boolean estSortie() {
+		return sortie;
+	}
+	
+	public boolean estVide() {
+		return listeEnnemie.isEmpty();
+	}
+	
+}
+

JAVA/PROJET-PMT_STRI1A/src/modeles/sauvegarde.java

@@ -0,0 +1,42 @@
+package modeles;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+
+public class sauvegarde {
+
+	public void enregistrerPersonnage(Labyrinthe lab) {
+		try {
+			File f= new File("./personnage.json");
+			f.createNewFile();
+			FileWriter fw= new FileWriter(f,true);
+			for (int i =0; i<lab.listePersonnage.size();i++) {
+				fw.write("{\n\t \"nom\" : \""+lab.listePersonnage.get(i).getNom()+"\" ,"
+						+ "\n\t \"pVieMax\" : \""+lab.listePersonnage.get(i).getPvMax()
+						+"\" ,\n\t \"pVie\" : \""+lab.listePersonnage.get(i).getpVie()
+						+"\" ,\n\t \"pAttaque\" : \""+lab.listePersonnage.get(i).getpAttaque()
+						//+"\" ,\n\t \"salle\" : \""+lab.listePersonnage.get(i).getSalle().getPositionX()+" "+lab.listePersonnage.get(i).getSalle().getPositionY() /*attention pour la r<>cup<75>ration de sauvegarde*/
+						+"\" ,\n\t \"vivant\" : \""+lab.listePersonnage.get(i).isVivant() +"\n\t \"arme\" : \""+lab.listePersonnage.get(i).getArme().getNom()
+						+"\" ,\n\t \"armure\" : \""+lab.listePersonnage.get(i).getArmure().getNom() +"\n\t \"bourse\" : \""+lab.listePersonnage.get(i).getBourse().getValeur()+"\n}"); /* attention pour la r<>cup<75>ration de donn<6E>e */
+			}
+			fw.flush();
+			fw.close();			
+		} catch (IOException ex) {
+			ex.printStackTrace();
+		}
+	}
+	/*
+	public void enregistrerLabyrinthe(Labyrinthe lab) { // <20> faire
+		try {
+			File f = new File ("./labyrinthe.json");
+			f.createNewFile();
+			FileWriter fw= new FileWriter(f,true);
+			for(int i = 0; i<lab.listeSalle.size();i++) {
+				fw.write("{\n\t [ \n\t{\n\t  ");
+			}
+		}
+	}
+	*/
+}

JAVA/PROJET-PMT_STRI1A/src/module-info.java

@@ -0,0 +1,12 @@
+/**
+ * 
+ */
+/**
+ * @author nicolas
+ *
+ */
+module projet {
+	requires gson;
+	requires java.sql;
+	opens modeles to gson;
+}