From 4ccdb53aa062dc310a0e5fce7cdc38b72ed0df23 Mon Sep 17 00:00:00 2001 From: potzplitz <127513690+potzplitz@users.noreply.github.com> Date: Sat, 11 May 2024 02:01:41 +0200 Subject: [PATCH] push --- src/data/RequestLevelLength.java | 16 +++++++++++++++- src/gui/LoadingStatus.java | 5 +++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/data/RequestLevelLength.java b/src/data/RequestLevelLength.java index 0210621..0a84a87 100644 --- a/src/data/RequestLevelLength.java +++ b/src/data/RequestLevelLength.java @@ -2,24 +2,38 @@ package data; import api.GetApiData; import database.Sqlite; +import gui.LoadingStatus; public class RequestLevelLength { GetApiData data = new GetApiData(); FetchData fetch = new FetchData(); Sqlite sql = new Sqlite("levels"); + LoadingStatus status = new LoadingStatus(); public void request() { sql.queryData("levels"); + status.initialize(); + status.changeState("API wird auf Levellänge abgefragt..."); + Thread thread = new Thread(new Runnable( ) { + @Override public void run() { for(int i = 0; i < ManageFiles.getMissinglevels().size(); i++) { - sql.modifyData(sql.getLevelname().get(sql.getRawLevelNames().indexOf(sql.getRawLevelNames().get(i))), Boolean.parseBoolean(sql.getCompleted().get(i).toString()), sql.getAttempts().get(i).intValue(), sql.getLocked().get(i).booleanValue(), sql.getPbarr().get(i), "" + data.getLevelLength(Integer.parseInt(sql.getLevelID().get(sql.getRawLevelNames().indexOf(ManageFiles.getMissinglevels().get(i)))))); + status.update(sql.getLevelname().get(sql.getRawLevelNames().indexOf(sql.getRawLevelNames().get(i))), i); + + sql.modifyData(sql.getLevelname().get(sql.getRawLevelNames().indexOf(sql.getRawLevelNames().get(i))), + Boolean.parseBoolean(sql.getCompleted().get(i).toString()), + sql.getAttempts().get(i).intValue(), + sql.getLocked().get(i).booleanValue(), + sql.getPbarr().get(i), + "" + data.getLevelLength(Integer.parseInt(sql.getLevelID().get(sql.getRawLevelNames().indexOf(ManageFiles.getMissinglevels().get(i))))) + ); try { Thread.sleep(200); } catch (InterruptedException e) { diff --git a/src/gui/LoadingStatus.java b/src/gui/LoadingStatus.java index d6dc3db..32b2512 100644 --- a/src/gui/LoadingStatus.java +++ b/src/gui/LoadingStatus.java @@ -19,7 +19,7 @@ public class LoadingStatus { private JLabel info = new JLabel("Updateroutine wird durchgeführt..."); private FetchData data = new FetchData(); - private LoadingStatus() { + public LoadingStatus() { initialize(); } @@ -34,7 +34,7 @@ public class LoadingStatus { area.setEditable(false); area.setLineWrap(true); area.setWrapStyleWord(true); - area.setCaretPosition(area.getDocument().getLength()); + JScrollPane scroll = new JScrollPane(area); scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); @@ -63,6 +63,7 @@ public class LoadingStatus { public void update(String level, int barValue) { area.append(level + "\n"); bar.setValue(barValue + 1); + area.setCaretPosition(area.getDocument().getLength()); } public void dispose() {