Skip to content

Commit

Permalink
Warnings entfernt (#177)
Browse files Browse the repository at this point in the history
- Unnötige import entfernt
- Raw Type warnings unterdrückt
- Zuweisung  von DBIterator an Liste nicht prüfen
- an SelectInput nur Listen übergeben
- einige new durch .valueOf ersetzt
- Endlosschleife 1==1 durch true ersetzt
  • Loading branch information
JohannMaierhofer committed Mar 1, 2024
1 parent 96a7ab2 commit 416af37
Show file tree
Hide file tree
Showing 26 changed files with 39 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.schlevoigt.JVerein.gui.control;

import java.rmi.RemoteException;
import java.util.ArrayList;

import com.schlevoigt.JVerein.Queries.BuchungsKorrekturQuery;
import com.schlevoigt.JVerein.util.Misc;
Expand Down
2 changes: 2 additions & 0 deletions src/de/jost_net/JVerein/gui/action/BackupRestoreAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@ public void run(ProgressMonitor monitor) throws ApplicationException
{

@Override
@SuppressWarnings("rawtypes")
public GenericObject create(String type, String id, Map values)
throws Exception
{
@SuppressWarnings("unchecked")
AbstractDBObject object = (AbstractDBObject) Einstellungen
.getDBService().createObject(
(Class<AbstractDBObject>) loader.loadClass(type), null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@

package de.jost_net.JVerein.gui.action;

import de.jost_net.JVerein.Messaging.BuchungMessage;
import de.jost_net.JVerein.gui.control.BuchungsControl;
import de.jost_net.JVerein.gui.dialogs.BuchungsartZuordnungDialog;
import de.jost_net.JVerein.gui.dialogs.KontoauszugZuordnungDialog;
import de.jost_net.JVerein.rmi.Buchung;
import de.willuhn.jameica.gui.Action;
import de.willuhn.jameica.gui.GUI;
import de.willuhn.jameica.system.Application;
import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException;
import de.willuhn.jameica.system.OperationCanceledException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ private GenericIterator<ArbeitseinsatzZeile> getIterator()
{
ArrayList<ArbeitseinsatzZeile> zeile = arbeitseinsatzueberpruefungList
.getInfo();

@SuppressWarnings("unchecked")
GenericIterator<ArbeitseinsatzZeile> gi = PseudoIterator
.fromArray(zeile.toArray(new GenericObject[zeile.size()]));
return gi;
Expand Down
4 changes: 3 additions & 1 deletion src/de/jost_net/JVerein/gui/control/BuchungsartControl.java
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ public void handleEvent(Event event)
try
{
DBIterator<Buchungsart> it = getFilteredBuchungsart();
@SuppressWarnings("unchecked")
List<Buchungsart> buchungsartenListe = it != null ? PseudoIterator.asList(it) : null;
steuer_buchungsart.setPleaseChoose("Bitte wählen");
steuer_buchungsart.setAttribute(getBuchungartAttribute());
Expand Down Expand Up @@ -251,6 +252,7 @@ public SelectInput getSteuerBuchungsart() throws RemoteException
steuer_buchungsart = new SelectInput(PseudoIterator.asList(it), null);
if (it != null)
{
@SuppressWarnings("unchecked")
List<Buchungsart> buchungsartenListe = it != null ? PseudoIterator.asList(it) : null;
steuer_buchungsart.setAttribute(getBuchungartAttribute());
steuer_buchungsart.setPleaseChoose("Bitte wählen");
Expand Down Expand Up @@ -347,7 +349,7 @@ public Input getBuchungsklasse() throws RemoteException
DBIterator<Buchungsklasse> list = Einstellungen.getDBService()
.createList(Buchungsklasse.class);
list.setOrder(getBuchungartSortOrder());
buchungsklasse = new SelectInput(list,
buchungsklasse = new SelectInput(PseudoIterator.asList(list),
getBuchungsart().getBuchungsklasse());
buchungsklasse.setValue(getBuchungsart().getBuchungsklasse());
buchungsklasse.setAttribute(getBuchungartAttribute());
Expand Down
3 changes: 2 additions & 1 deletion src/de/jost_net/JVerein/gui/control/EigenschaftControl.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import de.jost_net.JVerein.rmi.Eigenschaft;
import de.jost_net.JVerein.rmi.EigenschaftGruppe;
import de.willuhn.datasource.GenericObject;
import de.willuhn.datasource.pseudo.PseudoIterator;
import de.willuhn.datasource.rmi.DBIterator;
import de.willuhn.datasource.rmi.DBService;
import de.willuhn.jameica.gui.AbstractControl;
Expand Down Expand Up @@ -93,7 +94,7 @@ public Input getEigenschaftGruppe() throws RemoteException
DBIterator<EigenschaftGruppe> list = Einstellungen.getDBService()
.createList(EigenschaftGruppe.class);
list.setOrder("ORDER BY bezeichnung");
eigenschaftgruppe = new SelectInput(list,
eigenschaftgruppe = new SelectInput(PseudoIterator.asList(list),
getEigenschaft().getEigenschaftGruppe());
eigenschaftgruppe.setValue(getEigenschaft().getEigenschaftGruppe());
eigenschaftgruppe.setAttribute("bezeichnung");
Expand Down
3 changes: 3 additions & 0 deletions src/de/jost_net/JVerein/gui/control/FamilienbeitragNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,14 @@ public boolean hasChild(GenericObjectNode object)
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPossibleParents()
{
return null;
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPath()
{
return null;
Expand All @@ -195,6 +197,7 @@ public GenericObjectNode getParent()
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getChildren() throws RemoteException
{
if (children != null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import de.jost_net.JVerein.rmi.Mitglied;
import de.jost_net.JVerein.rmi.MitgliedNextBGruppe;
import de.jost_net.JVerein.util.JVDateFormatTTMMJJJJ;
import de.willuhn.datasource.pseudo.PseudoIterator;
import de.willuhn.datasource.rmi.DBIterator;
import de.willuhn.jameica.gui.AbstractControl;
import de.willuhn.jameica.gui.AbstractView;
Expand Down Expand Up @@ -183,7 +184,7 @@ public Input getBeitragsgruppeInput() throws RemoteException
ArtBeitragsart.FAMILIE_ZAHLER.getKey(),
ArtBeitragsart.FAMILIE_ANGEHOERIGER.getKey());
}
beitragsgruppe = new SelectInput(list,
beitragsgruppe = new SelectInput(PseudoIterator.asList(list),
getMitgliedNextBGruppe().getBeitragsgruppe());
beitragsgruppe.setName("Beitragsgruppe");
beitragsgruppe.setMandatory(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ public void paint(Composite composite) throws RemoteException
List<MitgliedskontoNode> items = mitgliedskontoTree.getItems();
for (MitgliedskontoNode mkn : items)
{
@SuppressWarnings("rawtypes")
GenericIterator items2 = mkn.getChildren();
while (items2.hasNext())
{
Expand Down Expand Up @@ -637,6 +638,7 @@ public TablePart getMitgliedskontoList(Action action, ContextMenu menu)
throws RemoteException
{
this.action = action;
@SuppressWarnings("rawtypes")
GenericIterator mitgliedskonten = getMitgliedskontoIterator();
settings.setAttribute("differenz", getDifferenz().getValue().toString());
if (mitgliedskontoList == null)
Expand Down Expand Up @@ -745,6 +747,7 @@ private GenericIterator<Mitglied> getMitgliedIterator() throws RemoteException
return mitglieder;
}

@SuppressWarnings("rawtypes")
public GenericIterator getMitgliedskontoIterator() throws RemoteException
{
DBService service = Einstellungen.getDBService();
Expand Down
3 changes: 3 additions & 0 deletions src/de/jost_net/JVerein/gui/control/MitgliedskontoNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,14 @@ public boolean hasChild(GenericObjectNode object)
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPossibleParents()
{
return null;
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPath()
{
return null;
Expand All @@ -258,6 +260,7 @@ public GenericObjectNode getParent()
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getChildren() throws RemoteException
{
if (children != null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ private void aktuallisierePosListe(QIFImportHead head) throws RemoteException
endSaldo.setValue(Double.valueOf(saldo));
}

@SuppressWarnings("rawtypes")
private GenericIterator getIterator() throws RemoteException
{
ArrayList<QIFImportPos> zeile = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ private void refreshSelectedQIFImportPos() throws RemoteException
*
* @throws RemoteException
*/
@SuppressWarnings("rawtypes")
private GenericIterator getDistinctQIFBuchartList() throws RemoteException
{
DBIterator<QIFImportPos> it = Einstellungen.getDBService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public SelectInput getMitgliederInput() throws RemoteException
{
return mitgliederInput;
}
mitgliederInput = new SelectInput((GenericIterator) null, null);
mitgliederInput = new SelectInput((Object[]) null, null);
mitgliederInput.setAttribute("namevorname");
mitgliederInput.setPleaseChoose("Bitte auswählen");
mitgliederInput.setComment(" ");
Expand Down Expand Up @@ -356,6 +356,7 @@ private void refreshSelectedQIFImportPos() throws RemoteException
*
* @throws RemoteException
*/
@SuppressWarnings("rawtypes")
private GenericIterator getDistinctQIFNameList() throws RemoteException
{
DBIterator<QIFImportPos> it = Einstellungen.getDBService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public void handleAction(Object context) throws ApplicationException
SpendenbescheinigungNode spn = (SpendenbescheinigungNode) items
.get(0);
// Loop über die Mitglieder
@SuppressWarnings("rawtypes")
GenericIterator it1 = spn.getChildren();
while (it1.hasNext())
{
Expand All @@ -182,6 +183,7 @@ public void handleAction(Object context) throws ApplicationException
spbescheinigung.setBetrag(0.01);
spbescheinigung.setAutocreate(Boolean.TRUE);
// Loop über die Buchungen eines Mitglieds
@SuppressWarnings("rawtypes")
GenericIterator it2 = sp1.getChildren();
while (it2.hasNext())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package de.jost_net.JVerein.gui.dialogs;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
Expand Down
1 change: 0 additions & 1 deletion src/de/jost_net/JVerein/gui/dialogs/ExportDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import de.jost_net.JVerein.io.IORegistry;
import de.jost_net.JVerein.util.Dateiname;
import de.willuhn.datasource.GenericObject;
import de.willuhn.datasource.pseudo.PseudoIterator;
import de.willuhn.jameica.gui.Action;
import de.willuhn.jameica.gui.GUI;
import de.willuhn.jameica.gui.dialogs.AbstractDialog;
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/formatter/JaNeinFormatter.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public String format(Object o)
if (o instanceof Byte)
{
Byte b = (Byte) o;
if (b.equals(new Byte("1")))
if (b.equals(Byte.valueOf("1")))
{
return "Ja";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public SplitbuchungListTablePart(Action action)
super(action);
}

@SuppressWarnings("rawtypes")
public SplitbuchungListTablePart(GenericIterator list, Action action)
{
super(list, action);
Expand Down
2 changes: 0 additions & 2 deletions src/de/jost_net/JVerein/gui/view/KontoauszugView.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
**********************************************************************/
package de.jost_net.JVerein.gui.view;

import java.util.Date;

import de.jost_net.JVerein.gui.action.DokumentationAction;
import de.jost_net.JVerein.gui.control.MitgliedskontoControl;
import de.willuhn.jameica.gui.AbstractView;
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/io/CSVConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public int getNumberOfRows() throws SQLException
public void openCsvDB() throws SQLException
{
Properties props = new java.util.Properties();
props.put("separator", (new Character(seperator)).toString()); // separator
props.put("separator", (Character.valueOf(seperator)).toString()); // separator
// is a bar
props.put("suppressHeaders", "false"); // first line contains data
props.put("charset", "ISO-8859-1");
Expand Down
3 changes: 0 additions & 3 deletions src/de/jost_net/JVerein/io/FormularAufbereitung.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

import de.jost_net.JVerein.Einstellungen;
import de.jost_net.JVerein.Variable.AllgemeineVar;
import de.jost_net.JVerein.Variable.MitgliedskontoVar;
import de.jost_net.JVerein.rmi.Einstellung;
import de.jost_net.JVerein.rmi.Formular;
import de.jost_net.JVerein.rmi.Formularfeld;
Expand All @@ -44,8 +43,6 @@
import de.willuhn.jameica.gui.internal.action.Program;
import de.willuhn.jameica.messaging.StatusBarMessage;
import de.willuhn.jameica.system.Application;
import de.willuhn.logging.Level;
import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException;

public class FormularAufbereitung
Expand Down
2 changes: 2 additions & 0 deletions src/de/jost_net/JVerein/io/Kontoauszug.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ private void generiereMitglied(Mitglied m, Date von, Date bis)

MitgliedskontoNode node = new MitgliedskontoNode(m, von, bis);
generiereZeile(node);
@SuppressWarnings("rawtypes")
GenericIterator gi1 = node.getChildren();
while (gi1.hasNext())
{
MitgliedskontoNode n1 = (MitgliedskontoNode) gi1.next();
generiereZeile(n1);
@SuppressWarnings("rawtypes")
GenericIterator gi2 = n1.getChildren();
while (gi2.hasNext())
{
Expand Down
1 change: 1 addition & 0 deletions src/de/jost_net/JVerein/io/Mahnungsausgabe.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public Mahnungsausgabe(MitgliedskontoControl control) throws IOException
}
else
{
@SuppressWarnings("rawtypes")
GenericIterator it = control.getMitgliedskontoIterator();
Mitgliedskonto[] mk = new Mitgliedskonto[it.size()];
int i = 0;
Expand Down
3 changes: 3 additions & 0 deletions src/de/jost_net/JVerein/server/EigenschaftenNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ private EigenschaftenNode(EigenschaftenNode parent, Mitglied mitglied,
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getChildren() throws RemoteException
{
if (childrens == null)
Expand All @@ -169,12 +170,14 @@ public EigenschaftenNode getParent()
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPath()
{
return null;
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPossibleParents()
{
return null;
Expand Down
4 changes: 4 additions & 0 deletions src/de/jost_net/JVerein/server/SpendenbescheinigungNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ private SpendenbescheinigungNode(Mitglied mitglied, Buchung buchung)
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getChildren() throws RemoteException
{
if (childrens == null)
Expand All @@ -202,12 +203,14 @@ public SpendenbescheinigungNode getParent()
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPath()
{
return null;
}

@Override
@SuppressWarnings("rawtypes")
public GenericIterator getPossibleParents()
{
return null;
Expand Down Expand Up @@ -236,6 +239,7 @@ public Object getAttribute(String name) throws RemoteException
}
case MITGLIED:
{
@SuppressWarnings("rawtypes")
GenericIterator it1 = getChildren();
double betrag = 0.0;
while (it1.hasNext())
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/util/MemoryAnalyzer.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class MemoryAnalyzer extends Thread
@Override
public void run()
{
while (1 == 1)
while (true)
{
// System.out.println(Runtime.getRuntime().freeMemory());
MemoryMXBean memBean = ManagementFactory.getMemoryMXBean();
Expand Down

0 comments on commit 416af37

Please sign in to comment.