Skip to content
Snippets Groups Projects
Commit fb2a8f8c authored by Nicolas Dausque's avatar Nicolas Dausque
Browse files

Merge j'ai marché gans un conflit

parents 052bced9 bd1a7261
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/dao/ImageAccessorDao.kt 0 → 100644
+ 5
− 0
View file @ fb2a8f8c
package com.tpKotlin.glhf.tpkotlin.dao
interface ImageAccessorDao {
fun getAll():List<Any>
}
\ No newline at end of file
tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/dao/ImageAccessorDaoImpl.kt 0 → 100644
+ 14
− 0
View file @ fb2a8f8c
package com.tpKotlin.glhf.tpkotlin.dao
import com.tpKotlin.glhf.tpkotlin.entity.FavDir
class ImageAccessorDaoImpl : ImageAccessorDao {
override fun getAll(): List<Any> {
var imagesFav = FavDir.getAll()
Thread.sleep(imagesFav.size.toLong() * 3000L) //celui qui retire ça est maudit pendant 3 generation (la sienne incluse)
return imagesFav
}
}
\ No newline at end of file
tpkotlin/src/main/kotlin/com/tpKotlin/glhf/tpkotlin/entity/Entities.kt
+ 14
− 4
View file @ fb2a8f8c
...@@ -2,6 +2,7 @@ package com.tpKotlin.glhf.tpkotlin.entity ...@@ -2,6 +2,7 @@ package com.tpKotlin.glhf.tpkotlin.entity
//import javax.persistence.* //import javax.persistence.*
import java.time.LocalDateTime import java.time.LocalDateTime
//import com.tpKotlin.glhf.tpkotlin.extension.toSlug //import com.tpKotlin.glhf.tpkotlin.extension.toSlug
//@Entity //@Entity
...@@ -33,12 +34,15 @@ object FavDir { ...@@ -33,12 +34,15 @@ object FavDir {
init{ init{
println("Dossier de favoris crée") println("Dossier de favoris crée")
} }
fun addMeme(src: String) { fun addMeme(src: String) {
list.add(src) list.add(src)
} }
fun rmMeme(src: String) { fun rmMeme(src: String) {
list.remove(src) list.remove(src)
} }
@JvmStatic @JvmStatic
fun affiche(): String{ fun affiche(): String{
var s: String ="" var s: String =""
...@@ -48,6 +52,12 @@ object FavDir { ...@@ -48,6 +52,12 @@ object FavDir {
} }
return s return s
} }
fun getAll(): MutableList<String> {
return list
}
} }
tpkotlin/src/main/webapp/WEB-INF/jsp/ex4.jsp
+ 7
− 2
View file @ fb2a8f8c
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
<title>${msg}</title> <title>${msg}</title>
</head> </head>
<body> <body>
<c:import url="/WEB-INF/jsp/footer.jsp" /> <h1 class="content-title">Exercice 4 : Les coroutines</h1>
<br>
<h3 class="content-sub-title">EEEEEEEEHHHHHHHHHHH </h3>
<br><br>
<div class="container-fluid">
oui
</div>
</body> </body>
</html> </html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment