868d6abb7 2025 -> 2026
63081666f Quellcode-Dateiköpfe: 2024 -> 2025.
1204b927b Migration läuft... (alle Tests aller Pakete: OK).
1b50060c3 BaseDao: umbenannt: get -> find, save -> insert, getList -> select, load -> select
3ba7a5fb6 Migration läuft...
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
index d534471b3..bfe23f75a 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2025 Micromata GmbH, Deutschland (www.micromata.com)
+// Copyright (C) 2001-2026 Micromata GmbH, Deutschland (www.micromata.com)
//
// ProjectForge ist dual-lizenziert.
//
63081666f
Quellcode-Dateiköpfe: 2024 -> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
index 8c0472037..d534471b3 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2024 Micromata GmbH, Deutschland (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Deutschland (www.micromata.com)
//
// ProjectForge ist dual-lizenziert.
//
1204b927b
Migration läuft... (alle Tests aller Pakete: OK).1204b927bf77691fc98260f0361a6dd4462a25f2
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
index 57705ffa4..8c0472037 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
@@ -28,7 +28,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.ValidationError;
-import org.projectforge.business.fibu.KostFormatter;
+import org.projectforge.business.fibu.OldKostFormatter;
import org.projectforge.business.fibu.kost.Kost1DO;
import org.projectforge.business.fibu.kost.Kost1Dao;
import org.projectforge.business.fibu.kost.KostFilter;
@@ -94,7 +94,7 @@ public class Kost1FormComponent extends PFAutoCompleteTextField<Kost1DO>
if (kost1 == null) {
return "";
}
- return KostFormatter.format(kost1) + " - " + KostFormatter.formatToolTip(kost1);
+ return OldKostFormatter.format(kost1) + " - " + OldKostFormatter.formatToolTip(kost1);
}
@Override 1b50060c3
BaseDao: umbenannt: get -> find, save -> insert, getList -> select, load -> select1b50060c3a4b099ec07fd85d28f514b101da4d29
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
index fe1980b6d..57705ffa4 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
@@ -25,7 +25,6 @@ package org.projectforge.web.fibu;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.ValidationError;
@@ -108,7 +107,7 @@ public class Kost1FormComponent extends PFAutoCompleteTextField<Kost1DO>
filter.setSearchString(input + "*");
}
filter.setListType(KostFilter.FILTER_NOT_ENDED);
- final List<Kost1DO> list = WicketSupport.get(Kost1Dao.class).getList(filter);
+ final List<Kost1DO> list = WicketSupport.get(Kost1Dao.class).select(filter);
Collections.sort(list, new Comparator<Kost1DO>()
{
@Override 3ba7a5fb6
Migration läuft...3ba7a5fb6c4638b7eb382db5a52c472470b1f697
diff --git a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
index 9067e610e..fe1980b6d 100644
--- a/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
+++ b/projectforge-wicket/src/main/java/org/projectforge/web/fibu/Kost1FormComponent.java
@@ -33,6 +33,7 @@ import org.projectforge.business.fibu.KostFormatter;
import org.projectforge.business.fibu.kost.Kost1DO;
import org.projectforge.business.fibu.kost.Kost1Dao;
import org.projectforge.business.fibu.kost.KostFilter;
+import org.projectforge.web.WicketSupport;
import org.projectforge.web.wicket.autocompletion.PFAutoCompleteTextField;
import java.util.Collections;
@@ -44,9 +45,6 @@ public class Kost1FormComponent extends PFAutoCompleteTextField<Kost1DO>
{
private static final long serialVersionUID = -5900055958356749220L;
- @SpringBean
- private Kost1Dao kost1Dao;
-
class Kost1Converter implements IConverter<Kost1DO>
{
private static final long serialVersionUID = 5770334618044073827L;
@@ -55,7 +53,7 @@ public class Kost1FormComponent extends PFAutoCompleteTextField<Kost1DO>
public Kost1DO convertToObject(String value, final Locale locale)
{
value = StringUtils.trimToEmpty(value);
- return kost1Dao.getKost1(value);
+ return WicketSupport.get(Kost1Dao.class).getKost1(value);
}
@Override
@@ -110,7 +108,7 @@ public class Kost1FormComponent extends PFAutoCompleteTextField<Kost1DO>
filter.setSearchString(input + "*");
}
filter.setListType(KostFilter.FILTER_NOT_ENDED);
- final List<Kost1DO> list = kost1Dao.getList(filter);
+ final List<Kost1DO> list = WicketSupport.get(Kost1Dao.class).getList(filter);
Collections.sort(list, new Comparator<Kost1DO>()
{
@Override