directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1228278 [1/2] - in /directory/studio/trunk/plugins: ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/ ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/ ldapbrows...
Date Fri, 06 Jan 2012 17:06:53 GMT
Author: pamarcelot
Date: Fri Jan  6 17:06:52 2012
New Revision: 1228278

URL: http://svn.apache.org/viewvc?rev=1228278&view=rev
Log:
Marked strings as non-externalized.

Modified:
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java Fri Jan  6 17:06:52 2012
@@ -190,17 +190,17 @@ public class BrowserCommonPreferencesIni
 
                 // Active Directory
                 new ObjectClassIconPair( new String[]
-                    { "1.2.840.113556.1.5.9" }, BrowserCommonConstants.IMG_ENTRY_PERSON ), // User
+                    { "1.2.840.113556.1.5.9" }, BrowserCommonConstants.IMG_ENTRY_PERSON ), // User //$NON-NLS-1$
                 new ObjectClassIconPair( new String[]
-                    { "1.2.840.113556.1.5.8" }, BrowserCommonConstants.IMG_ENTRY_GROUP ), // Group
+                    { "1.2.840.113556.1.5.8" }, BrowserCommonConstants.IMG_ENTRY_GROUP ), // Group //$NON-NLS-1$
                 new ObjectClassIconPair( new String[]
-                    { "1.2.840.113556.1.3.23" }, BrowserCommonConstants.IMG_ENTRY_ORG ), // Container 
+                    { "1.2.840.113556.1.3.23" }, BrowserCommonConstants.IMG_ENTRY_ORG ), // Container  //$NON-NLS-1$
                 new ObjectClassIconPair( new String[]
-                    { "1.2.840.113556.1.5.66", "1.2.840.113556.1.5.67" }, BrowserCommonConstants.IMG_ENTRY_DC ), // Domain, DomainDNS
+                    { "1.2.840.113556.1.5.66", "1.2.840.113556.1.5.67" }, BrowserCommonConstants.IMG_ENTRY_DC ), // Domain, DomainDNS //$NON-NLS-1$ //$NON-NLS-2$
                 new ObjectClassIconPair( new String[]
-                    { "1.2.840.113556.1.3.13" }, BrowserCommonConstants.IMG_OCD ), // ClassSchema
+                    { "1.2.840.113556.1.3.13" }, BrowserCommonConstants.IMG_OCD ), // ClassSchema //$NON-NLS-1$
                 new ObjectClassIconPair( new String[]
-                    { "1.2.840.113556.1.3.14" }, BrowserCommonConstants.IMG_ATD ), // AttributeSchema
+                    { "1.2.840.113556.1.3.14" }, BrowserCommonConstants.IMG_ATD ), // AttributeSchema //$NON-NLS-1$
             };
         BrowserCorePlugin.getDefault().getCorePreferences().setDefaultObjectClassIcons( objectClassIcons );
 

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java Fri Jan  6 17:06:52 2012
@@ -198,7 +198,7 @@ public class BrowserQuickSearchWidget
         {
             public void modifyText( ModifyEvent e )
             {
-                quickSearchRunButton.setEnabled( !"".equals( quickSearchAttributeCombo.getText() ) );
+                quickSearchRunButton.setEnabled( !"".equals( quickSearchAttributeCombo.getText() ) ); //$NON-NLS-1$
             }
         } );
         quickSearchAttributeCombo.addSelectionListener( new SelectionAdapter()
@@ -213,7 +213,7 @@ public class BrowserQuickSearchWidget
         quickSearchAttributeCombo.setLayoutData( gd );
 
         String[] operators = new String[]
-            { "=", "!=", "<=", ">=", "~=" };
+            { "=", "!=", "<=", ">=", "~=" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
         quickSearchOperatorCombo = BaseWidgetUtils.createReadonlyCombo( innerComposite, operators, 0, 1 );
         GridData data = new GridData();
         quickSearchOperatorCombo.setLayoutData( data );
@@ -296,27 +296,27 @@ public class BrowserQuickSearchWidget
         quickSearch.getSearchParameter().setScope( quickSearchScopeButton.getSelection() ? SearchScope.SUBTREE : SearchScope.ONELEVEL );
 
         StringBuffer filter = new StringBuffer();
-        filter.append( "(" );
-        if ( "!=".equals( quickSearchOperatorCombo.getText() ) )
+        filter.append( "(" ); //$NON-NLS-1$
+        if ( "!=".equals( quickSearchOperatorCombo.getText() ) ) //$NON-NLS-1$
         {
-            filter.append( "!(" );
+            filter.append( "!(" ); //$NON-NLS-1$
         }
         filter.append( quickSearchAttributeCombo.getText() );
-        filter.append( "!=".equals( quickSearchOperatorCombo.getText() ) ? "=" : quickSearchOperatorCombo.getText() );
+        filter.append( Messages.getString("BrowserQuickSearchWidget.9").equals( quickSearchOperatorCombo.getText() ) ? "=" : quickSearchOperatorCombo.getText() ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // only escape '\', '(', ')', and '\u0000'
         // don't escape '*' to allow substring search
         String value = quickSearchValueCombo.getText();
-        value = value.replaceAll( "\\\\", "\\\\5c" );
-        value = value.replaceAll( "\u0000", "\\\\00" );
-        value = value.replaceAll( "\\(", "\\\\28" );
-        value = value.replaceAll( "\\)", "\\\\29" );
+        value = value.replaceAll( "\\\\", "\\\\5c" ); //$NON-NLS-1$ //$NON-NLS-2$
+        value = value.replaceAll( "\u0000", "\\\\00" ); //$NON-NLS-1$ //$NON-NLS-2$
+        value = value.replaceAll( "\\(", "\\\\28" ); //$NON-NLS-1$ //$NON-NLS-2$
+        value = value.replaceAll( "\\)", "\\\\29" ); //$NON-NLS-1$ //$NON-NLS-2$
         filter.append( value );
-        if ( "!=".equals( quickSearchOperatorCombo.getText() ) )
+        if ( "!=".equals( quickSearchOperatorCombo.getText() ) ) //$NON-NLS-1$
         {
-            filter.append( ")" );
+            filter.append( ")" ); //$NON-NLS-1$
         }
-        filter.append( ")" );
+        filter.append( ")" ); //$NON-NLS-1$
         quickSearch.getSearchParameter().setFilter( filter.toString() );
 
         // set new quick search
@@ -410,7 +410,7 @@ public class BrowserQuickSearchWidget
             quickSearchOperatorCombo.setEnabled( enabled );
             quickSearchValueCombo.setEnabled( enabled );
             quickSearchScopeButton.setEnabled( enabled );
-            quickSearchRunButton.setEnabled( enabled && !"".equals( quickSearchAttributeCombo.getText() ) );
+            quickSearchRunButton.setEnabled( enabled && !"".equals( quickSearchAttributeCombo.getText() ) ); //$NON-NLS-1$
 
             if ( !enabled )
             {

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties Fri Jan  6 17:06:52 2012
@@ -45,6 +45,7 @@ BrowserSorterDialog.SortLimit=Sort limit
 BrowserSorterDialog.SortLimitToolTip=If there are more than the specified number of children they won't be sorted. Hint: For performance reason the maximum value should be 10.000\!
 OpenSortDialogAction.Sorting=Sorting...
 ShowQuickSearchAction.ShowQuickSearch=Show Quick Search
+BrowserQuickSearchWidget.9=\!=
 BrowserQuickSearchWidget.RunQuickSearch=Run Quick Search
 BrowserQuickSearchWidget.ScopeOneLevelToolTip=Search one level only
 BrowserQuickSearchWidget.ScopeSubtreeToolTip=Search whole subtree

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java Fri Jan  6 17:06:52 2012
@@ -185,7 +185,7 @@ public class FilterWidget extends Browse
      */
     public String getFilter()
     {
-        if ( "".equals( filterCombo.getText() ) )
+        if ( "".equals( filterCombo.getText() ) ) //$NON-NLS-1$
         {
             return ""; //$NON-NLS-1$
         }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java Fri Jan  6 17:06:52 2012
@@ -64,30 +64,30 @@ import org.dom4j.io.XMLWriter;
 public class BrowserConnectionIO
 {
     // XML tags
-    private static final String BROWSER_CONNECTIONS_TAG = "browserConnections";
+    private static final String BROWSER_CONNECTIONS_TAG = "browserConnections"; //$NON-NLS-1$
 
-    private static final String BROWSER_CONNECTION_TAG = "browserConnection";
-    private static final String ID_TAG = "id";
+    private static final String BROWSER_CONNECTION_TAG = "browserConnection"; //$NON-NLS-1$
+    private static final String ID_TAG = "id"; //$NON-NLS-1$
 
-    private static final String SEARCHES_TAG = "searches";
-    private static final String SEARCH_PARAMETER_TAG = "searchParameter";
-    private static final String NAME_TAG = "name";
-    private static final String SEARCH_BASE_TAG = "searchBase";
-    private static final String FILTER_TAG = "filer";
-    private static final String RETURNING_ATTRIBUTES_TAG = "returningAttributes";
-    private static final String RETURNING_ATTRIBUTE_TAG = "returningAttribute";
-    private static final String VALUE_TAG = "value";
-    private static final String SCOPE_TAG = "scope";
-    private static final String TIME_LIMIT_TAG = "timeLimit";
-    private static final String COUNT_LIMIT_TAG = "countLimit";
-    private static final String ALIASES_DEREFERENCING_METHOD_TAG = "aliasesDereferencingMethod";
-    private static final String REFERRALS_HANDLING_METHOD_TAG = "referralsHandlingMethod";
-    private static final String CONTROLS_TAG = "controls";
-    private static final String CONTROL_TAG = "control";
-
-    private static final String BOOKMARKS_TAG = "bookmarks";
-    private static final String BOOKMARK_PARAMETER_TAG = "bookmarkParameter";
-    private static final String DN_TAG = "dn";
+    private static final String SEARCHES_TAG = "searches"; //$NON-NLS-1$
+    private static final String SEARCH_PARAMETER_TAG = "searchParameter"; //$NON-NLS-1$
+    private static final String NAME_TAG = "name"; //$NON-NLS-1$
+    private static final String SEARCH_BASE_TAG = "searchBase"; //$NON-NLS-1$
+    private static final String FILTER_TAG = "filer"; //$NON-NLS-1$
+    private static final String RETURNING_ATTRIBUTES_TAG = "returningAttributes"; //$NON-NLS-1$
+    private static final String RETURNING_ATTRIBUTE_TAG = "returningAttribute"; //$NON-NLS-1$
+    private static final String VALUE_TAG = "value"; //$NON-NLS-1$
+    private static final String SCOPE_TAG = "scope"; //$NON-NLS-1$
+    private static final String TIME_LIMIT_TAG = "timeLimit"; //$NON-NLS-1$
+    private static final String COUNT_LIMIT_TAG = "countLimit"; //$NON-NLS-1$
+    private static final String ALIASES_DEREFERENCING_METHOD_TAG = "aliasesDereferencingMethod"; //$NON-NLS-1$
+    private static final String REFERRALS_HANDLING_METHOD_TAG = "referralsHandlingMethod"; //$NON-NLS-1$
+    private static final String CONTROLS_TAG = "controls"; //$NON-NLS-1$
+    private static final String CONTROL_TAG = "control"; //$NON-NLS-1$
+
+    private static final String BOOKMARKS_TAG = "bookmarks"; //$NON-NLS-1$
+    private static final String BOOKMARK_PARAMETER_TAG = "bookmarkParameter"; //$NON-NLS-1$
+    private static final String DN_TAG = "dn"; //$NON-NLS-1$
 
 
     /**
@@ -408,7 +408,7 @@ public class BrowserConnectionIO
 
         // Writing the file to disk
         OutputFormat outformat = OutputFormat.createPrettyPrint();
-        outformat.setEncoding( "UTF-8" );
+        outformat.setEncoding( "UTF-8" ); //$NON-NLS-1$
         XMLWriter writer = new XMLWriter( stream, outformat );
         writer.write( document );
         writer.flush();
@@ -459,7 +459,7 @@ public class BrowserConnectionIO
         searchParameterElement.addAttribute( NAME_TAG, searchParameter.getName() );
 
         // Search base
-        String searchBase = searchParameter.getSearchBase() != null ? searchParameter.getSearchBase().getName() : "";
+        String searchBase = searchParameter.getSearchBase() != null ? searchParameter.getSearchBase().getName() : ""; //$NON-NLS-1$
         searchParameterElement.addAttribute( SEARCH_BASE_TAG, searchBase );
 
         // Filter
@@ -477,10 +477,10 @@ public class BrowserConnectionIO
         searchParameterElement.addAttribute( SCOPE_TAG, searchParameter.getScope().toString() );
 
         // Time limit
-        searchParameterElement.addAttribute( TIME_LIMIT_TAG, "" + searchParameter.getTimeLimit() );
+        searchParameterElement.addAttribute( TIME_LIMIT_TAG, "" + searchParameter.getTimeLimit() ); //$NON-NLS-1$
 
         // Count limit
-        searchParameterElement.addAttribute( COUNT_LIMIT_TAG, "" + searchParameter.getCountLimit() );
+        searchParameterElement.addAttribute( COUNT_LIMIT_TAG, "" + searchParameter.getCountLimit() ); //$NON-NLS-1$
 
         // Alias dereferencing method
         searchParameterElement.addAttribute( ALIASES_DEREFERENCING_METHOD_TAG, searchParameter
@@ -513,7 +513,7 @@ public class BrowserConnectionIO
         bookmarkParameterElement.addAttribute( NAME_TAG, bookmarkParameter.getName() );
 
         // Dn
-        String dn = bookmarkParameter.getDn() != null ? bookmarkParameter.getDn().getName() : "";
+        String dn = bookmarkParameter.getDn() != null ? bookmarkParameter.getDn().getName() : ""; //$NON-NLS-1$
         bookmarkParameterElement.addAttribute( DN_TAG, dn );
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java Fri Jan  6 17:06:52 2012
@@ -128,9 +128,9 @@ public class BrowserConnectionManager im
             // 1st search it in current workspace with the old ldapstudio plugin ID
             // 2nd search it in old .ldapstudio workspace with the old ldapstudio plugin ID
             String[] oldFilenames = new String[2];
-            oldFilenames[0] = filename.replace( "org.apache.directory.studio.ldapbrowser.core",
-                "org.apache.directory.ldapstudio.browser.core" );
-            oldFilenames[1] = oldFilenames[0].replace( ".ApacheDirectoryStudio", ".ldapstudio" );
+            oldFilenames[0] = filename.replace( "org.apache.directory.studio.ldapbrowser.core", //$NON-NLS-1$
+                "org.apache.directory.ldapstudio.browser.core" ); //$NON-NLS-1$
+            oldFilenames[1] = oldFilenames[0].replace( ".ApacheDirectoryStudio", ".ldapstudio" ); //$NON-NLS-1$ //$NON-NLS-2$
             for ( int i = 0; i < oldFilenames.length; i++ )
             {
                 File oldFile = new File( oldFilenames[i] );
@@ -138,10 +138,10 @@ public class BrowserConnectionManager im
                 {
                     try
                     {
-                        String oldContent = FileUtils.readFileToString( oldFile, "UTF-8" );
-                        String newContent = oldContent.replace( "org.apache.directory.ldapstudio.browser.core",
-                            "org.apache.directory.studio.ldapbrowser.core" );
-                        FileUtils.writeStringToFile( file, newContent, "UTF-8" );
+                        String oldContent = FileUtils.readFileToString( oldFile, "UTF-8" ); //$NON-NLS-1$
+                        String newContent = oldContent.replace( "org.apache.directory.ldapstudio.browser.core", //$NON-NLS-1$
+                            "org.apache.directory.studio.ldapbrowser.core" ); //$NON-NLS-1$
+                        FileUtils.writeStringToFile( file, newContent, "UTF-8" ); //$NON-NLS-1$
                         break;
                     }
                     catch ( IOException e )
@@ -345,7 +345,7 @@ public class BrowserConnectionManager im
         // To avoid a corrupt file, save object to a temp file first 
         try
         {
-            BrowserConnectionIO.save( new FileOutputStream( getBrowserConnectionStoreFileName() + "-temp" ),
+            BrowserConnectionIO.save( new FileOutputStream( getBrowserConnectionStoreFileName() + "-temp" ), //$NON-NLS-1$
                 connectionMap );
         }
         catch ( IOException e )
@@ -356,7 +356,7 @@ public class BrowserConnectionManager im
 
         // move temp file to good file
         File file = new File( getBrowserConnectionStoreFileName() );
-        File tempFile = new File( getBrowserConnectionStoreFileName() + "-temp" );
+        File tempFile = new File( getBrowserConnectionStoreFileName() + "-temp" ); //$NON-NLS-1$
         if ( file.exists() )
         {
             file.delete();
@@ -364,8 +364,8 @@ public class BrowserConnectionManager im
 
         try
         {
-            String content = FileUtils.readFileToString( tempFile, "UTF-8" );
-            FileUtils.writeStringToFile( file, content, "UTF-8" );
+            String content = FileUtils.readFileToString( tempFile, "UTF-8" ); //$NON-NLS-1$
+            FileUtils.writeStringToFile( file, content, "UTF-8" ); //$NON-NLS-1$
         }
         catch ( IOException e )
         {
@@ -457,8 +457,8 @@ public class BrowserConnectionManager im
             File file = new File( fileName );
             if ( file.exists() )
             {
-                String oldContent = FileUtils.readFileToString( file, "UTF-8" );
-                if ( !oldContent.contains( "java.beans.XMLDecoder" ) )
+                String oldContent = FileUtils.readFileToString( file, "UTF-8" ); //$NON-NLS-1$
+                if ( !oldContent.contains( "java.beans.XMLDecoder" ) ) //$NON-NLS-1$
                 {
                     // new file format
                     try
@@ -472,7 +472,7 @@ public class BrowserConnectionManager im
                         try
                         {
                             BrowserConnectionIO.load( new FileInputStream( getBrowserConnectionStoreFileName()
-                                + "-temp" ), connectionMap );
+                                + "-temp" ), connectionMap ); //$NON-NLS-1$
                         }
                         catch ( FileNotFoundException e1 )
                         {
@@ -568,7 +568,7 @@ public class BrowserConnectionManager im
         catch ( Exception e )
         {
             // if loading failed, try with temp file
-            String tempFilename = filename + "-temp";
+            String tempFilename = filename + "-temp"; //$NON-NLS-1$
             try
             {
                 XMLDecoder decoder = new XMLDecoder( new BufferedInputStream( ( new FileInputStream( tempFilename ) ) ) );
@@ -614,7 +614,7 @@ public class BrowserConnectionManager im
                     {
                         if ( oldInstance == field.get( null ) )
                         {
-                            return new Expression( oldInstance, field, "get", new Object[]
+                            return new Expression( oldInstance, field, "get", new Object[] //$NON-NLS-1$
                                 { null } );
                         }
                     }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java Fri Jan  6 17:06:52 2012
@@ -43,7 +43,7 @@ public final class BrowserCoreConstants
     }
 
     /** The plug-in ID */
-    public static final String PLUGIN_ID = BrowserCorePlugin.getDefault().getPluginProperties().getString( "Plugin_id" );
+    public static final String PLUGIN_ID = BrowserCorePlugin.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
 
     public static final String PREFERENCE_BINARY_SYNTAXES = "binarySyntaxes"; //$NON-NLS-1$
 
@@ -110,5 +110,5 @@ public final class BrowserCoreConstants
     public static final int SORT_ORDER_DESCENDING = 2;
 
     public static final String LDAP_SEARCH_PAGE_ID = BrowserCorePlugin.getDefault().getPluginProperties().getString(
-        "SearchPage_LdapSearch_id" );
+        "SearchPage_LdapSearch_id" ); //$NON-NLS-1$
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java Fri Jan  6 17:06:52 2012
@@ -165,14 +165,14 @@ public class BrowserCorePlugin extends P
             try
             {
                 properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(), new Path(
-                    "plugin.properties" ), false ) );
+                    "plugin.properties" ), false ) ); //$NON-NLS-1$
             }
             catch ( IOException e )
             {
                 // We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed,
                 // So we're using a default plugin id.
                 getLog().log(
-                    new Status( Status.ERROR, "org.apache.directory.studio.ldapbrowser.core", Status.OK,
+                    new Status( Status.ERROR, "org.apache.directory.studio.ldapbrowser.core", Status.OK, //$NON-NLS-1$
                         "Unable to get the plugin properties.", e ) );
             }
         }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java Fri Jan  6 17:06:52 2012
