Änderungsvorschläge von @meigelb eingearbeitet

willuhn · Jan 23, 2022 · add68c9 · add68c9
1 parent ccfdc21
commit add68c9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 29 deletions.
diff --git a/src/de/willuhn/jameica/hbci/TextSchluessel.java b/src/de/willuhn/jameica/hbci/TextSchluessel.java
@@ -130,6 +130,7 @@ public static TextSchluessel[] get(String[] codes)
         if (code.equals(ts.getCode()))
         {
           l.add(ts);
+          break;
         }
       }
     }
@@ -222,4 +223,4 @@ public boolean equals(Object other)
  * Revision 1.1  2008/08/01 11:05:14  willuhn
  * @N BUGZILLA 587
  *
- **********************************************************************/
+ **********************************************************************/
diff --git a/src/de/willuhn/jameica/hbci/io/AbstractDTAUSIO.java b/src/de/willuhn/jameica/hbci/io/AbstractDTAUSIO.java
@@ -20,6 +20,8 @@
 import de.willuhn.jameica.system.Application;
 import de.willuhn.util.I18N;
 
+import java.util.Arrays;
+
 /**
  * Abstrakte Basis-Klasse fuer DTAUS-Import/Export.
  */
@@ -94,13 +96,12 @@ public IOFormat[] getIOFormats(Class objectType)
       return null;
 
     Class[] supported = getSupportedObjectTypes();
-    if (supported == null || supported.length == 0)
-      return null;
-
-    for (Class supportedObjType : supported)
+    if (supported != null && supported.length > 0)
     {
-      if (objectType.equals(supportedObjType))
+      if (Arrays.asList(supported).contains(objectType))
+      {
         return new IOFormat[]{new MyIOFormat(objectType)};
+      }
     }
     return null;
   }

diff --git a/src/de/willuhn/jameica/hbci/io/AbstractExporter.java b/src/de/willuhn/jameica/hbci/io/AbstractExporter.java
@@ -12,6 +12,7 @@
 
 import java.io.OutputStream;
 import java.rmi.RemoteException;
+import java.util.Arrays;
 
 import de.willuhn.io.IOUtil;
 import de.willuhn.jameica.hbci.HBCI;
@@ -129,13 +130,12 @@ public IOFormat[] getIOFormats(Class objectType)
       return null;
 
     Class[] supported = getSupportedObjectTypes();
-    if (supported == null || supported.length == 0)
-      return null;
-
-    for (Class supportedObjType : supported)
+    if (supported != null && supported.length > 0)
     {
-      if (objectType.equals(supportedObjType))
+      if (Arrays.asList(supported).contains(objectType))
+      {
         return new IOFormat[]{new MyIOFormat(objectType)};
+      }
     }
     return null;
   }

diff --git a/src/de/willuhn/jameica/hbci/io/AbstractImporter.java b/src/de/willuhn/jameica/hbci/io/AbstractImporter.java
@@ -12,6 +12,7 @@
 
 import java.io.InputStream;
 import java.rmi.RemoteException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -147,13 +148,12 @@ public IOFormat[] getIOFormats(Class objectType)
       return null;
 
     Class[] supported = getSupportedObjectTypes();
-    if (supported == null || supported.length == 0)
-      return null;
-
-    for (Class supportedObjType : supported)
+    if (supported != null && supported.length > 0)
     {
-      if (objectType.equals(supportedObjType))
+      if (Arrays.asList(supported).contains(objectType))
+      {
         return new IOFormat[]{new MyIOFormat(objectType)};
+      }
     }
     return null;
   }

diff --git a/src/de/willuhn/jameica/hbci/io/AbstractPDFUmsatzExporter.java b/src/de/willuhn/jameica/hbci/io/AbstractPDFUmsatzExporter.java
@@ -58,19 +58,19 @@ public void doExport(Object[] objects, IOFormat format, OutputStream os, Progres
 
     Date startDate     = first.getDatum();
     Date endDate       = first.getDatum();
-    Map<String,List> umsaetze = new HashMap<String,List>();
+    Map<String,List<Umsatz>> umsaetze = new HashMap<>();
 
     if (monitor != null) 
     {
       monitor.setStatusText(i18n.tr("Ermittle zu exportierende Umsätze und Konten"));
       monitor.addPercentComplete(1);
     }
 
-    Map<String,T> groupMap = new HashMap<String,T>();
+    Map<String,T> groupMap = new HashMap<>();
 
-    for (int i=0;i<objects.length;++i)
+    for (Object object : objects)
     {
-      Umsatz u = (Umsatz) objects[i];
+      Umsatz u = (Umsatz) object;
 
       // Wir ermitteln bei der Gelegenheit das Maximal- und Minimal-Datum
       Date date = u.getDatum();
@@ -84,7 +84,7 @@ public void doExport(Object[] objects, IOFormat format, OutputStream os, Progres
       T group = this.getGroup(u);
       String key = group != null ? group.getID() : null;
       groupMap.put(key,group);
-      List<Umsatz> list = umsaetze.computeIfAbsent(key, k -> new ArrayList<Umsatz>());
+      List<Umsatz> list = umsaetze.computeIfAbsent(key, k -> new ArrayList<>());
       list.add(u);
     }
 

diff --git a/src/de/willuhn/jameica/hbci/passports/pintan/PinTanConfigFactory.java b/src/de/willuhn/jameica/hbci/passports/pintan/PinTanConfigFactory.java
@@ -13,6 +13,7 @@
 import java.io.File;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Set;
 
 import org.kapott.hbci.manager.HBCIUtils;
@@ -73,14 +74,10 @@ public static synchronized void store(PinTanConfig config) throws Exception
     boolean found = false;
     if (existing != null && existing.length > 0)
     {
-      for (String configID : existing)
+      if(Arrays.asList(existing).contains(config.getID()))
       {
-        if (configID.equals(config.getID()))
-        {
-          Logger.info("updating existing config");
-          found = true;
-          break;
-        }
+        Logger.info("updating existing config");
+        found = true;
       }
     }
 

diff --git a/src/de/willuhn/jameica/hbci/server/UmsatzGroup.java b/src/de/willuhn/jameica/hbci/server/UmsatzGroup.java
@@ -32,7 +32,7 @@ public class UmsatzGroup implements GenericObjectNode, Comparable
   private final static transient I18N i18n = Application.getPluginLoader().getPlugin(HBCI.class).getResources().getI18N();
 
   private UmsatzTyp typ = null;
-  private ArrayList<Umsatz> umsaetze = new ArrayList();
+  private ArrayList<Umsatz> umsaetze = new ArrayList<>();
 
   /**
    * ct.