5 files changed, 15 insertions, 0 deletions
diff --git a/src/main/ui/gui/widgets/CertEditDialog.java b/src/main/ui/gui/widgets/CertEditDialog.java
index 6c440a3..a928053 100644
--- a/src/main/ui/gui/widgets/CertEditDialog.java
+++ b/src/main/ui/gui/widgets/CertEditDialog.java
@@ -1,5 +1,7 @@
 package ui.gui.widgets;
 
+import annotations.Assoc;
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -32,9 +34,13 @@ public abstract class CertEditDialog<T> extends JDialog {
     /**
      * Root pane.
      */
+    @Assoc(partOf = true)
     protected JPanel contentPane = new JPanel();
+    @Assoc(partOf = true)
     protected JButton buttonOK = UIUtils.btn("", this::onOK);
+    @Assoc(partOf = true)
     protected JTextField textFieldSubject = new JTextField();
+    @Assoc(partOf = true)
     protected JSpinner spinnerValidity =
             new JSpinner(new SpinnerNumberModel(60, 1, null, 0));
 
diff --git a/src/main/ui/gui/widgets/CertTableModel.java b/src/main/ui/gui/widgets/CertTableModel.java
index f10d621..aa3f808 100644
--- a/src/main/ui/gui/widgets/CertTableModel.java
+++ b/src/main/ui/gui/widgets/CertTableModel.java
@@ -1,5 +1,6 @@
 package ui.gui.widgets;
 
+import annotations.Assoc;
 import model.ca.CertificationAuthority;
 import model.pki.cert.Certificate;
 import model.pki.crl.RevokedCertificate;
@@ -39,11 +40,13 @@ public class CertTableModel extends AbstractTableModel {
     /**
      * Pointer to {@link CertificationAuthority#getSigned()}
      */
+    @Assoc(lowerBond = 0)
     private List<Certificate> ptrData;
 
     /**
      * Pointer to {@link CertificationAuthority#getRevoked()}
      */
+    @Assoc(lowerBond = 0)
     private List<RevokedCertificate> ptrRevokedData;
 
     /**
diff --git a/src/main/ui/gui/widgets/LogTableModel.java b/src/main/ui/gui/widgets/LogTableModel.java
index a7b52ac..2f91dd0 100644
--- a/src/main/ui/gui/widgets/LogTableModel.java
+++ b/src/main/ui/gui/widgets/LogTableModel.java
@@ -1,5 +1,6 @@
 package ui.gui.widgets;
 
+import annotations.Assoc;
 import model.ca.AuditLogEntry;
 import model.ca.CertificationAuthority;
 
@@ -23,6 +24,7 @@ public class LogTableModel extends AbstractTableModel {
     /**
      * Pointer to the {@link CertificationAuthority#getLogs()}.
      */
+    @Assoc(lowerBond = 0)
     private List<AuditLogEntry> ptrData;
 
     /**
diff --git a/src/main/ui/gui/widgets/QRPanel.java b/src/main/ui/gui/widgets/QRPanel.java
index ebd70af..334f921 100644
--- a/src/main/ui/gui/widgets/QRPanel.java
+++ b/src/main/ui/gui/widgets/QRPanel.java
@@ -1,5 +1,6 @@
 package ui.gui.widgets;
 
+import annotations.Assoc;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
@@ -18,6 +19,7 @@ import static com.google.zxing.qrcode.decoder.ErrorCorrectionLevel.L;
 public class QRPanel extends JPanel {
     private final int size;
 
+    @Assoc(partOf = true, lowerBond = 0)
     private BitMatrix data;
 
     /**
diff --git a/src/main/ui/gui/widgets/TemplateTableModel.java b/src/main/ui/gui/widgets/TemplateTableModel.java
index de23b54..93e9bcf 100644
--- a/src/main/ui/gui/widgets/TemplateTableModel.java
+++ b/src/main/ui/gui/widgets/TemplateTableModel.java
@@ -1,5 +1,6 @@
 package ui.gui.widgets;
 
+import annotations.Assoc;
 import model.ca.CertificationAuthority;
 import model.ca.Template;
 
@@ -36,6 +37,7 @@ public class TemplateTableModel extends AbstractTableModel {
     /**
      * Pointer to the {@link CertificationAuthority#getTemplates()}.
      */
+    @Assoc(lowerBond = 0)
     private List<Template> ptrData;
 
     /**