Merge pull request #2166 from jlawyerorg/54-epost-integration

54 epost integration
jlawyerorg · Oct 25, 2023 · a459c5b · a459c5b
2 parents 5a2b5cc + 34c106c
commit a459c5b
Show file tree

Hide file tree

Showing 103 changed files with 13,809 additions and 1,858 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -115,7 +115,7 @@ jobs:
             -Dsonar.organization=jlawyerorg
             -Dsonar.projectKey=jlawyerorg_j-lawyer-org
             -Dsonar.projectName=j-lawyer-org
-            -Dsonar.projectVersion=2.5.0
+            -Dsonar.projectVersion=2.6.0
             -Dsonar.java.binaries=.
             -Dsonar.java.source=8
             

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/JKanzleiGUI.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/JKanzleiGUI.form
@@ -1048,7 +1048,7 @@
                   <EmptySpace type="unrelated" max="-2" attributes="0"/>
                   <Component id="lblNewsStatus" min="-2" max="-2" attributes="0"/>
                   <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                  <Component id="lblFaxStatus" min="-2" max="-2" attributes="0"/>
+                  <Component id="lblMailingStatus" min="-2" max="-2" attributes="0"/>
                   <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
                   <Component id="lblUnreadInstantMessages" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
@@ -1068,7 +1068,7 @@
                   <Component id="lblUpdateStatus" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="lblScanStatus" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="lblMailStatus" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="lblFaxStatus" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="lblMailingStatus" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="lblNewsStatus" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="statusLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="lblDrebisStatus" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -1145,11 +1145,11 @@
             <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="lblSystemStatusMouseClicked"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JLabel" name="lblFaxStatus">
+        <Component class="javax.swing.JLabel" name="lblMailingStatus">
           <Properties>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
               <FontInfo relative="true">
-                <Font component="lblFaxStatus" property="font" relativeSize="true" size="0"/>
+                <Font component="lblMailingStatus" property="font" relativeSize="true" size="0"/>
               </FontInfo>
             </Property>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/JKanzleiGUI.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/JKanzleiGUI.java
@@ -681,7 +681,7 @@
 import com.jdimension.jlawyer.client.events.EmailStatusEvent;
 import com.jdimension.jlawyer.client.events.Event;
 import com.jdimension.jlawyer.client.events.EventBroker;
-import com.jdimension.jlawyer.client.events.FaxStatusEvent;
+import com.jdimension.jlawyer.client.events.MailingStatusEvent;
 import com.jdimension.jlawyer.client.events.NewInstantMessagesEvent;
 import com.jdimension.jlawyer.client.events.NewsEvent;
 import com.jdimension.jlawyer.client.events.OpenMentionsEvent;
