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 18:26:20 UTC
svn commit: r1692908 - in
/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor:
valueeditors/ widgets/
Author: elecharny
Date: Mon Jul 27 16:26:20 2015
New Revision: 1692908
URL: http://svn.apache.org/r1692908
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/AttributeTypeAndValueValueEditor.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/MaxValueCountValueEditor.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGrantsAndDenialsComposite.java
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java?rev=1692908&r1=1692907&r2=1692908&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java Mon Jul 27 16:26:20 2015
@@ -48,7 +48,7 @@ public class AttributeTypeAndValueValueE
public boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof AttributeTypeAndValueValueEditorRawValueWrapper )
+ if ( value instanceof AttributeTypeAndValueValueEditorRawValueWrapper )
{
AttributeTypeAndValueValueEditorRawValueWrapper wrapper = ( AttributeTypeAndValueValueEditorRawValueWrapper ) value;
AttributeTypeAndValueDialog dialog = new AttributeTypeAndValueDialog( shell, wrapper.schema,
@@ -83,7 +83,7 @@ public class AttributeTypeAndValueValueE
{
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/AttributeTypeValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java?rev=1692908&r1=1692907&r2=1692908&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java Mon Jul 27 16:26:20 2015
@@ -48,7 +48,7 @@ public class AttributeTypeValueEditor ex
public boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof AttributeTypeValueEditorRawValueWrapper )
+ if ( value instanceof AttributeTypeValueEditorRawValueWrapper )
{
AttributeTypeValueEditorRawValueWrapper wrapper = ( AttributeTypeValueEditorRawValueWrapper ) value;
AttributeTypeDialog dialog = new AttributeTypeDialog( shell, wrapper.schema, wrapper.attributeType );
@@ -81,7 +81,7 @@ public class AttributeTypeValueEditor ex
{
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/FilterValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java?rev=1692908&r1=1692907&r2=1692908&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java Mon Jul 27 16:26:20 2015
@@ -48,7 +48,7 @@ public class FilterValueEditor extends A
public boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof FilterValueEditorRawValueWrapper )
+ if ( value instanceof FilterValueEditorRawValueWrapper )
{
FilterValueEditorRawValueWrapper wrapper = ( FilterValueEditorRawValueWrapper ) value;
FilterWidgetDialog dialog = new FilterWidgetDialog( shell, Messages
@@ -78,7 +78,7 @@ public class FilterValueEditor extends A
private Object getRawValue( IBrowserConnection connection, Object value )
{
- if ( connection == null || value == null || !( value instanceof String ) )
+ if ( connection == null || !( value instanceof String ) )
{
return null;
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/MaxValueCountValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/MaxValueCountValueEditor.java?rev=1692908&r1=1692907&r2=1692908&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/MaxValueCountValueEditor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/MaxValueCountValueEditor.java Mon Jul 27 16:26:20 2015
@@ -71,7 +71,7 @@ public class MaxValueCountValueEditor ex
public boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof MaxValueCountValueEditorRawValueWrapper )
+ if ( value instanceof MaxValueCountValueEditorRawValueWrapper )
{
MaxValueCountValueEditorRawValueWrapper wrapper = ( MaxValueCountValueEditorRawValueWrapper ) value;
MaxValueCountDialog dialog = new MaxValueCountDialog( shell, wrapper.schema, wrapper.type, wrapper.maxCount );
@@ -104,7 +104,7 @@ public class MaxValueCountValueEditor ex
{
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/widgets/ACIItemGrantsAndDenialsComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGrantsAndDenialsComposite.java?rev=1692908&r1=1692907&r2=1692908&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGrantsAndDenialsComposite.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGrantsAndDenialsComposite.java Mon Jul 27 16:26:20 2015
@@ -484,7 +484,7 @@ public class ACIItemGrantsAndDenialsComp
*/
public void modify( Object element, String property, Object value )
{
- if ( element != null && element instanceof Item )
+ if ( element instanceof Item )
{
element = ( ( Item ) element ).getData();
}