diff --git a/.gradle/7.4.1/executionHistory/executionHistory.bin b/.gradle/7.4.1/executionHistory/executionHistory.bin
index bb5d5d6d7b4b9584be40d7d4f4ae00105acf7054..591b259f7c7a8a4517336da58c06975e9eaa53f5 100644
Binary files a/.gradle/7.4.1/executionHistory/executionHistory.bin and b/.gradle/7.4.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/7.4.1/executionHistory/executionHistory.lock b/.gradle/7.4.1/executionHistory/executionHistory.lock
index 32f03cbb74e8df515e94b1226e242cea03e255c5..b1f4f40098398af0a184a900c24b5ac62b06a550 100644
Binary files a/.gradle/7.4.1/executionHistory/executionHistory.lock and b/.gradle/7.4.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/7.4.1/fileHashes/fileHashes.bin b/.gradle/7.4.1/fileHashes/fileHashes.bin
index 7e1939d242b76ad7cf8e2e86abc6995fd4d61e4f..9d039b6b48d6d988b92faef230be44d612417e1c 100644
Binary files a/.gradle/7.4.1/fileHashes/fileHashes.bin and b/.gradle/7.4.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/7.4.1/fileHashes/fileHashes.lock b/.gradle/7.4.1/fileHashes/fileHashes.lock
index 74b2433335998345d41a5ddcedd540328dbb5593..cce5810c0e6edd56cc3cb6d1bbeb3a7beed285c0 100644
Binary files a/.gradle/7.4.1/fileHashes/fileHashes.lock and b/.gradle/7.4.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/.gradle/7.4.1/fileHashes/resourceHashesCache.bin
index 201243be709491cbdd81f96077f5381a3cace741..57c29488fc7eae956bebdc47327b109325cf8cef 100644
Binary files a/.gradle/7.4.1/fileHashes/resourceHashesCache.bin and b/.gradle/7.4.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index b6e840f9c42e3eaa55009c9e47c03d0139502788..d54f0816cb7e908c711c619a1a94295b9faf20d5 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 6af8291b8023dae630c8f203ac80683799f6d3f5..7c55d31e39476212a4ac899a0a9a0d698cb7ade0 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index f08f37343d9dd9e1f806996102f152f667c6044f..104fc74109164c53e0dec14ce6db9dccca4ca6bc 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b589d56e9f285d8cfdc6c270853a5d439021a278
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <bytecodeTargetLevel target="17" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..611e7c8ad7b91e576987485e8678b0fdad4193ae
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GradleMigrationSettings" migrationVersion="1" />
+ <component name="GradleSettings">
+ <option name="linkedExternalProjectsSettings">
+ <GradleProjectSettings>
+ <option name="distributionType" value="DEFAULT_WRAPPED" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="modules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ </set>
+ </option>
+ </GradleProjectSettings>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc392fe877c32ab51d532fa67f65ff2e75e9061
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="jboss.community" />
+ <option name="name" value="JBoss Community repository" />
+ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="MavenRepo" />
+ <option name="name" value="MavenRepo" />
+ <option name="url" value="https://repo.maven.apache.org/maven2/" />
+ </remote-repository>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..668048d361f325597a12d4975b8ba9630ad8decb
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin
index bb5d5d6d7b4b9584be40d7d4f4ae00105acf7054..f266c40fd57010c9d12e995fca8c9ce6b74a9a6c 100644
Binary files a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin and b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin differ
diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock
index 32f03cbb74e8df515e94b1226e242cea03e255c5..be3ffce2fad1d1fbe5ccaa68ed993209aba34400 100644
Binary files a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock and b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock differ
diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin
index 7e1939d242b76ad7cf8e2e86abc6995fd4d61e4f..971bc06afd5df9093d97f15bd900742b03cb7f2c 100644
Binary files a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin and b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin differ
diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock
index 74b2433335998345d41a5ddcedd540328dbb5593..be33c03bb97fcd621ffd6118ceb64bc1e4e40a8a 100644
Binary files a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock and b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock differ
diff --git a/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin
index 201243be709491cbdd81f96077f5381a3cace741..43b10917e38060490cecafb40b37a47abd6f0562 100644
Binary files a/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin and b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin differ
diff --git a/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index b6e840f9c42e3eaa55009c9e47c03d0139502788..fdf7e3e95f540985babec9c9198633f8afe29c73 100644
Binary files a/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/bin/default/.gradle/buildOutputCleanup/outputFiles.bin b/bin/default/.gradle/buildOutputCleanup/outputFiles.bin
index 6af8291b8023dae630c8f203ac80683799f6d3f5..fce6a9ca2c87c27cccc8c9b966cbacafcb41da86 100644
Binary files a/bin/default/.gradle/buildOutputCleanup/outputFiles.bin and b/bin/default/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/bin/default/.gradle/file-system.probe b/bin/default/.gradle/file-system.probe
index f08f37343d9dd9e1f806996102f152f667c6044f..f6e0a7774bc75d8bae1480f1c021331ebb201c77 100644
Binary files a/bin/default/.gradle/file-system.probe and b/bin/default/.gradle/file-system.probe differ
diff --git a/bin/default/.idea/.gitignore b/bin/default/.idea/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5
--- /dev/null
+++ b/bin/default/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/bin/default/.idea/compiler.xml b/bin/default/.idea/compiler.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b589d56e9f285d8cfdc6c270853a5d439021a278
--- /dev/null
+++ b/bin/default/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <bytecodeTargetLevel target="17" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/bin/default/.idea/gradle.xml b/bin/default/.idea/gradle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..611e7c8ad7b91e576987485e8678b0fdad4193ae
--- /dev/null
+++ b/bin/default/.idea/gradle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GradleMigrationSettings" migrationVersion="1" />
+ <component name="GradleSettings">
+ <option name="linkedExternalProjectsSettings">
+ <GradleProjectSettings>
+ <option name="distributionType" value="DEFAULT_WRAPPED" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="modules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ </set>
+ </option>
+ </GradleProjectSettings>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/bin/default/.idea/jarRepositories.xml b/bin/default/.idea/jarRepositories.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc392fe877c32ab51d532fa67f65ff2e75e9061
--- /dev/null
+++ b/bin/default/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="jboss.community" />
+ <option name="name" value="JBoss Community repository" />
+ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="MavenRepo" />
+ <option name="name" value="MavenRepo" />
+ <option name="url" value="https://repo.maven.apache.org/maven2/" />
+ </remote-repository>
+ </component>
+</project>
\ No newline at end of file
diff --git a/bin/default/.idea/misc.xml b/bin/default/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..668048d361f325597a12d4975b8ba9630ad8decb
--- /dev/null
+++ b/bin/default/.idea/misc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/bin/default/.idea/vcs.xml b/bin/default/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /dev/null
+++ b/bin/default/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/bin/default/.project b/bin/default/.project
index 57d760327f1b39551b2bcc06f3a8328c1335a10a..d2569ad3f6682660c6da540d457769f26201bd90 100644
--- a/bin/default/.project
+++ b/bin/default/.project
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>applicationgommette-1</name>
- <comment>Project applicationgommette-1 created by Buildship.</comment>
+ <name>applicationgommette</name>
+ <comment>Project applicationgommette created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
@@ -22,7 +22,7 @@
</natures>
<filteredResources>
<filter>
- <id>1649232034026</id>
+ <id>1649235114166</id>
<name></name>
<type>30</type>
<matcher>
diff --git a/bin/default/.settings/org.eclipse.buildship.core.prefs b/bin/default/.settings/org.eclipse.buildship.core.prefs
index 9ba44126cfc47c9105ac840dbe0a0ea577a0aecb..a87e6b90aba6ace9a5a82e9e2d714e81ca94cf31 100644
--- a/bin/default/.settings/org.eclipse.buildship.core.prefs
+++ b/bin/default/.settings/org.eclipse.buildship.core.prefs
@@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
-java.home=C\:/Program Files/OpenJDK/openjdk-11.0.10_9
+java.home=C\:/Program Files/Java/jdk-17.0.2
jvm.arguments=
offline.mode=false
override.workspace.settings=true
diff --git a/bin/default/build/tmp/compileJava/previous-compilation-data.bin b/bin/default/build/tmp/compileJava/previous-compilation-data.bin
deleted file mode 100644
index bd82f138c67d96e9f361842e91a51b3bc5299fa0..0000000000000000000000000000000000000000
Binary files a/bin/default/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ
diff --git a/bin/default/src/com/uca/StartServer.class b/bin/default/src/com/uca/StartServer.class
index 9d44210e25e89d8962edbe6d61485a4a3ed8c0e7..4918228e6b609b46e6b18175e762aaaf34d54024 100644
Binary files a/bin/default/src/com/uca/StartServer.class and b/bin/default/src/com/uca/StartServer.class differ
diff --git a/bin/default/src/com/uca/core/UserCore.class b/bin/default/src/com/uca/core/UserCore.class
index 98e08e827d9b80ab4a9ed6a4bbd57ca9c66e5e97..a15e1cd0ef8cdeb79af9ef60c10bdd1965291831 100644
Binary files a/bin/default/src/com/uca/core/UserCore.class and b/bin/default/src/com/uca/core/UserCore.class differ
diff --git a/bin/default/src/com/uca/dao/UserDAO.class b/bin/default/src/com/uca/dao/UserDAO.class
index 4e5b7e4a83975df3b6bb190fa9c616e0f7e9f7d6..cd4aa4dff5850fd209116aee607f77bc16524696 100644
Binary files a/bin/default/src/com/uca/dao/UserDAO.class and b/bin/default/src/com/uca/dao/UserDAO.class differ
diff --git a/bin/default/src/com/uca/dao/_Connector.class b/bin/default/src/com/uca/dao/_Connector.class
index 475deba7c0b0123e58376e99943bfaa7616cec2f..ae923f0f5663badbebde9535da56b832e45429ec 100644
Binary files a/bin/default/src/com/uca/dao/_Connector.class and b/bin/default/src/com/uca/dao/_Connector.class differ
diff --git a/bin/default/src/com/uca/dao/_Generic.class b/bin/default/src/com/uca/dao/_Generic.class
index e27e1ca6de774ef9459fc78a60812c25bd95b868..22080ea8cd3b6e4a28db3ee4b20efd22d71fb538 100644
Binary files a/bin/default/src/com/uca/dao/_Generic.class and b/bin/default/src/com/uca/dao/_Generic.class differ
diff --git a/bin/default/src/com/uca/dao/_Initializer.class b/bin/default/src/com/uca/dao/_Initializer.class
index 2a06ab50a82188781aef1722e563589ec7038258..de96891d15d1744dda564565c3db0eb26dd2ce91 100644
Binary files a/bin/default/src/com/uca/dao/_Initializer.class and b/bin/default/src/com/uca/dao/_Initializer.class differ
diff --git a/bin/default/src/com/uca/entity/Couleur.class b/bin/default/src/com/uca/entity/Couleur.class
new file mode 100644
index 0000000000000000000000000000000000000000..671fb2ee81cca6ad6bf2f40e8ca985ecc5d14bcc
Binary files /dev/null and b/bin/default/src/com/uca/entity/Couleur.class differ
diff --git a/bin/default/src/com/uca/entity/EleveEntity.class b/bin/default/src/com/uca/entity/EleveEntity.class
index af6fd7a1be7fe8c0fed02084d2d9455afbdfe301..51a33516075dd3ed3cdb48d4a6f3a3a823b6befd 100644
Binary files a/bin/default/src/com/uca/entity/EleveEntity.class and b/bin/default/src/com/uca/entity/EleveEntity.class differ
diff --git a/bin/default/src/com/uca/entity/GommetteAttribEntity.class b/bin/default/src/com/uca/entity/GommetteAttribEntity.class
index 645d4d654ee028411d95acd41d954276227dd829..c78eebf55826879d272a5bafe160a81443d0412d 100644
Binary files a/bin/default/src/com/uca/entity/GommetteAttribEntity.class and b/bin/default/src/com/uca/entity/GommetteAttribEntity.class differ
diff --git a/bin/default/src/com/uca/entity/GommetteEntity$Couleur.class b/bin/default/src/com/uca/entity/GommetteEntity$Couleur.class
deleted file mode 100644
index e57a805904a9866f0f91304fb6d85b1e255be931..0000000000000000000000000000000000000000
Binary files a/bin/default/src/com/uca/entity/GommetteEntity$Couleur.class and /dev/null differ
diff --git a/bin/default/src/com/uca/entity/GommetteEntity.class b/bin/default/src/com/uca/entity/GommetteEntity.class
index ce862de7d8b9e1745340d9e6e24128e1e1df0489..1426ad709a6eca5a6fa808c8e09aa905e7bad254 100644
Binary files a/bin/default/src/com/uca/entity/GommetteEntity.class and b/bin/default/src/com/uca/entity/GommetteEntity.class differ
diff --git a/bin/default/src/com/uca/entity/ProfEntity.class b/bin/default/src/com/uca/entity/ProfEntity.class
index 76748bd140c9a6a36a8a1c33a0eb1f46c184cf56..2e14a3a4c17768ba33b877c3a9187badaf209889 100644
Binary files a/bin/default/src/com/uca/entity/ProfEntity.class and b/bin/default/src/com/uca/entity/ProfEntity.class differ
diff --git a/bin/default/src/com/uca/entity/UserEntity.class b/bin/default/src/com/uca/entity/UserEntity.class
index b0a01207ab8dc57b84e9838620fff8fc5b5b5a7f..497d13bfc4cd1ea4bdb8501ad37f965bd5647237 100644
Binary files a/bin/default/src/com/uca/entity/UserEntity.class and b/bin/default/src/com/uca/entity/UserEntity.class differ
diff --git a/bin/default/src/com/uca/gui/DefaultGUI.class b/bin/default/src/com/uca/gui/DefaultGUI.class
new file mode 100644
index 0000000000000000000000000000000000000000..43c6dadfc89ea0c511da14b1c8757d808bf70ad8
Binary files /dev/null and b/bin/default/src/com/uca/gui/DefaultGUI.class differ
diff --git a/bin/default/src/com/uca/gui/ProfGUI.class b/bin/default/src/com/uca/gui/ProfGUI.class
new file mode 100644
index 0000000000000000000000000000000000000000..ddf3d5bca9190dcbc13b0430e876dc4b42d69663
Binary files /dev/null and b/bin/default/src/com/uca/gui/ProfGUI.class differ
diff --git a/bin/default/src/com/uca/gui/UserGUI.class b/bin/default/src/com/uca/gui/UserGUI.class
index 1f8a80f004bf771fb21c3ea4585d3dda7cfa306e..9801019584b4ac48d7e083c0dd1459e430526e21 100644
Binary files a/bin/default/src/com/uca/gui/UserGUI.class and b/bin/default/src/com/uca/gui/UserGUI.class differ
diff --git a/bin/default/src/com/uca/gui/_FreeMarkerInitializer.class b/bin/default/src/com/uca/gui/_FreeMarkerInitializer.class
index e9702bc833a1429af0724c994a5d73b27445f083..ad6ffc28ef0b627f98a53826927fbeb22ecf7ad0 100644
Binary files a/bin/default/src/com/uca/gui/_FreeMarkerInitializer.class and b/bin/default/src/com/uca/gui/_FreeMarkerInitializer.class differ
diff --git a/build/classes/java/main/com/uca/StartServer.class b/build/classes/java/main/com/uca/StartServer.class
deleted file mode 100644
index 5f00f206253702eb628c8e5cdc2de6884e67a769..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/StartServer.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/core/UserCore.class b/build/classes/java/main/com/uca/core/UserCore.class
deleted file mode 100644
index 36771d033a9c9123d4a33aaa610e34cc521d6d30..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/core/UserCore.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/dao/UserDAO.class b/build/classes/java/main/com/uca/dao/UserDAO.class
deleted file mode 100644
index 5338946da0990f839cf416887957304d94a8ac08..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/dao/UserDAO.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/dao/_Connector.class b/build/classes/java/main/com/uca/dao/_Connector.class
deleted file mode 100644
index 8fd58517daef2b401a0e14c3bfaf972670c361c5..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/dao/_Connector.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/dao/_Generic.class b/build/classes/java/main/com/uca/dao/_Generic.class
deleted file mode 100644
index 3a68e85553010f70bb02d7f57579b2ce3f0fa543..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/dao/_Generic.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/dao/_Initializer.class b/build/classes/java/main/com/uca/dao/_Initializer.class
deleted file mode 100644
index 8393adbda65509902248158231b48eb6ead76099..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/dao/_Initializer.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/entity/UserEntity.class b/build/classes/java/main/com/uca/entity/UserEntity.class
deleted file mode 100644
index 308e923df8af0a67292876388afebbed711931b5..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/entity/UserEntity.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/gui/UserGUI.class b/build/classes/java/main/com/uca/gui/UserGUI.class
deleted file mode 100644
index f253ee75cef87ca96231d248b77e1724dd486851..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/gui/UserGUI.class and /dev/null differ
diff --git a/build/classes/java/main/com/uca/gui/_FreeMarkerInitializer.class b/build/classes/java/main/com/uca/gui/_FreeMarkerInitializer.class
deleted file mode 100644
index 0bb0cf69fb21b6a17bee4077213a5fe363dbfa26..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/com/uca/gui/_FreeMarkerInitializer.class and /dev/null differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
deleted file mode 100644
index bd82f138c67d96e9f361842e91a51b3bc5299fa0..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ
diff --git a/src/com/uca/entity/Couleur.java b/src/com/uca/entity/Couleur.java
new file mode 100644
index 0000000000000000000000000000000000000000..8bddcf4a27f15ea5ff181cf0a3421dc87bb90825
--- /dev/null
+++ b/src/com/uca/entity/Couleur.java
@@ -0,0 +1,32 @@
+
+public enum Couleur
+{
+ ArcEnCiel("arcEnCiel"),
+ Rouge("rouge"),
+ Vert ("vert"),
+ Bleu ("bleu"),
+ Blanc("blanc");
+
+ private String value;
+
+ private Couleur(String value)
+ {
+ this.value = value;
+ }
+
+ public String getString() { return value; }
+ @Override public void toString()
+ {
+ return getString();
+ }
+
+ public static Couleur valueOf(String value) {
+ for (Couleur col : Couleur.values()) {
+ if(col.getString() == value)
+ {
+ return col;
+ }
+ }
+ return ArcEnCiel;
+ }
+}
diff --git a/src/com/uca/entity/GommetteAttribEntity.java b/src/com/uca/entity/GommetteAttribEntity.java
index 9c2737706f40c26264e6aa7f372c3d8ebbdcf59a..3a26b97731e68cd7eab93423088ea1197094c8b2 100644
--- a/src/com/uca/entity/GommetteAttribEntity.java
+++ b/src/com/uca/entity/GommetteAttribEntity.java
@@ -25,9 +25,7 @@ public class GommetteAttribEntity {
idEleve = nIdEleve;
}
- public int getIdProf() {
- return idProf;
- }
+ public int getIdProf() { return idProf; }
public void setIdProf(int nIdProf) {
idProf = nIdProf;
diff --git a/src/com/uca/entity/GommetteEntity.java b/src/com/uca/entity/GommetteEntity.java
index 1ace5e914d83641ab7ddc97db60f0ddcaa62c0c9..243f4809d63b23eb6413c421c4d11619426879ad 100644
--- a/src/com/uca/entity/GommetteEntity.java
+++ b/src/com/uca/entity/GommetteEntity.java
@@ -11,7 +11,6 @@ public class GommetteEntity
public String getNom() { return nom; }
public void setNom(String value) { nom = value; }
- public enum Couleur { Verte, Rouge, Blanc, ArcEnCiel }
private Couleur couleur;
public Couleur getCouleur() { return couleur; }
public void setCouleur(Couleur value) { couleur = value; }
diff --git a/src/com/uca/entity/ProfEntity.java b/src/com/uca/entity/ProfEntity.java
index 954eb8e90508d4d0ef338d0f491b2a514f9739d0..03bbfccab59e085e53b86a88d2c549a17ec8a253 100644
--- a/src/com/uca/entity/ProfEntity.java
+++ b/src/com/uca/entity/ProfEntity.java
@@ -3,9 +3,9 @@ import java.sql.Timestamp;
import com.uca.entity.UserEntity;
public class ProfEntity extends UserEntity {
- private String Username;
- public String getUsername() { return Username; }
- public void setUsername(String value) { Username = value; }
+ private String UserName;
+ public String getUserName() { return UserName; }
+ public void setUserName(String value) { UserName = value; }
public ProfEntity(){
//Ignored !
diff --git a/src/com/uca/gui/DefaultGUI.java b/src/com/uca/gui/DefaultGUI.java
new file mode 100644
index 0000000000000000000000000000000000000000..d8010849c993b540a463aa28d03e9e3eda80b277
--- /dev/null
+++ b/src/com/uca/gui/DefaultGUI.java
@@ -0,0 +1,25 @@
+package com.uca.gui;
+
+import com.uca.core.UserCore;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+public class DefaultGUI
+{
+ public static String getDefaultGUI(Map<String, Object> input) throws IOException, TemplateException
+ {
+ Configuration configuration = _FreeMarkerInitializer.getContext();
+ Writer output = new StringWriter();
+ Template template = configuration.getTemplate("users/users.ftl");
+ template.setOutputEncoding("UTF-8");
+ template.process(input, output);
+ return output.toString();
+ }
+}
diff --git a/src/com/uca/gui/ProfGUI.java b/src/com/uca/gui/ProfGUI.java
new file mode 100644
index 0000000000000000000000000000000000000000..e30b12905fd2826877fc64e38b82cf00507ad86e
--- /dev/null
+++ b/src/com/uca/gui/ProfGUI.java
@@ -0,0 +1,22 @@
+package com.uca.gui;
+
+import com.uca.core.UserCore;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ProfGUI
+{
+ public static String getAllProfs() throws IOException, TemplateException {
+
+ Map<String, Object> input = new HashMap<>();
+ input.put("profs", ProfCore.getAllProfs());
+ return DefaultGUI.getDefaultGUI(input);
+ }
+}
diff --git a/src/com/uca/gui/UserGUI.java b/src/com/uca/gui/UserGUI.java
index 86ec18416978fc756e5df2c7678bdcb44ad80689..6c3256da3e7fa39ebf8a5a0d78cdd805907ba8ca 100644
--- a/src/com/uca/gui/UserGUI.java
+++ b/src/com/uca/gui/UserGUI.java
@@ -11,20 +11,12 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-public class UserGUI {
-
+public class UserGUI
+{
public static String getAllUsers() throws IOException, TemplateException {
- Configuration configuration = _FreeMarkerInitializer.getContext();
Map<String, Object> input = new HashMap<>();
-
input.put("users", UserCore.getAllUsers());
-
- Writer output = new StringWriter();
- Template template = configuration.getTemplate("users/users.ftl");
- template.setOutputEncoding("UTF-8");
- template.process(input, output);
-
- return output.toString();
+ return DefaultGUI.getDefaultGUI(input);
}
}