diff options
| author | James Moger <james.moger@gitblit.com> | 2013-05-07 08:09:07 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-05-07 08:09:07 -0400 |
| commit | 0b086146ffd70574b1069056e35bb11a1d782407 (patch) | |
| tree | c1f079cdc3f627a49771cee25760aa6ab43c53a5 /src | |
| parent | 5c36f8425345b48adc354def8ed1443b4a236a20 (diff) | |
| download | gitblit-0b086146ffd70574b1069056e35bb11a1d782407.tar.gz gitblit-0b086146ffd70574b1069056e35bb11a1d782407.zip | |
[authority] Clear user selection on filter change
Diffstat (limited to 'src')
3 files changed, 13 insertions, 8 deletions
diff --git a/src/main/java/com/gitblit/authority/CertificatesTableModel.java b/src/main/java/com/gitblit/authority/CertificatesTableModel.java index 44d80e3a..333836dd 100644 --- a/src/main/java/com/gitblit/authority/CertificatesTableModel.java +++ b/src/main/java/com/gitblit/authority/CertificatesTableModel.java @@ -138,6 +138,9 @@ public class CertificatesTableModel extends AbstractTableModel { public void setUserCertificateModel(UserCertificateModel ucm) {
this.ucm = ucm;
+ if (ucm == null) {
+ return;
+ }
Collections.sort(ucm.certs, new Comparator<X509Certificate>() {
@Override
public int compare(X509Certificate o1, X509Certificate o2) {
diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java index 1c0c142f..e0b079ea 100644 --- a/src/main/java/com/gitblit/authority/GitblitAuthority.java +++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java @@ -804,6 +804,8 @@ public class GitblitAuthority extends JFrame implements X509Log { }
private void filterUsers(final String fragment) {
+ table.clearSelection();
+ userCertificatePanel.setUserCertificateModel(null);
if (StringUtils.isEmpty(fragment)) {
table.setRowSorter(defaultSorter);
return;
diff --git a/src/main/java/com/gitblit/authority/UserOidsPanel.java b/src/main/java/com/gitblit/authority/UserOidsPanel.java index 8c3adf66..5a33b3f3 100644 --- a/src/main/java/com/gitblit/authority/UserOidsPanel.java +++ b/src/main/java/com/gitblit/authority/UserOidsPanel.java @@ -61,14 +61,14 @@ public class UserOidsPanel extends JPanel { public void setUserCertificateModel(UserCertificateModel ucm) { setEditable(false); - displayname.setText(ucm.user.getDisplayName()); - username.setText(ucm.user.username); - emailAddress.setText(ucm.user.emailAddress); - organizationalUnit.setText(ucm.user.organizationalUnit); - organization.setText(ucm.user.organization); - locality.setText(ucm.user.locality); - stateProvince.setText(ucm.user.stateProvince); - countryCode.setText(ucm.user.countryCode); + displayname.setText(ucm == null ? "" : ucm.user.getDisplayName()); + username.setText(ucm == null ? "" : ucm.user.username); + emailAddress.setText(ucm == null ? "" : ucm.user.emailAddress); + organizationalUnit.setText(ucm == null ? "" : ucm.user.organizationalUnit); + organization.setText(ucm == null ? "" : ucm.user.organization); + locality.setText(ucm == null ? "" : ucm.user.locality); + stateProvince.setText(ucm == null ? "" : ucm.user.stateProvince); + countryCode.setText(ucm == null ? "" : ucm.user.countryCode); } public void setEditable(boolean editable) { |