diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaAccess.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaAccess.java index 61c5a38f1..00ac5f11f 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaAccess.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaAccess.java @@ -1263,14 +1263,14 @@ public Message sendAndRetrieveMessage(Message msg, String senderSafeId, String r return sentMessage; } - public String saveMessageToDrafts(Message msg, String senderSafeId, String recipientSafeId, BeaListItem authority) throws BeaWrapperException { + public String saveMessageToDrafts(Message msg, String senderSafeId, String recipientSafeId, BeaListItem authority, BeaListItem priority) throws BeaWrapperException { this.checkValidBeaClient(); Folder draftsFolder = this.wrapper.getDraftsFolder(senderSafeId); if (draftsFolder != null) { if (this.folderOverviewCache.containsKey(draftsFolder.getId())) this.folderOverviewCache.remove(draftsFolder.getId()); } - return this.wrapper.saveMessageToDrafts(msg, senderSafeId, recipientSafeId, authority); + return this.wrapper.saveMessageToDrafts(msg, senderSafeId, recipientSafeId, authority, priority); } public Message sendEebConfirmation(Message incomingMessage, String senderSafeId, String recipientSafeId, Date abgabeDate) throws BeaWrapperException { diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SaveBeaMessageAction.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SaveBeaMessageAction.java index fd38ef850..50f0c679d 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SaveBeaMessageAction.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SaveBeaMessageAction.java @@ -702,6 +702,7 @@ public class SaveBeaMessageAction extends ProgressableAction { private List attachments = null; private boolean readReceipt = false; private BeaListItem authority = null; + private BeaListItem priority = null; private Identity to = null; private String subject = ""; private String body = ""; @@ -714,7 +715,7 @@ public class SaveBeaMessageAction extends ProgressableAction { private CaseFolder folder = null; - public SaveBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String fromSafeId, List attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, Identity to, String subject, String body, String documentTag, String azSender, String azRecipient) { + public SaveBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String fromSafeId, List attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, Identity to, String subject, String body, String documentTag, String azSender, String azRecipient, BeaListItem priority) { super(i, false, cleanAfter); this.attachments = attachmentMetadata; this.readReceipt = readReceipt; @@ -727,10 +728,11 @@ public SaveBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String from this.authority = authority; this.azSender = azSender; this.azRecipient = azRecipient; + this.priority=priority; } - public SaveBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String fromSafeId, List attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, Identity to, String subject, String body, ArchiveFileBean af, String documentTag, String azSender, String azRecipient, CaseFolder folder) { - this(i, cleanAfter, fromSafeId, attachmentMetadata, cu, readReceipt, authority, to, subject, body, documentTag, azSender, azRecipient); + public SaveBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String fromSafeId, List attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, Identity to, String subject, String body, ArchiveFileBean af, String documentTag, String azSender, String azRecipient, CaseFolder folder, BeaListItem priority) { + this(i, cleanAfter, fromSafeId, attachmentMetadata, cu, readReceipt, authority, to, subject, body, documentTag, azSender, azRecipient, priority); this.archiveFile = af; this.folder = folder; } @@ -793,7 +795,7 @@ public boolean execute() throws Exception { String toSafeId=null; if(this.to!=null) toSafeId=this.to.getSafeId(); - sentId = bea.saveMessageToDrafts(msg, senderSafeId, toSafeId, this.authority); + sentId = bea.saveMessageToDrafts(msg, senderSafeId, toSafeId, this.authority, this.priority); } catch (BeaWrapperException ex) { log.error(ex); diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.form index 1ec43925d..03d0f69cd 100755 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.form +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.form @@ -786,12 +786,11 @@ - - - - - - + + + + + @@ -848,7 +847,7 @@ - + @@ -894,7 +893,7 @@ - + diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.java index 796345a13..a889b5252 100755 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.java @@ -1630,7 +1630,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { jLabel6.setText("Priorität:"); - chkEeb.setText("Zust. g. Empfangsb."); + chkEeb.setText("Zustellung gegen Empfangsbekenntnis"); chkEeb.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { chkEebActionPerformed(evt); @@ -1660,11 +1660,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel2Layout.createSequentialGroup() - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(cmbPriorities, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel6)) - .addComponent(jLabel5)) + .addContainerGap() + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(cmbPriorities, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel6) + .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(cmbMessageType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -1706,7 +1706,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(cmbTemplates, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(pnlParties, javax.swing.GroupLayout.DEFAULT_SIZE, 49, Short.MAX_VALUE) + .addComponent(pnlParties, javax.swing.GroupLayout.DEFAULT_SIZE, 88, Short.MAX_VALUE) .addContainerGap()) ); @@ -2286,6 +2286,11 @@ private void cmdSaveDraftActionPerformed(java.awt.event.ActionEvent evt) {//GEN- if (this.lstTo.getModel().getSize() > 0) { recipient = (Identity) ((DefaultListModel) this.lstTo.getModel()).elements().nextElement(); } + + BeaListItem priority=null; + if(this.cmbPriorities.getSelectedItem() instanceof BeaListItem) + // first index is a string (no priority selected) + priority=(BeaListItem)this.cmbPriorities.getSelectedItem(); ArrayList attachmentMetadata = this.getAttachmentMetdata(); @@ -2297,9 +2302,9 @@ private void cmdSaveDraftActionPerformed(java.awt.event.ActionEvent evt) {//GEN- } if (this.chkSaveAsDocument.isSelected()) { - a = new SaveBeaMessageAction(dlg, this, fromSafeId, attachmentMetadata, this.cu, this.chkEeb.isSelected(), this.authority, recipient, this.txtSubject.getText(), ed.getText(), this.contextArchiveFile, createDocumentTag, this.txtAzSender.getText(), this.cmbAzRecipient.getEditor().getItem().toString(), folder); + a = new SaveBeaMessageAction(dlg, this, fromSafeId, attachmentMetadata, this.cu, this.chkEeb.isSelected(), this.authority, recipient, this.txtSubject.getText(), ed.getText(), this.contextArchiveFile, createDocumentTag, this.txtAzSender.getText(), this.cmbAzRecipient.getEditor().getItem().toString(), folder, priority); } else { - a = new SaveBeaMessageAction(dlg, this, fromSafeId, attachmentMetadata, this.cu, this.chkEeb.isSelected(), this.authority, recipient, this.txtSubject.getText(), ed.getText(), createDocumentTag, this.txtAzSender.getText(), this.cmbAzRecipient.getEditor().getItem().toString()); + a = new SaveBeaMessageAction(dlg, this, fromSafeId, attachmentMetadata, this.cu, this.chkEeb.isSelected(), this.authority, recipient, this.txtSubject.getText(), ed.getText(), createDocumentTag, this.txtAzSender.getText(), this.cmbAzRecipient.getEditor().getItem().toString(), priority); } a.start(); diff --git a/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar b/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar index 3d600709e..c71d99a63 100644 Binary files a/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar and b/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar differ