Merge branch 'nb80'

junichi11 · Oct 16, 2015 · 06cc50e · 06cc50e
2 parents 620ced9 + 3c3a425
commit 06cc50e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.junichi11</groupId>
     <artifactId>netbeans-backlog-plugin</artifactId>
-    <version>0.3.4</version>
+    <version>0.3.5</version>
     <packaging>nbm</packaging>
     <build>
         <plugins>

diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.form b/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.form
@@ -4,9 +4,24 @@
   <NonVisualComponents>
     <Container class="javax.swing.JPanel" name="mainCommentsPanel">
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout">
-        <Property name="axis" type="int" value="3"/>
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Component id="dummyMainCommentsPanel" alignment="0" pref="545" max="32767" attributes="0"/>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Component id="dummyMainCommentsPanel" alignment="0" max="32767" attributes="0"/>
+          </Group>
+        </DimensionLayout>
       </Layout>
+      <SubComponents>
+        <Container class="javax.swing.JPanel" name="dummyMainCommentsPanel">
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+        </Container>
+      </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="mainAttachmentsPanel">
 
@@ -55,7 +70,7 @@
           <Group type="102" alignment="1" attributes="0">
               <Component id="headerPanel" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="mainScrollPane" pref="987" max="32767" attributes="0"/>
+              <Component id="mainScrollPane" pref="1001" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>

diff --git a/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.java b/src/main/java/com/junichi11/netbeans/modules/backlog/issue/ui/BacklogIssuePanel.java
@@ -94,6 +94,7 @@
 import java.util.logging.Logger;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListModel;
+import javax.swing.GroupLayout;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JFormattedTextField;
@@ -233,7 +234,8 @@ private void init() {
         // comments
         commentsPanel = new CommentsPanel();
         commentsPanel.addPropertyChangeListener(this);
-        mainCommentsPanel.add(commentsPanel);
+        // #40 add a child panel(dummyMainCommentsPanel)
+        ((GroupLayout) mainCommentsPanel.getLayout()).replace(dummyMainCommentsPanel, commentsPanel);
 
         // header
         Font font = errorHeaderLabel.getFont();
@@ -853,6 +855,7 @@ public void setSubmitButtonEnabled(boolean isEnabled) {
     private void initComponents() {
 
         mainCommentsPanel = new javax.swing.JPanel();
+        dummyMainCommentsPanel = new javax.swing.JPanel();
         mainAttachmentsPanel = new javax.swing.JPanel();
         selectFilesButton = new javax.swing.JButton();
         mainSubtaskTablePanel = new javax.swing.JPanel();
@@ -923,7 +926,18 @@ private void initComponents() {
         attachmentsCollapsibleSectionPanel = new org.netbeans.modules.bugtracking.commons.CollapsibleSectionPanel();
         subtaskingCollapsibleSectionPanel = new org.netbeans.modules.bugtracking.commons.CollapsibleSectionPanel();
 
-        mainCommentsPanel.setLayout(new javax.swing.BoxLayout(mainCommentsPanel, javax.swing.BoxLayout.PAGE_AXIS));
+        dummyMainCommentsPanel.setLayout(new java.awt.BorderLayout());
+
+        javax.swing.GroupLayout mainCommentsPanelLayout = new javax.swing.GroupLayout(mainCommentsPanel);
+        mainCommentsPanel.setLayout(mainCommentsPanelLayout);
+        mainCommentsPanelLayout.setHorizontalGroup(
+            mainCommentsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addComponent(dummyMainCommentsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 545, Short.MAX_VALUE)
+        );
+        mainCommentsPanelLayout.setVerticalGroup(
+            mainCommentsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addComponent(dummyMainCommentsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+        );
 
         mainAttachmentsPanel.setLayout(new javax.swing.BoxLayout(mainAttachmentsPanel, javax.swing.BoxLayout.Y_AXIS));
 
@@ -1351,7 +1365,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addComponent(headerPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(mainScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 987, Short.MAX_VALUE))
+                .addComponent(mainScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 1001, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -1831,6 +1845,7 @@ private static String getBacklogIssueUrlFormat(String backlogDomain) {
     private javax.swing.JScrollPane descriptionScrollPane;
     private javax.swing.JLabel dueDateLabel;
     private org.jdesktop.swingx.JXDatePicker dueDatePicker;
+    private javax.swing.JPanel dummyMainCommentsPanel;
     private javax.swing.JLabel errorHeaderLabel;
     private javax.swing.JLabel estimatedHoursLabel;
     private javax.swing.JTextField estimatedHoursTextField;