You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/07/27 17:15:52 UTC

svn commit: r1692895 [2/2] - in /directory/studio/trunk/plugins: aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ ldapbrowser.common/src/main/java...

Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/editor/OpenLdapAclValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/editor/OpenLdapAclValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/editor/OpenLdapAclValueEditor.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/editor/OpenLdapAclValueEditor.java Mon Jul 27 15:15:52 2015
@@ -20,13 +20,13 @@
 package org.apache.directory.studio.openldap.config.acl.editor;
 
 
+import org.apache.directory.api.util.Strings;
 import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
 import org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor;
 import org.eclipse.swt.widgets.Shell;
-
 import org.apache.directory.studio.openldap.config.acl.OpenLdapAclValueWithContext;
 import org.apache.directory.studio.openldap.config.acl.dialogs.OpenLdapAclDialog;
 
@@ -50,12 +50,13 @@ public class OpenLdapAclValueEditor exte
     {
         Object value = getValue();
 
-        if ( value != null && value instanceof OpenLdapAclValueWithContext )
+        if ( ( value != null ) && ( value instanceof OpenLdapAclValueWithContext ) )
         {
             OpenLdapAclValueWithContext context = ( OpenLdapAclValueWithContext ) value;
 
             OpenLdapAclDialog dialog = new OpenLdapAclDialog( shell, context );
-            if ( dialog.open() == OpenLdapAclDialog.OK && !"".equals( dialog.getAclValue() ) ) //$NON-NLS-1$
+            
+            if ( ( dialog.open() == OpenLdapAclDialog.OK)  && !"".equals( dialog.getAclValue() ) ) //$NON-NLS-1$
             {
                 if ( dialog.isHasPrecedence() )
                 {
@@ -71,6 +72,7 @@ public class OpenLdapAclValueEditor exte
                 return true;
             }
         }
+        
         return false;
     }
 
@@ -94,13 +96,13 @@ public class OpenLdapAclValueEditor exte
         {
             return null;
         }
-        else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 0 )
+        else if ( ( attributeHierarchy.size() == 1 ) && ( attributeHierarchy.getAttribute().getValueSize() == 0 ) )
         {
             IEntry entry = attributeHierarchy.getAttribute().getEntry();
             IBrowserConnection connection = entry.getBrowserConnection();
             return new OpenLdapAclValueWithContext( connection, entry, false, -1, "" ); //$NON-NLS-1$
         }
