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/28 07:12:10 UTC
svn commit: r1692996 - in
/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors:
bool/ dn/ integer/ objectclass/ time/
Author: elecharny
Date: Tue Jul 28 05:12:10 2015
New Revision: 1692996
URL: http://svn.apache.org/r1692996
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/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/bool/InPlaceBooleanValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java
Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/bool/InPlaceBooleanValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/bool/InPlaceBooleanValueEditor.java?rev=1692996&r1=1692995&r2=1692996&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/bool/InPlaceBooleanValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/bool/InPlaceBooleanValueEditor.java Tue Jul 28 05:12:10 2015
@@ -50,7 +50,7 @@ public class InPlaceBooleanValueEditor e
{
String stringValue = ( String ) value;
- if ( "".equals( stringValue ) )
+ if ( EMPTY.equals( stringValue ) )
{
return null;
}
Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java?rev=1692996&r1=1692995&r2=1692996&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java Tue Jul 28 05:12:10 2015
@@ -49,7 +49,8 @@ public class DnValueEditor extends Abstr
protected boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof DnValueEditorRawValueWrapper )
+
+ if ( value instanceof DnValueEditorRawValueWrapper )
{
DnValueEditorRawValueWrapper wrapper = ( DnValueEditorRawValueWrapper ) value;
Dn dn;
@@ -116,7 +117,7 @@ public class DnValueEditor extends Abstr
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();
return new DnValueEditorRawValueWrapper( connection, ( String ) o );
Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerValueEditor.java?rev=1692996&r1=1692995&r2=1692996&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/integer/IntegerValueEditor.java Tue Jul 28 05:12:10 2015
@@ -43,7 +43,7 @@ public class IntegerValueEditor extends
{
Object value = getValue();
- if ( value != null && value instanceof String )
+ if ( value instanceof String )
{
BigDecimal integer = null;
boolean isNewOrMalformedValue = false;
Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java?rev=1692996&r1=1692995&r2=1692996&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java Tue Jul 28 05:12:10 2015
@@ -47,7 +47,7 @@ public class ObjectClassValueEditor exte
public boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof ObjectClassValueEditorRawValueWrapper )
+ if ( value instanceof ObjectClassValueEditorRawValueWrapper )
{
ObjectClassValueEditorRawValueWrapper wrapper = ( ObjectClassValueEditorRawValueWrapper ) value;
ObjectClassDialog dialog = new ObjectClassDialog( shell, wrapper.schema, wrapper.objectClass );
@@ -135,17 +135,20 @@ public class ObjectClassValueEditor exte
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 ( !( value instanceof String ) )
{
return null;
}
String ocValue = ( String ) value;
ObjectClassValueEditorRawValueWrapper wrapper = new ObjectClassValueEditorRawValueWrapper( schema, ocValue );
+
return wrapper;
}
Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java?rev=1692996&r1=1692995&r2=1692996&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java (original)
+++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java Tue Jul 28 05:12:10 2015
@@ -82,7 +82,7 @@ public class GeneralizedTimeValueEditor
protected boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof String )
+ if ( value instanceof String )
{
String s = ( String ) value;