svn commit: r1692915 - in /directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors: RestrictedByValueEditor.java SubtreeValueEditor.java

[el...@apache.org]

Author: elecharny
Date: Mon Jul 27 17:35:31 2015
New Revision: 1692915

URL: http://svn.apache.org/r1692915
Log:
o Removed useless checked on x != null when && ( x instanceof X )
o Same for check of x == null when && !( x instanceof X )

Modified:
    directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/RestrictedByValueEditor.java
    directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java

Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/RestrictedByValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/RestrictedByValueEditor.java?rev=1692915&r1=1692914&r2=1692915&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/RestrictedByValueEditor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/RestrictedByValueEditor.java Mon Jul 27 17:35:31 2015
@@ -69,10 +69,12 @@ public class RestrictedByValueEditor ext
     public boolean openDialog( Shell shell )
     {
         Object value = getValue();
-        if ( value != null && value instanceof RestrictedByValueEditorRawValueWrapper )
+        
+        if ( value instanceof RestrictedByValueEditorRawValueWrapper )
         {
             RestrictedByValueEditorRawValueWrapper wrapper = ( RestrictedByValueEditorRawValueWrapper ) value;
             RestrictedByDialog dialog = new RestrictedByDialog( shell, wrapper.schema, wrapper.type, wrapper.valuesIn );
+            
             if ( dialog.open() == TextDialog.OK && !EMPTY.equals( dialog.getType() )
                 && !EMPTY.equals( dialog.getValuesIn() ) )
             {
@@ -80,6 +82,7 @@ public class RestrictedByValueEditor ext
                 return true;
             }
         }
+        
         return false;
     }
 
@@ -99,11 +102,13 @@ public class RestrictedByValueEditor ext
     private Object getRawValue( IBrowserConnection connection, Object value )
     {
         Schema schema = null;
+        
         if ( connection != null )
         {
             schema = connection.getSchema();
         }
-        if ( schema == null || value == null || !( value instanceof String ) )
+        
+        if ( schema == null || !( value instanceof String ) )
         {
             return null;
         }

Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java?rev=1692915&r1=1692914&r2=1692915&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java Mon Jul 27 17:35:31 2015
@@ -72,7 +72,7 @@ public class SubtreeValueEditor extends
     protected boolean openDialog( Shell shell )
     {
         Object value = getValue();
-        if ( value != null && value instanceof SubtreeSpecificationValueWrapper )
+        if ( value instanceof SubtreeSpecificationValueWrapper )
         {
             SubtreeSpecificationValueWrapper wrapper = ( SubtreeSpecificationValueWrapper ) value;
 
@@ -94,7 +94,7 @@ public class SubtreeValueEditor extends
     public Object getRawValue( IValue value )
     {
         Object o = super.getRawValue( value );
-        if ( o != null && o instanceof String )
+        if ( o instanceof String )
         {
             IBrowserConnection connection = value.getAttribute().getEntry().getBrowserConnection();
             Dn dn = value.getAttribute().getEntry().getDn();