removed obsolete parameters. issue #2246

jlawyerorg · Aug 27, 2024 · 51de381 · 51de381
1 parent 1ccd621
commit 51de381
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 27 deletions.
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaInboxPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaInboxPanel.java
@@ -2849,7 +2849,7 @@ private void saveEebResponse(Message m, MessageHeader originalMessage, String re
             ArchiveFileServiceRemote remote = locator.lookupArchiveFileServiceRemote();
 
             MessageExport mex = BeaAccess.exportMessage(m);
-            String newName = FileUtils.getNewFileName(targetCase, m.getId() + "_eEb-" + rejectionOrConfirmation + ".bea", false, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "eEb-Antwort speichern");
+            String newName = FileUtils.getNewFileName(targetCase, m.getId() + "_eEb-" + rejectionOrConfirmation + ".bea", new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "eEb-Antwort speichern");
             if (newName == null || "".equals(newName)) {
                 newName=m.getId() + "_eEb-" + rejectionOrConfirmation + ".bea";
             }

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageAction.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageAction.java
@@ -862,7 +862,7 @@ public boolean execute() throws Exception {
                         if (receivedPrefix == null) {
                             receivedPrefix = new java.util.Date();
                         }
-                        String newName = com.jdimension.jlawyer.client.utils.FileUtils.getNewFileName(this.archiveFile, mex.getFileName(), true, receivedPrefix, true, this.indicator, "Datei benennen");
+                        String newName = com.jdimension.jlawyer.client.utils.FileUtils.getNewFileName(this.archiveFile, mex.getFileName(), receivedPrefix, true, this.indicator, "Datei benennen");
                         if (newName == null) {
                             return false;
                         }
@@ -880,7 +880,7 @@ public boolean execute() throws Exception {
 
                         boolean documentExists = afs.doesDocumentExist(this.archiveFile.getId(), newName);
                         while (documentExists) {
-                            newName = com.jdimension.jlawyer.client.utils.FileUtils.getNewFileName(this.archiveFile, newName, true, receivedPrefix, true, this.indicator, "Datei benennen");
+                            newName = com.jdimension.jlawyer.client.utils.FileUtils.getNewFileName(this.archiveFile, newName, receivedPrefix, true, this.indicator, "Datei benennen");
                             if (newName == null || "".equals(newName)) {
                                 break;
                             }

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/drebis/freetext/FreeTextReceiptStep.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/drebis/freetext/FreeTextReceiptStep.java
@@ -865,7 +865,7 @@ public String getStepName() {
     }
 
     public String getNewFileName(ArchiveFileBean selectedCase, String currentFileName) {
-        return FileUtils.getNewFileName(selectedCase, currentFileName, false, new Date(), true, this, "Datei benennen");
+        return FileUtils.getNewFileName(selectedCase, currentFileName, new Date(), true, this, "Datei benennen");
     }
 
     @Override

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
@@ -4804,7 +4804,7 @@ private void mnuDuplicateDocumentActionPerformed(java.awt.event.ActionEvent evt)
 
                         byte[] content = remote.getDocumentContent(doc.getId());
                         ArchiveFileDocumentsBean orgDoc = remote.getDocument(doc.getId());
-                        String newName = FileUtils.getNewFileName(dto, doc.getName(), false, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Dokument duplizieren");
+                        String newName = FileUtils.getNewFileName(dto, doc.getName(), new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Dokument duplizieren");
 
                         if (newName == null || "".equals(newName)) {
                             return;
@@ -4942,7 +4942,7 @@ private void mnuRenameDocumentActionPerformed(java.awt.event.ActionEvent evt) {/
                 return;
             }
             ArchiveFileDocumentsBean doc = selectedDocs.get(0);
-            String newName = FileUtils.getNewFileName(dto, doc.getName(), false, null, false, this, "Dokument umbenennen");
+            String newName = FileUtils.getNewFileName(dto, doc.getName(), null, false, this, "Dokument umbenennen");
             this.lastPopupClosed = System.currentTimeMillis();
             if (newName == null) {
                 return;
@@ -5507,7 +5507,7 @@ private void mnuCopyDocumentToOtherCaseActionPerformed(java.awt.event.ActionEven
                     try {
 
                         byte[] content = remote.getDocumentContent(doc.getId());
-                        String newName = FileUtils.getNewFileName(sel, doc.getName(), false, new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Dokument kopieren");
+                        String newName = FileUtils.getNewFileName(sel, doc.getName(), new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Dokument kopieren");
                         if (newName == null || "".equalsIgnoreCase(newName)) {
                             this.lastPopupClosed = System.currentTimeMillis();
                             return;
@@ -5570,7 +5570,7 @@ public void convertDocumentToPdf(ArchiveFileDocumentsBean doc) throws Exception
                     int response = JOptionPane.showOptionDialog(EditorsRegistry.getInstance().getMainWindow(), "Eine Datei mit dem Namen '" + newName + "' existiert bereits, soll diese ersetzt werden?", "Datei ersetzen?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, new String[]{"Ja", "Nein"}, "Nein");
                     replaceDocument = response == JOptionPane.YES_OPTION;
                     if (!replaceDocument) {
-                        newName = FileUtils.getNewFileName(dto, newName, false, new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für PDF-Dokument");
+                        newName = FileUtils.getNewFileName(dto, newName, new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für PDF-Dokument");
                         if (newName == null || "".equals(newName)) {
                             this.lastPopupClosed = System.currentTimeMillis();
                             return;
@@ -5977,7 +5977,7 @@ private void mnuUseDocumentAsTemplateActionPerformed(java.awt.event.ActionEvent
             for (ArchiveFileDocumentsBean doc : selectedDocs) {
                 if (doc.getName().toLowerCase().endsWith(".ods") || doc.getName().toLowerCase().endsWith(".odt") || doc.getName().toLowerCase().endsWith(".docx")) {
                     byte[] content = remote.getDocumentContent(doc.getId());
-                    String newName = FileUtils.getNewFileName(dto, doc.getName(), false, new Date(), false, this, "Dokument als Vorlage speichern");
+                    String newName = FileUtils.getNewFileName(dto, doc.getName(), new Date(), false, this, "Dokument als Vorlage speichern");
 
                     if (newName == null || "".equals(newName)) {
                         this.lastPopupClosed = System.currentTimeMillis();
@@ -6813,7 +6813,7 @@ private void mnuMoveDocumentToOtherCaseActionPerformed(java.awt.event.ActionEven
                     try {
 
                         byte[] content = remote.getDocumentContent(doc.getId());
-                        String newName = FileUtils.getNewFileName(sel, doc.getName(), false, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Dokument verschieben");
+                        String newName = FileUtils.getNewFileName(sel, doc.getName(), new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Dokument verschieben");
                         if (newName == null || "".equalsIgnoreCase(newName)) {
                             this.lastPopupClosed = System.currentTimeMillis();
                             return;

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/UploadDocumentsAction.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/UploadDocumentsAction.java
@@ -764,7 +764,7 @@ private boolean processFile(File f, CaseFolder folder, ArchiveFileServiceRemote
         boolean documentExists = afs.doesDocumentExist(this.archiveFile.getId(), newName);
         while (documentExists) {
 
-            newName = FileUtils.getNewFileName(this.archiveFile, newName, false, new Date(), true, this.indicator, "neuer Dateiname");
+            newName = FileUtils.getNewFileName(this.archiveFile, newName, new Date(), true, this.indicator, "neuer Dateiname");
             if (newName == null || "".equals(newName)) {
                 EditorsRegistry.getInstance().clearStatus(true);
                 ThreadUtils.setDefaultCursor(this.owner);

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/EmailTemplatesPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/EmailTemplatesPanel.java
@@ -1258,7 +1258,7 @@ private void cmdRenameActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
 
                             String oldName = selectedValue.toString();
 
-                            String newName = FileUtils.getNewFileName(null, oldName, false, new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Vorlage umbenennen");
+                            String newName = FileUtils.getNewFileName(null, oldName, new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Vorlage umbenennen");
                             if (newName==null || newName.isEmpty()) {
                                 JOptionPane.showMessageDialog(this, "Name darf nicht leer sein.", CommonStrings.HINT, JOptionPane.INFORMATION_MESSAGE);
                                 return;
@@ -1291,7 +1291,7 @@ private void cmdDuplicateActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
                             String oldName = selectedValue.toString();
 
-                            String newName = FileUtils.getNewFileName(null, oldName, false, new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Vorlage duplizieren");
+                            String newName = FileUtils.getNewFileName(null, oldName, new Date(), false, EditorsRegistry.getInstance().getMainWindow(), "Vorlage duplizieren");
                             if (newName==null || newName.isEmpty()) {
                                 JOptionPane.showMessageDialog(this, "Name darf nicht leer sein.", CommonStrings.HINT, JOptionPane.INFORMATION_MESSAGE);
                                 return;

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/SendAction.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/SendAction.java
@@ -936,7 +936,7 @@ public PasswordAuthentication getPasswordAuthentication() {
                     newName = newName + ".eml";
                     newName = FileUtils.sanitizeFileName(newName);
                     java.util.Date sentPrefix = new Date();
-                    newName = FileUtils.getNewFileName(this.archiveFile, newName, true, sentPrefix, true, this.indicator, "Datei benennen");
+                    newName = FileUtils.getNewFileName(this.archiveFile, newName, sentPrefix, true, this.indicator, "Datei benennen");
                     if (newName != null) {
                         if (newName.trim().length() == 0) {
                             newName = "E-Mail";
@@ -948,7 +948,7 @@ public PasswordAuthentication getPasswordAuthentication() {
                         boolean documentExists = afs.doesDocumentExist(this.archiveFile.getId(), newName);
                         while (documentExists) {
 
-                            newName = FileUtils.getNewFileName(this.archiveFile, newName, true, sentPrefix, true, this.indicator, "Datei benennen");
+                            newName = FileUtils.getNewFileName(this.archiveFile, newName, sentPrefix, true, this.indicator, "Datei benennen");
                             if (newName == null || "".equals(newName)) {
                                 break;
                             }

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/SendEncryptedAction.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/SendEncryptedAction.java
@@ -963,7 +963,7 @@ public PasswordAuthentication getPasswordAuthentication() {
                         newName = newName + ".eml";
                         newName = FileUtils.sanitizeFileName(newName);
                         java.util.Date sentPrefix = new Date();
-                        newName = FileUtils.getNewFileName(this.archiveFile, newName, true, sentPrefix, true, this.indicator, "Datei benennen");
+                        newName = FileUtils.getNewFileName(this.archiveFile, newName, sentPrefix, true, this.indicator, "Datei benennen");
 
                         if (newName != null) {
                             if (newName.trim().length() == 0) {
@@ -976,7 +976,7 @@ public PasswordAuthentication getPasswordAuthentication() {
                             boolean documentExists = afs.doesDocumentExist(this.archiveFile.getId(), newName);
                             while (documentExists) {
 
-                                newName = FileUtils.getNewFileName(this.archiveFile, newName, true, sentPrefix, true, this.indicator, "Datei benennen");
+                                newName = FileUtils.getNewFileName(this.archiveFile, newName, sentPrefix, true, this.indicator, "Datei benennen");
                                 if (newName == null || "".equals(newName)) {
                                     break;
                                 }

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/templates/TemplatesTreePanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/templates/TemplatesTreePanel.java
@@ -1371,7 +1371,7 @@ private void mnuRenameTemplateActionPerformed(java.awt.event.ActionEvent evt) {/
         }
         DefaultMutableTreeNode selNode = (DefaultMutableTreeNode) tp.getLastPathComponent();
         GenericNode folder = (GenericNode) selNode.getUserObject();
-        String newName=FileUtils.getNewFileName(null, this.lstTemplates.getSelectedValue().toString(), false, null, false, this, "Vorlage umbenennen");
+        String newName=FileUtils.getNewFileName(null, this.lstTemplates.getSelectedValue().toString(), null, false, this, "Vorlage umbenennen");
         if(newName==null)
             return;
 

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/utils/FileUtils.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/utils/FileUtils.java
@@ -837,13 +837,13 @@ public static String getNewFileName(ArchiveFileBean selectedCase, String current
 
     public static String getNewFileName(ArchiveFileBean selectedCase, String currentFileName, boolean datetimePrefix, java.util.Date d, boolean applyNameTemplate) {
 
-        return getNewFileName(selectedCase, currentFileName, datetimePrefix, d, applyNameTemplate, EditorsRegistry.getInstance().getMainWindow(), "Datei benennen");
+        return getNewFileName(selectedCase, currentFileName, d, applyNameTemplate, EditorsRegistry.getInstance().getMainWindow(), "Datei benennen");
 
     }
 
     public static String getNewFileName(ArchiveFileBean selectedCase, String currentFileName, boolean datetimePrefix, java.util.Date d, boolean applyNameTemplate, Component parent) {
 
-        return getNewFileName(selectedCase, currentFileName, datetimePrefix, d, applyNameTemplate, parent, "Datei benennen");
+        return getNewFileName(selectedCase, currentFileName, d, applyNameTemplate, parent, "Datei benennen");
 
     }
 
@@ -1023,7 +1023,7 @@ public static void cleanupTempFile(String url) {
 
     }
 
-    public static String getNewFileName(ArchiveFileBean selectedCase, String currentFileName, boolean datetimePrefix, java.util.Date d, boolean applyNameTemplate, Component parent, String title) {
+    public static String getNewFileName(ArchiveFileBean selectedCase, String currentFileName, java.util.Date d, boolean applyNameTemplate, Component parent, String title) {
 
         if (parent == null) {
             parent = EditorsRegistry.getInstance().getMainWindow();

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/voip/EpostLetterSendStatus.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/voip/EpostLetterSendStatus.java
@@ -892,7 +892,7 @@ public void display() {
                             }
                             newName = FileUtils.sanitizeFileName(newName);
                             java.util.Date sentPrefix = new Date();
-                            newName = FileUtils.getNewFileName(selectedCase, newName, true, sentPrefix, true, this, "Datei benennen");
+                            newName = FileUtils.getNewFileName(selectedCase, newName, sentPrefix, true, this, "Datei benennen");
                             if (newName != null) {
                                 if (newName.trim().length() == 0) {
                                     newName = "E-POST-Brief";
@@ -904,7 +904,7 @@ public void display() {
                                 boolean documentExists = afs.doesDocumentExist(this.data.get("epost.letter.caseid").toString(), newName);
                                 while (documentExists) {
 
-                                    newName = FileUtils.getNewFileName(selectedCase, newName, true, sentPrefix, true, this, "Datei benennen");
+                                    newName = FileUtils.getNewFileName(selectedCase, newName, sentPrefix, true, this, "Datei benennen");
                                     if (newName == null || "".equals(newName)) {
                                         break;
                                     }

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/voip/MailingStatusPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/voip/MailingStatusPanel.java
@@ -1259,15 +1259,15 @@ private void cmdSaveReportActionPerformed(java.awt.event.ActionEvent evt) {//GEN
 
             for (String id : faxEntriesIds) {
                 String defaultName = locator.lookupVoipServiceRemote().getNewFaxReportFileName(id);
-                defaultName = FileUtils.getNewFileName(faxEntries.get(id).getCase(), defaultName, false, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für Faxbericht");
+                defaultName = FileUtils.getNewFileName(faxEntries.get(id).getCase(), defaultName, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für Faxbericht");
                 if(defaultName==null) {
                     this.clearDetails();
                     return;
                 }
 
                 boolean documentExists = locator.lookupArchiveFileServiceRemote().doesDocumentExist(faxEntries.get(id).getCase().getId(), defaultName);
                 while (documentExists) {
-                    defaultName = FileUtils.getNewFileName(faxEntries.get(id).getCase(), defaultName, false, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für Faxbericht");
+                    defaultName = FileUtils.getNewFileName(faxEntries.get(id).getCase(), defaultName, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für Faxbericht");
                     if (defaultName == null || "".equals(defaultName)) {
                         this.clearDetails();
                         return;
@@ -1280,15 +1280,15 @@ private void cmdSaveReportActionPerformed(java.awt.event.ActionEvent evt) {//GEN
 
             for (int id : epostEntriesIds) {
                 String defaultName = locator.lookupVoipServiceRemote().getNewEpostReportFileName(id);
-                defaultName = FileUtils.getNewFileName(epostEntries.get(id).getCase(), defaultName, false, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für E-POST-Bericht");
+                defaultName = FileUtils.getNewFileName(epostEntries.get(id).getCase(), defaultName, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für E-POST-Bericht");
                 if(defaultName==null) {
                     this.clearDetails();
                     return;
                 }
 
                 boolean documentExists = locator.lookupArchiveFileServiceRemote().doesDocumentExist(epostEntries.get(id).getCase().getId(), defaultName);
                 while (documentExists) {
-                    defaultName = FileUtils.getNewFileName(epostEntries.get(id).getCase(), defaultName, false, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für E-POST-Bericht");
+                    defaultName = FileUtils.getNewFileName(epostEntries.get(id).getCase(), defaultName, new Date(), true, EditorsRegistry.getInstance().getMainWindow(), "Neuer Name für E-POST-Bericht");
                     if (defaultName == null || "".equals(defaultName)) {
                         this.clearDetails();
                         return;