@@ -242,7 +242,7 @@ public class EventRegistry extends Conne
 
             public String toString()
             {
-                return "EventRunnableFactory [entryUpdateEvent=" + entryUpdateEvent + "]";
+                return "EventRunnableFactory [entryUpdateEvent=" + entryUpdateEvent + "]"; //$NON-NLS-1$ //$NON-NLS-2$
             }
         };
         entryUpdateEventManager.fire( factory );

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java Fri Jan  6 17:06:52 2012
@@ -101,7 +101,7 @@ public class ExecuteLdifRunnable impleme
     public Object[] getLockedObjects()
     {
         List<Object> l = new ArrayList<Object>();
-        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldif ) );
+        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldif ) ); //$NON-NLS-1$
         return l.toArray();
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java Fri Jan  6 17:06:52 2012
@@ -114,7 +114,7 @@ public class ExportCsvRunnable implement
     public Object[] getLockedObjects()
     {
         return new Object[]
-            { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportCsvFilename ) };
+            { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportCsvFilename ) }; //$NON-NLS-1$
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Fri Jan  6 17:06:52 2012
@@ -220,7 +220,7 @@ public class ExportDsmlRunnable implemen
             if ( dsmlExportString != null )
             {
                 FileOutputStream fos = new FileOutputStream( exportDsmlFilename );
-                OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" );
+                OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" ); //$NON-NLS-1$
                 BufferedWriter bufferedWriter = new BufferedWriter( osw );
                 bufferedWriter.write( dsmlExportString );
                 bufferedWriter.close();

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java Fri Jan  6 17:06:52 2012
@@ -122,7 +122,7 @@ public class ExportLdifRunnable implemen
     public Object[] getLockedObjects()
     {
         List<Object> l = new ArrayList<Object>();
-        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportLdifFilename ) );
+        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportLdifFilename ) ); //$NON-NLS-1$
         return l.toArray();
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java Fri Jan  6 17:06:52 2012
@@ -118,7 +118,7 @@ public class ExportOdfRunnable implement
     public Object[] getLockedObjects()
     {
         return new Object[]
-            { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportOdfFilename ) };
+            { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportOdfFilename ) }; //$NON-NLS-1$
     }
 
 
