Skip to content

Commit

Permalink
Fix: Use lowercase file extensions and check (#91)
Browse files Browse the repository at this point in the history 
Co-authored-by: Alexander Dippe <info@dippe-it.de>
  • Loading branch information
@dippeal
dippeal and Alexander Dippe committed Dec 9, 2023
1 parent eeea7c8 commit d1bd46b
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 51 deletions.
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/action/FreiesFormularAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ private void generiereFreiesFormular(Mitglied[] m) throws Exception
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("freiesformular", "", Einstellungen
.getEinstellung().getDateinamenmuster(), "PDF").get());
fd.setFilterExtensions(new String[] { "*.PDF" });
.getEinstellung().getDateinamenmuster(), "pdf").get());
fd.setFilterExtensions(new String[] { "*.pdf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".PDF"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}
final File file = new File(s);
settings.setAttribute("lastdir", file.getParent());
Expand Down
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/action/MitgliedVCardDateiAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ else if (context instanceof Mitglied[])
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("vCards", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "VCF").get());
fd.setFilterExtensions(new String[] { "*.VCF" });
Einstellungen.getEinstellung().getDateinamenmuster(), "vcf").get());
fd.setFilterExtensions(new String[] { "*.vcf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".VCF"))
if (!s.toLowerCase().endsWith(".vcf"))
{
s = s + ".VCF";
s = s + ".vcf";
}
final File file = new File(s);
final BufferedWriter w = new BufferedWriter(
Expand Down
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/action/PersonalbogenAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,17 @@ private void generierePersonalbogen(Mitglied[] m) throws IOException
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("personalbogen", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "PDF").get());
fd.setFilterExtensions(new String[] { "*.PDF" });
Einstellungen.getEinstellung().getDateinamenmuster(), "pdf").get());
fd.setFilterExtensions(new String[] { "*.pdf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".PDF"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}
final File file = new File(s);
settings.setAttribute("lastdir", file.getParent());
Expand Down
16 changes: 8 additions & 8 deletions src/de/jost_net/JVerein/gui/control/ArbeitseinsatzControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,17 @@ private void startePDFAuswertung() throws RemoteException
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("arbeitseinsaetze", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "PDF").get());
fd.setFilterExtensions(new String[] { "*.PDF" });
Einstellungen.getEinstellung().getDateinamenmuster(), "pdf").get());
fd.setFilterExtensions(new String[] { "*.pdf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".PDF"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}
final File file = new File(s);
final GenericIterator<ArbeitseinsatzZeile> it = getIterator();
Expand Down Expand Up @@ -342,17 +342,17 @@ private void starteCSVAuswertung() throws RemoteException
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("arbeitseinsaetze", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "CSV").get());
fd.setFilterExtensions(new String[] { "*.CSV" });
Einstellungen.getEinstellung().getDateinamenmuster(), "csv").get());
fd.setFilterExtensions(new String[] { "*.csv" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".CSV"))
if (!s.toLowerCase().endsWith(".csv"))
{
s = s + ".CSV";
s = s + ".csv";
}
final File file = new File(s);
final GenericIterator<ArbeitseinsatzZeile> it = getIterator();
Expand Down
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/control/BuchungsartControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,17 +343,17 @@ private void starteAuswertung() throws RemoteException
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("buchungsarten", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "PDF").get());
fd.setFilterExtensions(new String[] { "*.PDF" });
Einstellungen.getEinstellung().getDateinamenmuster(), "pdf").get());
fd.setFilterExtensions(new String[] { "*.pdf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".PDF"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}
final File file = new File(s);
final DBIterator<Buchungsart> it = Einstellungen.getDBService()
Expand Down
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/control/MitgliedControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3571,25 +3571,25 @@ private void starteStatistik() throws RemoteException
{
FileDialog fd = new FileDialog(GUI.getShell(), SWT.SAVE);
fd.setText("Ausgabedatei wählen.");
fd.setFilterExtensions(new String[] { "*.PDF" });
fd.setFilterExtensions(new String[] { "*.pdf" });
String path = settings.getString("lastdir",
System.getProperty("user.home"));
if (path != null && path.length() > 0)
{
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("statistik", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "PDF").get());
Einstellungen.getEinstellung().getDateinamenmuster(), "pdf").get());

String s = fd.open();

if (s == null || s.length() == 0)
{
return;
}
if (!s.toUpperCase().endsWith("PDF"))
if (!s.toLowerCase().endsWith("pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}

final File file = new File(s);
Expand Down
18 changes: 9 additions & 9 deletions src/de/jost_net/JVerein/gui/control/PreNotificationControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,17 @@ private void generierePDF(Object currentObject, boolean mitMail,
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("prenotification", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "PDF").get());
fd.setFilterExtensions(new String[] { "*.PDF" });
Einstellungen.getEinstellung().getDateinamenmuster(), "pdf").get());
fd.setFilterExtensions(new String[] { "*.pdf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".PDF"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}
final File file = new File(s);
settings.setAttribute("lastdir", file.getParent());
Expand All @@ -363,7 +363,7 @@ private void generierePDF(Object currentObject, boolean mitMail,
it.setOrder("order by name, vorname");

int dateinummer = 0;
String postfix = ".PDF";
String postfix = ".pdf";
String prefix = s.substring(0, s.length() - postfix.length());

while (it.hasNext())
Expand Down Expand Up @@ -421,18 +421,18 @@ private void generiere1ct(Object currentObject) throws Exception
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("1ctueberweisung", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "XML").get());
fd.setFilterExtensions(new String[] { "*.XML" });
Einstellungen.getEinstellung().getDateinamenmuster(), "xml").get());
fd.setFilterExtensions(new String[] { "*.xml" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
settings.setAttribute("ausgabedateiname", s);
if (!s.endsWith(".XML"))
if (!s.toLowerCase().endsWith(".xml"))
{
s = s + ".XML";
s = s + ".xml";
}
file = new File(s);
settings.setAttribute("lastdir", file.getParent());
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/control/SpendenbescheinigungControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ public void handleAction(Object context) throws ApplicationException
{
return;
}
if (!s.endsWith(".pdf"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".pdf";
}
Expand Down Expand Up @@ -606,7 +606,7 @@ private void generiereSpendenbescheinigungIndividuell() throws IOException
{
return;
}
if (!s.endsWith(".pdf"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".pdf";
}
Expand Down
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/control/ZusatzbetragControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,17 +384,17 @@ private void starteAuswertung() throws RemoteException
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("zusatzbetraege", "",
Einstellungen.getEinstellung().getDateinamenmuster(), "PDF").get());
fd.setFilterExtensions(new String[] { "*.PDF" });
Einstellungen.getEinstellung().getDateinamenmuster(), "pdf").get());
fd.setFilterExtensions(new String[] { "*.pdf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".PDF"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}
final File file = new File(s);
final DBIterator<Zusatzbetrag> it = getIterator();
Expand Down
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/io/AbstractMitgliedskontoDokument.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ public AbstractMitgliedskontoDokument(MitgliedskontoControl control,
switch ((Ausgabeart) control.getAusgabeart().getValue())
{
case DRUCK:
file = getDateiAuswahl("PDF");
file = getDateiAuswahl("pdf");
formularaufbereitung = new FormularAufbereitung(file);
break;
case EMAIL:
file = getDateiAuswahl("ZIP");
file = getDateiAuswahl("zip");
zos = new ZipOutputStream(new FileOutputStream(file));
break;
}
Expand All @@ -93,7 +93,7 @@ public void aufbereitung(Formular formular) throws IOException
formularaufbereitung = new FormularAufbereitung(f);
aufbereitenFormular(mk, formularaufbereitung, formular);
formularaufbereitung.closeFormular();
zos.putNextEntry(new ZipEntry(getDateiname(mk) + ".PDF"));
zos.putNextEntry(new ZipEntry(getDateiname(mk) + ".pdf"));
FileInputStream in = new FileInputStream(f);
// buffer size
byte[] b = new byte[1024];
Expand Down Expand Up @@ -139,7 +139,7 @@ File getDateiAuswahl(String extension) throws RemoteException
{
return null;
}
if (!s.endsWith("." + extension))
if (!s.toLowerCase().endsWith("." + extension))
{
s = s + "." + extension;
}
Expand Down
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/io/Kontoauszug.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@ private void init() throws IOException
fd.setFilterPath(path);
}
fd.setFileName(new Dateiname("kontoauszug", "", Einstellungen
.getEinstellung().getDateinamenmuster(), "PDF").get());
fd.setFilterExtensions(new String[] { "*.PDF" });
.getEinstellung().getDateinamenmuster(), "pdf").get());
fd.setFilterExtensions(new String[] { "*.pdf" });

String s = fd.open();
if (s == null || s.length() == 0)
{
return;
}
if (!s.endsWith(".PDF"))
if (!s.toLowerCase().endsWith(".pdf"))
{
s = s + ".PDF";
s = s + ".pdf";
}
file = new File(s);
settings.setAttribute("lastdir", file.getParent());
Expand Down

0 comments on commit d1bd46b

Please sign in to comment.