diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 14:49:11 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:03:25 -0500 |
commit | 7c7b9d023cd466c1771068badc020dab36beb553 (patch) | |
tree | 178877eb83e25336be7577953945fbdb0b9e1a15 /base/console/src/com/netscape/admin/certsrv/ug | |
parent | da1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff) | |
download | pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz pki-7c7b9d023cd466c1771068badc020dab36beb553.zip |
Removed whitespaces from Java code.
Whitespaces in Java code have been removed with the following command:
find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \;
Ticket #134
Diffstat (limited to 'base/console/src/com/netscape/admin/certsrv/ug')
13 files changed, 96 insertions, 96 deletions
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java index 6656b3abb..fcfc0b912 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java @@ -79,9 +79,9 @@ public class AuthBaseDialog extends JDialog * @param users list of current groups */ // Changed by beomsuk - /*public void showDialog(NameValuePairs data, String name, + /*public void showDialog(NameValuePairs data, String name, boolean pinDirExist, boolean userDirExist) {*/ - public void showDialog(NameValuePairs data, String name, + public void showDialog(NameValuePairs data, String name, boolean pinDirExist, boolean userDirExist, boolean portalExist) { // Change end mDataModel.removeAllRows(); @@ -172,7 +172,7 @@ public class AuthBaseDialog extends JDialog mTable.setValueAt(str, row, col); } } - + try { if (mAuthName.isVisible()) addPolicyRule(getData(), getRuleName()); @@ -323,8 +323,8 @@ public class AuthBaseDialog extends JDialog super(x); } - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, int row, + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, int row, int column) { if(value == null) { diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java index aa756b388..6844e911c 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java @@ -84,8 +84,8 @@ public class AuthConfigDialog extends CMSBaseConfigDialog Debug.println("Returning instance name "+instanceName); return instanceName; - + } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java index 0cc964c60..8170944ee 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java @@ -56,7 +56,7 @@ public class AuthImplTab extends CMSBaseUGTab { protected AuthImplDataModel mDataModel; //table model protected AuthRegisterDialog mEditor=null; //keep single copy protected JButton mRefresh, mAdd, mDelete, mHelp; - private static final String HELPINDEX = + private static final String HELPINDEX = "authentication-certsrv-authplugin-help"; /*========================================================== @@ -111,9 +111,9 @@ public class AuthImplTab extends CMSBaseUGTab { public void mouseClicked(MouseEvent e) { setButtons(); } - + public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java index 929f99aef..d35dc1909 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java @@ -40,7 +40,7 @@ public class AuthInstanceTab extends CMSPluginInstanceTab { private static final String ADMINRULE = "adminAuth"; private static final String AGENTRULE = "agentAuth"; - private static final String HELPINDEX = + private static final String HELPINDEX = "authentication-certsrv-authrules-help"; private static final String DEST = DestDef.DEST_AUTH_ADMIN; diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java index 8721363d1..b550c4cfb 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java @@ -61,7 +61,7 @@ public class AuthPluginSelectionDialog extends PluginSelectionDialog * constructors *==========================================================*/ public AuthPluginSelectionDialog(JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, CMSPluginInstanceTab pluginType) { @@ -69,7 +69,7 @@ public class AuthPluginSelectionDialog extends PluginSelectionDialog mScope = ScopeDef.SC_AUTH_IMPLS; mInstanceScope = ScopeDef.SC_AUTH_MGR_INSTANCE; mImageName = CMSAdminResources.IMAGE_RULE_PLUGIN; - + mHelpToken = "authentication-certsrv-add-authrule-dbox-help"; setDisplay(); /**** diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java index 6f3ed575a..94216eeb4 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java @@ -44,7 +44,7 @@ public class AuthViewDialog extends AuthBaseDialog * variables *==========================================================*/ private static final String PREFIX = "AUTHVIEWDIALOG"; - private static final String HELPINDEX = + private static final String HELPINDEX = "authentication-certsrv-view-authrule-dbox-help"; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java index 758dda109..843f12a23 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java @@ -105,12 +105,12 @@ public class CertImportDialog extends JDialog //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent evt) { - + if (evt.getSource().equals(mPaste)) { mTextArea.paste(); return; } - + if (evt.getSource().equals(mCancel)) { this.hide(); } @@ -229,7 +229,7 @@ public class CertImportDialog extends JDialog gbc.weightx=1.0; gb3.setConstraints(mPaste, gbc); content.add(mPaste); - + CMSAdminUtil.resetGBC(gbc); mTextArea = new JTextArea("",40,70); Font f = new Font("Monospaced", Font.PLAIN, 12); @@ -241,7 +241,7 @@ public class CertImportDialog extends JDialog JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); scrollPanel.setAlignmentX(LEFT_ALIGNMENT); scrollPanel.setAlignmentY(TOP_ALIGNMENT); - scrollPanel.setBorder(BorderFactory.createLoweredBevelBorder()); + scrollPanel.setBorder(BorderFactory.createLoweredBevelBorder()); scrollPanel.setPreferredSize(new Dimension(300, 500)); gbc.fill = gbc.BOTH; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java index 82083649e..0f3585591 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.common.*; * The administrator can use this dialog to management the * certificates of specific user. This allows the import of * new certificates and delete/view of existing certificates. - * + * * This dialog is launched by clicking on the certificate button * on the main user management tab. * @@ -64,7 +64,7 @@ public class CertManagementDialog extends JDialog private JList mList; private JButton mOK, mCancel, mAdd, mDelete, mView, mHelp; - private final static String HELPINDEX = + private final static String HELPINDEX = "usersgroups-certsrv-manage-usercert-dbox-help"; /*========================================================== @@ -94,7 +94,7 @@ public class CertManagementDialog extends JDialog */ public void showDialog(String uid) { mUID = uid; - + if (!refresh()) return; setButtons(); @@ -154,7 +154,7 @@ public class CertManagementDialog extends JDialog /*========================================================== * private methods *==========================================================*/ - + /** * Setup the initial UI components */ @@ -278,10 +278,10 @@ public class CertManagementDialog extends JDialog //refresh the table content private boolean refresh() { - + mDataModel.clear(); mPPData.removeAllElements(); - + NameValuePairs response; try { response = mConnection.read(DestDef.DEST_USER_ADMIN, @@ -290,19 +290,19 @@ public class CertManagementDialog extends JDialog } catch (EAdminException e) { CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.getMessage(), CMSAdminUtil.ERROR_MESSAGE); - return false; + return false; } - + //parse data String[] vals = new String[response.size()]; int i=0; - + for (String entry : response.keySet()) { vals[i++] = entry.trim(); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { String str = reformat(vals[y]); mDataModel.addElement(new JLabel(str, @@ -310,7 +310,7 @@ public class CertManagementDialog extends JDialog JLabel.LEFT)); mPPData.addElement(response.get(vals[y])); } - + return true; } @@ -334,7 +334,7 @@ public class CertManagementDialog extends JDialog String serial = val.substring(9, subject_pos).trim(); long num = CMSAdminUtil.hexToLong(serial); try { - return "-1;" + + return "-1;" + num + ";" + val.substring(issuer_pos+7).trim() + ";" + val.substring(subject_pos+8, issuer_pos).trim(); @@ -356,20 +356,20 @@ public class CertManagementDialog extends JDialog String issuer=null; String subject=null; - try { + try { version = st.nextToken(); serial = st.nextToken(); issuer = st.nextToken(); subject = st.nextToken(); } catch (Exception e) {} - + try { if (serial != null) { String hexserial = Integer.toHexString(Integer.parseInt(serial)); name = name + "Serial:0x"+hexserial; } } catch (Exception e) {} - + if (subject != null) { name = name + " Subject:"+subject; @@ -381,7 +381,7 @@ public class CertManagementDialog extends JDialog return name; } - + private void addCert(String B64E) { //send comment to server for the removal of user NameValuePairs config = new NameValuePairs(); @@ -397,8 +397,8 @@ public class CertManagementDialog extends JDialog e.getMessage(), CMSAdminUtil.ERROR_MESSAGE); return; } - } - + } + /** * routine to cleanup the certificate data * this removes end of line embedded in the @@ -415,15 +415,15 @@ public class CertManagementDialog extends JDialog buff.append(c); } return buff.toString(); - } - + } + private void deleteCert() { //get entry name String dn = ((JLabel)mDataModel.elementAt(mList.getSelectedIndex())).getText(); dn = toServerFormat(dn); NameValuePairs config = new NameValuePairs(); config.put(Constants.PR_USER_CERT, dn); - + //send comment to server for the removal of user try { mConnection.modify(DestDef.DEST_USER_ADMIN, diff --git a/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java index e9693b15d..5617398b7 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java @@ -58,10 +58,10 @@ public class GroupEditor extends JDialog private JButton mOK, mCancel, mHelp, mAddUser, mDelete; private JTextField mGroupNameField, mGroupDescField; private JLabel mGroupNameLabel; - - private static final String ADDHELPINDEX = + + private static final String ADDHELPINDEX = "usersgroups-certsrv-add-group-dbox-help"; - private static final String EDITHELPINDEX = + private static final String EDITHELPINDEX = "usersgroups-certsrv-edit-group-dbox-help"; private String mHelpToken; @@ -149,7 +149,7 @@ public class GroupEditor extends JDialog "NOGROUPNAME", CMSAdminUtil.ERROR_MESSAGE); return; } - + try { mGroupName = mGroupNameField.getText().trim(); addGroup(); @@ -190,13 +190,13 @@ public class GroupEditor extends JDialog if (evt.getSource().equals(mAddUser)) { //bring up the list for selection - + //create vector here Vector currentUser = new Vector(); for (int i=0; i<mDataModel.getSize(); i++) { currentUser.addElement((String)mDataModel.getElementAt(i)); } - + NameValuePairs response; try { response = mConnection.search(DestDef.DEST_USER_ADMIN, @@ -220,18 +220,18 @@ public class GroupEditor extends JDialog if (mUserDialog==null) mUserDialog = new UserListDialog(mParentFrame, mConnection); - + mUserDialog.showDialog(currentUser); //get selection if (!mUserDialog.isOK()) return; - + //create user NVP data object and add user entry Vector selectedUser = mUserDialog.getSelectedUser(); //Debug.println("Selected User = "+selectedUser.toString()); - + for(int i=0; i<selectedUser.size(); i++) { String name = ((String) selectedUser.elementAt(i)).trim(); if (!isDuplicate(name)) @@ -356,7 +356,7 @@ public class GroupEditor extends JDialog gbc. insets = new Insets(CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE,0,0); top.add(label1, gbc); - + gbc.anchor = gbc.WEST; gbc.fill = gbc.HORIZONTAL; gbc.weightx = 1.0; @@ -365,7 +365,7 @@ public class GroupEditor extends JDialog 0,CMSAdminUtil.DIFFERENT_COMPONENT_SPACE); top.add( mGroupNameLabel, gbc ); top.add( mGroupNameField, gbc ); - + JLabel dummy = new JLabel(); dummy.setVisible(false); gbc.gridwidth = gbc.REMAINDER; @@ -388,7 +388,7 @@ public class GroupEditor extends JDialog CMSAdminUtil.DIFFERENT_COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE,0); top.add(label3, gbc ); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; gbc.gridwidth = gbc.REMAINDER; @@ -407,8 +407,8 @@ public class GroupEditor extends JDialog resizeButtons(); //group membership table - - + + mList = makeJList(mDataModel,9); mList.addListSelectionListener(this); mScrollPane = new JScrollPane(mList, @@ -506,7 +506,7 @@ public class GroupEditor extends JDialog String user_str = tokenizer.nextToken().trim(); mDataModel.addElement(user_str); } - + } //add new group information diff --git a/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java index e80cc7047..84e9fe0b0 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java @@ -81,14 +81,14 @@ public class GroupTab extends CMSBaseUGTab { Debug.println("Edit Groups "+mTable.getSelectedRow()); String groupName = (String) mDataModel.getObjectValueAt(mTable.getSelectedRow()); - + if (mEditor==null){ - mEditor = new GroupEditor(mModel.getFrame(), mConnection); - } + mEditor = new GroupEditor(mModel.getFrame(), mConnection); + } mEditor.showDialog(groupName, false); refresh(); - + } if (e.getSource().equals(mAdd)) { Debug.println("Show Editor"); @@ -114,7 +114,7 @@ public class GroupTab extends CMSBaseUGTab { //==== MOUSELISTENER ====================== public void mouseClicked(MouseEvent e) { setButtons(); - + /* //NEED TO DISABLE THIS DUE TO BUG THAT WILL RE-DISPLAY @@ -152,9 +152,9 @@ public class GroupTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); - } - + setButtons(); + } + /*========================================================== * protected methods *==========================================================*/ @@ -301,7 +301,7 @@ public class GroupTab extends CMSBaseUGTab { mEdit.setEnabled(true); } - + private void updateGroup() { //send request and parse data @@ -325,7 +325,7 @@ public class GroupTab extends CMSBaseUGTab { for (String entry : response.keySet()) { store.addElement(entry.trim()); } - + String[] vals = new String[store.size()]; store.copyInto(vals); @@ -335,10 +335,10 @@ public class GroupTab extends CMSBaseUGTab { String value = response.get(vals[y]); mDataModel.processData(vals[y],value); } - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java index c3b74ce35..6759294fa 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java @@ -53,7 +53,7 @@ public class UserDataModel extends CMSContentTableModel { v.addElement(new JLabel(uid, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_USER), JLabel.LEFT)); - v.addElement(name); + v.addElement(name); addRow(v,uid); } diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java index 75908fe6a..29d1c6c22 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.common.*; * * @author Jack Pan-Chen * @version $Revision$, $Date$ - * + * * @see com.netscape.admin.certsrv.ug.UserTab */ public class UserEditor extends JDialog @@ -66,9 +66,9 @@ public class UserEditor extends JDialog private JPasswordField mPasswordConfirm; private JLabel mUserLabel, mMembership, mGroupLbl, dummy1; private JComboBox mGroupBox; - private static final String ADDHELPINDEX = + private static final String ADDHELPINDEX = "usersgroups-certsrv-add-user-dbox-help"; - private static final String EDITHELPINDEX = + private static final String EDITHELPINDEX = "usersgroups-certsrv-edit-user-dbox-help"; /*========================================================== @@ -90,7 +90,7 @@ public class UserEditor extends JDialog setLocationRelativeTo(parent); getRootPane().setDoubleBuffered(true); setDisplay(); - + if(!mIsNewUser) { mUserNameField.setVisible(false); mUserLabel.setVisible(true); @@ -134,7 +134,7 @@ public class UserEditor extends JDialog mDataModel.clear(); //mViewCert.setEnabled(false); - + if(!mIsNewUser) { mUserLabel.setText(user); } else { @@ -142,7 +142,7 @@ public class UserEditor extends JDialog mUserLabel.setText(""); mStateField.setText("1"); } - + //retrieve the cert record from the server try { if (mIsNewUser == false) @@ -184,7 +184,7 @@ public class UserEditor extends JDialog mUserAdded = false; if (evt.getSource().equals(mOK)) { - + //check password field String pwd = mPasswordField.getText().trim(); if (!pwd.equals("")) { @@ -194,15 +194,15 @@ public class UserEditor extends JDialog return; } } - + if (mIsNewUser) { - + //check text fields if (mUserNameField.getText().trim().equals("")) { CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, "NOUSERNAME", CMSAdminUtil.ERROR_MESSAGE); return; - } + } try { addUser(); @@ -310,15 +310,15 @@ public class UserEditor extends JDialog public void insertUpdate(DocumentEvent e) { updateView(); } - + public void removeUpdate(DocumentEvent e){ updateView(); } - + public void changedUpdate(DocumentEvent e){ updateView(); } - + /*========================================================== * private methods *==========================================================*/ @@ -332,7 +332,7 @@ public class UserEditor extends JDialog mOK.setEnabled(false); return; } - } + } if (mFullNameField.getText().trim().equals("")) { mOK.setEnabled(false); return; @@ -391,7 +391,7 @@ public class UserEditor extends JDialog } private JPanel makeContentPane() { - + Insets insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,0, CMSAdminUtil.COMPONENT_SPACE,0); @@ -481,7 +481,7 @@ public class UserEditor extends JDialog mList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION ); mList.addMouseListener(this); mScrollPane.setBackground(Color.white); - + mScrollPane.setBorder(BorderFactory.createLoweredBevelBorder()); //setLabelCellRenderer(mTable,0); @@ -560,7 +560,7 @@ public class UserEditor extends JDialog } } - + //add new group information private void addUser() throws EAdminException { diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java index 78b7e5252..f74b67bfa 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java @@ -69,7 +69,7 @@ public class UserTab extends CMSBaseUGTab { /*========================================================== * public methods *==========================================================*/ - + /** * refresh the content of the tab * IRefreshTab menthod @@ -142,7 +142,7 @@ public class UserTab extends CMSBaseUGTab { public void mouseClicked(MouseEvent e) { //Debug.println("CertRepositoryPanel: mouseClicked() -"+e.toString()); setButtons(); - + //we track the double click action on the table entry - View op if(mTable.getSelectedRow() >= 0) { if(e.getClickCount() == 2) { @@ -151,15 +151,15 @@ public class UserTab extends CMSBaseUGTab { } } } - + public void mouseReleased(MouseEvent e) { - setButtons(); - } + setButtons(); + } /*========================================================== * protected methods *==========================================================*/ - + /** * create the user action button panel */ @@ -264,11 +264,11 @@ public class UserTab extends CMSBaseUGTab { mCert.setEnabled(true); } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= - + private void updateUser() { //send request and parse data @@ -348,10 +348,10 @@ public class UserTab extends CMSBaseUGTab { String str = e.toString(); if (str.indexOf("The user") == 0) { - int i = - JOptionPane.showConfirmDialog(new JFrame(), str, + int i = + JOptionPane.showConfirmDialog(new JFrame(), str, "Information", JOptionPane.YES_NO_OPTION, - JOptionPane.INFORMATION_MESSAGE, + JOptionPane.INFORMATION_MESSAGE, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_INFO_ICON)); if (i == JOptionPane.YES_OPTION) { Debug.println("User Deleted"); |