@@ -152,16 +152,16 @@ public class ExportOdfRunnable implement
 
             // Remove the default table added in construction
             Element spreadsheetElement = ( Element ) contentDoc.getElementsByTagNameNS( OdfNamespace.OFFICE.getUri(),
-                "spreadsheet" ).item( 0 );
+                "spreadsheet" ).item( 0 ); //$NON-NLS-1$
             OdfTable table = ( OdfTable ) ( spreadsheetElement.getElementsByTagNameNS( OdfNamespace.TABLE.getUri(),
-                "table" ).item( 0 ) );
+                "table" ).item( 0 ) ); //$NON-NLS-1$
             table.getParentNode().removeChild( table );
 
             // create the table
             table = new OdfTable( contentDoc );
             table.setName( "Export" ); //$NON-NLS-1$
             Element officeSpreadsheet = ( Element ) contentDoc.getElementsByTagNameNS( OdfNamespace.OFFICE.getUri(),
-                "spreadsheet" ).item( 0 );
+                "spreadsheet" ).item( 0 ); //$NON-NLS-1$
             officeSpreadsheet.appendChild( table );
 
             // header
@@ -277,7 +277,7 @@ public class ExportOdfRunnable implement
         String valueDelimiter, int binaryEncoding, boolean exportDn )
     {
         // group multi-valued attributes
-        Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16",
+        Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16", //$NON-NLS-1$
             binaryEncoding );
 
         // output attributes
