diff options
Diffstat (limited to 'pki/base/console/src/com/netscape/admin/certsrv/ug')
14 files changed, 95 insertions, 117 deletions
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java index d2a412d18..6656b3abb 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java @@ -18,16 +18,13 @@ package com.netscape.admin.certsrv.ug; import com.netscape.admin.certsrv.*; -import com.netscape.admin.certsrv.config.*; import com.netscape.admin.certsrv.connection.*; import javax.swing.*; -import javax.swing.event.*; -import javax.swing.table.*; import javax.swing.text.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; import com.netscape.certsrv.common.*; @@ -90,12 +87,12 @@ public class AuthBaseDialog extends JDialog mDataModel.removeAllRows(); mData = data; - mImplName.setText(data.getValue(Constants.PR_AUTH_IMPL_NAME)); + mImplName.setText(data.get(Constants.PR_AUTH_IMPL_NAME)); - for (Enumeration e = data.getNames(); e.hasMoreElements() ;) { - String entry = ((String)e.nextElement()).trim(); + for (String entry : data.keySet()) { + entry = entry.trim(); if (!entry.equals(Constants.PR_AUTH_IMPL_NAME)) { - String value = data.getValue(entry); + String value = data.get(entry); Vector v = new Vector(); v.addElement(entry); v.addElement(value); @@ -134,10 +131,10 @@ public class AuthBaseDialog extends JDialog protected NameValuePairs getData() { NameValuePairs response = new NameValuePairs(); - response.add(Constants.PR_AUTH_IMPL_NAME,mImplName.getText()); + response.put(Constants.PR_AUTH_IMPL_NAME, mImplName.getText()); for (int i=0; i< mDataModel.getRowCount(); i++) { - response.add((String)mDataModel.getValueAt(i,0), - (String)mDataModel.getValueAt(i,1)); + response.put((String) mDataModel.getValueAt(i, 0), + (String) mDataModel.getValueAt(i, 1)); } return response; } diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java index ca034e61c..98214871e 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java @@ -21,7 +21,6 @@ import java.util.*; import javax.swing.*; import com.netscape.certsrv.common.*; import com.netscape.admin.certsrv.*; -import com.netscape.admin.certsrv.connection.*; /** * Auth Plugin Implementation Data model - represents the implementation @@ -59,13 +58,13 @@ public class AuthImplDataModel extends CMSContentTableModel public void processData(Object data) { Vector v = new Vector(); NameValuePairs obj = (NameValuePairs) data; - JLabel label = new JLabel(obj.getValue(IMPL_NAME), + JLabel label = new JLabel(obj.get(IMPL_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_AUTH_PLUGIN), JLabel.LEFT); - if(!obj.getValue(IMPL_DESC).trim().equals("")) - label.setToolTipText(obj.getValue(IMPL_DESC)); + if(!obj.get(IMPL_DESC).trim().equals("")) + label.setToolTipText(obj.get(IMPL_DESC)); v.addElement(label); - v.addElement(obj.getValue(IMPL_CLASS)); + v.addElement(obj.get(IMPL_CLASS)); //v.addElement(obj.getValue(IMPL_DESC)); addRow(v, data); } diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java index 52ec30824..0cc964c60 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java @@ -19,13 +19,12 @@ package com.netscape.admin.certsrv.ug; import com.netscape.admin.certsrv.*; import com.netscape.admin.certsrv.connection.*; -import com.netscape.admin.certsrv.config.*; + import javax.swing.*; -import javax.swing.event.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; import com.netscape.certsrv.common.*; @@ -232,7 +231,7 @@ public class AuthImplTab extends CMSBaseUGTab { if (index >= 0) { NameValuePairs nvp = (NameValuePairs)mDataModel.getObjectValueAt(index); - String type = nvp.getValue(IMPL_TYPE); + String type = nvp.get(IMPL_TYPE); if (type.equals(Constants.VIEW) || type.equals(Constants.VIEW)) mDelete.setEnabled(false); } @@ -264,9 +263,9 @@ public class AuthImplTab extends CMSBaseUGTab { int i=0; String[] vals = new String[response.size()]; Hashtable data = new Hashtable(); - for (Enumeration e = response.getNames(); e.hasMoreElements() ;) { - String entry = ((String)e.nextElement()).trim(); - String value = response.getValue(entry); + for (String entry : response.keySet()) { + entry = entry.trim(); + String value = response.get(entry); Debug.println("AuthImplTab.java update(): "+ "entry="+entry+ "value="+value @@ -274,34 +273,34 @@ public class AuthImplTab extends CMSBaseUGTab { int x = value.indexOf(","); int y = value.indexOf(TOKEN); NameValuePairs obj = new NameValuePairs(); - obj.add(IMPL_NAME,entry); + obj.put(IMPL_NAME, entry); Debug.println("x="+x); if(x != -1) { Debug.println("0 obj.add(IMPL_CLASS,"+value.substring(0,x)); - obj.add(IMPL_CLASS, value.substring(0,x)); + obj.put(IMPL_CLASS, value.substring(0, x)); if (y == -1) { Debug.println("1 obj.add(IMPL_DESC,"+value.substring(0,x)); - obj.add(IMPL_DESC, value.substring(x+1)); + obj.put(IMPL_DESC, value.substring(x + 1)); } else { Debug.println("1 obj.add(IMPL_DESC,"+value.substring(x+1,y)); - obj.add(IMPL_DESC, value.substring(x+1, y)); + obj.put(IMPL_DESC, value.substring(x + 1, y)); } } else { Debug.println(" 2 obj.add(IMPL_CLASS,"+value.substring(0,y)); - obj.add(IMPL_CLASS, value.substring(0,y)); + obj.put(IMPL_CLASS, value.substring(0, y)); Debug.println(" 2 obj.add(IMPL_DESC,\"\""); - obj.add(IMPL_DESC,""); + obj.put(IMPL_DESC, ""); } String type = ""; Debug.println("y="+y); if (y == -1) { type = Constants.EDIT; - obj.add(IMPL_TYPE, Constants.EDIT); + obj.put(IMPL_TYPE, Constants.EDIT); } else { type = value.substring(y+1); - obj.add(IMPL_TYPE, type); + obj.put(IMPL_TYPE, type); } if (type.equals(Constants.EDIT)) { data.put(entry,obj); @@ -339,7 +338,7 @@ public class AuthImplTab extends CMSBaseUGTab { try { mConnection.delete(mDestination, ScopeDef.SC_AUTH_IMPLS, - obj.getValue(IMPL_NAME)); + obj.get(IMPL_NAME)); } catch (EAdminException e) { //display error dialog showErrorDialog(e.getMessage()); diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java index a4db6dd0a..929f99aef 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java @@ -21,12 +21,7 @@ import com.netscape.admin.certsrv.*; import com.netscape.admin.certsrv.connection.*; import com.netscape.admin.certsrv.config.*; import javax.swing.*; -import javax.swing.event.*; -import java.awt.event.*; -import java.awt.*; -import java.util.*; -import com.netscape.management.client.*; -import com.netscape.management.client.util.*; + import com.netscape.certsrv.common.*; /** @@ -117,7 +112,7 @@ public class AuthInstanceTab extends CMSPluginInstanceTab { try { mConnection.delete(DestDef.DEST_AUTH_ADMIN, ScopeDef.SC_AUTH_MGR_INSTANCE, - data.getValue(RULE_NAME)); + data.get(RULE_NAME)); } catch (EAdminException e) { //display error dialog showErrorDialog(e.getMessage()); @@ -139,7 +134,7 @@ public class AuthInstanceTab extends CMSPluginInstanceTab { NameValuePairs response; response = mConnection.read(DestDef.DEST_AUTH_ADMIN, ScopeDef.SC_AUTH_MGR_INSTANCE, - data.getValue(RULE_NAME), + data.get(RULE_NAME), new NameValuePairs()); return response; } diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java index 41fabfcc4..35e08d0eb 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java @@ -21,7 +21,6 @@ import java.util.*; import javax.swing.*; import com.netscape.certsrv.common.*; import com.netscape.admin.certsrv.*; -import com.netscape.admin.certsrv.connection.*; import com.netscape.admin.certsrv.config.*; import com.netscape.management.client.util.Debug; @@ -54,10 +53,10 @@ public class AuthRuleDataModel extends CMSRuleDataModel NameValuePairs obj = (NameValuePairs) data; //XXX NEED TO ADD STUFF - v.addElement(new JLabel(obj.getValue(RULE_NAME), + v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_AUTH), JLabel.LEFT)); - v.addElement(obj.getValue(RULE_IMPL)); + v.addElement(obj.get(RULE_IMPL)); addRow(v, data); } diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java index b6eda1308..de6a588f6 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java @@ -18,7 +18,6 @@ package com.netscape.admin.certsrv.ug; import com.netscape.admin.certsrv.*; -import com.netscape.admin.certsrv.connection.*; import com.netscape.certsrv.common.*; import com.netscape.management.client.util.*; import java.util.*; @@ -60,7 +59,7 @@ public class CertDataModel extends CMSContentTableModel NameValuePairs obj = (NameValuePairs) data; //XXX NEED TO CHANGE if we are going to have multi-column table - v.addElement(new JLabel(obj.getValue(CERT_NAME), + v.addElement(new JLabel(obj.get(CERT_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_CERTICON_SMALL), JLabel.LEFT)); addRow(v, data); @@ -77,7 +76,7 @@ public class CertDataModel extends CMSContentTableModel public String getDataBlob(int row) { try { NameValuePairs obj = (NameValuePairs)getObjectValueAt(row); - return obj.getValue(CERT_DATA); + return obj.get(CERT_DATA); } catch (Exception e) { Debug.println("CertDataModel: getDataBlob()- "+e.toString()); return ""; diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java index c6a1a878c..82083649e 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java @@ -20,11 +20,10 @@ package com.netscape.admin.certsrv.ug; import com.netscape.admin.certsrv.*; import com.netscape.admin.certsrv.connection.*; import javax.swing.*; -import javax.swing.event.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; import com.netscape.certsrv.common.*; @@ -298,8 +297,8 @@ public class CertManagementDialog extends JDialog String[] vals = new String[response.size()]; int i=0; - for (Enumeration e = response.getNames(); e.hasMoreElements() ;) { - vals[i++] = ((String)e.nextElement()).trim(); + for (String entry : response.keySet()) { + vals[i++] = entry.trim(); } CMSAdminUtil.bubbleSort(vals); @@ -309,7 +308,7 @@ public class CertManagementDialog extends JDialog mDataModel.addElement(new JLabel(str, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_CERTICON_SMALL), JLabel.LEFT)); - mPPData.addElement(response.getValue(vals[y])); + mPPData.addElement(response.get(vals[y])); } return true; @@ -386,7 +385,7 @@ public class CertManagementDialog extends JDialog private void addCert(String B64E) { //send comment to server for the removal of user NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_USER_CERT, cleanupCertData(B64E)); + config.put(Constants.PR_USER_CERT, cleanupCertData(B64E)); try { mConnection.add(DestDef.DEST_USER_ADMIN, ScopeDef.SC_USER_CERTS, @@ -423,7 +422,7 @@ public class CertManagementDialog extends JDialog String dn = ((JLabel)mDataModel.elementAt(mList.getSelectedIndex())).getText(); dn = toServerFormat(dn); NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_USER_CERT,dn); + config.put(Constants.PR_USER_CERT, dn); //send comment to server for the removal of user try { diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java index f25267be5..e9693b15d 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java @@ -24,8 +24,7 @@ import javax.swing.event.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import javax.swing.table.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; import com.netscape.certsrv.common.*; @@ -203,8 +202,8 @@ public class GroupEditor extends JDialog response = mConnection.search(DestDef.DEST_USER_ADMIN, ScopeDef.SC_USERS, new NameValuePairs()); boolean hasNewUser = false; - for (Enumeration e = response.getNames(); e.hasMoreElements() ;) { - String entry = ((String)e.nextElement()).trim(); + for (String entry : response.keySet()) { + entry = entry.trim(); if (currentUser.indexOf(entry)== -1) hasNewUser = true; } @@ -483,9 +482,9 @@ public class GroupEditor extends JDialog //construct NVP NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_GROUP_DESC, ""); - config.add(Constants.PR_GROUP_USER, ""); - config.add(Constants.PR_GROUP_GROUP, ""); + config.put(Constants.PR_GROUP_DESC, ""); + config.put(Constants.PR_GROUP_USER, ""); + config.put(Constants.PR_GROUP_GROUP, ""); NameValuePairs response; response = mConnection.read(DestDef.DEST_GROUP_ADMIN, @@ -496,12 +495,12 @@ public class GroupEditor extends JDialog Debug.println("Received Memebership: "+response.toString()); //setup the ui mGroupNameField.setText(mGroupName); - mGroupDescField.setText(response.getValue(Constants.PR_GROUP_DESC)); + mGroupDescField.setText(response.get(Constants.PR_GROUP_DESC)); //setup the member table //parse user entry - String user = response.getValue(Constants.PR_GROUP_USER).trim(); + String user = response.get(Constants.PR_GROUP_USER).trim(); StringTokenizer tokenizer = new StringTokenizer(user, ","); while (tokenizer.hasMoreTokens()) { String user_str = tokenizer.nextToken().trim(); @@ -515,7 +514,7 @@ public class GroupEditor extends JDialog //construct NVP NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_GROUP_DESC, mGroupName); + config.put(Constants.PR_GROUP_DESC, mGroupName); createUGString(config); //send request @@ -530,7 +529,7 @@ public class GroupEditor extends JDialog //construct NVP NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_GROUP_DESC, mGroupDescField.getText()); + config.put(Constants.PR_GROUP_DESC, mGroupDescField.getText()); createUGString(config); //send request @@ -567,7 +566,7 @@ public class GroupEditor extends JDialog } //set parameters - config.add(Constants.PR_GROUP_USER, userBuf.toString()); + config.put(Constants.PR_GROUP_USER, userBuf.toString()); } //refresh the table content diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java index 706ed2ccd..d5931a6f8 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java @@ -260,8 +260,8 @@ public class GroupListDialog extends JDialog } //parse the data - for (Enumeration e = response.getNames(); e.hasMoreElements() ;) { - String entry = ((String)e.nextElement()).trim(); + for (String entry : response.keySet()) { + entry = entry.trim(); //check if not already in current list if (mCurrentGroups.indexOf(entry)== -1) mDataModel.processData(entry); diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java index eca04bddc..e80cc7047 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java @@ -20,11 +20,10 @@ package com.netscape.admin.certsrv.ug; import com.netscape.admin.certsrv.*; import com.netscape.admin.certsrv.connection.*; import javax.swing.*; -import javax.swing.event.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; import com.netscape.certsrv.common.*; @@ -323,9 +322,8 @@ public class GroupTab extends CMSBaseUGTab { //parse the data Vector store = new Vector(); - for (Enumeration e = response.getNames(); e.hasMoreElements() ;) { - String entry = ((String)e.nextElement()).trim(); - store.addElement(entry); + for (String entry : response.keySet()) { + store.addElement(entry.trim()); } String[] vals = new String[store.size()]; @@ -334,7 +332,7 @@ public class GroupTab extends CMSBaseUGTab { CMSAdminUtil.bubbleSort(vals); for (int y=0; y< vals.length ; y++) { - String value = response.getValue(vals[y]); + String value = response.get(vals[y]); mDataModel.processData(vals[y],value); } diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java index 6ebb84cb6..6b1fbfeec 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java @@ -21,7 +21,6 @@ import java.util.*; import javax.swing.*; import com.netscape.certsrv.common.*; import com.netscape.admin.certsrv.*; -import com.netscape.admin.certsrv.connection.*; import com.netscape.management.client.util.*; /** @@ -66,13 +65,13 @@ public class MemberDataModel extends CMSContentTableModel NameValuePairs rec = (NameValuePairs)data; Icon icon; - icon = (rec.getValue(MEMBER_TYPE).equals(MEMBER_GROUP))? + icon = (rec.get(MEMBER_TYPE).equals(MEMBER_GROUP))? CMSAdminUtil.getImage(CMSAdminResources.IMAGE_USERGROUP): CMSAdminUtil.getImage(CMSAdminResources.IMAGE_USER); - String entry = rec.getValue(MEMBER_NAME); + String entry = rec.get(MEMBER_NAME); String name = entry; - if(rec.getValue(MEMBER_TYPE).equals(MEMBER_GROUP)) { + if(rec.get(MEMBER_TYPE).equals(MEMBER_GROUP)) { if (entry.startsWith(PrefixDef.PX_SYS)) name = entry.substring(PrefixDef.PX_SYS.length()); else @@ -101,10 +100,10 @@ public class MemberDataModel extends CMSContentTableModel { Debug.println("MemberDataModel: removeRow() - start"); NameValuePairs data = (NameValuePairs)getObjectValueAt(index); - if (data.getValue(MEMBER_TYPE).equals(MEMBER_GROUP)) - mGroups.removeElement(data.getValue(MEMBER_NAME)); + if (data.get(MEMBER_TYPE).equals(MEMBER_GROUP)) + mGroups.removeElement(data.get(MEMBER_NAME)); else - mUsers.removeElement(data.getValue(MEMBER_NAME)); + mUsers.removeElement(data.get(MEMBER_NAME)); super.removeRow(index); Debug.println("MemberDataModel: removeRow() - end"); } @@ -118,10 +117,10 @@ public class MemberDataModel extends CMSContentTableModel super.addRow(values); mObjectContainer.addElement(obj); NameValuePairs rec = (NameValuePairs)obj; - if (rec.getValue(MEMBER_TYPE).equals(MEMBER_GROUP)) - mGroups.addElement(rec.getValue(MEMBER_NAME)); + if (rec.get(MEMBER_TYPE).equals(MEMBER_GROUP)) + mGroups.addElement(rec.get(MEMBER_NAME)); else - mUsers.addElement(rec.getValue(MEMBER_NAME)); + mUsers.addElement(rec.get(MEMBER_NAME)); } /** diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java index 561b8bb19..75908fe6a 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java @@ -24,9 +24,8 @@ import javax.swing.event.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; -import javax.swing.table.*; import com.netscape.certsrv.common.*; /** @@ -520,11 +519,11 @@ public class UserEditor extends JDialog //construct NVP NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_USER_FULLNAME, ""); - config.add(Constants.PR_USER_EMAIL, ""); - config.add(Constants.PR_USER_PHONE, ""); - config.add(Constants.PR_USER_STATE, ""); - config.add(Constants.PR_USER_GROUP, ""); + config.put(Constants.PR_USER_FULLNAME, ""); + config.put(Constants.PR_USER_EMAIL, ""); + config.put(Constants.PR_USER_PHONE, ""); + config.put(Constants.PR_USER_STATE, ""); + config.put(Constants.PR_USER_GROUP, ""); NameValuePairs response; response = mConnection.read(DestDef.DEST_USER_ADMIN, @@ -534,13 +533,13 @@ public class UserEditor extends JDialog //setup the ui mUserNameField.setText(mUserName); - mFullNameField.setText(response.getValue(Constants.PR_USER_FULLNAME)); - mEMailField.setText(response.getValue(Constants.PR_USER_EMAIL)); - mPhoneField.setText(response.getValue(Constants.PR_USER_PHONE)); - mStateField.setText(response.getValue(Constants.PR_USER_STATE)); + mFullNameField.setText(response.get(Constants.PR_USER_FULLNAME)); + mEMailField.setText(response.get(Constants.PR_USER_EMAIL)); + mPhoneField.setText(response.get(Constants.PR_USER_PHONE)); + mStateField.setText(response.get(Constants.PR_USER_STATE)); //parse group entry - String userStr = response.getValue(Constants.PR_USER_GROUP); + String userStr = response.get(Constants.PR_USER_GROUP); if ( (userStr != null) && (!userStr.trim().equals("")) ) { StringTokenizer tokenizer = new StringTokenizer(userStr, ","); while (tokenizer.hasMoreTokens()) { @@ -556,8 +555,7 @@ public class UserEditor extends JDialog ScopeDef.SC_GROUPS, new NameValuePairs()); if (mGroupBox.getItemCount() > 0) mGroupBox.removeAllItems(); - for (Enumeration e = response.getNames(); e.hasMoreElements() ;) { - String groupname = (String)e.nextElement(); + for (String groupname : response.keySet()) { mGroupBox.addItem(groupname.trim()); } @@ -568,13 +566,13 @@ public class UserEditor extends JDialog //construct NVP NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_USER_FULLNAME, mFullNameField.getText().trim()); - config.add(Constants.PR_USER_PASSWORD,mPasswordField.getText().trim()); - config.add(Constants.PR_USER_EMAIL,mEMailField.getText().trim()); - config.add(Constants.PR_USER_PHONE,mPhoneField.getText().trim()); - config.add(Constants.PR_USER_STATE,mStateField.getText().trim()); - config.add(Constants.PR_USER_GROUP,(String)mGroupBox.getSelectedItem()); - config.add(Constants.PR_USER_TYPE, ""); + config.put(Constants.PR_USER_FULLNAME, mFullNameField.getText().trim()); + config.put(Constants.PR_USER_PASSWORD, mPasswordField.getText().trim()); + config.put(Constants.PR_USER_EMAIL, mEMailField.getText().trim()); + config.put(Constants.PR_USER_PHONE, mPhoneField.getText().trim()); + config.put(Constants.PR_USER_STATE, mStateField.getText().trim()); + config.put(Constants.PR_USER_GROUP, (String) mGroupBox.getSelectedItem()); + config.put(Constants.PR_USER_TYPE, ""); //config.add(Constants.PR_USER_CERT,""); //createCertEntry(config); @@ -590,12 +588,12 @@ public class UserEditor extends JDialog //construct NVP NameValuePairs config = new NameValuePairs(); - config.add(Constants.PR_USER_FULLNAME, mFullNameField.getText().trim()); - config.add(Constants.PR_USER_PASSWORD,mPasswordField.getText().trim()); - config.add(Constants.PR_USER_EMAIL,mEMailField.getText().trim()); - config.add(Constants.PR_USER_PHONE,mPhoneField.getText().trim()); - config.add(Constants.PR_USER_STATE,mStateField.getText().trim()); - config.add(Constants.PR_USER_TYPE, ""); + config.put(Constants.PR_USER_FULLNAME, mFullNameField.getText().trim()); + config.put(Constants.PR_USER_PASSWORD, mPasswordField.getText().trim()); + config.put(Constants.PR_USER_EMAIL, mEMailField.getText().trim()); + config.put(Constants.PR_USER_PHONE, mPhoneField.getText().trim()); + config.put(Constants.PR_USER_STATE, mStateField.getText().trim()); + config.put(Constants.PR_USER_TYPE, ""); //createCertEntry(config); //send request diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java index b54ac7d8d..6f0c6215b 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java @@ -20,13 +20,11 @@ package com.netscape.admin.certsrv.ug; import com.netscape.admin.certsrv.*; import com.netscape.admin.certsrv.connection.*; import javax.swing.*; -import javax.swing.event.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; -import javax.swing.table.*; import com.netscape.certsrv.common.*; /** @@ -317,7 +315,7 @@ public class UserListDialog extends JDialog store.copyInto(vals); */ - String responseValue = response.getValue("userInfo"); + String responseValue = response.get("userInfo"); StringTokenizer tokenizer = new StringTokenizer(responseValue, ";"); StringTokenizer subTokenizer = null; diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java index ccf7ac5ae..78b7e5252 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java @@ -20,11 +20,10 @@ package com.netscape.admin.certsrv.ug; import com.netscape.admin.certsrv.*; import com.netscape.admin.certsrv.connection.*; import javax.swing.*; -import javax.swing.event.*; import java.awt.event.*; import java.awt.*; import java.util.*; -import com.netscape.management.client.*; + import com.netscape.management.client.util.*; import com.netscape.certsrv.common.*; @@ -289,7 +288,7 @@ public class UserTab extends CMSBaseUGTab { Debug.println(response.toString()); - String responseValue = response.getValue("userInfo"); + String responseValue = response.get("userInfo"); StringTokenizer tokenizer = new StringTokenizer(responseValue, ";"); StringTokenizer subTokenizer = null; |