Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Java",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/java:3-17-bookworm",
"image": "mcr.microsoft.com/devcontainers/java:3-21-bookworm",

"features": {
"ghcr.io/devcontainers/features/java:1": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '17', '21', '25' ]
java: [ '21', '25' ]

steps:
- uses: actions/checkout@v7
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
# com.bitctrl
Allgemeine Bibliothek für BitCtrl-Projekte

## Version 3.1.0
- Update auf Java 21

## Version 3.0.1
- Update der Dependencies

Expand Down
11 changes: 3 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@

<groupId>com.bitctrl</groupId>
<artifactId>com.bitctrl</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>

<name>Allgemeine BitCtrl-Bibliothek</name>
<url>http://bitctrl.github.io/${project.artifactId}/</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>

<licenses>
Expand Down Expand Up @@ -46,11 +46,6 @@
<url>https://github.com/bitctrl/${project.artifactId}/</url>
</issueManagement>

<ciManagement>
<system>Travis-CI</system>
<url>https://travis-ci.org/bitctrl/${project.artifactId}/</url>
</ciManagement>

<profiles>
<profile>
<id>bitctrl</id>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/beans/BeanEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

package com.bitctrl.beans;

import java.io.Serial;
import java.util.EventObject;

/**
Expand All @@ -35,6 +36,7 @@
*/
public class BeanEvent extends EventObject {

@Serial
private static final long serialVersionUID = 1L;

private final Object beanData;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/commands/CommandFinishedEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

package com.bitctrl.commands;

import java.io.Serial;
import java.util.EventObject;

/**
Expand All @@ -35,6 +36,7 @@
*/
public class CommandFinishedEvent extends EventObject {

@Serial
private static final long serialVersionUID = 1L;
private final boolean successful;
private final String message;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bitctrl/graph/GraphAlgorithm.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private static List<Bogen> getPfadVonWurzel(final Knoten zielKnoten, final Array
return pfad;
}

pfad.add(0, stuetzBogen);
pfad.addFirst(stuetzBogen);
return getPfadVonWurzel(stuetzBogen.getAnfangsKnoten(), pfad);
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/model/ModelElement.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serial;
import java.io.Serializable;

import jakarta.xml.bind.annotation.XmlTransient;
Expand All @@ -17,6 +18,7 @@
*/
public class ModelElement implements Serializable {

@Serial
private static final long serialVersionUID = 1L;

@XmlTransient
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/bitctrl/model/NamedObject.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.bitctrl.model;

import java.io.Serial;

/**
* Ein benanntes Modellelement.
*
Expand All @@ -10,6 +12,7 @@ public class NamedObject extends ModelElement {
/** Konstante für den Namen der entsprechenden Property. */
public static final String PROP_NAME = "name";

@Serial
private static final long serialVersionUID = 1L;

private String name;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/bitctrl/modell/DAOEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

package com.bitctrl.modell;

import java.io.Serial;
import java.util.EventObject;

/**
Expand All @@ -36,6 +37,7 @@
@Deprecated(since = "3.0.0", forRemoval = true)
public class DAOEvent extends EventObject {

@Serial
private static final long serialVersionUID = 1;

/** Die Typen einer Änderung. */
Expand All @@ -55,7 +57,7 @@ public enum Type {
* Aktualisierung nicht unterscheiden kann, z.&nbsp;B. wenn sich alle Daten der
* Quelle geändert haben.
*/
Unknown;
Unknown

}

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/bitctrl/modell/DAOException.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

package com.bitctrl.modell;

import java.io.Serial;

/**
* Dies ist eine allgemeine Exception für Fehler bei der Arbeit mit DAO. In der
* Regel kapselt eine {@link DAOException} eine andere Exception wie z.&nbsp;B.
Expand All @@ -36,6 +38,7 @@
@Deprecated(since = "3.0.0", forRemoval = true)
public class DAOException extends Exception {

@Serial
private static final long serialVersionUID = 1L;

/**
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/net/IP.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

package com.bitctrl.net;

import java.io.Serial;
import java.io.Serializable;

/**
Expand All @@ -36,6 +37,7 @@
*/
public class IP implements Serializable {

@Serial
private static final long serialVersionUID = 1L;
private static final boolean IP_V4 = true;

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/net/MAC.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

package com.bitctrl.net;

import java.io.Serial;
import java.io.Serializable;
import java.util.Arrays;

Expand All @@ -39,6 +40,7 @@
*/
public class MAC implements Serializable {

@Serial
private static final long serialVersionUID = 1L;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/bitctrl/text/CheckText.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ public static boolean matches(final String expr, final String str) {
searchStrings.add(Constants.EMPTY_STRING);
}

boolean result = tStr.startsWith(searchStrings.get(0))
&& tStr.endsWith(searchStrings.get(searchStrings.size() - 1));
boolean result = tStr.startsWith(searchStrings.getFirst())
&& tStr.endsWith(searchStrings.getLast());

if (result) {
for (final String arg : searchStrings) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/util/ListChangedEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

package com.bitctrl.util;

import java.io.Serial;
import java.util.EventObject;
import java.util.List;

Expand All @@ -38,6 +39,7 @@
*/
public class ListChangedEvent<T> extends EventObject {

@Serial
private static final long serialVersionUID = 1L;
private final int indexFrom;
private final int indexTo;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/util/Timestamp.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

package com.bitctrl.util;

import java.io.Serial;
import java.io.Serializable;
import java.text.DateFormat;
import java.text.ParseException;
Expand All @@ -42,6 +43,7 @@
*/
public class Timestamp implements Serializable {

@Serial
private static final long serialVersionUID = 0L;

/**
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/util/TreeProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Serial;
import java.util.Date;
import java.util.HashSet;
import java.util.Properties;
Expand Down Expand Up @@ -140,6 +141,7 @@ public String toString() {

}

@Serial
private static final long serialVersionUID = 1L;
private static final char[] HEXDIGIT = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E',
'F' };
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/bitctrl/util/TwoDimensionalMap.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.bitctrl.util;

import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -27,6 +28,7 @@
* @author BitCtrl Systems GmbH, schnepel
*/
public class TwoDimensionalMap<R, C, D> implements Serializable, ITwoDimensionalMap<R, C, D> {
@Serial
private static final long serialVersionUID = 3216584215464568453L;

private final Map<R, Integer> rows;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bitctrl/util/jar/JarVersionInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static void main(final String[] args) {
files = new LinkedList<>(Arrays.asList(args));
if ("-short".equals(args[0])) {
onlyVersion = true;
files.remove(0);
files.removeFirst();
} else {
onlyVersion = false;
}
Expand Down
Loading