directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1430352 [3/3] - in /directory/studio/trunk/plugins: aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ aciitemeditor/src/main/java/org/apache/...
Date Tue, 08 Jan 2013 16:09:26 GMT
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
Tue Jan  8 16:09:24 2013
@@ -79,7 +79,15 @@ public class SearchPage extends DialogPa
      */
     public enum SearchInEnum
     {
-        ALIASES, OID, DESCRIPTION, SUPERIOR, SYNTAX, MATCHING_RULES, SUPERIORS, MANDATORY_ATTRIBUTES,
OPTIONAL_ATTRIBUTES
+        ALIASES,
+        OID,
+        DESCRIPTION,
+        SUPERIOR,
+        SYNTAX,
+        MATCHING_RULES,
+        SUPERIORS,
+        MANDATORY_ATTRIBUTES,
+        OPTIONAL_ATTRIBUTES
     }
 
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
Tue Jan  8 16:09:24 2013
@@ -61,7 +61,7 @@ public class CoreSchemasSelectionWidget
 
     /** The array containing the 'core' from ApacheDS */
     private static final String[] coreSchemasFromApacheDS = new String[]
-        { "adsconfig","apache", "apachedns", "apachemeta", "autofs", "collective", "corba",
"core", "cosine", "dhcp", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
//$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+        { "adsconfig", "apache", "apachedns", "apachemeta", "autofs", "collective", "corba",
"core", "cosine", "dhcp", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
//$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
             "inetorgperson", "java", "krb5kdc", "mozilla", "nis", "pwdpolicy", "samba", "system"
}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
//$NON-NLS-8$
 
     /** The array containing the 'core' from OpenLDAP */

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
Tue Jan  8 16:09:24 2013
@@ -355,7 +355,7 @@ public class ExportSchemasForADSWizard e
             }
             holder.setMay( mayList );
             List<String> mustList = new ArrayList<String>();
-            for ( String must : oc.getMustAttributeTypeOids())
+            for ( String must : oc.getMustAttributeTypeOids() )
             {
                 mustList.add( must );
             }
