From 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 15:58:15 -0500
Subject: [PATCH] Remove artifact setting from manager dialog
---
src/main/java/com/gitblit/authority/UserOidsPanel.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/UserOidsPanel.java b/src/main/java/com/gitblit/authority/UserOidsPanel.java
index 8c3adf6..815a470 100644
--- a/src/main/java/com/gitblit/authority/UserOidsPanel.java
+++ b/src/main/java/com/gitblit/authority/UserOidsPanel.java
@@ -23,9 +23,9 @@
import com.gitblit.client.Translation;
public class UserOidsPanel extends JPanel {
-
+
private static final long serialVersionUID = 1L;
-
+
private JTextField displayname;
private JTextField username;
private JTextField emailAddress;
@@ -37,7 +37,7 @@
public UserOidsPanel() {
super();
-
+
displayname = new JTextField(20);
username = new JTextField(20);
username.setEditable(false);
@@ -47,7 +47,7 @@
locality = new JTextField(20);
stateProvince = new JTextField(20);
countryCode = new JTextField(20);
-
+
setLayout(new GridLayout(0, 1, Utils.MARGIN, Utils.MARGIN));
add(Utils.newFieldPanel(Translation.get("gb.displayName"), displayname));
add(Utils.newFieldPanel(Translation.get("gb.username") + " (CN)", username));
@@ -58,19 +58,19 @@
add(Utils.newFieldPanel(Translation.get("gb.stateProvince") + " (ST)", stateProvince));
add(Utils.newFieldPanel(Translation.get("gb.countryCode") + " (C)", countryCode));
}
-
+
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) {
displayname.setEditable(editable);
// username.setEditable(editable);
@@ -81,7 +81,7 @@
stateProvince.setEditable(editable);
countryCode.setEditable(editable);
}
-
+
protected void updateUser(UserCertificateModel ucm) {
ucm.user.displayName = displayname.getText();
ucm.user.username = username.getText();
--
Gitblit v1.9.1