genuineparts/OEBBInfoOrbApp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	src/main/java/be/jaud/Main.java
This commit is contained in:
genuineparts 2025-06-26 20:04:10 +02:00
commit 8949a1ada7
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>be.jaud</groupId> <groupId>be.jaud</groupId>
<artifactId>OebbApi</artifactId> <artifactId>OebbApi</artifactId>
<version>0.7</version> <version>0.9</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>ÖBB delay check and output for Info Orbs</name> <name>ÖBB delay check and output for Info Orbs</name>
<properties> <properties>

3
src/main/java/be/jaud/Main.java
View file

@ -17,7 +17,7 @@ import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class Main { public class Main {
private static final String version = "0.8.1"; private static final String version = "0.9";
private static final HashMap<String, HashMap<String, Integer>> udata = new HashMap<>(); private static final HashMap<String, HashMap<String, Integer>> udata = new HashMap<>();
public static Settings conf; public static Settings conf;
static OebbCheck check = new OebbCheck(); static OebbCheck check = new OebbCheck();
@ -71,6 +71,7 @@ public class Main {
ResultSet rs = MariaDB.load_users(); ResultSet rs = MariaDB.load_users();
if (rs != null) { if (rs != null) {
while (rs.next()) { while (rs.next()) {
HashMap<String, Integer> data = new HashMap<>();
String user = rs.getString("user"); String user = rs.getString("user");
ResultSet rsu = MariaDB.load_user(user); ResultSet rsu = MariaDB.load_user(user);
if (rsu != null) { if (rsu != null) {