@@ -477,7 +477,8 @@ public class ExportSchemasForADSWizard e
                 AttributeType sup = schemaHandler.getAttributeType( supName );
                 if ( sup != null )
                 {
-                    if ( !Strings.toLowerCase( schema.getSchemaName() ).equals( Strings.toLowerCase(
sup.getSchemaName() ) ) )
+                    if ( !Strings.toLowerCase( schema.getSchemaName() ).equals(
+                        Strings.toLowerCase( sup.getSchemaName() ) ) )
                     {
                         schemaNames.add( sup.getSchemaName() );
                     }
@@ -497,7 +498,8 @@ public class ExportSchemasForADSWizard e
                     ObjectClass sup = schemaHandler.getObjectClass( supName );
                     if ( sup != null )
                     {
-                        if ( !Strings.toLowerCase( schema.getSchemaName() ).equals( Strings.toLowerCase(
sup.getSchemaName() ) ) )
+                        if ( !Strings.toLowerCase( schema.getSchemaName() ).equals(
+                            Strings.toLowerCase( sup.getSchemaName() ) ) )
                         {
                             schemaNames.add( sup.getSchemaName() );
                         }
@@ -514,7 +516,8 @@ public class ExportSchemasForADSWizard e
                     AttributeType may = schemaHandler.getAttributeType( mayName );
                     if ( may != null )
                     {
-                        if ( !Strings.toLowerCase( schema.getSchemaName() ).equals( Strings.toLowerCase(
may.getSchemaName() ) ) )
+                        if ( !Strings.toLowerCase( schema.getSchemaName() ).equals(
+                            Strings.toLowerCase( may.getSchemaName() ) ) )
                         {
                             schemaNames.add( may.getSchemaName() );
                         }
@@ -532,7 +535,8 @@ public class ExportSchemasForADSWizard e
                     AttributeType must = schemaHandler.getAttributeType( mustName );
                     if ( must != null )
                     {
-                        if ( !Strings.toLowerCase( schema.getSchemaName() ).equals( Strings.toLowerCase(
must.getSchemaName() ) ) )
+                        if ( !Strings.toLowerCase( schema.getSchemaName() ).equals(
+                            Strings.toLowerCase( must.getSchemaName() ) ) )
                         {
                             schemaNames.add( must.getSchemaName() );
                         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
Tue Jan  8 16:09:24 2013
@@ -83,8 +83,8 @@ public class NewObjectClassWizard extend
         newOC.setSuperiorOids( contentPage.getSuperiorsNameValue() );
         newOC.setType( contentPage.getClassTypeValue() );
         newOC.setObsolete( contentPage.getObsoleteValue() );
-        newOC.setMustAttributeTypeOids(  mandatoryAttributesPage.getMandatoryAttributeTypesNames()
);
-        newOC.setMayAttributeTypeOids(  optionalAttributesPage.getOptionalAttributeTypesNames()
);
+        newOC.setMustAttributeTypeOids( mandatoryAttributesPage.getMandatoryAttributeTypesNames()
);
+        newOC.setMayAttributeTypeOids( optionalAttributesPage.getOptionalAttributeTypesNames()
);
 
         // Adding the new object class
         Activator.getDefault().getSchemaHandler().addObjectClass( newOC );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java
Tue Jan  8 16:09:24 2013
@@ -19,9 +19,8 @@
  */
 package org.apache.directory.studio.schemaeditor.view.wrappers;
 
-import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaWarning;
-
 
+import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaWarning;
 
 
 /**

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java
Tue Jan  8 16:09:24 2013
@@ -38,8 +38,8 @@ public final class ValueEditorsConstants
     }
 
     /** The plug-in ID */
-    public static final String PLUGIN_ID = ValueEditorsActivator.getDefault().getPluginProperties().getString(
-        "Plugin_id" ); //$NON-NLS-1$
+    public static final String PLUGIN_ID = ValueEditorsActivator.getDefault().getPluginProperties()
+        .getString( "Plugin_id" ); //$NON-NLS-1$
 
     /** The relative path to the image editor icon */
     public static final String IMG_IMAGEEDITOR = "resources/icons/imageeditor.gif"; //$NON-NLS-1$

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
Tue Jan  8 16:09:24 2013
@@ -74,7 +74,7 @@ public class InPlaceMsAdObjectSidValueEd
 
         if ( bytes == null || bytes.length < 8 )
         {
-            return "Invalid SID"; 
+            return "Invalid SID";
         }
 
         char[] hex = Hex.encodeHex( bytes );
@@ -94,7 +94,7 @@ public class InPlaceMsAdObjectSidValueEd
         // check length
         if ( bytes.length != ( 8 + count * 4 ) )
         {
-            return "Invalid SID"; 
+            return "Invalid SID";
         }
 
         // get authority, big-endian

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
Tue Jan  8 16:09:24 2013
@@ -278,7 +278,7 @@ public class PasswordDialog extends Dial
             currentLayout.verticalSpacing = convertVerticalDLUsToPixels( IDialogConstants.VERTICAL_SPACING
);
             currentLayout.horizontalSpacing = convertHorizontalDLUsToPixels( IDialogConstants.HORIZONTAL_SPACING
);
             currentPasswordContainer.setLayout( currentLayout );
-            currentPasswordContainer.setLayoutData( new GridData(SWT.FILL, SWT.FILL, true,
true) );
+            currentPasswordContainer.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true,
true ) );
 
             BaseWidgetUtils.createLabel( currentPasswordContainer, Messages
                 .getString( "PasswordDialog.CurrentPassword" ) + ":", 1 ); //$NON-NLS-1$//$NON-NLS-2$

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueDialog.java
Tue Jan  8 16:09:24 2013
@@ -352,7 +352,7 @@ public class GeneralizedTimeValueDialog 
 
         // Combo viewer
         timezoneComboViewer = new ComboViewer( parent );
-        GridData  timezoneGridData = new GridData( SWT.FILL, SWT.CENTER, true, false );
+        GridData timezoneGridData = new GridData( SWT.FILL, SWT.CENTER, true, false );
         timezoneGridData.widthHint = 50;
         timezoneComboViewer.getCombo().setLayoutData( timezoneGridData );
 

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditor.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditor.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditor.java
Tue Jan  8 16:09:24 2013
@@ -51,8 +51,8 @@ public class InPlaceUuidValueEditor exte
             if ( rawValue instanceof byte[] )
             {
                 byte[] bytes = ( byte[] ) rawValue;
-                String string = Strings.utf8ToString(bytes);
-                if ( string.matches( UUID_REGEX ) || Strings.isEmpty(string) )
+                String string = Strings.utf8ToString( bytes );
+                if ( string.matches( UUID_REGEX ) || Strings.isEmpty( string ) )
                 {
                     return string;
                 }

Modified: directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java
Tue Jan  8 16:09:24 2013
@@ -36,12 +36,23 @@ public class InPlaceMsAdObjectGuidValueE
         InPlaceMsAdObjectGuidValueEditor editor = new InPlaceMsAdObjectGuidValueEditor();
         byte[] bytes = new byte[]
             {
-            //
-                ( byte ) 0x89, ( byte ) 0xBA, ( byte ) 0x78, ( byte ) 0xDB, //
-                ( byte ) 0x5F, ( byte ) 0xB8, //
-                ( byte ) 0x7F, ( byte ) 0x44, //
-                ( byte ) 0xBD, ( byte ) 0x06, //
-                ( byte ) 0xE3, ( byte ) 0xA4, ( byte ) 0x09, ( byte ) 0x96, ( byte ) 0xA9,
( byte ) 0xA8 };
+                //
+                ( byte ) 0x89,
+                ( byte ) 0xBA,
+                ( byte ) 0x78,
+                ( byte ) 0xDB, //
+                ( byte ) 0x5F,
+                ( byte ) 0xB8, //
+                ( byte ) 0x7F,
+                ( byte ) 0x44, //
+                ( byte ) 0xBD,
+                ( byte ) 0x06, //
+                ( byte ) 0xE3,
+                ( byte ) 0xA4,
+                ( byte ) 0x09,
+                ( byte ) 0x96,
+                ( byte ) 0xA9,
+                ( byte ) 0xA8 };
         String displayValue = editor.convertToString( bytes );
         assertEquals( Strings.toLowerCase( "{db78ba89-b85f-447f-bd06-e3a40996a9a8}" ), displayValue
); //$NON-NLS-1$
     }
@@ -53,12 +64,23 @@ public class InPlaceMsAdObjectGuidValueE
         InPlaceMsAdObjectGuidValueEditor editor = new InPlaceMsAdObjectGuidValueEditor();
         byte[] bytes = new byte[]
             {
-            //
-                ( byte ) 0x00, ( byte ) 0x11, ( byte ) 0x22, ( byte ) 0x33, //
-                ( byte ) 0x44, ( byte ) 0x55, //
-                ( byte ) 0x66, ( byte ) 0x77, //
-                ( byte ) 0x88, ( byte ) 0x99, //
-                ( byte ) 0xAA, ( byte ) 0xBB, ( byte ) 0xCC, ( byte ) 0xDD, ( byte ) 0xEE,
( byte ) 0xFF };
+                //
+                ( byte ) 0x00,
+                ( byte ) 0x11,
+                ( byte ) 0x22,
+                ( byte ) 0x33, //
+                ( byte ) 0x44,
+                ( byte ) 0x55, //
+                ( byte ) 0x66,
+                ( byte ) 0x77, //
+                ( byte ) 0x88,
+                ( byte ) 0x99, //
+                ( byte ) 0xAA,
+                ( byte ) 0xBB,
+                ( byte ) 0xCC,
+                ( byte ) 0xDD,
+                ( byte ) 0xEE,
+                ( byte ) 0xFF };
         String displayValue = editor.convertToString( bytes );
         assertEquals( Strings.toLowerCase( "{33221100-5544-7766-8899-AABBCCDDEEFF}" ), displayValue
); //$NON-NLS-1$
     }