@@ -311,7 +311,7 @@ public class ExportOdfRunnable implement
             String value = attributeMap.get( attributeName );
             if ( value == null )
             {
-                value = "";
+                value = ""; //$NON-NLS-1$
             }
             OdfTableCell cell = new OdfTableCell( contentDoc );
             cell.setValueType( OdfValueType.STRING );

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java Fri Jan  6 17:06:52 2012
@@ -115,7 +115,7 @@ public class ExportXlsRunnable implement
     public Object[] getLockedObjects()
     {
         return new Object[]
-            { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportXlsFilename ) };
+            { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportXlsFilename ) }; //$NON-NLS-1$
     }
 
 
@@ -292,7 +292,7 @@ public class ExportXlsRunnable implement
         int binaryEncoding, boolean exportDn )
     {
         // group multi-valued attributes
-        Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16",
+        Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16", //$NON-NLS-1$
             binaryEncoding );
 
         // output attributes

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java Fri Jan  6 17:06:52 2012
@@ -169,7 +169,7 @@ public class ImportDsmlRunnable implemen
     public Object[] getLockedObjects()
     {
         List<Object> l = new ArrayList<Object>();
-        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( dsmlFile.toString() ) );
+        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( dsmlFile.toString() ) ); //$NON-NLS-1$
         return l.toArray();
     }
 
@@ -197,7 +197,7 @@ public class ImportDsmlRunnable implemen
             // Parsing the file
             Dsmlv2Grammar grammar = new Dsmlv2Grammar();
             Dsmlv2Parser parser = new Dsmlv2Parser( grammar );
-            parser.setInput( new FileInputStream( dsmlFile ), "UTF-8" );
+            parser.setInput( new FileInputStream( dsmlFile ), "UTF-8" ); //$NON-NLS-1$
             parser.parseAllRequests();
 
             // Getting the batch request
@@ -237,7 +237,7 @@ public class ImportDsmlRunnable implemen
             if ( responseFile != null )
             {
                 FileOutputStream fos = new FileOutputStream( responseFile );
-                OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" );
+                OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" ); //$NON-NLS-1$
                 BufferedWriter bufferedWriter = new BufferedWriter( osw );
                 bufferedWriter.write( batchResponseDsml.toDsml() );
                 bufferedWriter.close();
@@ -250,7 +250,7 @@ public class ImportDsmlRunnable implemen
             {
                 monitor.reportError( BrowserCoreMessages.bind(
                     "{0} errors occurred, see the response file for details", new String[]
-                        { "" + errorsCount } ) );
+                        { "" + errorsCount } ) ); //$NON-NLS-1$
             }
         }
         catch ( Exception e )
