Merge origin/master

[habeas.git] / src / habeas / DraftStatusDialog.java

diff --git a/src/habeas/DraftStatusDialog.java b/src/habeas/DraftStatusDialog.java
index 0154d47..4bf55d9 100644 (file)
--- a/src/habeas/DraftStatusDialog.java
+++ b/src/habeas/DraftStatusDialog.java
@@ -24,7 +24,8 @@ public class DraftStatusDialog extends javax.swing.JDialog {
         initComponents();
     }
     
-    public void setDraftStatus (boolean created, boolean approved) {
+    public void setFields (int selid, boolean created, boolean approved) {        
+        selectednotice_id = selid;
         checkDraftCreated.setSelected(created);
         checkDraftApproved.setSelected(approved);
     }    
@@ -77,11 +78,11 @@ public class DraftStatusDialog extends javax.swing.JDialog {
                     .addComponent(checkDraftCreated, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(checkDraftApproved, javax.swing.GroupLayout.DEFAULT_SIZE, 224, Short.MAX_VALUE))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addContainerGap(195, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap(183, Short.MAX_VALUE)
                 .addComponent(buttonUpdate, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
         layout.setVerticalGroup(
@@ -108,7 +109,7 @@ public class DraftStatusDialog extends javax.swing.JDialog {
 
     private void buttonUpdateActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonUpdateActionPerformed
         // TODO add your handling code here:
-        boolean rt = Utility.updateLegalNoticeDraftStatus (selectednotice_id,
+        boolean rt = Utility.updateNoticeDraftStatus (selectednotice_id,
                 checkDraftCreated.isSelected(), checkDraftApproved.isSelected());
         
         if (rt == false)
@@ -167,7 +168,4 @@ public class DraftStatusDialog extends javax.swing.JDialog {
     private javax.swing.JCheckBox checkDraftCreated;
     // End of variables declaration//GEN-END:variables
 
-    void setSelectedNotice(int selid) {
-        selectednotice_id = selid;
-    }
 }