@@ -73,7 +95,7 @@ public class InPlaceMsAdObjectGuidValueE
         byte[] bytes = new byte[]
             { ( byte ) 0x00, ( byte ) 0x11, ( byte ) 0x22, ( byte ) 0x33 };
         String displayValue = editor.convertToString( bytes );
-        assertEquals( "Invalid GUID", displayValue ); 
+        assertEquals( "Invalid GUID", displayValue );
 
         // test too long
         byte[] bytes2 = new byte[]
@@ -82,7 +104,7 @@ public class InPlaceMsAdObjectGuidValueE
                 ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x00,
                 ( byte ) 0x00, };
         String displayValue2 = editor.convertToString( bytes2 );
-        assertEquals( "Invalid GUID", displayValue2 ); 
+        assertEquals( "Invalid GUID", displayValue2 );
     }
 
 
@@ -92,6 +114,6 @@ public class InPlaceMsAdObjectGuidValueE
         InPlaceMsAdObjectGuidValueEditor editor = new InPlaceMsAdObjectGuidValueEditor();
         byte[] bytes = null;
         String displayValue = editor.convertToString( bytes );
-        assertEquals( "Invalid GUID", displayValue ); 
+        assertEquals( "Invalid GUID", displayValue );
     }
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java
Tue Jan  8 16:09:24 2013
@@ -35,12 +35,20 @@ public class InPlaceMsAdObjectSidValueEd
         InPlaceMsAdObjectSidValueEditor editor = new InPlaceMsAdObjectSidValueEditor();
         byte[] bytes = new byte[]
             {
-            // 01 01 00 00 00 00 00 05  04 00 00 00 
+                // 01 01 00 00 00 00 00 05  04 00 00 00 
                 ( byte ) 0x01, //
                 ( byte ) 0x01, //
-                ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x05, //
-                ( byte ) 0x04, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00 //
-            };
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x05, //
+                ( byte ) 0x04,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00 //
+        };
         String displayValue = editor.convertToString( bytes );
         assertEquals( "S-1-5-4", displayValue ); //$NON-NLS-1$
     }
