jdejeu/WaterMarker
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update Main

Browse source
This commit is contained in:
Julius de Jeu 2019-01-17 17:33:09 +01:00
parent e771a75512
commit b300c3c114
1 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/main/kotlin/nl/aegeedelft/watermarker/Main.kt
View file

@ -22,11 +22,6 @@ val filenameRegex = ".*\\.(png|jpe?g|bmp)".toRegex()
val jf = JFrame("WaterMarker") val jf = JFrame("WaterMarker")
object obs : Observable() {
fun observe() {
setChanged()
}
}
fun main(args: Array<String>) { fun main(args: Array<String>) {
var watermark: File? = null var watermark: File? = null
@ -127,7 +122,7 @@ fun main(args: Array<String>) {
fun doTheThing(basedir: File, outdir: File, watermarkpath: File) { fun doTheThing(basedir: File, outdir: File, watermarkpath: File) {
val watermark = ImageIO.read(watermarkpath) val watermark = ImageIO.read(watermarkpath)
//JOptionPane.showMessageDialog(jf, "", "Inserting watermark!", JOptionPane.INFORMATION_MESSAGE, ImageIcon(watermark)) //JOptionPane.showMessageDialog(jf, "", "Inserting watermark!", JOptionPane.INFORMATION_MESSAGE, ImageIcon(watermark))
FrmPopUpInfo("Inserting Watermark", watermark) //FrmPopUpInfo("Inserting Watermark", watermark)
for (f in basedir.listFiles()) { for (f in basedir.listFiles()) {
if (filenameRegex.matches(f.name.toString()) && !"jpe?g".toRegex().matches(f.extension)) { if (filenameRegex.matches(f.name.toString()) && !"jpe?g".toRegex().matches(f.extension)) {
val image = ImageIO.read(f) val image = ImageIO.read(f)
@ -158,8 +153,6 @@ fun doTheThing(basedir: File, outdir: File, watermarkpath: File) {
writer.dispose() writer.dispose()
} }
} }
obs.observe()
obs.notifyObservers()
} }
fun Component.forceToCenter(): Component = JPanel().apply { this.add(this@forceToCenter) } fun Component.forceToCenter(): Component = JPanel().apply { this.add(this@forceToCenter) }
@ -174,23 +167,23 @@ fun addWM(watermark: BufferedImage, image: BufferedImage): Image {
return combined return combined
} }
class FrmPopUpInfo(message: String, image: Image) : JFrame() { //class FrmPopUpInfo(message: String, image: Image) : JFrame() {
init { // init {
this.title = message // this.title = message
this.add(JLabel(ImageIcon(image))) // this.add(JLabel(ImageIcon(image)))
this.background = Color.WHITE // this.background = Color.WHITE
this.pack() // this.pack()
//
this.setLocationRelativeTo(null) // this.setLocationRelativeTo(null)
obs.addObserver { o, arg -> // obs.addObserver { _, _ ->
java.util.Timer().schedule(timerTask { // java.util.Timer().schedule(timerTask {
//
}, 5 * 1000) // }, 5 * 1000)
this@FrmPopUpInfo.isVisible = false // this@FrmPopUpInfo.isVisible = false
//
this@FrmPopUpInfo.dispose() // this@FrmPopUpInfo.dispose()
} // }
//
this.isVisible = true // this.isVisible = true
} // }
} //}