Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse')
-rw-r--r--plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/LDAPAuthenticationProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/Messages.java60
-rw-r--r--plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/internal/LDAPConnector.java2
-rw-r--r--plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/service/ILDAPService.java60
4 files changed, 63 insertions, 63 deletions
diff --git a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/LDAPAuthenticationProvider.java b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/LDAPAuthenticationProvider.java
index 17147b76369..631aac4b155 100644
--- a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/LDAPAuthenticationProvider.java
+++ b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/LDAPAuthenticationProvider.java
@@ -151,12 +151,12 @@ public class LDAPAuthenticationProvider extends AbstractAuthenticationProvider {
String bundleName = e.getContributor().getName();
- if ((className != null) && (bundleName != null)) {
+ if (className != null && bundleName != null) {
Bundle bundle = Platform.getBundle(bundleName);
Object obj1 = bundle.loadClass(className).newInstance();
- if ((obj1 != null) && (obj1 instanceof ILDAPService)) {
+ if (obj1 != null && obj1 instanceof ILDAPService) {
return (ILDAPService) obj1;
diff --git a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/Messages.java b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/Messages.java
index 2f598eeceed..0cf33fde737 100644
--- a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/Messages.java
+++ b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/Messages.java
@@ -12,36 +12,36 @@ import org.eclipse.osgi.util.NLS;
*/
public class Messages extends NLS {
- /**
- * bundle name
- */
- private static final String BUNDLE_NAME = "org.eclipse.osee.framework.authentication.ldap.core.messages"; //$NON-NLS-1$
- /**
- * String to store LDAP service extension point ID
- */
- public static String LDAPServiceExtensionPointID;
- /**
- * String to store LDAP Service extension point attribute
- */
- public static String LDAPServiceExtensionPointAttribute;
- /**
- * String to store the LDAP Authentication failure
- */
- public static String LDAPAuthenticationFailed;
- /**
- * String to store the LDAP Authentication Protocol name
- */
- public static String LDAPAuthenticationProtocol;
+ /**
+ * bundle name
+ */
+ private static final String BUNDLE_NAME = "org.eclipse.osee.framework.authentication.ldap.core.messages"; //$NON-NLS-1$
+ /**
+ * String to store LDAP service extension point ID
+ */
+ public static String LDAPServiceExtensionPointID;
+ /**
+ * String to store LDAP Service extension point attribute
+ */
+ public static String LDAPServiceExtensionPointAttribute;
+ /**
+ * String to store the LDAP Authentication failure
+ */
+ public static String LDAPAuthenticationFailed;
+ /**
+ * String to store the LDAP Authentication Protocol name
+ */
+ public static String LDAPAuthenticationProtocol;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
- /**
- * Constructor
- */
- private Messages() {
- // Default constructor
- }
+ /**
+ * Constructor
+ */
+ private Messages() {
+ // Default constructor
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/internal/LDAPConnector.java b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/internal/LDAPConnector.java
index 4558c11638b..d5bceaec908 100644
--- a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/internal/LDAPConnector.java
+++ b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/internal/LDAPConnector.java
@@ -107,7 +107,7 @@ public class LDAPConnector {
if (attribs.size() > 0) {
Attribute attribute = attribs.get(accountField);
NamingEnumeration<?> allMembers = attribute.getAll();
- while ((allMembers != null) && allMembers.hasMoreElements()) {
+ while (allMembers != null && allMembers.hasMoreElements()) {
String accountName = (String) allMembers.next();
if (username.equalsIgnoreCase(accountName)) {
toReturn = accountName;
diff --git a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/service/ILDAPService.java b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/service/ILDAPService.java
index 41aa47721c2..587f0137338 100644
--- a/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/service/ILDAPService.java
+++ b/plugins/org.eclipse.osee.framework.authentication.ldap.core/src/org/eclipse/osee/framework/authentication/ldap/core/service/ILDAPService.java
@@ -13,39 +13,39 @@ package org.eclipse.osee.framework.authentication.ldap.core.service;
*/
public interface ILDAPService {
- /**
- * Getter for user name as in LDAP directory.
- *
- * @return LDAP user name
- */
- String getLDAPUsername();
+ /**
+ * Getter for user name as in LDAP directory.
+ *
+ * @return LDAP user name
+ */
+ String getLDAPUsername();
- /**
- * Getter for password.
- *
- * @return LDAP password
- */
- String getLDAPCrendentials();
+ /**
+ * Getter for password.
+ *
+ * @return LDAP password
+ */
+ String getLDAPCrendentials();
- /**
- * Getter for LDAP URL.
- *
- * @return LDAP server name
- */
- String getLDAPServerName();
+ /**
+ * Getter for LDAP URL.
+ *
+ * @return LDAP server name
+ */
+ String getLDAPServerName();
- /**
- * Getter for LDAP port.
- *
- * @return LDAP port number
- */
- String getLDAPPort();
+ /**
+ * Getter for LDAP port.
+ *
+ * @return LDAP port number
+ */
+ String getLDAPPort();
- /**
- * Getter for LDAP search base
- *
- * @return LDAP search base where user search needs to be performed
- */
- String getLDAPSearchBase();
+ /**
+ * Getter for LDAP search base
+ *
+ * @return LDAP search base where user search needs to be performed
+ */
+ String getLDAPSearchBase();
}

Back to the top