@@ -52,13 +60,24 @@ public class InPlaceMsAdObjectSidValueEd
         InPlaceMsAdObjectSidValueEditor editor = new InPlaceMsAdObjectSidValueEditor();
         byte[] bytes = new byte[]
             {
-            // 01 02 00 00 00 00 00 05  20 00 00 00 25 02 00 00
+                // 01 02 00 00 00 00 00 05  20 00 00 00 25 02 00 00
                 ( byte ) 0x01, //
                 ( byte ) 0x02, //
-                ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x05, //
-                ( byte ) 0x20, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, //
-                ( byte ) 0x25, ( byte ) 0x02, ( byte ) 0x00, ( byte ) 0x00 //
-            };
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x05, //
+                ( byte ) 0x20,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00, //
+                ( byte ) 0x25,
+                ( byte ) 0x02,
+                ( byte ) 0x00,
+                ( byte ) 0x00 //
+        };
         String displayValue = editor.convertToString( bytes );
         assertEquals( "S-1-5-32-549", displayValue ); //$NON-NLS-1$
     }
@@ -70,17 +89,37 @@ public class InPlaceMsAdObjectSidValueEd
         InPlaceMsAdObjectSidValueEditor editor = new InPlaceMsAdObjectSidValueEditor();
         byte[] bytes = new byte[]
             {
-            // 01 05 00 00 00 00 00 05  15 00 00 00 af 6e b6 27
+                // 01 05 00 00 00 00 00 05  15 00 00 00 af 6e b6 27
                 // 0c f5 77 a0 a7 10 df 6e  f4 01 00 00
                 ( byte ) 0x01, //
                 ( byte ) 0x05, //
-                ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x05, //
-                ( byte ) 0x15, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, //
-                ( byte ) 0xaf, ( byte ) 0x6e, ( byte ) 0xb6, ( byte ) 0x27, //
-                ( byte ) 0x0c, ( byte ) 0xf5, ( byte ) 0x77, ( byte ) 0xa0, //
-                ( byte ) 0xa7, ( byte ) 0x10, ( byte ) 0xdf, ( byte ) 0x6e, //
-                ( byte ) 0xf4, ( byte ) 0x01, ( byte ) 0x00, ( byte ) 0x00 //
-            };
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x05, //
+                ( byte ) 0x15,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00, //
+                ( byte ) 0xaf,
+                ( byte ) 0x6e,
+                ( byte ) 0xb6,
+                ( byte ) 0x27, //
+                ( byte ) 0x0c,
+                ( byte ) 0xf5,
+                ( byte ) 0x77,
+                ( byte ) 0xa0, //
+                ( byte ) 0xa7,
+                ( byte ) 0x10,
+                ( byte ) 0xdf,
+                ( byte ) 0x6e, //
+                ( byte ) 0xf4,
+                ( byte ) 0x01,
+                ( byte ) 0x00,
+                ( byte ) 0x00 //
+        };
         String displayValue = editor.convertToString( bytes );
         assertEquals( "S-1-5-21-666267311-2692216076-1860112551-500", displayValue ); //$NON-NLS-1$
     }
@@ -95,41 +134,81 @@ public class InPlaceMsAdObjectSidValueEd
         byte[] bytes = new byte[]
             { ( byte ) 0x00 };
         String displayValue = editor.convertToString( bytes );
