Skip to content

Commit f6b1c50

Browse files
committed
Merge branch 'nb80'
2 parents f47ea3a + eabd989 commit f6b1c50

4 files changed

Lines changed: 17 additions & 7 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.junichi11</groupId>
55
<artifactId>netbeans-github-issues</artifactId>
6-
<version>0.0.5-SNAPSHOT</version>
6+
<version>0.0.6-SNAPSHOT</version>
77
<packaging>nbm</packaging>
88
<build>
99
<plugins>

src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/GitHubIssuePanel.form

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
6666
</Group>
6767
<Group type="102" alignment="0" attributes="0">
68-
<Component id="headerNameLabel" min="-2" max="-2" attributes="0"/>
69-
<EmptySpace max="32767" attributes="0"/>
68+
<Component id="headerNameLabel" max="32767" attributes="0"/>
69+
<EmptySpace type="separate" max="-2" attributes="0"/>
7070
<Component id="refreshLinkButton" min="-2" max="-2" attributes="0"/>
7171
<EmptySpace max="-2" attributes="0"/>
7272
<Component id="jSeparator1" min="-2" pref="6" max="-2" attributes="0"/>

src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/GitHubIssuePanel.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import com.junichi11.netbeans.modules.github.issues.ui.AttributesListCellRenderer;
5656
import com.junichi11.netbeans.modules.github.issues.utils.UiUtils;
5757
import java.awt.Color;
58+
import java.awt.Dimension;
5859
import java.awt.Font;
5960
import java.beans.PropertyChangeListener;
6061
import java.text.DateFormat;
@@ -202,6 +203,9 @@ public void update() {
202203

203204
// title
204205
titleTextField.setText(issue.getTitle());
206+
Dimension dim = titleTextField.getPreferredSize();
207+
titleTextField.setMinimumSize(new Dimension(0, dim.height));
208+
titleTextField.setPreferredSize(new Dimension(0, dim.height));
205209

206210
// description
207211
descriptionTabbedPanel.setText(issue.getBody());
@@ -360,7 +364,12 @@ private void setHeader() {
360364
headerStatusLabel.setText("");
361365

362366
} else {
363-
headerNameLabel.setText(String.format("%s #%s", gitHubIssue.getSummary(), gitHubIssue.getID())); // NOI18N
367+
String summary = gitHubIssue.getSummary();
368+
headerNameLabel.setText(String.format("%s #%s", summary, gitHubIssue.getID())); // NOI18N
369+
Dimension dim = headerNameLabel.getPreferredSize();
370+
headerNameLabel.setMinimumSize(new Dimension(0, dim.height));
371+
headerNameLabel.setPreferredSize(new Dimension(0, dim.height));
372+
364373
headerSubmitButton.setText(Bundle.GitHubIssuePanel_label_header_submit_button());
365374
headerSubmitButton.setVisible(gitHubIssue.isEditableUser());
366375
Issue issue = gitHubIssue.getIssue();
@@ -653,8 +662,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
653662
.addComponent(headerCreatedByUserLabel)
654663
.addGap(0, 0, Short.MAX_VALUE))
655664
.addGroup(headerPanelLayout.createSequentialGroup()
656-
.addComponent(headerNameLabel)
657-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
665+
.addComponent(headerNameLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
666+
.addGap(18, 18, 18)
658667
.addComponent(refreshLinkButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
659668
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
660669
.addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 6, javax.swing.GroupLayout.PREFERRED_SIZE)

src/main/java/com/junichi11/netbeans/modules/github/issues/repository/GitHubRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,8 @@ public Repository getRepository() {
789789
}
790790

791791
public void setRepositoryInfo(GitHubRepositoryInfo githubRepositoryInfo) {
792-
repositoryInfo = createRepositoryInfo(githubRepositoryInfo, null, githubRepositoryInfo.getUserName(), null, null, null);
792+
String url = String.format("https://github.com/%s/%s/issues/", githubRepositoryInfo.getRepositoryAuthor(), githubRepositoryInfo.getRepositoryName()); // NOI18N
793+
repositoryInfo = createRepositoryInfo(githubRepositoryInfo, url, githubRepositoryInfo.getUserName(), null, null, null);
793794
setProperties(githubRepositoryInfo);
794795
}
795796

0 commit comments

Comments
 (0)