@@ -773,8 +773,8 @@ public JKanzleiGUI() {
         b.subscribeConsumer(this, Event.TYPE_NEWS);
         b.subscribeConsumer(this, Event.TYPE_SYSTEMSTATUS);
         b.subscribeConsumer(this, Event.TYPE_SCANNERSTATUS);
-        b.subscribeConsumer(this, Event.TYPE_FAXSTATUS);
-        b.subscribeConsumer(this, Event.TYPE_FAXFAILED);
+        b.subscribeConsumer(this, Event.TYPE_MAILINGSTATUS);
+        b.subscribeConsumer(this, Event.TYPE_MAILINGFAILED);
         b.subscribeConsumer(this, Event.TYPE_MAILSTATUS);
         b.subscribeConsumer(this, Event.TYPE_BEASTATUS);
         b.subscribeConsumer(this, Event.TYPE_DREBISSTATUS);
@@ -1010,25 +1010,25 @@ public void onEvent(Event e) {
             } else {
                 this.lblScanStatus.setEnabled(false);
             }
-        } else if (e instanceof FaxStatusEvent) {
+        } else if (e instanceof MailingStatusEvent) {
 
-            this.lblFaxStatus.setText(" " + ((FaxStatusEvent) e).getFaxList().size());
-            this.lblFaxStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/kfax.png")));
-            if (((FaxStatusEvent) e).getFailed() > 0) {
+            this.lblMailingStatus.setText(" " + ((MailingStatusEvent) e).getMailingList().size());
+            this.lblMailingStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/kfax.png")));
+            if (((MailingStatusEvent) e).getFailed() > 0) {
 
                 String failedFaxesCaption = java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/editors/EditorsRegistry").getString("caption.failedfaxes");
-                this.lblFaxStatus.setToolTipText("<html><p align=\"center\">" + failedFaxesCaption + "</p></html>");
-                this.lblFaxStatus.setForeground(DefaultColorTheme.COLOR_LOGO_RED);
+                this.lblMailingStatus.setToolTipText("<html><p align=\"center\">" + failedFaxesCaption + "</p></html>");
+                this.lblMailingStatus.setForeground(DefaultColorTheme.COLOR_LOGO_RED);
 
             } else {
-                this.lblFaxStatus.setToolTipText("");
-                this.lblFaxStatus.setForeground(Color.black);
+                this.lblMailingStatus.setToolTipText("");
+                this.lblMailingStatus.setForeground(Color.black);
 
             }
-            if (((FaxStatusEvent) e).getFaxList().size() > 0) {
-                this.lblFaxStatus.setEnabled(true);
+            if (((MailingStatusEvent) e).getMailingList().size() > 0) {
+                this.lblMailingStatus.setEnabled(true);
             } else {
-                this.lblFaxStatus.setEnabled(false);
+                this.lblMailingStatus.setEnabled(false);
             }
 
         } else if (e instanceof EmailStatusEvent) {
@@ -1096,7 +1096,7 @@ private void initComponents() {
         lblScanStatus = new javax.swing.JLabel();
         lblMailStatus = new javax.swing.JLabel();
         lblSystemStatus = new javax.swing.JLabel();
-        lblFaxStatus = new javax.swing.JLabel();
+        lblMailingStatus = new javax.swing.JLabel();
         lblNewsStatus = new javax.swing.JLabel();
         lblDrebisStatus = new javax.swing.JLabel();
         lblBeaStatus = new javax.swing.JLabel();
@@ -1241,11 +1241,11 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
             }
         });
 
-        lblFaxStatus.setFont(lblFaxStatus.getFont());
-        lblFaxStatus.setForeground(new java.awt.Color(255, 0, 0));
-        lblFaxStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/printer.png"))); // NOI18N
-        lblFaxStatus.setText("?");
-        lblFaxStatus.setEnabled(false);
+        lblMailingStatus.setFont(lblMailingStatus.getFont());
+        lblMailingStatus.setForeground(new java.awt.Color(255, 0, 0));
+        lblMailingStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/printer.png"))); // NOI18N
+        lblMailingStatus.setText("?");
+        lblMailingStatus.setEnabled(false);
 
         lblNewsStatus.setFont(lblNewsStatus.getFont().deriveFont(lblNewsStatus.getFont().getStyle() & ~java.awt.Font.BOLD));
         lblNewsStatus.setForeground(new java.awt.Color(255, 153, 0));
@@ -1293,7 +1293,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
                 .add(lblNewsStatus)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                .add(lblFaxStatus)
+                .add(lblMailingStatus)
                 .add(12, 12, 12)
                 .add(lblUnreadInstantMessages)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
@@ -1311,7 +1311,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
                 .add(lblUpdateStatus)
                 .add(lblScanStatus)
                 .add(lblMailStatus)
-                .add(lblFaxStatus)
+                .add(lblMailingStatus)
                 .add(lblNewsStatus)
                 .add(statusLabel)
                 .add(lblDrebisStatus)
@@ -2881,8 +2881,8 @@ public static void main(String args[]) {
     private javax.swing.JPopupMenu.Separator jSeparator5;
     private javax.swing.JLabel lblBeaStatus;
     private javax.swing.JLabel lblDrebisStatus;
-    private javax.swing.JLabel lblFaxStatus;
     private javax.swing.JLabel lblMailStatus;
+    private javax.swing.JLabel lblMailingStatus;
     private javax.swing.JLabel lblNewsStatus;
     private javax.swing.JLabel lblScanStatus;
     private javax.swing.JLabel lblSystemStatus;

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/Main.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/Main.java
@@ -1044,16 +1044,16 @@ private void showSplash(String cmdHost, String cmdPort, String cmdUser, String c
         drebis.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/Icons2-17-green.png")));
         drebis.setStatusEventType(Event.TYPE_DREBISSTATUS);
         mail.addChildModule(drebis);
-        ModuleMetadata faxStatus = new ModuleMetadata(java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/Modules").getString("mod.comm.fax"));
-        faxStatus.setEditorClass("com.jdimension.jlawyer.client.voip.FaxStatusPanel");
-        faxStatus.setBackgroundImage("emails.jpg");
-        faxStatus.setFullName("Faxstatus");
-        faxStatus.setEditorName("Fax");
-        faxStatus.setModuleName("Post");
-        faxStatus.setDefaultIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/baseline_print_blue_36dp.png")));
-        faxStatus.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/baseline_print_green_36dp.png")));
-        faxStatus.setStatusEventType(Event.TYPE_FAXSTATUS);
-        mail.addChildModule(faxStatus);
+        ModuleMetadata mailingStatus = new ModuleMetadata(java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/Modules").getString("mod.comm.fax"));
+        mailingStatus.setEditorClass("com.jdimension.jlawyer.client.voip.MailingStatusPanel");
+        mailingStatus.setBackgroundImage("emails.jpg");
+        mailingStatus.setFullName("Mailingstatus");
+        mailingStatus.setEditorName("Brief / Fax");
+        mailingStatus.setModuleName("Post");
+        mailingStatus.setDefaultIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/baseline_print_blue_36dp.png")));
+        mailingStatus.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/baseline_print_green_36dp.png")));
+        mailingStatus.setStatusEventType(Event.TYPE_MAILINGSTATUS);
+        mail.addChildModule(mailingStatus);
         ModuleMetadata mailTpl = new ModuleMetadata(java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/Modules").getString("mod.comm.templates"));
         mailTpl.setEditorClass("com.jdimension.jlawyer.client.mail.EmailTemplatesPanel");
         mailTpl.setBackgroundImage("emails.jpg");

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/Modules.properties b/j-lawyer-client/src/com/jdimension/jlawyer/client/Modules.properties
@@ -17,7 +17,7 @@ mod.fup.find=suchen
 mod.comm=Kommunikation
 mod.comm.inbox=E-Mail Posteingang
 mod.comm.templates=Vorlagen
-mod.comm.fax=Faxstatus
+mod.comm.fax=Status Brief / Fax
 mod.comm.drebis=\ Posteingang
 mod.docs=Dokumente
 mod.docs.master=Master-Vorlagen

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/Modules_en.properties b/j-lawyer-client/src/com/jdimension/jlawyer/client/Modules_en.properties
@@ -17,7 +17,7 @@ mod.fup.find=find
 mod.comm=Correspondence
 mod.comm.inbox=Email Inbox
 mod.comm.templates=Templates
-mod.comm.fax=Fax Status
+mod.comm.fax=Status Letter / Fax
 mod.comm.drebis=\ Inbox
 mod.docs=Documents
 mod.docs.master=Master Templates

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/AddBeaRecipientSearchDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/AddBeaRecipientSearchDialog.java
@@ -694,17 +694,17 @@ public class AddBeaRecipientSearchDialog extends javax.swing.JDialog {
 
     private static final Logger log = Logger.getLogger(AddBeaRecipientSearchDialog.class.getName());
     private JList to = null;
-    private int targetReferenceType = -1;
-    //private KeyAdapter tableKeyListener = null;
-    private JDialog parent = null;
     private JComponent nextFocus = null;
 
     /**
      * Creates new form AddBeaRecipientSearchDialog
+     * @param parent
+     * @param modal
+     * @param to
+     * @param nextFocus
      */
     public AddBeaRecipientSearchDialog(JDialog parent, boolean modal, JList to, JComponent nextFocus) {
         super(parent, modal);
-        this.parent = parent;
         this.nextFocus = nextFocus;
         this.to = to;
         initComponents();
@@ -718,14 +718,6 @@ public AddBeaRecipientSearchDialog(JDialog parent, boolean modal, JList to, JCom
 
         ComponentUtils.restoreDialogSize(this);
 
-//        this.tableKeyListener = new java.awt.event.KeyAdapter() {
-//            public void keyPressed(java.awt.event.KeyEvent evt) {
-//                if (evt.getKeyCode() == evt.VK_ENTER) {
-//                    useSelection();
-//                }
-//            }
-//        };
-        //this.tableKeyListener = null;
         this.tblResults.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "Enter");
         this.tblResults.getActionMap().put("Enter", new AbstractAction() {
             @Override
@@ -860,7 +852,6 @@ private void useSelection() {
                 BeaAccess bea = BeaAccess.getInstance();
                 Identity i = bea.getIdentity(safeId);
                 DefaultListModel model=(DefaultListModel)this.to.getModel();
-                model.removeAllElements();
                 model.addElement(i);
 
             } catch (Throwable t) {
@@ -886,16 +877,7 @@ private void cmdQuickSearchActionPerformed(java.awt.event.ActionEvent evt) {//GE
 
     private void txtSearchStringKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtSearchStringKeyPressed
         if (evt.getKeyCode() == evt.VK_ENTER) {
-            //this.tblResults.removeKeyListener(this.tableKeyListener);
             this.cmdQuickSearchActionPerformed(null);
-//            this.tableKeyListener = new java.awt.event.KeyAdapter() {
-//                public void keyPressed(java.awt.event.KeyEvent evt) {
-//                    if (evt.getKeyCode() == evt.VK_ENTER) {
-//                        useSelection();
-//                    }
-//                }
-//            };
-//            tblResults.addKeyListener(this.tableKeyListener);
         }
     }//GEN-LAST:event_txtSearchStringKeyPressed
 
@@ -911,12 +893,8 @@ private void cmdTagFilterMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRS
      * @param args the command line arguments
      */
     public static void main(String args[]) {
-        java.awt.EventQueue.invokeLater(new Runnable() {
-
-            public void run() {
-                new AddBeaRecipientSearchDialog(null, true, null, null).setVisible(true);
-                //new AddRecipientSearchDialog(new javax.swing.JFrame(), true, null).setVisible(true);
-            }
+        java.awt.EventQueue.invokeLater(() -> {
+            new AddBeaRecipientSearchDialog(null, true, null, null).setVisible(true);
         });
     }
     // Variables declaration - do not modify//GEN-BEGIN:variables