-        assertEquals( "Invalid SID", displayValue ); 
+        assertEquals( "Invalid SID", displayValue );
 
         // test missing sub aurhority byte
         byte[] bytes2 = new byte[]
             {
-            // 01 05 00 00 00 00 00 05  15 00 00 00 af 6e b6 27
+                // 01 05 00 00 00 00 00 05  15 00 00 00 af 6e b6 27
                 // 0c f5 77 a0 a7 10 df 6e  f4 01 00 00
                 ( byte ) 0x01, //
                 ( byte ) 0x05, //
-                ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x05, //
-                ( byte ) 0x15, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, //
-                ( byte ) 0xaf, ( byte ) 0x6e, ( byte ) 0xb6, ( byte ) 0x27, //
-                ( byte ) 0x0c, ( byte ) 0xf5, ( byte ) 0x77, ( byte ) 0xa0, //
-                ( byte ) 0xa7, ( byte ) 0x10, ( byte ) 0xdf, ( byte ) 0x6e, //
-                ( byte ) 0xf4, ( byte ) 0x01, ( byte ) 0x00, /*( byte ) 0x00*///
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x05, //
+                ( byte ) 0x15,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00, //
+                ( byte ) 0xaf,
+                ( byte ) 0x6e,
+                ( byte ) 0xb6,
+                ( byte ) 0x27, //
+                ( byte ) 0x0c,
+                ( byte ) 0xf5,
+                ( byte ) 0x77,
+                ( byte ) 0xa0, //
+                ( byte ) 0xa7,
+                ( byte ) 0x10,
+                ( byte ) 0xdf,
+                ( byte ) 0x6e, //
+                ( byte ) 0xf4,
+                ( byte ) 0x01,
+                ( byte ) 0x00, /*( byte ) 0x00*///
             };
         String displayValue2 = editor.convertToString( bytes2 );
-        assertEquals( "Invalid SID", displayValue2 ); 
+        assertEquals( "Invalid SID", displayValue2 );
 
         // test additional sub authority byte
         byte[] bytes3 = new byte[]
             {
-            // 01 05 00 00 00 00 00 05  15 00 00 00 af 6e b6 27
+                // 01 05 00 00 00 00 00 05  15 00 00 00 af 6e b6 27
                 // 0c f5 77 a0 a7 10 df 6e  f4 01 00 00
                 ( byte ) 0x01, //
                 ( byte ) 0x05, //
-                ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x05, //
-                ( byte ) 0x15, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, //
-                ( byte ) 0xaf, ( byte ) 0x6e, ( byte ) 0xb6, ( byte ) 0x27, //
-                ( byte ) 0x0c, ( byte ) 0xf5, ( byte ) 0x77, ( byte ) 0xa0, //
-                ( byte ) 0xa7, ( byte ) 0x10, ( byte ) 0xdf, ( byte ) 0x6e, //
-                ( byte ) 0xf4, ( byte ) 0x01, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00
//
-            };
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x05, //
+                ( byte ) 0x15,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00, //
+                ( byte ) 0xaf,
+                ( byte ) 0x6e,
+                ( byte ) 0xb6,
+                ( byte ) 0x27, //
+                ( byte ) 0x0c,
+                ( byte ) 0xf5,
+                ( byte ) 0x77,
+                ( byte ) 0xa0, //
+                ( byte ) 0xa7,
+                ( byte ) 0x10,
+                ( byte ) 0xdf,
+                ( byte ) 0x6e, //
+                ( byte ) 0xf4,
+                ( byte ) 0x01,
+                ( byte ) 0x00,
+                ( byte ) 0x00,
+                ( byte ) 0x00 //
+        };
         String displayValue3 = editor.convertToString( bytes3 );
-        assertEquals( "Invalid SID", displayValue3 ); 
+        assertEquals( "Invalid SID", displayValue3 );
     }
 
 
@@ -139,6 +218,6 @@ public class InPlaceMsAdObjectSidValueEd
         InPlaceMsAdObjectSidValueEditor editor = new InPlaceMsAdObjectSidValueEditor();
         byte[] bytes = null;
         String displayValue = editor.convertToString( bytes );