-        else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 1 )
+        else if ( ( attributeHierarchy.size() == 1 ) && ( attributeHierarchy.getAttribute().getValueSize() == 1 ) )
         {
             IEntry entry = attributeHierarchy.getAttribute().getEntry();
             IBrowserConnection connection = entry.getBrowserConnection();
@@ -128,7 +130,8 @@ public class OpenLdapAclValueEditor exte
     public Object getRawValue( IValue value )
     {
         Object o = super.getRawValue( value );
-        if ( o != null && o instanceof String )
+        
+        if ( o instanceof String )
         {
             IEntry entry = value.getAttribute().getEntry();
             IBrowserConnection connection = entry.getBrowserConnection();
@@ -136,6 +139,7 @@ public class OpenLdapAclValueEditor exte
             int precedence = getPrecedence( v );
             boolean hasPrecedence = ( precedence != -1 );
             String aclValue = getStrippedAclValue( v );
+            
             return new OpenLdapAclValueWithContext( connection, entry, hasPrecedence, precedence, aclValue );
         }
 
@@ -152,24 +156,41 @@ public class OpenLdapAclValueEditor exte
     public int getPrecedence( String s )
     {
         // Checking if the acl contains precedence information ("{int}")
-        if ( s.matches( PRECEDENCE_PATTERN ) )
+        if ( Strings.isCharASCII( s, 0, '{' ) )
         {
-            // Getting the index of the starting and closing curly brackets
-            int indexOfStartingCurlyBracket = s.indexOf( '{' );
-            int indexOfClosingCurlyBracket = s.indexOf( '}' );
-
-            try
-            {
-                // Returning the precedence string as an int
-                return Integer.parseInt( s.substring( indexOfStartingCurlyBracket + 1, indexOfClosingCurlyBracket ) );
-            }
-            catch ( NumberFormatException e )
+            int precedence = 0;
+            int pos = 1;
+            
+            while ( pos < s.length() )
             {
-                return -1;
+                char c = s.charAt( pos );
+                
+                if ( c == '}' )
+                {
+                    if ( pos == 1 )
+                    {
+                        return -1;
+                    }
+                    else
+                    {
+                        return precedence;
+                    }
+                }
+                
+                if ( ( c >= '0' ) && ( c <= '9' ) )
+                {
+                    precedence = precedence*10 + ( c - '0' );
+                }
+                
+                pos++;
             }
+            
+            return -1;
+        }
+        else
+        {
+            return -1;
         }
-
-        return -1;
     }
 
 

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressValueEditor.java Mon Jul 27 15:15:52 2015
@@ -36,7 +36,6 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class AddressValueEditor extends AbstractDialogStringValueEditor
 {
-
     /**
      * {@inheritDoc}
      * 
@@ -45,15 +44,19 @@ public class AddressValueEditor extends
     protected boolean openDialog( Shell shell )
     {
         Object value = getValue();
-        if ( value != null && value instanceof String )
+        
+        if ( value instanceof String )
         {
             AddressDialog dialog = new AddressDialog( shell, ( String ) value );
-            if ( dialog.open() == AddressDialog.OK && !"".equals( dialog.getAddress() ) ) //$NON-NLS-1$
+            
+            if ( ( dialog.open() == AddressDialog.OK ) && !EMPTY.equals( dialog.getAddress() ) ) //$NON-NLS-1$
             {
                 setValue( dialog.getAddress() );
+                
                 return true;
             }
         }
+        
         return false;
     }
 
@@ -61,7 +64,7 @@ public class AddressValueEditor extends
     /**
      * {@inheritDoc}
      * 
-     * This implementatiosn replaces the $ separators by commas.
+     * This implementation replaces the $ separators by commas.
      */
     public String getDisplayValue( IValue value )
     {
@@ -74,5 +77,4 @@ public class AddressValueEditor extends
 
         return displayValue;
     }
-
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleValueEditor.java Mon Jul 27 15:15:52 2015
@@ -42,16 +42,19 @@ public class AdministrativeRoleValueEdit
     public boolean openDialog( Shell shell )
     {
         Object value = getValue();
-        if ( value != null && value instanceof String )
+        
+        if ( value instanceof String )
         {
             AdministrativeRoleDialog dialog = new AdministrativeRoleDialog( shell, ( String ) value );
-            if ( dialog.open() == TextDialog.OK && !"".equals( dialog.getAdministrativeRole() ) ) //$NON-NLS-1$
+            
+            if ( ( dialog.open() == TextDialog.OK ) && !"".equals( dialog.getAdministrativeRole() ) ) //$NON-NLS-1$
             {
                 setValue( dialog.getAdministrativeRole() );
+                
                 return true;
             }
         }
+        
         return false;
     }
-
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/adtime/ActiveDirectoryTimeValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/adtime/ActiveDirectoryTimeValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/adtime/ActiveDirectoryTimeValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/adtime/ActiveDirectoryTimeValueEditor.java Mon Jul 27 15:15:52 2015
@@ -92,12 +92,13 @@ public class ActiveDirectoryTimeValueEdi
     protected boolean openDialog( Shell shell )
     {
         Object value = getValue();
-        if ( value != null && value instanceof String )
+        
+        if ( value instanceof String )
         {
             String s = ( String ) value;
             long adTimeValue = 0;
 
-            if ( !"".equals( s ) ) //$NON-NLS-1$
+            if ( !EMPTY.equals( s ) ) //$NON-NLS-1$
             {
                 // Trying to parse the value
                 try
@@ -132,9 +133,11 @@ public class ActiveDirectoryTimeValueEdi
 
             // Creating and opening the dialog
             ActiveDirectoryTimeValueDialog dialog = new ActiveDirectoryTimeValueDialog( shell, adTimeValue );
+            
             if ( dialog.open() == ActiveDirectoryTimeValueDialog.OK )
             {
-                setValue( "" + dialog.getValue() ); //$NON-NLS-1$
+                setValue( Long.toString( dialog.getValue() ) ); //$NON-NLS-1$
+                
                 return true;
             }
         }

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateValueEditor.java Mon Jul 27 15:15:52 2015
@@ -35,7 +35,6 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class CertificateValueEditor extends AbstractDialogBinaryValueEditor
 {
-
     /**
      * {@inheritDoc}
      * 
@@ -45,17 +44,19 @@ public class CertificateValueEditor exte
     {
         Object value = getValue();
 
-        if ( value != null && value instanceof byte[] )
+        if ( value instanceof byte[] )
         {
             byte[] currentCertificateData = ( byte[] ) value;
 
             CertificateDialog dialog = new CertificateDialog( shell, currentCertificateData );
-            if ( dialog.open() == TextDialog.OK && dialog.getData() != null )
+
+            if ( ( dialog.open() == TextDialog.OK ) && ( dialog.getData() != null ) )
             {
                 setValue( dialog.getData() );
                 return true;
             }
         }
+        
         return false;
     }
 
@@ -76,12 +77,13 @@ public class CertificateValueEditor exte
         {
             if ( value == null )
             {
-                return "NULL"; //$NON-NLS-1$
+                return NULL; //$NON-NLS-1$
             }
             else if ( value.isBinary() )
             {
                 byte[] data = value.getBinaryValue();
                 String text = CertificateDialog.getCertificateInfo( data );
+                
                 return text;
             }
             else
@@ -90,5 +92,4 @@ public class CertificateValueEditor exte
             }
         }
     }
-
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageValueEditor.java Mon Jul 27 15:15:52 2015
@@ -45,17 +45,20 @@ public class ImageValueEditor extends Ab
     {
         Object value = getValue();
 
-        if ( value != null && value instanceof byte[] )
+        if ( value instanceof byte[] )
         {
             byte[] currentImageData = ( byte[] ) value;
 
             ImageDialog dialog = new ImageDialog( shell, currentImageData, SWT.IMAGE_JPEG );
-            if ( dialog.open() == ImageDialog.OK && dialog.getNewImageRawData() != null )
+            
+            if ( ( dialog.open() == ImageDialog.OK ) && ( dialog.getNewImageRawData() != null ) )
             {
                 setValue( dialog.getNewImageRawData() );
+                
                 return true;
             }
         }
+        
         return false;
     }
 
@@ -76,12 +79,13 @@ public class ImageValueEditor extends Ab
         {
             if ( value == null )
             {
-                return "NULL"; //$NON-NLS-1$
+                return NULL; //$NON-NLS-1$
             }
             else if ( value.isBinary() )
             {
                 byte[] data = value.getBinaryValue();
                 String text = ImageDialog.getImageInfo( data );
+                
                 return text;
             }
             else
@@ -90,5 +94,4 @@ public class ImageValueEditor extends Ab
             }
         }
     }
-
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditor.java Mon Jul 27 15:15:52 2015
@@ -54,9 +54,11 @@ public class InPlaceMsAdObjectGuidValueE
         if ( !showRawValues() )
         {
             Object rawValue = super.getRawValue( value );
+            
             if ( rawValue instanceof byte[] )
             {
                 byte[] bytes = ( byte[] ) rawValue;
+            
                 return convertToString( bytes );
             }
         }
@@ -67,7 +69,7 @@ public class InPlaceMsAdObjectGuidValueE
 
     String convertToString( byte[] bytes )
     {
-        if ( bytes == null || bytes.length != 16 )
+        if ((  bytes == null ) || ( bytes.length != 16 ) )
         {
             return Messages.getString( "InPlaceMsAdObjectGuidValueEditor.InvalidGuid" ); //$NON-NLS-1$
         }
@@ -90,7 +92,7 @@ public class InPlaceMsAdObjectGuidValueE
         sb.append( '-' );
         sb.append( hex, 20, 12 );
         sb.append( '}' );
+        
         return Strings.toLowerCase( sb.toString() );
     }
-
 }

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=1692895&r1=1692894&r2=1692895&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 Mon Jul 27 15:15:52 2015
@@ -48,9 +48,11 @@ public class InPlaceMsAdObjectSidValueEd
         if ( !showRawValues() )
         {
             Object rawValue = super.getRawValue( value );
+            
             if ( rawValue instanceof byte[] )
             {
                 byte[] bytes = ( byte[] ) rawValue;
+                
                 return convertToString( bytes );
             }
         }
@@ -72,7 +74,7 @@ public class InPlaceMsAdObjectSidValueEd
          *              little-endian!
          */
 
-        if ( bytes == null || bytes.length < 8 )
+        if ( ( bytes == null ) || ( bytes.length < 8 ) )
         {
             return Messages.getString( "InPlaceMsAdObjectSidValueEditor.InvalidSid" ); //$NON-NLS-1$
         }
@@ -106,6 +108,7 @@ public class InPlaceMsAdObjectSidValueEd
         for ( int i = 0; i < count; i++ )
         {
             StringBuffer rid = new StringBuffer();
+            
             for ( int k = 3; k >= 0; k-- )
             {
                 rid.append( hex[16 + ( i * 8 ) + ( k * 2 )] );
@@ -119,5 +122,4 @@ public class InPlaceMsAdObjectSidValueEd
 
         return sb.toString();
     }
-
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/oid/InPlaceOidValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/oid/InPlaceOidValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/oid/InPlaceOidValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/oid/InPlaceOidValueEditor.java Mon Jul 27 15:15:52 2015
@@ -37,7 +37,6 @@ import org.apache.directory.studio.value
  */
 public class InPlaceOidValueEditor extends AbstractInPlaceStringValueEditor
 {
-
     /**
      * {@inheritDoc}
      */
@@ -48,6 +47,7 @@ public class InPlaceOidValueEditor exten
         if ( !showRawValues() )
         {
             String description = Utils.getOidDescription( displayValue );
+            
             if ( description != null )
             {
                 displayValue = displayValue + " (" + description + ")"; //$NON-NLS-1$ //$NON-NLS-2$
@@ -56,5 +56,4 @@ public class InPlaceOidValueEditor exten
 
         return displayValue;
     }
-
 }

Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordValueEditor.java Mon Jul 27 15:15:52 2015
@@ -38,7 +38,6 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class PasswordValueEditor extends AbstractDialogBinaryValueEditor
 {
-
     /**
      * {@inheritDoc}
      * 
@@ -47,20 +46,25 @@ public class PasswordValueEditor extends
     protected boolean openDialog( Shell shell )
     {
         Object value = getValue();
-        if ( value != null && value instanceof PasswordValueEditorRawValueWrapper )
+        
+        if ( value instanceof PasswordValueEditorRawValueWrapper )
         {
             PasswordValueEditorRawValueWrapper wrapper = ( PasswordValueEditorRawValueWrapper ) value;
-            if ( wrapper.password != null && wrapper.password instanceof byte[] )
+            
+            if ( wrapper.password instanceof byte[] )
             {
                 byte[] pw = ( byte[] ) wrapper.password;
                 PasswordDialog dialog = new PasswordDialog( shell, pw, wrapper.entry );
+                
                 if ( dialog.open() == TextDialog.OK )
                 {
                     setValue( dialog.getNewPassword() );
+                    
                     return true;
                 }
             }
         }
+        
         return false;
     }
 
@@ -83,22 +87,24 @@ public class PasswordValueEditor extends
         {
             if ( value == null )
             {
-                return "NULL"; //$NON-NLS-1$
+                return NULL; //$NON-NLS-1$
             }
 
-            String password = value.getStringValue();;
+            String password = value.getStringValue();
+            
             if ( password == null )
             {
-                return "NULL"; //$NON-NLS-1$
+                return NULL; //$NON-NLS-1$
             }
             else
             {
                 String text;
-                if ( "".equals( password ) ) //$NON-NLS-1$
+                
+                if ( EMPTY.equals( password ) ) //$NON-NLS-1$
                 {
                     text = Messages.getString( "PasswordValueEditor.EmptyPassword" ); //$NON-NLS-1$
                 }
-                else if ( password.indexOf( '{' ) == 0 && password.indexOf( '}' ) > 0 )
+                else if ( ( password.indexOf( '{' ) == 0  )&& ( password.indexOf( '}' ) > 0 ) )
                 {
                     String hashMethod = password.substring( password.indexOf( '{' ) + 1, password.indexOf( '}' ) );
                     text = NLS.bind(
@@ -153,8 +159,10 @@ public class PasswordValueEditor extends
     public Object getRawValue( IValue value )
     {
         Object password = super.getRawValue( value );
+        
         return new PasswordValueEditorRawValueWrapper( password, value.getAttribute().getEntry() );
     }
+    
 
     /**
      * The PasswordValueEditorRawValueWrapper is used to pass contextual 
@@ -183,5 +191,4 @@ public class PasswordValueEditor extends
             this.entry = entry;
         }
     }
-
 }

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=1692895&r1=1692894&r2=1692895&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 Mon Jul 27 15:15:52 2015
@@ -48,10 +48,12 @@ public class InPlaceUuidValueEditor exte
         if ( !showRawValues() )
         {
             Object rawValue = super.getRawValue( value );
+            
             if ( rawValue instanceof byte[] )
             {
                 byte[] bytes = ( byte[] ) rawValue;
                 String string = Strings.utf8ToString( bytes );
+                
                 if ( string.matches( UUID_REGEX ) || Strings.isEmpty( string ) )
                 {
                     return string;
@@ -85,6 +87,7 @@ public class InPlaceUuidValueEditor exte
         sb.append( hex, 16, 4 );
         sb.append( '-' );
         sb.append( hex, 20, 12 );
+        
         return Strings.toLowerCase( sb.toString() );
     }
 }