From c99f9e4f9d69717b0ac479c45bb812e8a8d87f8c Mon Sep 17 00:00:00 2001 From: simongehrig Date: Mon, 12 Jun 2017 10:58:42 +0200 Subject: [PATCH] Infected PC !!! Check everything later --- pom.xml | 2 +- src/main/java/workers/FilesWorker.java | 14 +++++++++----- src/main/java/workers/ScaleWorker.java | 9 ++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index e757fd8..f78dfbd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.selfomat selfomat-single-user - 0.4.0.13-SNAPSHOT + 0.4.0.14-SNAPSHOT scm:svn:svn://simongehrig:L4ut5pr3ch3r!@svn.picture.tools/selfomat/trunk/selfomat-java-single-user diff --git a/src/main/java/workers/FilesWorker.java b/src/main/java/workers/FilesWorker.java index c171f9a..321c7a0 100644 --- a/src/main/java/workers/FilesWorker.java +++ b/src/main/java/workers/FilesWorker.java @@ -235,12 +235,16 @@ public class FilesWorker { // Archive the Backup archiveBackup(); - - // Update the State fot previews and thumbs - SOMEvent.getInstance().getImages(); - - SOMGUI.changetopicture(); } + + // Update the State fot previews and thumbs + ScaleWorker.scale(SOMEvent.getInstance().getImages(), ScaleWorker.PREVIEW); + ScaleWorker.scale(SOMEvent.getInstance().getImages(), ScaleWorker.THUMBNAIL); + + + // In any case, internet or not, change to the pic scene + SOMGUI.changetopicture(); + } catch (IOException e) { e.printStackTrace(); } catch (InterruptedException e) { diff --git a/src/main/java/workers/ScaleWorker.java b/src/main/java/workers/ScaleWorker.java index e05bea0..13b395c 100644 --- a/src/main/java/workers/ScaleWorker.java +++ b/src/main/java/workers/ScaleWorker.java @@ -14,6 +14,9 @@ import java.awt.image.CropImageFilter; import java.awt.image.FilteredImageSource; import java.io.File; import java.io.IOException; +import java.util.List; + +//import java.awt.*; public class ScaleWorker extends Thread { @@ -48,11 +51,11 @@ public class ScaleWorker extends Thread { } // Overload of scale() that lets you enter Arrays of Pictures - public static SOMImage[] scale(SOMImage[] somImages, int type) { + public static List scale(List somImages, int type) { // loop through Array of SOMImages - for (SOMImage image : somImages) { + for (int i = 0; i < somImages.size(); i++) { //update the image - image = scale(image, type); + scale(somImages.get(i), type); } // return the imagearray return somImages;