-        assertEquals( "Invalid SID", displayValue ); 
+        assertEquals( "Invalid SID", displayValue );
     }
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java?rev=1430352&r1=1430351&r2=1430352&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java
(original)
+++ directory/studio/trunk/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java
Tue Jan  8 16:09:24 2013
@@ -36,12 +36,23 @@ public class InPlaceUuidValueEditorTest
         InPlaceUuidValueEditor editor = new InPlaceUuidValueEditor();
         byte[] bytes = new byte[]
             {
-            //
-                ( byte ) 0x6b, ( byte ) 0xa7, ( byte ) 0xb8, ( byte ) 0x10, //
-                ( byte ) 0x9d, ( byte ) 0xad, //
-                ( byte ) 0x11, ( byte ) 0xd1, //
-                ( byte ) 0x80, ( byte ) 0xb4, //
-                ( byte ) 0x00, ( byte ) 0xc0, ( byte ) 0x4f, ( byte ) 0xd4, ( byte ) 0x30,
( byte ) 0xc8 };
+                //
+                ( byte ) 0x6b,
+                ( byte ) 0xa7,
+                ( byte ) 0xb8,
+                ( byte ) 0x10, //
+                ( byte ) 0x9d,
+                ( byte ) 0xad, //
+                ( byte ) 0x11,
+                ( byte ) 0xd1, //
+                ( byte ) 0x80,
+                ( byte ) 0xb4, //
+                ( byte ) 0x00,
+                ( byte ) 0xc0,
+                ( byte ) 0x4f,
+                ( byte ) 0xd4,
+                ( byte ) 0x30,
+                ( byte ) 0xc8 };
         String displayValue = editor.convertToString( bytes );
         assertEquals( Strings.toLowerCase( "6ba7b810-9dad-11d1-80b4-00c04fd430c8" ), displayValue
); //$NON-NLS-1$
     }
@@ -53,12 +64,23 @@ public class InPlaceUuidValueEditorTest
         InPlaceUuidValueEditor editor = new InPlaceUuidValueEditor();
         byte[] bytes = new byte[]
             {
-            //
-                ( byte ) 0x00, ( byte ) 0x11, ( byte ) 0x22, ( byte ) 0x33, //
-                ( byte ) 0x44, ( byte ) 0x55, //
-                ( byte ) 0x66, ( byte ) 0x77, //
-                ( byte ) 0x88, ( byte ) 0x99, //
-                ( byte ) 0xAA, ( byte ) 0xBB, ( byte ) 0xCC, ( byte ) 0xDD, ( byte ) 0xEE,
( byte ) 0xFF };
+                //
+                ( byte ) 0x00,
+                ( byte ) 0x11,
+                ( byte ) 0x22,
+                ( byte ) 0x33, //
+                ( byte ) 0x44,
+                ( byte ) 0x55, //
+                ( byte ) 0x66,
+                ( byte ) 0x77, //
+                ( byte ) 0x88,
+                ( byte ) 0x99, //
+                ( byte ) 0xAA,
+                ( byte ) 0xBB,
+                ( byte ) 0xCC,
+                ( byte ) 0xDD,
+                ( byte ) 0xEE,
+                ( byte ) 0xFF };
         String displayValue = editor.convertToString( bytes );
         assertEquals( Strings.toLowerCase( "00112233-4455-6677-8899-AABBCCDDEEFF" ), displayValue
); //$NON-NLS-1$
     }
@@ -73,7 +95,7 @@ public class InPlaceUuidValueEditorTest
         byte[] bytes = new byte[]
             { ( byte ) 0x00, ( byte ) 0x11, ( byte ) 0x22, ( byte ) 0x33 };
         String displayValue = editor.convertToString( bytes );
-        assertEquals( "Invalid UUID", displayValue ); 
+        assertEquals( "Invalid UUID", displayValue );
 
         // test too long
         byte[] bytes2 = new byte[]
@@ -82,7 +104,7 @@ public class InPlaceUuidValueEditorTest
                 ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x00,
                 ( byte ) 0x00, };
         String displayValue2 = editor.convertToString( bytes2 );
-        assertEquals( "Invalid UUID", displayValue2 ); 
+        assertEquals( "Invalid UUID", displayValue2 );
     }
 
 
@@ -92,7 +114,7 @@ public class InPlaceUuidValueEditorTest
         InPlaceUuidValueEditor editor = new InPlaceUuidValueEditor();
         byte[] bytes = null;
         String displayValue = editor.convertToString( bytes );
-        assertEquals( "Invalid UUID", displayValue ); 
+        assertEquals( "Invalid UUID", displayValue );
     }
 
 }



Mime
View raw message