@@ -677,7 +677,7 @@ public class ImportDsmlRunnable implemen
         //  these signify that all user attributes are to be returned."]
         if ( returningAttributes.size() == 0 )
         {
-            returningAttributes.add( "*" );
+            returningAttributes.add( "*" ); //$NON-NLS-1$
         }
 
         controls.setReturningAttributes( returningAttributes.toArray( new String[0] ) );

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java Fri Jan  6 17:06:52 2012
@@ -161,7 +161,7 @@ public class ImportLdifRunnable implemen
     public Object[] getLockedObjects()
     {
         List<Object> l = new ArrayList<Object>();
-        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldifFile.toString() ) );
+        l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldifFile.toString() ) ); //$NON-NLS-1$
         return l.toArray();
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java Fri Jan  6 17:06:52 2012
@@ -190,7 +190,7 @@ public class InitializeRootDSERunnable i
 
         // 1st: add base DNs, either the specified or from the namingContexts attribute
         if ( !browserConnection.isFetchBaseDNs() && browserConnection.getBaseDN() != null
-            && !"".equals( browserConnection.getBaseDN().toString() ) )
+            && !"".equals( browserConnection.getBaseDN().toString() ) ) //$NON-NLS-1$
         {
             // only add the specified base Dn
             Dn dn = browserConnection.getBaseDN();
@@ -302,29 +302,29 @@ public class InitializeRootDSERunnable i
         // Set detected connection properties
         DetectedConnectionProperties detectedConnectionProperties = browserConnection.getConnection()
             .getDetectedConnectionProperties();
-        IAttribute vendorNameAttribute = browserConnection.getRootDSE().getAttribute( "vendorName" );
+        IAttribute vendorNameAttribute = browserConnection.getRootDSE().getAttribute( "vendorName" ); //$NON-NLS-1$
         if ( ( vendorNameAttribute != null ) && ( vendorNameAttribute.getValueSize() > 0 ) )
         {
             detectedConnectionProperties.setVendorName( vendorNameAttribute.getStringValue() );
         }
-        IAttribute vendorVersionAttribute = browserConnection.getRootDSE().getAttribute( "vendorVersion" );
+        IAttribute vendorVersionAttribute = browserConnection.getRootDSE().getAttribute( "vendorVersion" ); //$NON-NLS-1$
         if ( ( vendorVersionAttribute != null ) && ( vendorVersionAttribute.getValueSize() > 0 ) )
         {
             detectedConnectionProperties.setVendorVersion( vendorVersionAttribute.getStringValue() );
         }
-        IAttribute supportedControlAttribute = browserConnection.getRootDSE().getAttribute( "supportedControl" );
+        IAttribute supportedControlAttribute = browserConnection.getRootDSE().getAttribute( "supportedControl" ); //$NON-NLS-1$
         if ( ( supportedControlAttribute != null ) && ( supportedControlAttribute.getValueSize() > 0 ) )
         {
             detectedConnectionProperties.setSupportedControls( Arrays.asList( supportedControlAttribute
                 .getStringValues() ) );
         }
-        IAttribute supportedExtensionAttribute = browserConnection.getRootDSE().getAttribute( "supportedExtension" );
+        IAttribute supportedExtensionAttribute = browserConnection.getRootDSE().getAttribute( "supportedExtension" ); //$NON-NLS-1$
         if ( ( supportedExtensionAttribute != null ) && ( supportedExtensionAttribute.getValueSize() > 0 ) )
         {
             detectedConnectionProperties.setSupportedExtensions( Arrays.asList( supportedExtensionAttribute
                 .getStringValues() ) );
         }
-        IAttribute supportedFeaturesAttribute = browserConnection.getRootDSE().getAttribute( "supportedFeatures" );
+        IAttribute supportedFeaturesAttribute = browserConnection.getRootDSE().getAttribute( "supportedFeatures" ); //$NON-NLS-1$
         if ( ( supportedFeaturesAttribute != null ) && ( supportedFeaturesAttribute.getValueSize() > 0 ) )
         {
             detectedConnectionProperties.setSupportedFeatures( Arrays.asList( supportedFeaturesAttribute
@@ -376,7 +376,7 @@ public class InitializeRootDSERunnable i
             String[] values = attribute.getStringValues();
             for ( String dn : values )
             {
-                if ( dn != null && !"".equals( dn ) )
+                if ( dn != null && !"".equals( dn ) ) //$NON-NLS-1$
                 {
                     try
                     {

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java Fri Jan  6 17:06:52 2012
@@ -149,7 +149,7 @@ public class ServerTypeDetector
         {
             // IBM SecureWay Directory
             String[] iswVersions =
-                { "3.2", "3.2.1", "3.2.2" }; //$NON-NLS-1$
+                { "3.2", "3.2.1", "3.2.2" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             for ( String version : iswVersions )
             {
                 if ( vendorVersion.indexOf( version ) > -1 )
@@ -160,7 +160,7 @@ public class ServerTypeDetector
 
             // IBM Directory Server
             String[] idsVersions =
-                { "4.1", "5.1" }; //$NON-NLS-1$
+                { "4.1", "5.1" }; //$NON-NLS-1$ //$NON-NLS-2$
             for ( String version : idsVersions )
             {
                 if ( vendorVersion.indexOf( version ) > -1 )
@@ -171,7 +171,7 @@ public class ServerTypeDetector
 
             // IBM Tivoli Directory Server
             String[] tdsVersions =
-                { "5.2", "6.0", "6.1", "6.2" }; //$NON-NLS-1$
+                { "5.2", "6.0", "6.1", "6.2" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
             for ( String version : tdsVersions )
             {
                 if ( vendorVersion.indexOf( version ) > -1 )

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java Fri Jan  6 17:06:52 2012
@@ -244,7 +244,7 @@ public class AttributeDescription implem
         }
 
         // special case @: attributes by object class (RFC4529)
-        if ( other.description.length() > 1 && other.description.startsWith( "@" ) )
+        if ( other.description.length() > 1 && other.description.startsWith( "@" ) ) //$NON-NLS-1$
         {
             String objectClass = other.description.substring( 1 );
             ObjectClass ocd = schema.getObjectClassDescription( objectClass );
@@ -301,7 +301,7 @@ public class AttributeDescription implem
             for ( Iterator<String> otherIt = otherLangList.iterator(); otherIt.hasNext(); )
             {
                 String otherLang = otherIt.next();
-                if ( otherLang.endsWith( "-" ) )
+                if ( otherLang.endsWith( "-" ) ) //$NON-NLS-1$
                 {
                     if ( Strings.toLowerCase( myLang ).startsWith( Strings.toLowerCase( otherLang ) ) )
                     {

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java Fri Jan  6 17:06:52 2012
@@ -160,49 +160,49 @@ public interface IBrowserConnection exte
     }
 
     /** The key for the connection parameter "Get Base DNs from Root DSE". */
-    public static String CONNECTION_PARAMETER_FETCH_BASE_DNS = "ldapbrowser.fetchBaseDns";
+    public static String CONNECTION_PARAMETER_FETCH_BASE_DNS = "ldapbrowser.fetchBaseDns"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Base Dn". */
-    public static String CONNECTION_PARAMETER_BASE_DN = "ldapbrowser.baseDn";
+    public static String CONNECTION_PARAMETER_BASE_DN = "ldapbrowser.baseDn"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Count Limit". */
-    public static String CONNECTION_PARAMETER_COUNT_LIMIT = "ldapbrowser.countLimit";
+    public static String CONNECTION_PARAMETER_COUNT_LIMIT = "ldapbrowser.countLimit"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Time Limit". */
-    public static String CONNECTION_PARAMETER_TIME_LIMIT = "ldapbrowser.timeLimit";
+    public static String CONNECTION_PARAMETER_TIME_LIMIT = "ldapbrowser.timeLimit"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Alias Dereferencing". */
-    public static String CONNECTION_PARAMETER_ALIASES_DEREFERENCING_METHOD = "ldapbrowser.aliasesDereferencingMethod";
+    public static String CONNECTION_PARAMETER_ALIASES_DEREFERENCING_METHOD = "ldapbrowser.aliasesDereferencingMethod"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Referrals Handling". */
-    public static String CONNECTION_PARAMETER_REFERRALS_HANDLING_METHOD = "ldapbrowser.referralsHandlingMethod";
+    public static String CONNECTION_PARAMETER_REFERRALS_HANDLING_METHOD = "ldapbrowser.referralsHandlingMethod"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Fetch Operational Attributes. */
-    public static String CONNECTION_PARAMETER_FETCH_OPERATIONAL_ATTRIBUTES = "ldapbrowser.fetchOperationalAttributes";
+    public static String CONNECTION_PARAMETER_FETCH_OPERATIONAL_ATTRIBUTES = "ldapbrowser.fetchOperationalAttributes"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Fetch Sub-entries". */
-    public static String CONNECTION_PARAMETER_FETCH_SUBENTRIES = "ldapbrowser.fetchSubentries";
+    public static String CONNECTION_PARAMETER_FETCH_SUBENTRIES = "ldapbrowser.fetchSubentries"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Paged Search". */
-    public static String CONNECTION_PARAMETER_PAGED_SEARCH = "ldapbrowser.pagedSearch";
+    public static String CONNECTION_PARAMETER_PAGED_SEARCH = "ldapbrowser.pagedSearch"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Paged Search Size". */
-    public static String CONNECTION_PARAMETER_PAGED_SEARCH_SIZE = "ldapbrowser.pagedSearchSize";
+    public static String CONNECTION_PARAMETER_PAGED_SEARCH_SIZE = "ldapbrowser.pagedSearchSize"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Paged Search Scroll Mode". */
-    public static String CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE = "ldapbrowser.pagedSearchScrollMode";
+    public static String CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE = "ldapbrowser.pagedSearchScrollMode"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Modify Mode for attributes with equality matching rule". */
-    public static String CONNECTION_PARAMETER_MODIFY_MODE = "ldapbrowser.modifyMode";
+    public static String CONNECTION_PARAMETER_MODIFY_MODE = "ldapbrowser.modifyMode"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Modify Mode for attributes without equality matching rule". */
-    public static String CONNECTION_PARAMETER_MODIFY_MODE_NO_EMR = "ldapbrowser.modifyModeNoEMR";
+    public static String CONNECTION_PARAMETER_MODIFY_MODE_NO_EMR = "ldapbrowser.modifyModeNoEMR"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Modify add delete order". */
-    public static String CONNECTION_PARAMETER_MODIFY_ORDER = "ldapbrowser.modifyOrder";
+    public static String CONNECTION_PARAMETER_MODIFY_ORDER = "ldapbrowser.modifyOrder"; //$NON-NLS-1$
 
     /** The key for the connection parameter "Use ManageDsaIT Control" */
-    public static String CONNECTION_PARAMETER_MANAGE_DSA_IT = "ldapbrowser.manageDsaIT";
+    public static String CONNECTION_PARAMETER_MANAGE_DSA_IT = "ldapbrowser.manageDsaIT"; //$NON-NLS-1$
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java Fri Jan  6 17:06:52 2012
@@ -84,7 +84,7 @@ public class LdapAndFilterComponent exte
      */
     public String toString()
     {
-        String s = startToken != null ? "&" : "";
+        String s = startToken != null ? "&" : ""; //$NON-NLS-1$ //$NON-NLS-2$
         for ( LdapFilter filter : filterList )
         {
             if ( filter != null )

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java Fri Jan  6 17:06:52 2012
@@ -406,14 +406,14 @@ public class LdapFilterExtensibleCompone
      */
     public String toString()
     {
-        return ( attributeToken != null ? startToken.getValue() : "" )
-            + ( dnAttrColonToken != null ? dnAttrColonToken.getValue() : "" )
-            + ( dnAttrToken != null ? dnAttrToken.getValue() : "" )
-            + ( matchingRuleColonToken != null ? matchingRuleColonToken.getValue() : "" )
-            + ( matchingRuleToken != null ? matchingRuleToken.getValue() : "" )
-            + ( equalsColonToken != null ? equalsColonToken.getValue() : "" )
-            + ( equalsToken != null ? equalsToken.getValue() : "" )
-            + ( valueToken != null ? valueToken.getValue() : "" );
+        return ( attributeToken != null ? startToken.getValue() : "" ) //$NON-NLS-1$
+            + ( dnAttrColonToken != null ? dnAttrColonToken.getValue() : "" ) //$NON-NLS-1$
+            + ( dnAttrToken != null ? dnAttrToken.getValue() : "" ) //$NON-NLS-1$
+            + ( matchingRuleColonToken != null ? matchingRuleColonToken.getValue() : "" ) //$NON-NLS-1$
+            + ( matchingRuleToken != null ? matchingRuleToken.getValue() : "" ) //$NON-NLS-1$
+            + ( equalsColonToken != null ? equalsColonToken.getValue() : "" ) //$NON-NLS-1$
+            + ( equalsToken != null ? equalsToken.getValue() : "" ) //$NON-NLS-1$
+            + ( valueToken != null ? valueToken.getValue() : "" ); //$NON-NLS-1$
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java Fri Jan  6 17:06:52 2012
@@ -212,9 +212,9 @@ public class LdapFilterItemComponent ext
      */
     public String toString()
     {
-        return ( startToken != null ? startToken.getValue() : "" )
-            + ( filtertypeToken != null ? filtertypeToken.getValue() : "" )
-            + ( valueToken != null ? valueToken.getValue() : "" );
+        return ( startToken != null ? startToken.getValue() : "" ) //$NON-NLS-1$
+            + ( filtertypeToken != null ? filtertypeToken.getValue() : "" ) //$NON-NLS-1$
+            + ( valueToken != null ? valueToken.getValue() : "" ); //$NON-NLS-1$
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java Fri Jan  6 17:06:52 2012
@@ -102,7 +102,7 @@ public class LdapNotFilterComponent exte
      */
     public String toString()
     {
-        return ( startToken != null ? "!" : "" ) + ( !filterList.isEmpty() ? filterList.get( 0 ).toString() : "" );
+        return ( startToken != null ? "!" : "" ) + ( !filterList.isEmpty() ? filterList.get( 0 ).toString() : "" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java Fri Jan  6 17:06:52 2012
@@ -84,7 +84,7 @@ public class LdapOrFilterComponent exten
      */
     public String toString()
     {
-        String s = startToken != null ? "|" : "";
+        String s = startToken != null ? "|" : ""; //$NON-NLS-1$ //$NON-NLS-2$
         for ( LdapFilter filter : filterList )
         {
             if ( filter != null )

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java Fri Jan  6 17:06:52 2012
@@ -93,7 +93,7 @@ public class LdapFilterScanner
     public LdapFilterScanner()
     {
         super();
-        this.filter = "";
+        this.filter = ""; //$NON-NLS-1$
     }
 
 
@@ -186,7 +186,7 @@ public class LdapFilterScanner
         c = nextChar();
         if ( c == '\u0000' )
         {
-            return new LdapFilterToken( LdapFilterToken.EOF, "", pos );
+            return new LdapFilterToken( LdapFilterToken.EOF, "", pos ); //$NON-NLS-1$
         }
         else
         {
@@ -219,14 +219,14 @@ public class LdapFilterScanner
         {
             case '(':
                 this.lastTokenType = LdapFilterToken.LPAR;
-                return new LdapFilterToken( this.lastTokenType, "(", pos );
+                return new LdapFilterToken( this.lastTokenType, "(", pos ); //$NON-NLS-1$
             case ')':
                 if ( lastTokenType != LdapFilterToken.EQUAL && lastTokenType != LdapFilterToken.GREATER
                     && lastTokenType != LdapFilterToken.LESS && lastTokenType != LdapFilterToken.APROX
                     && lastTokenType != LdapFilterToken.SUBSTRING )
                 {
                     this.lastTokenType = LdapFilterToken.RPAR;
-                    return new LdapFilterToken( this.lastTokenType, ")", pos );
+                    return new LdapFilterToken( this.lastTokenType, ")", pos ); //$NON-NLS-1$
                 }
             case '&':
                 if ( lastTokenType == LdapFilterToken.LPAR )
@@ -234,7 +234,7 @@ public class LdapFilterScanner
                     // if(nextNonWhitespaceChar()=='(') {
                     // prevNonWhitespaceChar();
                     this.lastTokenType = LdapFilterToken.AND;
-                    return new LdapFilterToken( this.lastTokenType, "&", pos );
+                    return new LdapFilterToken( this.lastTokenType, "&", pos ); //$NON-NLS-1$
                     // }
                     // else {
                     // prevNonWhitespaceChar();
@@ -247,7 +247,7 @@ public class LdapFilterScanner
                     // if(nextNonWhitespaceChar()=='(') {
                     // prevNonWhitespaceChar();
                     this.lastTokenType = LdapFilterToken.OR;
-                    return new LdapFilterToken( this.lastTokenType, "|", pos );
+                    return new LdapFilterToken( this.lastTokenType, "|", pos ); //$NON-NLS-1$
                     // }
                     // else {
                     // prevNonWhitespaceChar();
@@ -260,7 +260,7 @@ public class LdapFilterScanner
                     // if(nextNonWhitespaceChar()=='(') {
                     // prevNonWhitespaceChar();
                     this.lastTokenType = LdapFilterToken.NOT;
-                    return new LdapFilterToken( this.lastTokenType, "!", pos );
+                    return new LdapFilterToken( this.lastTokenType, "!", pos ); //$NON-NLS-1$
                     // }
                     // else {
                     // prevNonWhitespaceChar();
@@ -277,7 +277,7 @@ public class LdapFilterScanner
                         {
                             prevChar();
                             this.lastTokenType = LdapFilterToken.PRESENT;
-                            return new LdapFilterToken( this.lastTokenType, "=*", pos - 1 );
+                            return new LdapFilterToken( this.lastTokenType, "=*", pos - 1 ); //$NON-NLS-1$
                         }
                         else
                         {
@@ -314,18 +314,18 @@ public class LdapFilterScanner
                     if ( asteriskFound )
                     {
                         this.lastTokenType = LdapFilterToken.SUBSTRING;
-                        return new LdapFilterToken( this.lastTokenType, "=", pos );
+                        return new LdapFilterToken( this.lastTokenType, "=", pos ); //$NON-NLS-1$
                     }
                     else
                     {
                         this.lastTokenType = LdapFilterToken.EQUAL;
-                        return new LdapFilterToken( this.lastTokenType, "=", pos );
+                        return new LdapFilterToken( this.lastTokenType, "=", pos ); //$NON-NLS-1$
                     }
                 }
                 else if ( lastTokenType == LdapFilterToken.EXTENSIBLE_EQUALS_COLON )
                 {
                     this.lastTokenType = LdapFilterToken.EQUAL;
-                    return new LdapFilterToken( this.lastTokenType, "=", pos );
+                    return new LdapFilterToken( this.lastTokenType, "=", pos ); //$NON-NLS-1$
                 }
                 break;
             case '>':
@@ -334,7 +334,7 @@ public class LdapFilterScanner
                     if ( nextChar() == '=' )
                     {
                         this.lastTokenType = LdapFilterToken.GREATER;
-                        return new LdapFilterToken( this.lastTokenType, ">=", pos - 1 );
+                        return new LdapFilterToken( this.lastTokenType, ">=", pos - 1 ); //$NON-NLS-1$
                     }
                     else
                     {
@@ -348,7 +348,7 @@ public class LdapFilterScanner
                     if ( nextChar() == '=' )
                     {
                         this.lastTokenType = LdapFilterToken.LESS;
-                        return new LdapFilterToken( this.lastTokenType, "<=", pos - 1 );
+                        return new LdapFilterToken( this.lastTokenType, "<=", pos - 1 ); //$NON-NLS-1$
                     }
                     else
                     {
@@ -362,7 +362,7 @@ public class LdapFilterScanner
                     if ( nextChar() == '=' )
                     {
                         this.lastTokenType = LdapFilterToken.APROX;
-                        return new LdapFilterToken( this.lastTokenType, "~=", pos - 1 );
+                        return new LdapFilterToken( this.lastTokenType, "~=", pos - 1 ); //$NON-NLS-1$
                     }
                     else
                     {
@@ -386,7 +386,7 @@ public class LdapFilterScanner
                     ( ( t1 == 'd' || t1 == 'D' ) && ( t2 == 'n' || t2 == 'N' ) && ( t3 == ':' ) ) ) )
                 {
                     this.lastTokenType = LdapFilterToken.EXTENSIBLE_DNATTR_COLON;
-                    return new LdapFilterToken( this.lastTokenType, ":", pos );
+                    return new LdapFilterToken( this.lastTokenType, ":", pos ); //$NON-NLS-1$
                 }
                 else if ( ( lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE
                     || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR
@@ -394,14 +394,14 @@ public class LdapFilterScanner
                     && t1 == '=' )
                 {
                     this.lastTokenType = LdapFilterToken.EXTENSIBLE_EQUALS_COLON;
-                    return new LdapFilterToken( this.lastTokenType, ":", pos );
+                    return new LdapFilterToken( this.lastTokenType, ":", pos ); //$NON-NLS-1$
                 }
                 else if ( ( lastTokenType == LdapFilterToken.LPAR
                     || lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE
                     || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR_COLON ) )
                 {
                     this.lastTokenType = LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID_COLON;
-                    return new LdapFilterToken( this.lastTokenType, ":", pos );
+                    return new LdapFilterToken( this.lastTokenType, ":", pos ); //$NON-NLS-1$
                 }
                 break;
 
@@ -521,7 +521,7 @@ public class LdapFilterScanner
             if ( ( t1 == 'd' || t1 == 'D' ) && ( t2 == 'n' || t2 == 'N' ) && ( t3 == ':' || t3 == '\u0000' ) )
             {
                 this.lastTokenType = LdapFilterToken.EXTENSIBLE_DNATTR;
-                return new LdapFilterToken( this.lastTokenType, "" + t1 + t2, pos - 1 );
+                return new LdapFilterToken( this.lastTokenType, "" + t1 + t2, pos - 1 ); //$NON-NLS-1$
             }
             prevChar();
             prevChar();

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java Fri Jan  6 17:06:52 2012
@@ -178,7 +178,7 @@ public class LdapFilterToken implements 
      */
     public String toString()
     {
-        return "(" + offset + ") " + "(" + type + ") " + value;
+        return "(" + offset + ") " + "(" + type + ") " + value; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java Fri Jan  6 17:06:52 2012
@@ -212,7 +212,7 @@ public abstract class AbstractEntry impl
         {
             if ( objectClassAttribute == null )
             {
-                throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": "
+                throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": " //$NON-NLS-1$
                     + attributeToDelete );
             }
 
@@ -234,7 +234,7 @@ public abstract class AbstractEntry impl
             }
             else
             {
-                throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": "
+                throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": " //$NON-NLS-1$
                     + attributeToDelete );
             }
         }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java Fri Jan  6 17:06:52 2012
@@ -100,7 +100,7 @@ public class BrowserConnection implement
             connection.getConnectionParameter().setExtendedIntProperty( CONNECTION_PARAMETER_REFERRALS_HANDLING_METHOD,
                 ReferralHandlingMethod.FOLLOW_MANUALLY.getOrdinal() );
             connection.getConnectionParameter().setExtendedBoolProperty( CONNECTION_PARAMETER_FETCH_BASE_DNS, true );
-            connection.getConnectionParameter().setExtendedProperty( CONNECTION_PARAMETER_BASE_DN, "" );
+            connection.getConnectionParameter().setExtendedProperty( CONNECTION_PARAMETER_BASE_DN, "" ); //$NON-NLS-1$
             connection.getConnectionParameter().setExtendedBoolProperty( CONNECTION_PARAMETER_FETCH_SUBENTRIES, false );
             connection.getConnectionParameter().setExtendedBoolProperty( CONNECTION_PARAMETER_PAGED_SEARCH, false );
             connection.getConnectionParameter().setExtendedIntProperty( CONNECTION_PARAMETER_PAGED_SEARCH_SIZE, 100 );
@@ -527,7 +527,7 @@ public class BrowserConnection implement
      */
     public String toString()
     {
-        return getConnection() != null ? getConnection().getName() : "null";
+        return getConnection() != null ? getConnection().getName() : "null"; //$NON-NLS-1$
     }
 
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java Fri Jan  6 17:06:52 2012
@@ -60,7 +60,7 @@ public class Entry extends AbstractEntry
     {
         assert parent != null;
         assert rdn != null;
-        assert !"".equals( rdn.toString() );
+        assert !"".equals( rdn.toString() ); //$NON-NLS-1$
 
         this.parent = parent;
         this.rdn = rdn;

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Fri Jan  6 17:06:52 2012
@@ -67,16 +67,16 @@ import org.apache.directory.studio.ldifp
 public class Schema
 {
 
-    public static final String SCHEMA_FILTER = "(objectClass=subschema)";
+    public static final String SCHEMA_FILTER = "(objectClass=subschema)"; //$NON-NLS-1$
 
-    public static final String RAW_SCHEMA_DEFINITION_LDIF_VALUE = "RAW_SCHEMA_DEFINITION_LDIF_VALUE";
+    public static final String RAW_SCHEMA_DEFINITION_LDIF_VALUE = "RAW_SCHEMA_DEFINITION_LDIF_VALUE"; //$NON-NLS-1$
 
-    public static final String DN_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.12";
+    public static final String DN_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.12"; //$NON-NLS-1$
 
     public static final LdapSyntax DUMMY_LDAP_SYNTAX;
     static
     {
-        DUMMY_LDAP_SYNTAX = new LdapSyntax( "", "" );
+        DUMMY_LDAP_SYNTAX = new LdapSyntax( "", "" ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     public static final HashMap<String, List<String>> DUMMY_EXTENSIONS;
@@ -84,8 +84,8 @@ public class Schema
     {
         DUMMY_EXTENSIONS = new HashMap<String, List<String>>();
         List<String> dummyValues = new ArrayList<String>();
-        dummyValues.add( "DUMMY" );
-        DUMMY_EXTENSIONS.put( "X-DUMMY", dummyValues );
+        dummyValues.add( "DUMMY" ); //$NON-NLS-1$
+        DUMMY_EXTENSIONS.put( "X-DUMMY", dummyValues ); //$NON-NLS-1$
     }
 
     public static final Schema DEFAULT_SCHEMA;
@@ -95,7 +95,7 @@ public class Schema
 
         try
         {
-            URL url = Schema.class.getClassLoader().getResource( "default_schema.ldif" );
+            URL url = Schema.class.getClassLoader().getResource( "default_schema.ldif" ); //$NON-NLS-1$
             InputStream is = url.openStream();
             Reader reader = new InputStreamReader( is );
 
@@ -180,7 +180,7 @@ public class Schema
         catch ( Exception e )
         {
             // TODO: exception handling
-            System.out.println( "Schema#loadFromLdif: " + e.toString() );
+            System.out.println( "Schema#loadFromLdif: " + e.toString() ); //$NON-NLS-1$
         }
     }
 
@@ -199,7 +199,7 @@ public class Schema
         catch ( Exception e )
         {
             // TODO: exception handling
-            System.out.println( "Schema#loadFromRecord: " + e.toString() );
+            System.out.println( "Schema#loadFromRecord: " + e.toString() ); //$NON-NLS-1$
         }
     }
 
@@ -218,7 +218,7 @@ public class Schema
         catch ( Exception e )
         {
             // TODO: exception handling
-            System.out.println( "Schema#saveToLdif: " + e.toString() );
+            System.out.println( "Schema#saveToLdif: " + e.toString() ); //$NON-NLS-1$
         }
     }
 
@@ -304,7 +304,7 @@ public class Schema
             catch ( Exception e )
             {
                 // TODO: exception handling
-                System.out.println( "Error reading schema: " + attributeName + " = " + value );
+                System.out.println( "Error reading schema: " + attributeName + " = " + value ); //$NON-NLS-1$ //$NON-NLS-2$
                 System.out.println( e.getMessage() );
             }
         }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java Fri Jan  6 17:06:52 2012
@@ -43,14 +43,14 @@ public class LdapFilterUtils
     {
         if ( value.isString() )
         {
-            return "(" + value.getAttribute().getDescription() + "=" + getEncodedValue( value.getStringValue() ) + ")";
+            return "(" + value.getAttribute().getDescription() + "=" + getEncodedValue( value.getStringValue() ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         else
         {
             StringBuffer filter = new StringBuffer();
-            filter.append( "(" );
+            filter.append( "(" ); //$NON-NLS-1$
             filter.append( value.getAttribute().getDescription() );
-            filter.append( "=" );
+            filter.append( "=" ); //$NON-NLS-1$
 
             byte[] bytes = value.getBinaryValue();
             for ( int i = 0; i < bytes.length; i++ )
@@ -61,15 +61,15 @@ public class LdapFilterUtils
                     b = 256 + b;
                 }
                 String s = Integer.toHexString( b );
-                filter.append( "\\" );
+                filter.append( "\\" ); //$NON-NLS-1$
                 if ( s.length() == 1 )
                 {
-                    filter.append( "0" );
+                    filter.append( "0" ); //$NON-NLS-1$
                 }
                 filter.append( s );
             }
 
-            filter.append( ")" );
+            filter.append( ")" ); //$NON-NLS-1$
             return filter.toString();
         }
     }
@@ -99,11 +99,11 @@ public class LdapFilterUtils
      */
     public static String getEncodedValue( String value )
     {
-        value = value.replaceAll( "\\\\", "\\\\5c" );
-        value = value.replaceAll( "" + '\u0000', "\\\\00" );
-        value = value.replaceAll( "\\*", "\\\\2a" );
-        value = value.replaceAll( "\\(", "\\\\28" );
-        value = value.replaceAll( "\\)", "\\\\29" );
+        value = value.replaceAll( "\\\\", "\\\\5c" ); //$NON-NLS-1$ //$NON-NLS-2$
+        value = value.replaceAll( "" + '\u0000', "\\\\00" ); //$NON-NLS-1$ //$NON-NLS-2$
+        value = value.replaceAll( "\\*", "\\\\2a" ); //$NON-NLS-1$ //$NON-NLS-2$
+        value = value.replaceAll( "\\(", "\\\\28" ); //$NON-NLS-1$ //$NON-NLS-2$
+        value = value.replaceAll( "\\)", "\\\\29" ); //$NON-NLS-1$ //$NON-NLS-2$
         return value;
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java Fri Jan  6 17:06:52 2012
@@ -131,8 +131,8 @@ public class ModelConverter
             else if ( !( parts[i] instanceof LdifDnLine ) && !( parts[i] instanceof LdifSepLine ) )
             {
                 String name = parts[i].toRawString();
-                name = name.replaceAll( "\n", "" );
-                name = name.replaceAll( "\r", "" );
+                name = name.replaceAll( "\n", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+                name = name.replaceAll( "\r", "" ); //$NON-NLS-1$ //$NON-NLS-2$
                 IAttribute attribute = new Attribute( entry, name );
                 attribute.addValue( new Value( attribute, parts[i] ) );
                 entry.addAttribute( attribute );



Mime
View raw message