directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1228278 [2/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
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.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/UnixCrypt.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java
Fri Jan  6 17:06:52 2012
@@ -487,7 +487,7 @@ public class UnixCrypt extends Object
         long keyword = 0L;
         /* invalid parameters! */
         if ( key == null || setting == null )
-            return "*"; // will NOT match under ANY circumstances!
+            return "*"; // will NOT match under ANY circumstances! //$NON-NLS-1$
 
         int keylen = key.length();
 
@@ -524,11 +524,11 @@ public class UnixCrypt extends Object
     {
         if ( arg.length != 2 )
         {
-            System.err.println( "Usage - java org.mortbay.util.UnixCrypt <key> <salt>"
);
+            System.err.println( "Usage - java org.mortbay.util.UnixCrypt <key> <salt>"
); //$NON-NLS-1$
             System.exit( 1 );
         }
 
-        System.err.println( "Crypt=" + crypt( arg[0], arg[1] ) );
+        System.err.println( "Crypt=" + crypt( arg[0], arg[1] ) ); //$NON-NLS-1$
     }
 
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.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/Utils.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
Fri Jan  6 17:06:52 2012
@@ -137,14 +137,14 @@ public class Utils
     {
         if ( array == null || array.length == 0 )
         {
-            return "";
+            return ""; //$NON-NLS-1$
         }
         else
         {
             StringBuffer sb = new StringBuffer( array[0] );
             for ( int i = 1; i < array.length; i++ )
             {
-                sb.append( ", " );
+                sb.append( ", " ); //$NON-NLS-1$
                 sb.append( array[i] );
             }
             return sb.toString();
@@ -173,11 +173,11 @@ public class Utils
     {
 
         if ( value == null )
-            return "";
+            return ""; //$NON-NLS-1$
 
         if ( value.length() > length )
         {
-            value = value.substring( 0, length ) + "...";
+            value = value.substring( 0, length ) + "..."; //$NON-NLS-1$
         }
 
         return value;
@@ -225,13 +225,13 @@ public class Utils
 
     public static String getNonNullString( Object o )
     {
-        return o == null ? "-" : o.toString();
+        return o == null ? "-" : o.toString(); //$NON-NLS-1$
     }
 
 
     public static String formatBytes( long bytes )
     {
-        String size = "";
+        String size = ""; //$NON-NLS-1$
         if ( bytes > 1024 * 1024 )
             size += ( bytes / 1024 / 1024 ) + " MB (" + bytes + " Bytes)";
         else if ( bytes > 1024 )
@@ -405,8 +405,8 @@ public class Utils
                 || ( !hasEMR && modifyModeNoEMR == ModifyMode.REPLACE );
             boolean isAddDelForced = ( hasEMR && modifyMode == ModifyMode.ADD_DELETE
)
                 || ( !hasEMR && modifyModeNoEMR == ModifyMode.ADD_DELETE );
-            boolean isOrderedValue = atd.getExtensions().containsKey( "X-ORDERED" )
-                && atd.getExtensions().get( "X-ORDERED" ).contains( "VALUES" );
+            boolean isOrderedValue = atd.getExtensions().containsKey( "X-ORDERED" ) //$NON-NLS-1$
+                && atd.getExtensions().get( "X-ORDERED" ).contains( "VALUES" ); //$NON-NLS-1$
//$NON-NLS-2$
 
             // get old an new values for comparison
             IAttribute oldAttribute = oldEntry.getAttribute( attributeDescription );

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java
Fri Jan  6 17:06:52 2012
@@ -42,7 +42,7 @@ public class LdapFilterParserErrorTolera
 
     public void testLpar()
     {
-        parser.parse( "(" );
+        parser.parse( "(" ); //$NON-NLS-1$
 
         LdapFilter model = parser.getModel();
 
@@ -50,21 +50,21 @@ public class LdapFilterParserErrorTolera
         assertEquals( 0, model.getStartToken().getOffset() );
         assertEquals( 1, model.getStartToken().getLength() );
         assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
-        assertEquals( "(", model.getStartToken().getValue() );
+        assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
 
         assertNull( model.getFilterComponent() );
 
         assertNull( model.getStopToken() );
 
-        assertEquals( "(", model.toString() );
-        assertEquals( "(", model.toUserProvidedString() );
+        assertEquals( "(", model.toString() ); //$NON-NLS-1$
+        assertEquals( "(", model.toUserProvidedString() ); //$NON-NLS-1$
         assertFalse( parser.getModel().isValid() );
     }
 
 
     public void testLparAttr()
     {
-        parser.parse( "(objectClass" );
+        parser.parse( "(objectClass" ); //$NON-NLS-1$
 
         LdapFilter model = parser.getModel();
 
@@ -72,7 +72,7 @@ public class LdapFilterParserErrorTolera
         assertEquals( 0, model.getStartToken().getOffset() );
         assertEquals( 1, model.getStartToken().getLength() );
         assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
-        assertEquals( "(", model.getStartToken().getValue() );
+        assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
 
         LdapFilterComponent filterComponent = model.getFilterComponent();
         assertNotNull( filterComponent );
@@ -82,21 +82,21 @@ public class LdapFilterParserErrorTolera
         assertEquals( 1, filterItemComponent.getAttributeToken().getOffset() );
         assertEquals( 11, filterItemComponent.getAttributeToken().getLength() );
         assertEquals( LdapFilterToken.ATTRIBUTE, filterItemComponent.getAttributeToken().getType()
);
-        assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
+        assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
//$NON-NLS-1$
         assertNull( filterItemComponent.getFilterToken() );
         assertNull( filterItemComponent.getValueToken() );
 
         assertNull( model.getStopToken() );
 
-        assertEquals( "(objectClass", model.toString() );
-        assertEquals( "(objectClass", model.toUserProvidedString() );
+        assertEquals( "(objectClass", model.toString() ); //$NON-NLS-1$
+        assertEquals( "(objectClass", model.toUserProvidedString() ); //$NON-NLS-1$
         assertFalse( parser.getModel().isValid() );
     }
 
 
     public void testLparAttrEquals()
     {
-        parser.parse( "(objectClass=" );
+        parser.parse( "(objectClass=" ); //$NON-NLS-1$
 
         LdapFilter model = parser.getModel();
 
@@ -104,7 +104,7 @@ public class LdapFilterParserErrorTolera
         assertEquals( 0, model.getStartToken().getOffset() );
         assertEquals( 1, model.getStartToken().getLength() );
         assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
-        assertEquals( "(", model.getStartToken().getValue() );
+        assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
 
         LdapFilterComponent filterComponent = model.getFilterComponent();
         assertNotNull( filterComponent );
@@ -114,27 +114,27 @@ public class LdapFilterParserErrorTolera
         assertEquals( 1, filterItemComponent.getAttributeToken().getOffset() );
         assertEquals( 11, filterItemComponent.getAttributeToken().getLength() );
         assertEquals( LdapFilterToken.ATTRIBUTE, filterItemComponent.getAttributeToken().getType()
);
-        assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
+        assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
//$NON-NLS-1$
 
         assertNotNull( filterItemComponent.getFilterToken() );
         assertEquals( 12, filterItemComponent.getFilterToken().getOffset() );
         assertEquals( 1, filterItemComponent.getFilterToken().getLength() );
         assertEquals( LdapFilterToken.EQUAL, filterItemComponent.getFilterToken().getType()
);
-        assertEquals( "=", filterItemComponent.getFilterToken().getValue() );
+        assertEquals( "=", filterItemComponent.getFilterToken().getValue() ); //$NON-NLS-1$
 
         assertNull( filterItemComponent.getValueToken() );
 
         assertNull( model.getStopToken() );
 
-        assertEquals( "(objectClass=", model.toString() );
-        assertEquals( "(objectClass=", model.toUserProvidedString() );
+        assertEquals( "(objectClass=", model.toString() ); //$NON-NLS-1$
+        assertEquals( "(objectClass=", model.toUserProvidedString() ); //$NON-NLS-1$
         assertFalse( parser.getModel().isValid() );
     }
 
 
     public void testLparAttrEqualsRpar()
     {
-        parser.parse( "(objectClass=)" );
+        parser.parse( "(objectClass=)" ); //$NON-NLS-1$
 
         LdapFilter model = parser.getModel();
 
@@ -142,7 +142,7 @@ public class LdapFilterParserErrorTolera
         assertEquals( 0, model.getStartToken().getOffset() );
         assertEquals( 1, model.getStartToken().getLength() );
         assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
-        assertEquals( "(", model.getStartToken().getValue() );
+        assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
 
         LdapFilterComponent filterComponent = model.getFilterComponent();
         assertNotNull( filterComponent );
@@ -152,20 +152,20 @@ public class LdapFilterParserErrorTolera
         assertEquals( 1, filterItemComponent.getAttributeToken().getOffset() );
         assertEquals( 11, filterItemComponent.getAttributeToken().getLength() );
         assertEquals( LdapFilterToken.ATTRIBUTE, filterItemComponent.getAttributeToken().getType()
);
-        assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
+        assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
//$NON-NLS-1$
 
         assertNotNull( filterItemComponent.getFilterToken() );
         assertEquals( 12, filterItemComponent.getFilterToken().getOffset() );
         assertEquals( 1, filterItemComponent.getFilterToken().getLength() );
         assertEquals( LdapFilterToken.EQUAL, filterItemComponent.getFilterToken().getType()
);
-        assertEquals( "=", filterItemComponent.getFilterToken().getValue() );
+        assertEquals( "=", filterItemComponent.getFilterToken().getValue() ); //$NON-NLS-1$
 
         assertNotNull( filterItemComponent.getValueToken() );
 
         assertNotNull( model.getStopToken() );
 
-        assertEquals( "(objectClass=)", model.toString() );
-        assertEquals( "(objectClass=)", model.toUserProvidedString() );
+        assertEquals( "(objectClass=)", model.toString() ); //$NON-NLS-1$
+        assertEquals( "(objectClass=)", model.toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
Fri Jan  6 17:06:52 2012
@@ -41,9 +41,9 @@ public class LdapFilterParserTest extend
      */
     public void testEqualsFilter()
     {
-        parser.parse( "(cn=test)" );
-        assertEquals( "(cn=test)", parser.getModel().toString() );
-        assertEquals( "(cn=test)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn=test)" ); //$NON-NLS-1$
+        assertEquals( "(cn=test)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -53,9 +53,9 @@ public class LdapFilterParserTest extend
      */
     public void testGreaterEqualsFilter()
     {
-        parser.parse( "(cn>=test)" );
-        assertEquals( "(cn>=test)", parser.getModel().toString() );
-        assertEquals( "(cn>=test)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn>=test)" ); //$NON-NLS-1$
+        assertEquals( "(cn>=test)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn>=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -65,9 +65,9 @@ public class LdapFilterParserTest extend
      */
     public void testLessEqualsFilter()
     {
-        parser.parse( "(cn<=test)" );
-        assertEquals( "(cn<=test)", parser.getModel().toString() );
-        assertEquals( "(cn<=test)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn<=test)" ); //$NON-NLS-1$
+        assertEquals( "(cn<=test)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn<=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -77,9 +77,9 @@ public class LdapFilterParserTest extend
      */
     public void testAproxFilter()
     {
-        parser.parse( "(cn~=test)" );
-        assertEquals( "(cn~=test)", parser.getModel().toString() );
-        assertEquals( "(cn~=test)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn~=test)" ); //$NON-NLS-1$
+        assertEquals( "(cn~=test)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn~=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -89,9 +89,9 @@ public class LdapFilterParserTest extend
      */
     public void testSubstringFilter()
     {
-        parser.parse( "(cn=te*st)" );
-        assertEquals( "(cn=te*st)", parser.getModel().toString() );
-        assertEquals( "(cn=te*st)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn=te*st)" ); //$NON-NLS-1$
+        assertEquals( "(cn=te*st)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn=te*st)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -101,9 +101,9 @@ public class LdapFilterParserTest extend
      */
     public void testPresentFilter()
     {
-        parser.parse( "(cn=*)" );
-        assertEquals( "(cn=*)", parser.getModel().toString() );
-        assertEquals( "(cn=*)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn=*)" ); //$NON-NLS-1$
+        assertEquals( "(cn=*)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn=*)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -113,9 +113,9 @@ public class LdapFilterParserTest extend
      */
     public void testRFC4515_1()
     {
-        parser.parse( "(cn=Babs Jensen)" );
-        assertEquals( "(cn=Babs Jensen)", parser.getModel().toString() );
-        assertEquals( "(cn=Babs Jensen)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn=Babs Jensen)" ); //$NON-NLS-1$
+        assertEquals( "(cn=Babs Jensen)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn=Babs Jensen)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -125,9 +125,9 @@ public class LdapFilterParserTest extend
      */
     public void testRFC4515_2()
     {
-        parser.parse( "(!(cn=Tim Howes))" );
-        assertEquals( "(!(cn=Tim Howes))", parser.getModel().toString() );
-        assertEquals( "(!(cn=Tim Howes))", parser.getModel().toUserProvidedString() );
+        parser.parse( "(!(cn=Tim Howes))" ); //$NON-NLS-1$
+        assertEquals( "(!(cn=Tim Howes))", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(!(cn=Tim Howes))", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -137,9 +137,9 @@ public class LdapFilterParserTest extend
      */
     public void testRFC4515_3()
     {
-        parser.parse( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))" );
-        assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toString()
);
-        assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))" ); //$NON-NLS-1$
+        assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toString()
); //$NON-NLS-1$
+        assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -149,9 +149,9 @@ public class LdapFilterParserTest extend
      */
     public void testRFC4515_4()
     {
-        parser.parse( "(o=univ*of*mich*)" );
-        assertEquals( "(o=univ*of*mich*)", parser.getModel().toString() );
-        assertEquals( "(o=univ*of*mich*)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(o=univ*of*mich*)" ); //$NON-NLS-1$
+        assertEquals( "(o=univ*of*mich*)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(o=univ*of*mich*)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -161,9 +161,9 @@ public class LdapFilterParserTest extend
      */
     public void testRFC4515_5()
     {
-        parser.parse( "(seeAlso=)" );
-        assertEquals( "(seeAlso=)", parser.getModel().toString() );
-        assertEquals( "(seeAlso=)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(seeAlso=)" ); //$NON-NLS-1$
+        assertEquals( "(seeAlso=)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(seeAlso=)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -177,9 +177,9 @@ public class LdapFilterParserTest extend
      */
     public void testEscapeRFC4515_1()
     {
-        parser.parse( "(o=Parens R Us \\28for all your parenthetical needs\\29)" );
-        assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel().toString()
);
-        assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel()
+        parser.parse( "(o=Parens R Us \\28for all your parenthetical needs\\29)" ); //$NON-NLS-1$
+        assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel().toString()
); //$NON-NLS-1$
+        assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel()
//$NON-NLS-1$
             .toUserProvidedString() );
         assertTrue( parser.getModel().isValid() );
     }
@@ -195,9 +195,9 @@ public class LdapFilterParserTest extend
      */
     public void testEscapeRFC4515_2()
     {
-        parser.parse( "(cn=*\\2A*)" );
-        assertEquals( "(cn=*\\2A*)", parser.getModel().toString() );
-        assertEquals( "(cn=*\\2A*)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn=*\\2A*)" ); //$NON-NLS-1$
+        assertEquals( "(cn=*\\2A*)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn=*\\2A*)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -210,9 +210,9 @@ public class LdapFilterParserTest extend
      */
     public void testEscapeRFC4515_3()
     {
-        parser.parse( "(filename=C:\\5cMyFile)" );
-        assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toString() );
-        assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(filename=C:\\5cMyFile)" ); //$NON-NLS-1$
+        assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -227,9 +227,9 @@ public class LdapFilterParserTest extend
      */
     public void testEscapeRFC4515_4()
     {
-        parser.parse( "(bin=\\00\\00\\00\\04)" );
-        assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toString() );
-        assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(bin=\\00\\00\\00\\04)" ); //$NON-NLS-1$
+        assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -247,9 +247,9 @@ public class LdapFilterParserTest extend
      */
     public void testEscapeRFC4515_5()
     {
-        parser.parse( "(sn=Lu\\c4\\8di\\c4\\87)" );
-        assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toString() );
-        assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(sn=Lu\\c4\\8di\\c4\\87)" ); //$NON-NLS-1$
+        assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -263,9 +263,9 @@ public class LdapFilterParserTest extend
      */
     public void testEscapeRFC4515_6()
     {
-        parser.parse( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)" );
-        assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toString()
);
-        assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)" ); //$NON-NLS-1$
+        assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toString()
); //$NON-NLS-1$
+        assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -278,9 +278,9 @@ public class LdapFilterParserTest extend
      */
     public void testExtensibleFilterRFC4515_1()
     {
-        parser.parse( "(cn:caseExactMatch:=Fred Flintstone)" );
-        assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toString()
);
-        assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(cn:caseExactMatch:=Fred Flintstone)" ); //$NON-NLS-1$
+        assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toString()
); //$NON-NLS-1$
+        assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -294,9 +294,9 @@ public class LdapFilterParserTest extend
      */
     public void testExtensibleFilterRFC4515_2()
     {
-        parser.parse( "(cn:=Betty Rubble)" );
-        assertEquals( "(cn:=Betty Rubble)", parser.getModel().toString() );
-        assertEquals( "(cn:=Betty Rubble)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(cn:=Betty Rubble)" ); //$NON-NLS-1$
+        assertEquals( "(cn:=Betty Rubble)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(cn:=Betty Rubble)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -313,9 +313,9 @@ public class LdapFilterParserTest extend
      */
     public void testExtensibleFilterRFC4515_3()
     {
-        parser.parse( "(sn:dn:2.4.6.8.10:=Barney Rubble)" );
-        assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toString() );
-        assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(sn:dn:2.4.6.8.10:=Barney Rubble)" ); //$NON-NLS-1$
+        assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toString() );
//$NON-NLS-1$
+        assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -330,9 +330,9 @@ public class LdapFilterParserTest extend
      */
     public void testExtensibleFilterRFC4515_4()
     {
-        parser.parse( "(o:dn:=Ace Industry)" );
-        assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toString() );
-        assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toUserProvidedString() );
+        parser.parse( "(o:dn:=Ace Industry)" ); //$NON-NLS-1$
+        assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toUserProvidedString() );
//$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -347,9 +347,9 @@ public class LdapFilterParserTest extend
      */
     public void testExtensibleFilterRFC4515_5()
     {
-        parser.parse( "(:1.2.3:=Wilma Flintstone)" );
-        assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toString() );
-        assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(:1.2.3:=Wilma Flintstone)" ); //$NON-NLS-1$
+        assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -365,9 +365,9 @@ public class LdapFilterParserTest extend
      */
     public void testExtensibleFilterRFC4515_6()
     {
-        parser.parse( "(:Dn:2.4.6.8.10:=Dino)" );
-        assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toString() );
-        assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toUserProvidedString()
);
+        parser.parse( "(:Dn:2.4.6.8.10:=Dino)" ); //$NON-NLS-1$
+        assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertTrue( parser.getModel().isValid() );
     }
 
@@ -377,9 +377,9 @@ public class LdapFilterParserTest extend
      */
     public void testDIRSTUDIO210()
     {
-        parser.parse( "(objectClass>=z*) " );
-        assertEquals( "(objectClass>=)", parser.getModel().toString() );
-        assertEquals( "(objectClass>=z*) ", parser.getModel().toUserProvidedString() );
+        parser.parse( "(objectClass>=z*) " ); //$NON-NLS-1$
+        assertEquals( "(objectClass>=)", parser.getModel().toString() ); //$NON-NLS-1$
+        assertEquals( "(objectClass>=z*) ", parser.getModel().toUserProvidedString() );
//$NON-NLS-1$
         assertFalse( parser.getModel().isValid() );
     }
 
@@ -389,9 +389,9 @@ public class LdapFilterParserTest extend
      */
     public void testDIRSTUDIO279()
     {
-        parser.parse( " (&\n    (objectClass=person)\n    (cn=a*)\n) " );
-        assertEquals( "(&(objectClass=person)(cn=a*))", parser.getModel().toString()
);
-        assertEquals( " (&\n    (objectClass=person)\n    (cn=a*)\n) ", parser.getModel().toUserProvidedString()
);
+        parser.parse( " (&\n    (objectClass=person)\n    (cn=a*)\n) " ); //$NON-NLS-1$
+        assertEquals( "(&(objectClass=person)(cn=a*))", parser.getModel().toString()
); //$NON-NLS-1$
+        assertEquals( " (&\n    (objectClass=person)\n    (cn=a*)\n) ", parser.getModel().toUserProvidedString()
); //$NON-NLS-1$
         assertFalse( parser.getModel().isValid() );
     }
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java
Fri Jan  6 17:06:52 2012
@@ -53,9 +53,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordSHAEncrypted()
     {
-        Password password = new Password( "{SHA}5en6G6MezRroT3XKqkdPOmY/BfQ=" );
+        Password password = new Password( "{SHA}5en6G6MezRroT3XKqkdPOmY/BfQ=" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -64,9 +64,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordSHAEncryptedLowercase()
     {
-        Password password = new Password( "{sha}5en6G6MezRroT3XKqkdPOmY/BfQ=" );
+        Password password = new Password( "{sha}5en6G6MezRroT3XKqkdPOmY/BfQ=" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -75,9 +75,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordSSHAEncrypted()
     {
-        Password password = new Password( "{SSHA}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g=="
);
+        Password password = new Password( "{SSHA}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g=="
); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -86,9 +86,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordSSHAEncryptedLowercase()
     {
-        Password password = new Password( "{ssha}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g=="
);
+        Password password = new Password( "{ssha}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g=="
); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -97,9 +97,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordMD5Encrypted()
     {
-        Password password = new Password( "{MD5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" );
+        Password password = new Password( "{MD5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -108,9 +108,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordMD5EncryptedLowercase()
     {
-        Password password = new Password( "{md5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" );
+        Password password = new Password( "{md5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -119,9 +119,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordSMD5Encrypted()
     {
-        Password password = new Password( "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
+        Password password = new Password( "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -130,9 +130,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordSMD5EncryptedLowercase()
     {
-        Password password = new Password( "{smd5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
+        Password password = new Password( "{smd5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -141,9 +141,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordCRYPTEncrypted()
     {
-        Password password = new Password( "{CRYPT}qFkH8Z1woBlXw" );
+        Password password = new Password( "{CRYPT}qFkH8Z1woBlXw" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -152,9 +152,9 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordCRYPTEncryptedLowercase()
     {
-        Password password = new Password( "{crypt}qFkH8Z1woBlXw" );
+        Password password = new Password( "{crypt}qFkH8Z1woBlXw" ); //$NON-NLS-1$
 
-        assertTrue( password.verify( "secret" ) );
+        assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 
 
@@ -163,8 +163,8 @@ public class PasswordTest extends TestCa
      */
     public void testPasswordBadAlgorithm()
     {
-        Password password = new Password( "{CRYPTE}qFkH8Z1woBlXw" );
+        Password password = new Password( "{CRYPTE}qFkH8Z1woBlXw" ); //$NON-NLS-1$
 
-        assertFalse( password.verify( "secret" ) );
+        assertFalse( password.verify( "secret" ) ); //$NON-NLS-1$
     }
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java?rev=1228278&r1=1228277&r2=1228278&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java
Fri Jan  6 17:06:52 2012
@@ -288,8 +288,8 @@ public class EntryEditorExtension
     @Override
     public String toString()
     {
-        return "EntryEditorExtension [className=" + className + ", description=" + description
+ ", editorId="
-            + editorId + ", icon=" + icon + ", id=" + id + ", member=" + member + ", name="
+ name + ", priority="
-            + priority + ", multiWindow=" + multiWindow + "]";
+        return "EntryEditorExtension [className=" + className + ", description=" + description
+ ", editorId=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            + editorId + ", icon=" + icon + ", id=" + id + ", member=" + member + ", name="
+ name + ", priority=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+            + priority + ", multiWindow=" + multiWindow + "]"; //$NON-NLS-1$ //$NON-NLS-2$
     }
 }



Mime
View raw message