You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2012/01/06 18:05:12 UTC
svn commit: r1228275 - in /directory/studio/trunk/plugins:
connection.core/src/main/java/org/apache/directory/studio/connection/core/
connection.core/src/main/java/org/apache/directory/studio/connection/core/event/
connection.core/src/main/java/org/apa...
Author: pamarcelot
Date: Fri Jan 6 17:05:11 2012
New Revision: 1228275
URL: http://svn.apache.org/viewvc?rev=1228275&view=rev
Log:
Marked strings as non-externalized.
Modified:
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java
directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java
directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java
directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java
directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java Fri Jan 6 17:05:11 2012
@@ -32,32 +32,32 @@ import org.eclipse.ui.IActionFilter;
public class ConnectionActionFilterAdapter implements IActionFilter
{
// Identifier and value strings
- private static final String ID = "id";
- private static final String NAME = "name";
- private static final String HOST = "host";
- private static final String PORT = "port";
- private static final String ENCRYPTION_METHOD = "encryptionMethod";
- private static final String NETWORK_PROVIDER = "networkProvider";
- private static final String AUTH_METHOD = "authMethod";
- private static final String BIND_PRINCIPAL = "bindPrincipal";
- private static final String BIND_PASSWORD = "bindPassword";
- private static final String SASL_REALM = "saslRealm";
- private static final String SASL_QOP = "saslQop";
- private static final String SASL_SECURITY_STRENGTH = "saslSecurityStrength";
- private static final String SASL_MUTUAL_AUTHENTICATION = "saslMutualAuthentication";
- private static final String KRB5_CREDENTIAL_CONFIGURATION = "krb5CredentialConfiguration";
- private static final String KRB5_CONFIGURATION = "krb5Configuration";
- private static final String KRB5_CONFIGURATION_FILE = "krb5ConfigurationFile";
- private static final String KRB5_REALM = "krb5Realm";
- private static final String KRB5_KDC_HOST = "krb5KdcHost";
- private static final String KRB5_KDC_PORT = "krb5KdcPort";
- private static final String VENDOR_NAME = "vendorName";
- private static final String VENDOR_VERSION = "vendorVersion";
- private static final String SERVER_TYPE = "serverType";
- private static final String SUPPORTED_LDAP_VERSIONS = "supportedLdapVersions";
- private static final String SUPPORTED_CONTROLS = "supportedControls";
- private static final String SUPPORTED_EXTENSIONS = "supportedExtensions";
- private static final String SUPPORTED_FEATURES = "supportedFeatures";
+ private static final String ID = "id"; //$NON-NLS-1$
+ private static final String NAME = "name"; //$NON-NLS-1$
+ private static final String HOST = "host"; //$NON-NLS-1$
+ private static final String PORT = "port"; //$NON-NLS-1$
+ private static final String ENCRYPTION_METHOD = "encryptionMethod"; //$NON-NLS-1$
+ private static final String NETWORK_PROVIDER = "networkProvider"; //$NON-NLS-1$
+ private static final String AUTH_METHOD = "authMethod"; //$NON-NLS-1$
+ private static final String BIND_PRINCIPAL = "bindPrincipal"; //$NON-NLS-1$
+ private static final String BIND_PASSWORD = "bindPassword"; //$NON-NLS-1$
+ private static final String SASL_REALM = "saslRealm"; //$NON-NLS-1$
+ private static final String SASL_QOP = "saslQop"; //$NON-NLS-1$
+ private static final String SASL_SECURITY_STRENGTH = "saslSecurityStrength"; //$NON-NLS-1$
+ private static final String SASL_MUTUAL_AUTHENTICATION = "saslMutualAuthentication"; //$NON-NLS-1$
+ private static final String KRB5_CREDENTIAL_CONFIGURATION = "krb5CredentialConfiguration"; //$NON-NLS-1$
+ private static final String KRB5_CONFIGURATION = "krb5Configuration"; //$NON-NLS-1$
+ private static final String KRB5_CONFIGURATION_FILE = "krb5ConfigurationFile"; //$NON-NLS-1$
+ private static final String KRB5_REALM = "krb5Realm"; //$NON-NLS-1$
+ private static final String KRB5_KDC_HOST = "krb5KdcHost"; //$NON-NLS-1$
+ private static final String KRB5_KDC_PORT = "krb5KdcPort"; //$NON-NLS-1$
+ private static final String VENDOR_NAME = "vendorName"; //$NON-NLS-1$
+ private static final String VENDOR_VERSION = "vendorVersion"; //$NON-NLS-1$
+ private static final String SERVER_TYPE = "serverType"; //$NON-NLS-1$
+ private static final String SUPPORTED_LDAP_VERSIONS = "supportedLdapVersions"; //$NON-NLS-1$
+ private static final String SUPPORTED_CONTROLS = "supportedControls"; //$NON-NLS-1$
+ private static final String SUPPORTED_EXTENSIONS = "supportedExtensions"; //$NON-NLS-1$
+ private static final String SUPPORTED_FEATURES = "supportedFeatures"; //$NON-NLS-1$
/** The class instance */
private static ConnectionActionFilterAdapter INSTANCE = new ConnectionActionFilterAdapter();
@@ -111,7 +111,7 @@ public class ConnectionActionFilterAdapt
// PORT
else if ( PORT.equals( name ) )
{
- return value.equals( "" + connection.getPort() );
+ return value.equals( "" + connection.getPort() ); //$NON-NLS-1$
}
// ENCRYPTION METHOD
else if ( ENCRYPTION_METHOD.equals( name ) )
@@ -156,7 +156,7 @@ public class ConnectionActionFilterAdapt
// SASL MUTUAL AUTHENTICATION
else if ( SASL_MUTUAL_AUTHENTICATION.equals( name ) )
{
- return value.equals( connection.isSaslMutualAuthentication() ? "true" : "false" );
+ return value.equals( connection.isSaslMutualAuthentication() ? "true" : "false" ); //$NON-NLS-1$ //$NON-NLS-2$
}
// KRB5 CREDENTIAL CONFIGURATION
else if ( KRB5_CREDENTIAL_CONFIGURATION.equals( name ) )
@@ -186,12 +186,12 @@ public class ConnectionActionFilterAdapt
// KRB5 KDC PORT
else if ( KRB5_KDC_PORT.equals( name ) )
{
- return value.equals( "" + connection.getKrb5KdcPort() );
+ return value.equals( "" + connection.getKrb5KdcPort() ); //$NON-NLS-1$
}
// VENDOR NAME
else if ( VENDOR_NAME.equals( name ) )
{
- return value.equals( "" + connection.getDetectedConnectionProperties().getVendorName() );
+ return value.equals( "" + connection.getDetectedConnectionProperties().getVendorName() ); //$NON-NLS-1$
}
// VENDOR VERSION
else if ( VENDOR_VERSION.equals( name ) )
@@ -204,7 +204,7 @@ public class ConnectionActionFilterAdapt
// SERVER TYPE
else if ( SERVER_TYPE.equals( name ) )
{
- return value.equals( "" + connection.getDetectedConnectionProperties().getServerType().toString() );
+ return value.equals( "" + connection.getDetectedConnectionProperties().getServerType().toString() ); //$NON-NLS-1$
}
// SUPPORTED LDAP VERSIONS
else if ( SUPPORTED_LDAP_VERSIONS.equals( name ) )
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java Fri Jan 6 17:05:11 2012
@@ -741,7 +741,7 @@ public class ConnectionParameter
String s = extendedProperties.get( key );
if ( s != null )
{
- String[] array = s.split( ";" );
+ String[] array = s.split( ";" ); //$NON-NLS-1$
if ( ( array != null ) && ( array.length > 0 ) )
{
return new ArrayList<String>( Arrays.asList( array ) );
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java Fri Jan 6 17:05:11 2012
@@ -33,28 +33,28 @@ import java.util.List;
public class DetectedConnectionProperties
{
/** The key for the connection parameter "Vendor name" */
- private static final String CONNECTION_PARAMETER_VENDOR_NAME = "detectedProperties.vendorName";
+ private static final String CONNECTION_PARAMETER_VENDOR_NAME = "detectedProperties.vendorName"; //$NON-NLS-1$
/** The key for the connection parameter "Vendor version" */
- private static final String CONNECTION_PARAMETER_VENDOR_VERSION = "detectedProperties.vendorVersion";
+ private static final String CONNECTION_PARAMETER_VENDOR_VERSION = "detectedProperties.vendorVersion"; //$NON-NLS-1$
/** The key for the connection parameter "Server type" */
- private static final String CONNECTION_PARAMETER_SERVER_TYPE = "detectedProperties.serverType";
+ private static final String CONNECTION_PARAMETER_SERVER_TYPE = "detectedProperties.serverType"; //$NON-NLS-1$
/** The key for the connection parameter "Supported LDAP versions" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_LDAP_VERSIONS = "detectedProperties.supportedLdapVersions";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_LDAP_VERSIONS = "detectedProperties.supportedLdapVersions"; //$NON-NLS-1$
/** The key for the connection parameter "Supported SASL mechanisms" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_SASL_MECHANISMS = "detectedProperties.supportedSaslMechanisms";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_SASL_MECHANISMS = "detectedProperties.supportedSaslMechanisms"; //$NON-NLS-1$
/** The key for the connection parameter "Supported controls" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_CONTROLS = "detectedProperties.supportedControls";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_CONTROLS = "detectedProperties.supportedControls"; //$NON-NLS-1$
/** The key for the connection parameter "Supported extensions" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_EXTENSIONS = "detectedProperties.supportedExtensions";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_EXTENSIONS = "detectedProperties.supportedExtensions"; //$NON-NLS-1$
/** The key for the connection parameter "Supported features" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_FEATURES = "detectedProperties.supportedFeatures";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_FEATURES = "detectedProperties.supportedFeatures"; //$NON-NLS-1$
/** The connection */
private Connection connection;
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java Fri Jan 6 17:05:11 2012
@@ -46,20 +46,20 @@ public class StudioControl implements Se
/**
* The subentries control as defined in RFC 3672.
*/
- public static final StudioControl SUBENTRIES_CONTROL = new StudioControl( "Subentries", "1.3.6.1.4.1.4203.1.10.1",
+ public static final StudioControl SUBENTRIES_CONTROL = new StudioControl( "Subentries", "1.3.6.1.4.1.4203.1.10.1", //$NON-NLS-1$ //$NON-NLS-2$
false, new byte[]
{ 0x01, 0x01, ( byte ) 0xFF } );
/**
* The Manage DSA IT control as defined in RFC 3296.
*/
- public static final StudioControl MANAGEDSAIT_CONTROL = new StudioControl( "Manage DSA IT",
- "2.16.840.1.113730.3.4.2", false, null );
+ public static final StudioControl MANAGEDSAIT_CONTROL = new StudioControl( "Manage DSA IT", //$NON-NLS-1$
+ "2.16.840.1.113730.3.4.2", false, null ); //$NON-NLS-1$
/**
* The Tree Delete control as defined in draft-armijo-ldap-treedelete-02.
*/
- public static final StudioControl TREEDELETE_CONTROL = new StudioControl( "Tree Delete", "1.2.840.113556.1.4.805",
+ public static final StudioControl TREEDELETE_CONTROL = new StudioControl( "Tree Delete", "1.2.840.113556.1.4.805", //$NON-NLS-1$ //$NON-NLS-2$
false, null );
/** The symbolic name. */
@@ -94,7 +94,7 @@ public class StudioControl implements Se
public StudioControl( String name, String oid, boolean critical, byte[] controlValue )
{
super();
- this.name = name == null ? "" : name;
+ this.name = name == null ? "" : name; //$NON-NLS-1$
this.oid = oid;
this.critical = critical;
this.controlValue = controlValue;
@@ -152,7 +152,7 @@ public class StudioControl implements Se
{
if ( oid == null )
{
- return "";
+ return ""; //$NON-NLS-1$
}
LdifControlLine line = LdifControlLine.create( getOid(), isCritical(), getControlValue() );
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java Fri Jan 6 17:05:11 2012
@@ -38,10 +38,10 @@ public class StudioPagedResultsControl e
private static final long serialVersionUID = -6219375680879062812L;
/** The OID of Simple Paged Search Control (1.2.840.113556.1.4.319) */
- public static final String OID = "1.2.840.113556.1.4.319";
+ public static final String OID = "1.2.840.113556.1.4.319"; //$NON-NLS-1$
/** The name of Simple Paged Search Control. */
- public static final String NAME = "Simple Paged Results";
+ public static final String NAME = "Simple Paged Results"; //$NON-NLS-1$
/** The page size. */
private int size;
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java Fri Jan 6 17:05:11 2012
@@ -51,7 +51,7 @@ public class Utils
{
try
{
- oidDescriptions = ResourceBundle.getBundle( "org.apache.directory.studio.connection.core.OIDDescriptions" );
+ oidDescriptions = ResourceBundle.getBundle( "org.apache.directory.studio.connection.core.OIDDescriptions" ); //$NON-NLS-1$
}
catch ( Exception e )
{
@@ -66,7 +66,7 @@ public class Utils
try
{
resultCodeDescriptions = ResourceBundle
- .getBundle( "org.apache.directory.studio.connection.core.ResultCodeDescriptions" );
+ .getBundle( "org.apache.directory.studio.connection.core.ResultCodeDescriptions" ); //$NON-NLS-1$
}
catch ( Exception e )
{
@@ -112,7 +112,7 @@ public class Utils
{
try
{
- return resultCodeDescriptions.getString( "" + code );
+ return resultCodeDescriptions.getString( "" + code ); //$NON-NLS-1$
}
catch ( MissingResourceException ignored )
{
@@ -255,7 +255,7 @@ public class Utils
*/
public static String getSimpleNormalizedUrl( LdapUrl url )
{
- return url.getScheme() + ( url.getHost() != null ? Strings.toLowerCase( url.getHost() ) : "" ) + ":" + url.getPort();
+ return url.getScheme() + ( url.getHost() != null ? Strings.toLowerCase( url.getHost() ) : "" ) + ":" + url.getPort(); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java Fri Jan 6 17:05:11 2012
@@ -94,7 +94,7 @@ public class ConnectionEventRegistry
if ( fireTimeStamps.size() > 5 )
{
- String message = "Warning: More then " + fireTimeStamps.size() + " events were fired per second!";
+ String message = "Warning: More then " + fireTimeStamps.size() + " events were fired per second!"; //$NON-NLS-1$ //$NON-NLS-2$
ConnectionCorePlugin.getDefault().getLog().log(
new Status( IStatus.WARNING, ConnectionCoreConstants.PLUGIN_ID, message,
new Exception( message ) ) );
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java Fri Jan 6 17:05:11 2012
@@ -260,7 +260,7 @@ public class ConnectionIO
Attribute saslQopAttribute = element.attribute( SASL_QOP_TAG );
if ( saslQopAttribute != null )
{
- if ( "AUTH_INT_PRIV".equals( saslQopAttribute.getValue() ) )
+ if ( "AUTH_INT_PRIV".equals( saslQopAttribute.getValue() ) ) //$NON-NLS-1$
{
// Used for legacy setting (before we used SaslQop enum from Shared)
connection.setSaslQop( SaslQoP.AUTH_CONF );
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java Fri Jan 6 17:05:11 2012
@@ -254,7 +254,7 @@ public class CursorStudioNamingEnumerati
*/
public boolean hasMoreElements()
{
- throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" );
+ throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$
}
@@ -317,7 +317,7 @@ public class CursorStudioNamingEnumerati
*/
public StudioSearchResult nextElement()
{
- throw new UnsupportedOperationException( "Call next() instead of nextElement() !" );
+ throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Fri Jan 6 17:05:11 2012
@@ -1192,15 +1192,15 @@ public class DirectoryApiConnectionWrapp
HashMap<String, Object> options = new HashMap<String, Object>();
// TODO: this only works for Sun JVM
- options.put( "refreshKrb5Config", "true" );
+ options.put( "refreshKrb5Config", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
switch ( connection.getConnectionParameter().getKrb5CredentialConfiguration() )
{
case USE_NATIVE:
- options.put( "useTicketCache", "true" );
- options.put( "doNotPrompt", "true" );
+ options.put( "useTicketCache", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
+ options.put( "doNotPrompt", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
case OBTAIN_TGT:
- options.put( "doNotPrompt", "false" );
+ options.put( "doNotPrompt", "false" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
@@ -1256,8 +1256,8 @@ public class DirectoryApiConnectionWrapp
message = Utils.getResultCodeDescription( code );
}
- throw new Exception( NLS.bind( "[LDAP: error code {0} - {1}]", new String[]
- { code + "", message } ) );
+ throw new Exception( NLS.bind( "[LDAP: error code {0} - {1}]", new String[] //$NON-NLS-1$
+ { code + "", message } ) ); //$NON-NLS-1$
}
}
}
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Fri Jan 6 17:05:11 2012
@@ -981,8 +981,8 @@ public class JNDIConnectionWrapper imple
// No Authentication
if ( authMethod == AUTHMETHOD_NONE )
{
- bindPrincipal = "";
- bindCredentials = "";
+ bindPrincipal = ""; //$NON-NLS-1$
+ bindCredentials = ""; //$NON-NLS-1$
}
else
{
@@ -1047,7 +1047,7 @@ public class JNDIConnectionWrapper imple
// Request mutual authentication
if ( connection.getConnectionParameter().isSaslMutualAuthentication() )
{
- context.addToEnvironment( Sasl.SERVER_AUTH, "true" );
+ context.addToEnvironment( Sasl.SERVER_AUTH, "true" ); //$NON-NLS-1$
}
else
{
@@ -1136,28 +1136,28 @@ public class JNDIConnectionWrapper imple
{
case DEFAULT:
// nothing
- System.clearProperty( "java.security.krb5.conf" );
+ System.clearProperty( "java.security.krb5.conf" ); //$NON-NLS-1$
break;
case FILE:
// use specified krb5.conf
- System.setProperty( "java.security.krb5.conf", connection.getConnectionParameter()
+ System.setProperty( "java.security.krb5.conf", connection.getConnectionParameter() //$NON-NLS-1$
.getKrb5ConfigurationFile() );
break;
case MANUAL:
// write manual config parameters to connection specific krb5.conf file
- String fileName = Utils.getFilenameString( connection.getId() ) + ".krb5.conf";
+ String fileName = Utils.getFilenameString( connection.getId() ) + ".krb5.conf"; //$NON-NLS-1$
configFile = ConnectionCorePlugin.getDefault().getStateLocation().append( fileName ).toFile();
String realm = connection.getConnectionParameter().getKrb5Realm();
String host = connection.getConnectionParameter().getKrb5KdcHost();
int port = connection.getConnectionParameter().getKrb5KdcPort();
StringBuilder sb = new StringBuilder();
- sb.append( "[libdefaults]" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "default_realm = " ).append( realm ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "[realms]" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( realm ).append( " = {" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "kdc = " ).append( host ).append( ":" ).append( port ).append(
+ sb.append( "[libdefaults]" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( "default_realm = " ).append( realm ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( "[realms]" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( realm ).append( " = {" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( "kdc = " ).append( host ).append( ":" ).append( port ).append( //$NON-NLS-1$ //$NON-NLS-2$
ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "}" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
+ sb.append( "}" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
try
{
FileUtils.writeStringToFile( configFile, sb.toString() );
@@ -1168,7 +1168,7 @@ public class JNDIConnectionWrapper imple
ne.setRootCause( ioe );
throw ne;
}
- System.setProperty( "java.security.krb5.conf", configFile.getAbsolutePath() );
+ System.setProperty( "java.security.krb5.conf", configFile.getAbsolutePath() ); //$NON-NLS-1$
}
// Use our custom configuration so we don't need to mess with external configuration
@@ -1336,15 +1336,15 @@ public class JNDIConnectionWrapper imple
HashMap<String, Object> options = new HashMap<String, Object>();
// TODO: this only works for Sun JVM
- options.put( "refreshKrb5Config", "true" );
+ options.put( "refreshKrb5Config", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
switch ( connection.getConnectionParameter().getKrb5CredentialConfiguration() )
{
case USE_NATIVE:
- options.put( "useTicketCache", "true" );
- options.put( "doNotPrompt", "true" );
+ options.put( "useTicketCache", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
+ options.put( "doNotPrompt", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
case OBTAIN_TGT:
- options.put( "doNotPrompt", "false" );
+ options.put( "doNotPrompt", "false" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java Fri Jan 6 17:05:11 2012
@@ -180,7 +180,7 @@ public class JndiStudioNamingEnumeration
*/
public boolean hasMoreElements()
{
- throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" );
+ throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$
}
@@ -228,7 +228,7 @@ public class JndiStudioNamingEnumeration
*/
public StudioSearchResult nextElement()
{
- throw new UnsupportedOperationException( "Call next() instead of nextElement() !" );
+ throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$
}
@@ -298,13 +298,13 @@ public class JndiStudioNamingEnumeration
public SearchResult nextElement()
{
- throw new UnsupportedOperationException( "Call next() instead of nextElement() !" );
+ throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$
}
public boolean hasMoreElements()
{
- throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" );
+ throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java Fri Jan 6 17:05:11 2012
@@ -104,7 +104,7 @@ public class CertificateTrustDialog exte
protected void createButtonsForButtonBar( Composite parent )
{
createButton( parent, IDialogConstants.DETAILS_ID, Messages
- .getString( "CertificateTrustDialog.ViewCertificate" ), false );
+ .getString( "CertificateTrustDialog.ViewCertificate" ), false ); //$NON-NLS-1$
createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false );
}
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java Fri Jan 6 17:05:11 2012
@@ -121,7 +121,7 @@ public class ConnectionsPreferencePage e
useKrb5SystemPropertiesButton.setSelection( useKrb5SystemProperties );
krb5LoginModuleLabel = BaseWidgetUtils.createLabel( krb5SettingsGroup, Messages
- .getString( "ConnectionsPreferencePage.Krb5LoginModule" ), 1 );
+ .getString( "ConnectionsPreferencePage.Krb5LoginModule" ), 1 ); //$NON-NLS-1$
String krb5LoginModule = preferences.getString( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE );
String defaultKrb5LoginModule = preferences
.getDefaultString( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE );
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java Fri Jan 6 17:05:11 2012
@@ -264,7 +264,7 @@ public class AuthenticationParameterPage
private int getKdcPort()
{
- return !"".equals( krb5ConfigManualPortText.getText() ) ? Integer.parseInt( krb5ConfigManualPortText.getText() )
+ return !"".equals( krb5ConfigManualPortText.getText() ) ? Integer.parseInt( krb5ConfigManualPortText.getText() ) //$NON-NLS-1$
: 0;
}
@@ -618,7 +618,7 @@ public class AuthenticationParameterPage
: "" ); //$NON-NLS-1$
krb5ConfigManualRealmText.setText( parameter.getKrb5Realm() != null ? parameter.getKrb5Realm() : "" ); //$NON-NLS-1$
krb5ConfigManualHostText.setText( parameter.getKrb5KdcHost() != null ? parameter.getKrb5KdcHost() : "" ); //$NON-NLS-1$
- krb5ConfigManualPortText.setText( parameter.getKrb5KdcPort() != 0 ? "" + parameter.getKrb5KdcPort() : "" ); //$NON-NLS-1$
+ krb5ConfigManualPortText.setText( parameter.getKrb5KdcPort() != 0 ? "" + parameter.getKrb5KdcPort() : "" ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -658,7 +658,7 @@ public class AuthenticationParameterPage
if ( !saveBindPasswordButton.getSelection() )
{
// Reseting the previously saved password (if any)
- bindPasswordText.setText( "" );
+ bindPasswordText.setText( "" ); //$NON-NLS-1$
}
connectionPageModified();
}
@@ -989,7 +989,7 @@ public class AuthenticationParameterPage
ldapUrl.getExtensions().add(
new Extension( false, X_KRB5_CONFIG_MANUAL_KDC_HOST, parameter.getKrb5KdcHost() ) );
ldapUrl.getExtensions().add(
- new Extension( false, X_KRB5_CONFIG_MANUAL_KDC_PORT, "" + parameter.getKrb5KdcPort() ) );
+ new Extension( false, X_KRB5_CONFIG_MANUAL_KDC_PORT, "" + parameter.getKrb5KdcPort() ) ); //$NON-NLS-1$
break;
}
}
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java Fri Jan 6 17:05:11 2012
@@ -180,7 +180,7 @@ public class CertificateListComposite ex
{
MessageDialog.openError( addButton.getShell(),
Messages.getString( "CertificateListComposite.ErrorDialogTitle" ), //$NON-NLS-1$
- NLS.bind( Messages.getString( "CertificateListComposite.ErrorDialogMessage" ),
+ NLS.bind( Messages.getString( "CertificateListComposite.ErrorDialogMessage" ), //$NON-NLS-1$
ex.getMessage() ) );
}
}
@@ -304,7 +304,7 @@ public class CertificateListComposite ex
X509Certificate certificate = ( X509Certificate ) element;
String certificateName = certificate.getSubjectX500Principal().getName();
- if ( ( certificateName != null ) && ( !"".equals( certificateName ) ) )
+ if ( ( certificateName != null ) && ( !"".equals( certificateName ) ) ) //$NON-NLS-1$
{
return certificateName;
}
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java Fri Jan 6 17:05:11 2012
@@ -107,7 +107,7 @@ public class ExportCertificateWizard ext
{
MessageDialog.openError( getShell(),
Messages.getString( "ExportCertificateWizard.ErrorDialogTitle" ), //$NON-NLS-1$
- NLS.bind( Messages.getString( "ExportCertificateWizard.ErrorDialogMessage" ),
+ NLS.bind( Messages.getString( "ExportCertificateWizard.ErrorDialogMessage" ), //$NON-NLS-1$
e.getMessage() ) );
return false;
}
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java?rev=1228275&r1=1228274&r2=1228275&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java Fri Jan 6 17:05:11 2012
@@ -68,7 +68,7 @@ public class ExportCertificateWizardPage
*/
public ExportCertificateWizardPage()
{
- super( "ExportCertificateWizardPage" );
+ super( "ExportCertificateWizardPage" ); //$NON-NLS-1$
setTitle( Messages.getString( "ExportCertificateWizardPage.ExportCertificate" ) ); //$NON-NLS-1$
setDescription( Messages.getString( "ExportCertificateWizardPage.PleaseSelectFileAndFormat" ) ); //$NON-NLS-1$
setImageDescriptor( ConnectionUIPlugin.getDefault().getImageDescriptor(
@@ -93,7 +93,7 @@ public class ExportCertificateWizardPage
fileComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Creating the file's text widget
- fileText = BaseWidgetUtils.createText( fileComposite, "", 1 );
+ fileText = BaseWidgetUtils.createText( fileComposite, "", 1 ); //$NON-NLS-1$
fileText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
fileText.addModifyListener( new ModifyListener()
{