display whether recipient has an encryption password enabled. close #…

…1834
jlawyerorg · Dec 8, 2023 · 98b2d21 · 98b2d21
1 parent 4fa7b4e
commit 98b2d21
Show file tree

Hide file tree

Showing 10 changed files with 730 additions and 19 deletions.
diff --git a/j-lawyer-client/nbproject/project.properties b/j-lawyer-client/nbproject/project.properties
@@ -77,6 +77,7 @@ file.reference.rt-2.3.3.jar=lib/bea/rt-2.3.3.jar
 file.reference.rtf-to-html-1.0.1.jar=lib/rtf-to-html-1.0.1.jar
 file.reference.saaj-impl-1.5.2.jar=lib/bea/saaj-impl-1.5.2.jar
 file.reference.security_utils-1.0.0.jar=lib/bea/security_utils-1.0.0.jar
+file.reference.SHEF.jar=lib/SHEF.jar
 file.reference.SignerToolBox-3.19.0.2.jar=lib/bea/SignerToolBox-3.19.0.2.jar
 file.reference.slf4j-api-1.7.30.jar=lib/bea/slf4j-api-1.7.30.jar
 file.reference.stax-ex-1.8.3.jar=lib/bea/stax-ex-1.8.3.jar
@@ -310,9 +311,9 @@ javac.classpath=\
     ${file.reference.hamcrest-core-1.3.jar}:\
     ${file.reference.commons-beanutils-1.8.0.jar}:\
     ${file.reference.json-simple-2.3.0.jar}:\
-    ${file.reference.SHEF.jar}:\
     ${file.reference.j-lawyer-server-api.jar}:\
     ${file.reference.config_schulung.jar-1}:\
+    ${file.reference.SHEF.jar}:\
     ${file.reference.jbig2-imageio-3.0.0.jar}:\
     ${file.reference.j-lawyer-cloud.jar}:\
     ${file.reference.javax.mail-1.6.2.jar}:\
@@ -460,7 +461,6 @@ file.reference.ical4j-0.9.18.jar=lib/bizcal/ical4j-0.9.18.jar
 build.test.classes.dir=${build.dir}/test/classes
 file.reference.javafx.media.jar=lib/javafx/javafx.media.jar
 application.splash=/home/jens/dev/j-lawyer-org/j-lawyer-client/src/images/j-lawyer-startup-splash.png
-file.reference.SHEF.jar=lib/SHEF.jar
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 file.reference.algorithm_identifier-1.0.0.10.jar=lib/bea/algorithm_identifier-1.0.0.10.jar
 file.reference.jcalendar-1.3.2.jar=lib/jcalendar-1.3.2.jar

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
@@ -708,9 +708,11 @@ public AddBeaRecipientSearchDialog(JDialog parent, boolean modal, JList to, JCom
         this.nextFocus = nextFocus;
         this.to = to;
         initComponents();
-        String[] colNames = new String[]{"Name", "Vorname", "Unternehmen", "PLZ", "Ort", "E-Mail", "SafeID"};
+        String[] colNames = new String[]{"Name", "Vorname", "Unternehmen", "PLZ", "Ort", "E-Mail", "", "SafeID"};
         QuickAddressSearchTableModel model = new QuickAddressSearchTableModel(colNames, 0);
         this.tblResults.setModel(model);
+
+        this.tblResults.setDefaultRenderer(Object.class, new AddressHasEncryptionCellRenderer());
 
         ClientSettings s = ClientSettings.getInstance();
         List<String> tags = s.getAddressTagsInUse();

diff --git a/...ent/src/com/jdimension/jlawyer/client/editors/addresses/QuickAddressSearchTableModel.java b/...ent/src/com/jdimension/jlawyer/client/editors/addresses/QuickAddressSearchTableModel.java
@@ -671,11 +671,14 @@
  */
 public class QuickAddressSearchTableModel extends DefaultTableModel {
 
-    /** Creates a new instance of QuickAddressSearchTableModel */
+    /** Creates a new instance of QuickAddressSearchTableModel
+     * @param colNames
+     * @param rowCount */
     public QuickAddressSearchTableModel(Object[] colNames, int rowCount) {
         super(colNames, rowCount);
     }
 
+    @Override
     public boolean isCellEditable(int i, int i0) {
         /*boolean retValue;
         

diff --git a/...t/src/com/jdimension/jlawyer/client/editors/files/QuickArchiveFileSearchCellRenderer.java b/...t/src/com/jdimension/jlawyer/client/editors/files/QuickArchiveFileSearchCellRenderer.java
@@ -665,7 +665,6 @@
 
 import com.jdimension.jlawyer.client.settings.ClientSettings;
 import com.jdimension.jlawyer.client.settings.UserSettings;
-import com.jdimension.jlawyer.persistence.ArchiveFileBean;
 import com.jdimension.jlawyer.services.JLawyerServiceLocator;
 import java.awt.Color;
 import java.awt.Component;

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/AddRecipientSearchDialog.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/AddRecipientSearchDialog.form
@@ -56,13 +56,13 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="cmdQuickSearch" alignment="0" min="-2" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                  <Component id="cmdQuickSearch" alignment="0" max="32767" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="txtSearchString" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Component id="cmdTagFilter" max="32767" attributes="0"/>
+                  <Component id="cmdTagFilter" alignment="0" max="32767" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jScrollPane1" pref="268" max="32767" attributes="0"/>

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/AddRecipientSearchDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/AddRecipientSearchDialog.java
@@ -706,9 +706,11 @@ public AddRecipientSearchDialog(JDialog parent, boolean modal, JTextField to, JC
         this.nextFocus=nextFocus;
         this.to = to;
         initComponents();
-        String[] colNames = new String[]{"Name", "Vorname", "Unternehmen", "PLZ", "Ort", "E-Mail", "SafeID"};
+        String[] colNames = new String[]{"Name", "Vorname", "Unternehmen", "PLZ", "Ort", "E-Mail", "", "SafeID"};
         QuickAddressSearchTableModel model = new QuickAddressSearchTableModel(colNames, 0);
         this.tblResults.setModel(model);
+
+        this.tblResults.setDefaultRenderer(Object.class, new AddressHasEncryptionCellRenderer());
 
         ClientSettings s = ClientSettings.getInstance();
         List<String> tags = s.getAddressTagsInUse();
@@ -827,8 +829,8 @@ public void mousePressed(java.awt.event.MouseEvent evt) {
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(layout.createSequentialGroup()
                 .addContainerGap()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(cmdQuickSearch)
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                    .add(cmdQuickSearch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                         .add(jLabel1)
                         .add(txtSearchString, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))