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/30 00:29:47 UTC
svn commit: r1693356 [1/2] - in
/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor:
./ dialogs/ model/ sourceeditor/ valueeditors/ widgets/
Author: elecharny
Date: Wed Jul 29 22:29:46 2015
New Revision: 1693356
URL: http://svn.apache.org/r1693356
Log:
Fixed many PMD violations
Modified:
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACICodeScanner.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueDialog.java
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/ExclusionDialog.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/valueeditors/Messages.java
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/SubtreeSpecificationDialog.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGeneralComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGrantsAndDenialsComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemProtectedItemsComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemSourceEditorComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemTabFolderComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserClassesComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/Messages.java
directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/WidgetModifyEvent.java
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java Wed Jul 29 22:29:46 2015
@@ -28,9 +28,9 @@ package org.apache.directory.studio.acii
public interface ACIITemConstants
{
/** The plug-in ID */
- public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
+ String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
/** The ID for ACI Item Template */
- public static final String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties()
+ String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties()
.getString( "CtxType_AciItem_Template_id" ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java Wed Jul 29 22:29:46 2015
@@ -37,15 +37,6 @@ import org.eclipse.swt.widgets.Shell;
public class ACIItemValueEditor extends AbstractDialogStringValueEditor
{
/**
- * The Constructor.
- */
- public ACIItemValueEditor()
- {
- super();
- }
-
-
- /**
* Opens the ACI item dialog.
*
* @param shell the shell
@@ -122,15 +113,15 @@ public class ACIItemValueEditor extends
*/
public Object getRawValue( IValue value )
{
- Object o = super.getRawValue( value );
+ Object object = super.getRawValue( value );
- if ( o instanceof String )
+ if ( object instanceof String )
{
IEntry entry = value.getAttribute().getEntry();
IBrowserConnection connection = entry.getBrowserConnection();
- String v = ( String ) o;
+ String valueStr = ( String ) object;
- return new ACIItemValueWithContext( connection, entry, v );
+ return new ACIItemValueWithContext( connection, entry, valueStr );
}
return null;
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java Wed Jul 29 22:29:46 2015
@@ -29,7 +29,7 @@ import java.util.ResourceBundle;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Messages
+public final class Messages
{
/** The resource name */
private static final ResourceBundle RESOURCE_BUNDLE =
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java Wed Jul 29 22:29:46 2015
@@ -74,18 +74,9 @@ public class MultiValuedDialog extends D
/** The inner composite for all the content */
private Composite composite = null;
- /** The table control for the table viewer */
- private Table table = null;
-
/** The table viewer containing all user classes */
private TableViewer tableViewer = null;
- /** The composite containing the buttons */
- private Composite buttonComposite = null;
-
- /** The add button */
- private Button addButton = null;
-
/** The edit button */
private Button editButton = null;
@@ -174,7 +165,7 @@ public class MultiValuedDialog extends D
tableGridData.horizontalAlignment = GridData.FILL;
//tableGridData.heightHint = 100;
- table = new Table( composite, SWT.BORDER );
+ Table table = new Table( composite, SWT.BORDER );
table.setHeaderVisible( false );
table.setLayoutData( tableGridData );
table.setLinesVisible( false );
@@ -233,11 +224,11 @@ public class MultiValuedDialog extends D
gridData.grabExcessVerticalSpace = false;
gridData.verticalAlignment = GridData.FILL;
- buttonComposite = new Composite( composite, SWT.NONE );
+ Composite buttonComposite = new Composite( composite, SWT.NONE );
buttonComposite.setLayoutData( gridData );
buttonComposite.setLayout( gridLayout );
- addButton = new Button( buttonComposite, SWT.NONE );
+ Button addButton = new Button( buttonComposite, SWT.NONE );
addButton.setText( Messages.getString( "MultiValuedDialog.button.add" ) ); //$NON-NLS-1$
addButton.setLayoutData( addButtonGridData );
addButton.addSelectionListener( new SelectionAdapter()
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java Wed Jul 29 22:29:46 2015
@@ -29,7 +29,7 @@ import java.util.ResourceBundle;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Messages
+public final class Messages
{
/** The resource name */
private static final ResourceBundle RESOURCE_BUNDLE =
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java Wed Jul 29 22:29:46 2015
@@ -60,7 +60,7 @@ import org.eclipse.osgi.util.NLS;
public class ProtectedItemWrapper
{
/** This map contains all possible protected item identifiers */
- public static final Map<Class<? extends ProtectedItem>, String> classToIdentifierMap;
+ public static final Map<Class<? extends ProtectedItem>, String> CLASS_TO_IDENTIFIER_MAP;
static
{
Map<Class<? extends ProtectedItem>, String> map = new HashMap<Class<? extends ProtectedItem>, String>();
@@ -76,11 +76,11 @@ public class ProtectedItemWrapper
map.put( MaxImmSubItem.class, "maxImmSub" ); //$NON-NLS-1$
map.put( RestrictedByItem.class, "restrictedBy" ); //$NON-NLS-1$
map.put( ClassesItem.class, "classes" ); //$NON-NLS-1$
- classToIdentifierMap = Collections.unmodifiableMap( map );
+ CLASS_TO_IDENTIFIER_MAP = Collections.unmodifiableMap( map );
}
/** This map contains all protected item display values */
- public static final Map<Class<? extends ProtectedItem>, String> classToDisplayMap;
+ public static final Map<Class<? extends ProtectedItem>, String> CLASS_TO_DISPLAY_MAP;
static
{
Map<Class<? extends ProtectedItem>, String> map = new HashMap<Class<? extends ProtectedItem>, String>();
@@ -106,7 +106,7 @@ public class ProtectedItemWrapper
map.put( RestrictedByItem.class, Messages
.getString( "ProtectedItemWrapper.protectedItem.restrictedBy.label" ) ); //$NON-NLS-1$
map.put( ClassesItem.class, Messages.getString( "ProtectedItemWrapper.protectedItem.classes.label" ) ); //$NON-NLS-1$
- classToDisplayMap = Collections.unmodifiableMap( map );
+ CLASS_TO_DISPLAY_MAP = Collections.unmodifiableMap( map );
}
/** A dummy ACI to check syntax of the protectedItemValue */
@@ -121,32 +121,32 @@ public class ProtectedItemWrapper
private List<String> values;
/** The value prefix, prepended to the value. */
- private String valuePrefix;
+ private final String valuePrefix;
/** The value suffix, appended to the value. */
- private String valueSuffix;
+ private final String valueSuffix;
/** The value editor, null means no value. */
private AbstractDialogStringValueEditor valueEditor;
/** The multivalued. */
- private boolean isMultivalued;
+ private final boolean multivalued;
/**
* Creates a new instance of ProtectedItemWrapper.
*
* @param clazz the java class of the UserClass
- * @param isMultivalued the is multivalued
+ * @param multivalued if it's a multiple value
* @param valuePrefix the identifier
- * @param valueSuffix the dislpay name
+ * @param valueSuffix the display name
* @param valueEditor the value editor
*/
- public ProtectedItemWrapper( Class<? extends ProtectedItem> clazz, boolean isMultivalued, String valuePrefix,
+ public ProtectedItemWrapper( Class<? extends ProtectedItem> clazz, boolean multivalued, String valuePrefix,
String valueSuffix, AbstractDialogStringValueEditor valueEditor )
{
this.clazz = clazz;
- this.isMultivalued = isMultivalued;
+ this.multivalued = multivalued;
this.valuePrefix = valuePrefix;
this.valueSuffix = valueSuffix;
this.valueEditor = valueEditor;
@@ -203,78 +203,83 @@ public class ProtectedItemWrapper
// switch on userClass type
// no value in ProtectedItem.Entry, ProtectedItem.AllUserAttributeTypes and ProtectedItem.AllUserAttributeTypesAndValues
- if ( item.getClass() == AttributeTypeItem.class )
+ if ( item instanceof AttributeTypeItem )
{
AttributeTypeItem at = ( AttributeTypeItem ) item;
+
for ( Iterator<AttributeType> it = at.iterator(); it.hasNext(); )
{
AttributeType attributeType = it.next();
values.add( attributeType.getName() );
}
}
- else if ( item.getClass() == AllAttributeValuesItem.class )
+ else if ( item instanceof AllAttributeValuesItem )
{
AllAttributeValuesItem aav = ( AllAttributeValuesItem ) item;
+
for ( Iterator<AttributeType> it = aav.iterator(); it.hasNext(); )
{
AttributeType attributeType = it.next();
values.add( attributeType.toString() );
}
}
- else if ( item.getClass() == AttributeValueItem.class )
+ else if ( item instanceof AttributeValueItem )
{
AttributeValueItem av = ( AttributeValueItem ) item;
+
for ( Iterator<Attribute> it = av.iterator(); it.hasNext(); )
{
Attribute entryAttribute = it.next();
values.add( entryAttribute.getId() + "=" + entryAttribute.get() ); //$NON-NLS-1$
}
}
- else if ( item.getClass() == SelfValueItem.class )
+ else if ( item instanceof SelfValueItem )
{
SelfValueItem sv = ( SelfValueItem ) item;
+
for ( Iterator<AttributeType> it = sv.iterator(); it.hasNext(); )
{
AttributeType attributeType = it.next();
values.add( attributeType.toString() );
}
}
- else if ( item.getClass() == RangeOfValuesItem.class )
+ else if ( item instanceof RangeOfValuesItem )
{
RangeOfValuesItem rov = ( RangeOfValuesItem ) item;
values.add( rov.getRefinement().toString() );
}
- else if ( item.getClass() == MaxValueCountItem.class )
+ else if ( item instanceof MaxValueCountItem )
{
MaxValueCountItem mvc = ( MaxValueCountItem ) item;
+
for ( Iterator<MaxValueCountElem> it = mvc.iterator(); it.hasNext(); )
{
MaxValueCountElem mvci = it.next();
values.add( mvci.toString() );
}
}
- else if ( item.getClass() == MaxImmSubItem.class )
+ else if ( item instanceof MaxImmSubItem )
{
MaxImmSubItem mis = ( MaxImmSubItem ) item;
values.add( Integer.toString( mis.getValue() ) );
}
- else if ( item.getClass() == RestrictedByItem.class )
+ else if ( item instanceof RestrictedByItem )
{
RestrictedByItem rb = ( RestrictedByItem ) item;
+
for ( Iterator<RestrictedByElem> it = rb.iterator(); it.hasNext(); )
{
RestrictedByElem rbe = it.next();
values.add( rbe.toString() );
}
}
- else if ( item.getClass() == ClassesItem.class )
+ else if ( item instanceof ClassesItem )
{
ClassesItem classes = ( ClassesItem ) item;
StringBuilder sb = new StringBuilder();
classes.getClasses().printRefinementToBuffer( sb );
values.add( sb.toString() );
}
-
}
@@ -286,11 +291,13 @@ public class ProtectedItemWrapper
public String toString()
{
String flatValue = getFlatValue();
+
if ( flatValue.length() > 0 )
{
flatValue = flatValue.replace( '\r', ' ' );
flatValue = flatValue.replace( '\n', ' ' );
flatValue = ": " + flatValue; //$NON-NLS-1$
+
if ( flatValue.length() > 40 )
{
String temp = flatValue;
@@ -316,7 +323,8 @@ public class ProtectedItemWrapper
return ""; //$NON-NLS-1$
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
+
if ( isMultivalued() )
{
sb.append( "{ " ); //$NON-NLS-1$
@@ -358,7 +366,7 @@ public class ProtectedItemWrapper
*/
public String getDisplayName()
{
- return classToDisplayMap.get( clazz );
+ return CLASS_TO_DISPLAY_MAP.get( clazz );
}
@@ -369,7 +377,7 @@ public class ProtectedItemWrapper
*/
public String getIdentifier()
{
- return classToIdentifierMap.get( clazz );
+ return CLASS_TO_IDENTIFIER_MAP.get( clazz );
}
@@ -413,6 +421,6 @@ public class ProtectedItemWrapper
*/
public boolean isMultivalued()
{
- return isMultivalued;
+ return multivalued;
}
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java Wed Jul 29 22:29:46 2015
@@ -47,7 +47,7 @@ import org.apache.directory.studio.value
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ProtectedItemWrapperFactory
+public final class ProtectedItemWrapperFactory
{
/**
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java Wed Jul 29 22:29:46 2015
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -47,9 +46,8 @@ import org.eclipse.osgi.util.NLS;
*/
public class UserClassWrapper
{
-
/** This map contains all possible user class identifiers */
- public static final Map<Class<? extends UserClass>, String> classToIdentifierMap;
+ public static final Map<Class<? extends UserClass>, String> CLASS_TO_IDENTIFIER_MAP;
static
{
Map<Class<? extends UserClass>, String> map = new HashMap<Class<? extends UserClass>, String>();
@@ -59,11 +57,11 @@ public class UserClassWrapper
map.put( UserClass.Name.class, "name" ); //$NON-NLS-1$
map.put( UserClass.UserGroup.class, "userGroup" ); //$NON-NLS-1$
map.put( UserClass.Subtree.class, "subtree" ); //$NON-NLS-1$
- classToIdentifierMap = Collections.unmodifiableMap( map );
+ CLASS_TO_IDENTIFIER_MAP = Collections.unmodifiableMap( map );
}
/** This map contains all user class display values */
- public static final Map<Class<? extends UserClass>, String> classToDisplayMap;
+ public static final Map<Class<? extends UserClass>, String> CLASS_TO_DISPLAY_MAP;
static
{
Map<Class<? extends UserClass>, String> map = new HashMap<Class<? extends UserClass>, String>();
@@ -73,7 +71,7 @@ public class UserClassWrapper
map.put( UserClass.Name.class, Messages.getString( "UserClassWrapper.userClass.name.label" ) ); //$NON-NLS-1$
map.put( UserClass.UserGroup.class, Messages.getString( "UserClassWrapper.userClass.userGroup.label" ) ); //$NON-NLS-1$
map.put( UserClass.Subtree.class, Messages.getString( "UserClassWrapper.userClass.subtree.label" ) ); //$NON-NLS-1$
- classToDisplayMap = Collections.unmodifiableMap( map );
+ CLASS_TO_DISPLAY_MAP = Collections.unmodifiableMap( map );
}
/** A dummy ACI to check syntax of the userClassValue. */
@@ -85,16 +83,16 @@ public class UserClassWrapper
private final Class<? extends UserClass> clazz;
/** The user class values, may be empty. */
- private List<String> values;
+ private final List<String> values;
/** The value prefix, prepended to the value. */
- private String valuePrefix;
+ private final String valuePrefix;
/** The value suffix, appended to the value. */
- private String valueSuffix;
+ private final String valueSuffix;
/** The value editor, null means no value. */
- private AbstractDialogStringValueEditor valueEditor;
+ private final AbstractDialogStringValueEditor valueEditor;
/**
@@ -134,6 +132,7 @@ public class UserClassWrapper
spec = spec.replaceAll( "#values#", flatValue ); //$NON-NLS-1$
ACIItemParser parser = new ACIItemParser( null );
UserFirstACIItem aci = null;
+
try
{
aci = ( UserFirstACIItem ) parser.parse( spec );
@@ -144,7 +143,9 @@ public class UserClassWrapper
Messages.getString( "UserClassWrapper.error.message" ), new String[] { getIdentifier(), flatValue } ); //$NON-NLS-1$
throw new ParseException( msg, 0 );
}
+
UserClass userClass = ( UserClass ) aci.getUserClasses().iterator().next();
+
return userClass;
}
@@ -189,8 +190,7 @@ public class UserClassWrapper
{
StringBuilder buffer = new StringBuilder();
subtreeSpecification.toString( buffer );
- String s = buffer.toString();
- values.add( s );
+ values.add( buffer.toString() );
}
}
}
@@ -229,26 +229,35 @@ public class UserClassWrapper
*/
private String getFlatValue()
{
- if ( valueEditor == null || values.isEmpty() )
+ if ( ( valueEditor == null ) || values.isEmpty() )
{
return ""; //$NON-NLS-1$
}
- StringBuffer sb = new StringBuffer();
- sb.append( "{ " ); //$NON-NLS-1$
- for ( Iterator<String> it = values.iterator(); it.hasNext(); )
+ StringBuilder buffer = new StringBuilder();
+ buffer.append( "{ " ); //$NON-NLS-1$
+
+ boolean isFirst = true;
+
+ for ( String value : values )
{
- sb.append( valuePrefix );
- String value = it.next();
- sb.append( value );
- sb.append( valueSuffix );
- if ( it.hasNext() )
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
- sb.append( ", " ); //$NON-NLS-1$
+ buffer.append( ", " ); //$NON-NLS-1$
}
+
+ buffer.append( valuePrefix );
+ buffer.append( value );
+ buffer.append( valueSuffix );
}
- sb.append( " }" ); //$NON-NLS-1$
- return sb.toString();
+
+ buffer.append( " }" ); //$NON-NLS-1$
+
+ return buffer.toString();
}
@@ -270,7 +279,7 @@ public class UserClassWrapper
*/
public String getDisplayName()
{
- return classToDisplayMap.get( clazz );
+ return CLASS_TO_DISPLAY_MAP.get( clazz );
}
@@ -281,7 +290,7 @@ public class UserClassWrapper
*/
public String getIdentifier()
{
- return classToIdentifierMap.get( clazz );
+ return CLASS_TO_IDENTIFIER_MAP.get( clazz );
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java Wed Jul 29 22:29:46 2015
@@ -31,15 +31,14 @@ import org.apache.directory.studio.value
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class UserClassWrapperFactory
+public final class UserClassWrapperFactory
{
-
/**
* Creates the user class wrappers.
*
* @return the user class wrapper[]
*/
- public static final UserClassWrapper[] createUserClassWrappers()
+ public static UserClassWrapper[] createUserClassWrappers()
{
UserClassWrapper[] userClassWrappers = new UserClassWrapper[]
{
@@ -75,5 +74,4 @@ public class UserClassWrapperFactory
return userClassWrappers;
}
-
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACICodeScanner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACICodeScanner.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACICodeScanner.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACICodeScanner.java Wed Jul 29 22:29:46 2015
@@ -42,24 +42,24 @@ import org.eclipse.jface.text.rules.Word
public class ACICodeScanner extends RuleBasedScanner
{
/** 'identificationTag' keyword */
- public static final String identificationTagPartition = "identificationTag"; //$NON-NLS-1$
+ public static final String IDENTIFICATION_TAG_PARTITION = "identificationTag"; //$NON-NLS-1$
/** 'precedence' keyword */
- public static final String precedencePartition = "precedence"; //$NON-NLS-1$
+ public static final String PRECEDENCE_PARTITION = "precedence"; //$NON-NLS-1$
/** 'authenticationLevel' keyword */
- public static final String authenticationLevelPartition = "authenticationLevel"; //$NON-NLS-1$
+ public static final String AUTHENTICATION_LEVEL_PARTITION = "authenticationLevel"; //$NON-NLS-1$
/** Keywords for the itemOrUserFirst Section */
- public static final String[] itemOrUserFirstSectionPartition = new String[]
+ public static final String[] ITEM_OR_USER_FIRST_SECTION_PARTITION = new String[]
{ "itemOrUserFirst", "itemFirst", "userFirst" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
/** Keywords for 'userFirst' section */
- public static final String[] userSection = new String[]
+ public static final String[] USER_SECTION = new String[]
{ "userClasses", "userPermissions" }; //$NON-NLS-1$ //$NON-NLS-2$
/** Keywords for AciItems values */
- public static final String[] aciKeywords = new String[]
+ public static final String[] ACI_KEYWORDS = new String[]
{ "protectedItems", //$NON-NLS-1$
"itemPermissions", //$NON-NLS-1$
"entry", //$NON-NLS-1$
@@ -87,7 +87,7 @@ public class ACICodeScanner extends Rule
"strong" }; //$NON-NLS-1$
/** Keywords for grant values */
- public static final String[] aciGrantValues = new String[]
+ public static final String[] ACI_GRANT_VALUES = new String[]
{ "grantAdd", //$NON-NLS-1$
"grantDiscloseOnError", //$NON-NLS-1$
"grantRead", //$NON-NLS-1$
@@ -103,7 +103,7 @@ public class ACICodeScanner extends Rule
"grantInvoke", }; //$NON-NLS-1$
/** Keywords for deny values */
- public static final String[] aciDenyValues = new String[]
+ public static final String[] ACI_DENY_VALUES = new String[]
{ "denyAdd", //$NON-NLS-1$
"denyDiscloseOnError", //$NON-NLS-1$
"denyRead", //$NON-NLS-1$
@@ -160,45 +160,45 @@ public class ACICodeScanner extends Rule
} ) );
// If the word isn't in the List, returns undefined
- WordRule wr = new WordRule( new AciWordDetector(), undefined );
+ WordRule worldRule = new WordRule( new AciWordDetector(), undefined );
// Adding Keywords
- for ( String aciKeyword : aciKeywords )
+ for ( String aciKeyword : ACI_KEYWORDS )
{
- wr.addWord( aciKeyword, keyword );
+ worldRule.addWord( aciKeyword, keyword );
}
// Adding GrantValues
- for ( String aciGrantValue : aciGrantValues )
+ for ( String aciGrantValue : ACI_GRANT_VALUES )
{
- wr.addWord( aciGrantValue, grantValue );
+ worldRule.addWord( aciGrantValue, grantValue );
}
// Adding DenyValues
- for ( String aciDenyValue : aciDenyValues )
+ for ( String aciDenyValue : ACI_DENY_VALUES )
{
- wr.addWord( aciDenyValue, denyValue );
+ worldRule.addWord( aciDenyValue, denyValue );
}
// Adding itemOrUserFirstSectionPartition
- for ( String itemOrUserFirstSectionPartitionValue : itemOrUserFirstSectionPartition )
+ for ( String itemOrUserFirstSectionPartitionValue : ITEM_OR_USER_FIRST_SECTION_PARTITION )
{
- wr.addWord( itemOrUserFirstSectionPartitionValue, itemOrUserFirst );
+ worldRule.addWord( itemOrUserFirstSectionPartitionValue, itemOrUserFirst );
}
// Adding User
- for ( String userSectionValue : userSection )
+ for ( String userSectionValue : USER_SECTION )
{
- wr.addWord( userSectionValue, user );
+ worldRule.addWord( userSectionValue, user );
}
- wr.addWord( identificationTagPartition, identification );
+ worldRule.addWord( IDENTIFICATION_TAG_PARTITION, identification );
- wr.addWord( precedencePartition, precedence );
+ worldRule.addWord( PRECEDENCE_PARTITION, precedence );
- wr.addWord( authenticationLevelPartition, authenticationLevel );
+ worldRule.addWord( AUTHENTICATION_LEVEL_PARTITION, authenticationLevel );
- rules.add( wr );
+ rules.add( worldRule );
IRule[] param = new IRule[rules.size()];
rules.toArray( param );
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIContentAssistProcessor.java Wed Jul 29 22:29:46 2015
@@ -53,12 +53,13 @@ public class ACIContentAssistProcessor e
// Add context dependend template proposals
ICompletionProposal[] templateProposals = super.computeCompletionProposals( viewer, offset );
+
if ( templateProposals != null )
{
proposalList.addAll( Arrays.asList( templateProposals ) );
}
- return ( ICompletionProposal[] ) proposalList.toArray( new ICompletionProposal[0] );
+ return ( ICompletionProposal[] ) proposalList.toArray( new ICompletionProposal[proposalList.size()] );
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java Wed Jul 29 22:29:46 2015
@@ -36,7 +36,6 @@ import org.eclipse.jface.text.source.ISo
*/
public class ACIFormattingStrategy implements IFormattingStrategy
{
-
/** The Constant INDENT_STRING. */
public static final String INDENT_STRING = " "; //$NON-NLS-1$
@@ -89,7 +88,7 @@ public class ACIFormattingStrategy imple
private String internFormat( String content )
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
// flag to track if a new line was started
boolean newLineStarted = true;
@@ -104,6 +103,7 @@ public class ACIFormattingStrategy imple
int indent = 0;
int contentLength = content.length();
+
for ( int i = 0; i < contentLength; i++ )
{
char c = content.charAt( i );
@@ -111,10 +111,10 @@ public class ACIFormattingStrategy imple
// track quotes
if ( c == '"' )
{
- inQuotedString = !inQuotedString;
+ inQuotedString ^= true;
}
- if ( c == '{' && !inQuotedString )
+ if ( ( c == '{' ) && !inQuotedString )
{
// check one-line mode
oneLineMode = checkInOneLine( i, content );
@@ -144,13 +144,14 @@ public class ACIFormattingStrategy imple
sb.append( NEWLINE );
newLineStarted = true;
indent++;
+
for ( int x = 0; x < indent; x++ )
{
sb.append( INDENT_STRING );
}
}
}
- else if ( c == '}' && !inQuotedString )
+ else if ( ( c == '}' ) && !inQuotedString )
{
if ( oneLineMode )
{
@@ -175,6 +176,7 @@ public class ACIFormattingStrategy imple
else
{
sb.append( NEWLINE );
+
for ( int x = 0; x < indent; x++ )
{
sb.append( INDENT_STRING );
@@ -187,13 +189,14 @@ public class ACIFormattingStrategy imple
// start a new line
sb.append( NEWLINE );
newLineStarted = true;
+
for ( int x = 0; x < indent; x++ )
{
sb.append( INDENT_STRING );
}
}
}
- else if ( c == ',' && !inQuotedString )
+ else if ( ( c == ',' ) && !inQuotedString )
{
// start new line on comma
if ( oneLineMode )
@@ -217,24 +220,18 @@ public class ACIFormattingStrategy imple
else if ( Character.isWhitespace( c ) )
{
char c1 = 'A';
+
if ( i + 1 < contentLength )
{
c1 = content.charAt( i + 1 );
}
- if ( newLineStarted )
- {
- // ignore space after starting a new line
- }
- else if ( c == '\n' || c == '\r' )
- {
- // ignore new lines
- }
- else if ( Character.isWhitespace( c1 ) || c1 == '\n' || c1 == '\r' )
- {
- // compress whitespaces
- }
- else
+ if ( ( !newLineStarted ) &&
+ // ignore space after starting a new line
+ ( c != '\n' ) && ( c != '\r' ) &&
+ // ignore new lines
+ !Character.isWhitespace( c1 ) && ( c1 != '\n' ) && ( c1 != '\r' ) )
+ // compress whitespaces
{
sb.append( c );
}
@@ -278,7 +275,7 @@ public class ACIFormattingStrategy imple
// track quotes
if ( c == '"' )
{
- inQuote = !inQuote;
+ inQuote ^= true;
}
// open curly indicates nested expression
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueDialog.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueDialog.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueDialog.java Wed Jul 29 22:29:46 2015
@@ -106,15 +106,6 @@ public class AttributeTypeAndValueDialog
/**
* {@inheritDoc}
*/
- protected void createButtonsForButtonBar( Composite parent )
- {
- super.createButtonsForButtonBar( parent );
- }
-
-
- /**
- * {@inheritDoc}
- */
protected void okPressed()
{
returnAttributeType = attributeTypeCombo.getText();
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=1693356&r1=1693355&r2=1693356&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 Wed Jul 29 22:29:46 2015
@@ -36,10 +36,6 @@ import org.eclipse.swt.widgets.Shell;
*/
public class AttributeTypeAndValueValueEditor extends AbstractDialogStringValueEditor
{
-
-
-
-
/**
* {@inheritDoc}
*
@@ -48,18 +44,22 @@ public class AttributeTypeAndValueValueE
public boolean openDialog( Shell shell )
{
Object value = getValue();
+
if ( value instanceof AttributeTypeAndValueValueEditorRawValueWrapper )
{
AttributeTypeAndValueValueEditorRawValueWrapper wrapper = ( AttributeTypeAndValueValueEditorRawValueWrapper ) value;
AttributeTypeAndValueDialog dialog = new AttributeTypeAndValueDialog( shell, wrapper.schema,
wrapper.attributeType, wrapper.value );
- if ( dialog.open() == TextDialog.OK && !EMPTY.equals( dialog.getAttributeType() )
+
+ if ( ( dialog.open() == TextDialog.OK ) && !EMPTY.equals( dialog.getAttributeType() )
&& !EMPTY.equals( dialog.getValue() ) )
{
setValue( dialog.getAttributeType() + '=' + dialog.getValue() );
+
return true;
}
}
+
return false;
}
@@ -71,19 +71,26 @@ public class AttributeTypeAndValueValueE
*/
public Object getRawValue( IValue value )
{
- return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value
- .getStringValue() ) : null;
+ if ( value != null )
+ {
+ return getRawValue( value.getAttribute().getEntry().getBrowserConnection(),
+ value.getStringValue() );
+ }
+
+ return null;
}
private Object getRawValue( IBrowserConnection connection, Object value )
{
Schema schema = null;
+
if ( connection != null )
{
schema = connection.getSchema();
}
- if ( schema == null || !( value instanceof String ) )
+
+ if ( ( schema == null ) || !( value instanceof String ) )
{
return null;
}
@@ -94,6 +101,7 @@ public class AttributeTypeAndValueValueE
String v = atav.length > 1 ? atav[1] : EMPTY;
AttributeTypeAndValueValueEditorRawValueWrapper wrapper = new AttributeTypeAndValueValueEditorRawValueWrapper(
schema, at, v );
+
return wrapper;
}
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=1693356&r1=1693355&r2=1693356&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 Wed Jul 29 22:29:46 2015
@@ -48,16 +48,20 @@ public class AttributeTypeValueEditor ex
public boolean openDialog( Shell shell )
{
Object value = getValue();
+
if ( value instanceof AttributeTypeValueEditorRawValueWrapper )
{
AttributeTypeValueEditorRawValueWrapper wrapper = ( AttributeTypeValueEditorRawValueWrapper ) value;
AttributeTypeDialog dialog = new AttributeTypeDialog( shell, wrapper.schema, wrapper.attributeType );
- if ( dialog.open() == TextDialog.OK && !EMPTY.equals( dialog.getAttributeType() ) )
+
+ if ( ( dialog.open() == TextDialog.OK ) && !EMPTY.equals( dialog.getAttributeType() ) )
{
setValue( dialog.getAttributeType() );
+
return true;
}
}
+
return false;
}
@@ -69,25 +73,33 @@ public class AttributeTypeValueEditor ex
*/
public Object getRawValue( IValue value )
{
- return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value
- .getStringValue() ) : null;
+ if ( value != null )
+ {
+ return getRawValue( value.getAttribute().getEntry().getBrowserConnection(),
+ value.getStringValue() );
+ }
+
+ return null;
}
private Object getRawValue( IBrowserConnection connection, Object value )
{
Schema schema = null;
+
if ( connection != null )
{
schema = connection.getSchema();
}
- if ( schema == null || !( value instanceof String ) )
+
+ if ( ( schema == null ) || !( value instanceof String ) )
{
return null;
}
String atValue = ( String ) value;
AttributeTypeValueEditorRawValueWrapper wrapper = new AttributeTypeValueEditorRawValueWrapper( schema, atValue );
+
return wrapper;
}
@@ -122,5 +134,4 @@ public class AttributeTypeValueEditor ex
this.attributeType = attributeType;
}
}
-
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java Wed Jul 29 22:29:46 2015
@@ -53,7 +53,6 @@ import org.eclipse.swt.widgets.Shell;
*/
class ExclusionDialog extends Dialog
{
-
/** The connection. */
private IBrowserConnection connection;
@@ -78,7 +77,6 @@ class ExclusionDialog extends Dialog
// UI Fields
private Combo typeCombo;
- private ComboViewer typeComboViewer;
private EntryWidget entryWidget;
@@ -154,7 +152,8 @@ class ExclusionDialog extends Dialog
String[] types = new String[2];
types[0] = CHOP_BEFORE;
types[1] = CHOP_AFTER;
- typeComboViewer = new ComboViewer( typeCombo );
+
+ ComboViewer typeComboViewer = new ComboViewer( typeCombo );
typeComboViewer.setContentProvider( new ArrayContentProvider() );
typeComboViewer.setLabelProvider( new LabelProvider() );
typeComboViewer.setInput( types );
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=1693356&r1=1693355&r2=1693356&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 Wed Jul 29 22:29:46 2015
@@ -71,8 +71,15 @@ public class FilterValueEditor extends A
*/
public Object getRawValue( IValue value )
{
- return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value
- .getStringValue() ) : null;
+ if ( value != null )
+ {
+ return getRawValue( value.getAttribute().getEntry().getBrowserConnection(),
+ value.getStringValue() );
+ }
+ else
+ {
+ 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=1693356&r1=1693355&r2=1693356&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 Wed Jul 29 22:29:46 2015
@@ -92,8 +92,15 @@ public class MaxValueCountValueEditor ex
*/
public Object getRawValue( IValue value )
{
- return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value
- .getStringValue() ) : null;
+ if ( value != null )
+ {
+ return getRawValue( value.getAttribute().getEntry().getBrowserConnection(),
+ value.getStringValue() );
+ }
+ else
+ {
+ return null;
+ }
}
@@ -226,15 +233,6 @@ public class MaxValueCountValueEditor ex
}
- /**
- * {@inheritDoc}
- */
- protected void createButtonsForButtonBar( Composite parent )
- {
- super.createButtonsForButtonBar( parent );
- }
-
-
/**
* {@inheritDoc}
*/
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java Wed Jul 29 22:29:46 2015
@@ -29,7 +29,7 @@ import java.util.ResourceBundle;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Messages
+public final class Messages
{
/** The resource name */
private static final ResourceBundle RESOURCE_BUNDLE =
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=1693356&r1=1693355&r2=1693356&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 Wed Jul 29 22:29:46 2015
@@ -94,8 +94,13 @@ public class RestrictedByValueEditor ext
*/
public Object getRawValue( IValue value )
{
- return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value
- .getStringValue() ) : null;
+ if ( value != null )
+ {
+ return getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value
+ .getStringValue() );
+ }
+
+ return null;
}
@@ -147,13 +152,13 @@ public class RestrictedByValueEditor ext
* The schema, used in RestrictedByDialog to build the list
* with possible attribute types.
*/
- private Schema schema;
+ private final Schema schema;
/** The type, used as initial type. */
- private String type;
+ private final String type;
/** The values in, used as initial values in. */
- private String valuesIn;
+ private final String valuesIn;
/**
@@ -235,15 +240,6 @@ public class RestrictedByValueEditor ext
/**
* {@inheritDoc}
*/
- protected void createButtonsForButtonBar( Composite parent )
- {
- super.createButtonsForButtonBar( parent );
- }
-
-
- /**
- * {@inheritDoc}
- */
protected void okPressed()
{
returnType = typeCombo.getText();
@@ -312,7 +308,5 @@ public class RestrictedByValueEditor ext
{
return returnValuesIn;
}
-
}
-
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java Wed Jul 29 22:29:46 2015
@@ -22,7 +22,6 @@ package org.apache.directory.studio.acii
import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -72,7 +71,6 @@ import org.eclipse.swt.widgets.Text;
*/
class SubtreeSpecificationDialog extends Dialog
{
-
/** The parser. */
private final SubtreeSpecificationParser parser = new SubtreeSpecificationParser( null );
@@ -102,7 +100,6 @@ class SubtreeSpecificationDialog extends
private Spinner minimumSpinner;
private Spinner maximumSpinner;
private TableViewer exclusionsTableViewer;
- private Button exclusionsTableAddButton;
private Button exclusionsTableEditButton;
private Button exclusionsTableDeleteButton;
private Button refinementButton;
@@ -217,7 +214,13 @@ class SubtreeSpecificationDialog extends
BaseWidgetUtils.createLabel( composite, Messages.getString( "SubtreeValueEditor.label.base" ), 1 ); //$NON-NLS-1$
Dn base = subtreeSpecification.getBase();
- Dn suffix = subentryDn != null ? subentryDn.getParent() : null;
+ Dn suffix = null;
+
+ if ( subentryDn != null )
+ {
+ suffix = subentryDn.getParent();
+ }
+
entryWidget = new EntryWidget( connection, base, suffix, useLocalName );
entryWidget.createWidget( composite );
entryWidget.addWidgetModifyListener( new WidgetModifyListener()
@@ -279,23 +282,11 @@ class SubtreeSpecificationDialog extends
applyDialogFont( outer );
- initFromInput();
-
validate();
return outer;
}
-
- /**
- * Initializes the Value Editor from the input.
- */
- private void initFromInput()
- {
-
- }
-
-
/**
* Creates the Exclusions Table.
*
@@ -353,7 +344,7 @@ class SubtreeSpecificationDialog extends
buttonGridData.verticalAlignment = GridData.BEGINNING;
buttonGridData.widthHint = Activator.getButtonWidth( buttonComposite );
- exclusionsTableAddButton = new Button( buttonComposite, SWT.PUSH );
+ Button exclusionsTableAddButton = new Button( buttonComposite, SWT.PUSH );
exclusionsTableAddButton.setText( Messages.getString( "SubtreeValueEditor.button.add" ) ); //$NON-NLS-1$
exclusionsTableAddButton.setLayoutData( buttonGridData );
exclusionsTableAddButton.addSelectionListener( new SelectionAdapter()
@@ -526,28 +517,33 @@ class SubtreeSpecificationDialog extends
private String buildSubreeSpecification()
{
// build subtree specification tree
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( "{" ); //$NON-NLS-1$
// Adding base
Dn base = entryWidget.getDn();
- if ( base != null && !SubtreeValueEditor.EMPTY.equals( base.toString() ) )
+
+ if ( ( base != null ) && !SubtreeValueEditor.EMPTY.equals( base.toString() ) )
{
- sb.append( " base \"" + base.toString() + "\"," ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( " base \"" );
+ sb.append( base.toString() );
+ sb.append( "\"," ); //$NON-NLS-1$ //$NON-NLS-2$
}
// Adding Minimum
int minimum = minimumSpinner.getSelection();
+
if ( minimum != 0 )
{
- sb.append( " minimum " + minimum + "," ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( " minimum " ).append( minimum ).append( ',' ); //$NON-NLS-1$ //$NON-NLS-2$
}
// Adding Maximum
int maximum = maximumSpinner.getSelection();
+
if ( maximum != 0 )
{
- sb.append( " maximum " + maximum + "," ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( " maximum " ).append( maximum ).append( ',' ); //$NON-NLS-1$ //$NON-NLS-2$
}
// Adding Exclusions
@@ -555,14 +551,20 @@ class SubtreeSpecificationDialog extends
{
sb.append( " specificExclusions {" ); //$NON-NLS-1$
- for ( Iterator<String> it = exclusions.iterator(); it.hasNext(); )
+ boolean isFirst = true;
+
+ for ( String exclusion : exclusions )
{
- sb.append( " " + it.next() ); //$NON-NLS-1$
-
- if ( it.hasNext() )
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
- sb.append( "," ); //$NON-NLS-1$
+ sb.append( ',' );
}
+
+ sb.append( ' ' ).append( exclusion ); //$NON-NLS-1$
}
sb.append( " }," ); //$NON-NLS-1$
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=1693356&r1=1693355&r2=1693356&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 Wed Jul 29 22:29:46 2015
@@ -36,8 +36,6 @@ import org.eclipse.swt.widgets.Shell;
*/
public class SubtreeValueEditor extends AbstractDialogStringValueEditor
{
- static final String EMPTY = ""; //$NON-NLS-1$
-
private boolean refinementOrFilterVisible;
private boolean useLocalName;
@@ -89,7 +87,8 @@ public class SubtreeValueEditor extends
/**
- * @see org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor#getRawValue(org.apache.directory.studio.ldapbrowser.core.model.IValue)
+ * @see org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor#getRawValue(
+ * org.apache.directory.studio.ldapbrowser.core.model.IValue)
*/
public Object getRawValue( IValue value )
{
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGeneralComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGeneralComposite.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGeneralComposite.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGeneralComposite.java Wed Jul 29 22:29:46 2015
@@ -59,36 +59,18 @@ import org.eclipse.swt.widgets.Text;
*/
public class ACIItemGeneralComposite extends Composite
{
- /** The inner composite for all the content */
- private Composite composite = null;
-
- /** The identification tag label */
- private Label identificationTagLabel = null;
-
/** The identification tag text field */
private Text identificationTagText = null;
- /** The precedence label */
- private Label precedenceLabel = null;
-
/** The spinner to select a valid precedence between 0 and 255 */
private Spinner precedenceSpinner = null;
- /** The authentication level label */
- private Label authenticationLevelLabel = null;
-
- /** The combo to select a valid uthentication level */
- private Combo authenticationLevelCombo = null;
-
/**
* The combo viewer is attached to authenticationLevelCombo to work with
* AuthenticationLevel objects rather than Strings
*/
private ComboViewer authenticationLevelComboViewer = null;
- /** The user or item first label */
- private Label userOrItemFirstLabel = null;
-
/** The user first radio button */
private Button userFirstRadioButton = null;
@@ -159,11 +141,11 @@ public class ACIItemGeneralComposite ext
gridData.grabExcessHorizontalSpace = true;
gridData.verticalAlignment = GridData.CENTER;
- composite = new Composite( this, SWT.NONE );
+ Composite composite = new Composite( this, SWT.NONE );
composite.setLayout( gridLayout );
composite.setLayoutData( gridData );
- identificationTagLabel = new Label( composite, SWT.NONE );
+ Label identificationTagLabel = new Label( composite, SWT.NONE );
identificationTagLabel.setText( Messages.getString( "ACIItemGeneralComposite.idTag.label" ) ); //$NON-NLS-1$
identificationTagText = new Text( composite, SWT.BORDER );
identificationTagText.setLayoutData( identificationTagGridData );
@@ -175,7 +157,7 @@ public class ACIItemGeneralComposite ext
}
} );
- precedenceLabel = new Label( composite, SWT.NONE );
+ Label precedenceLabel = new Label( composite, SWT.NONE );
precedenceLabel.setText( Messages.getString( "ACIItemGeneralComposite.precedence.label" ) ); //$NON-NLS-1$
precedenceSpinner = new Spinner( composite, SWT.BORDER );
precedenceSpinner.setMinimum( 0 );
@@ -193,9 +175,10 @@ public class ACIItemGeneralComposite ext
}
} );
- authenticationLevelLabel = new Label( composite, SWT.NONE );
+ Label authenticationLevelLabel = new Label( composite, SWT.NONE );
authenticationLevelLabel.setText( Messages.getString( "ACIItemGeneralComposite.authLevel.label" ) ); //$NON-NLS-1$
- authenticationLevelCombo = new Combo( composite, SWT.READ_ONLY );
+
+ Combo authenticationLevelCombo = new Combo( composite, SWT.READ_ONLY );
authenticationLevelCombo.setLayoutData( authenticationLevelGridData );
AuthenticationLevel[] authenticationLevels = new AuthenticationLevel[3];
authenticationLevels[0] = AuthenticationLevel.NONE;
@@ -214,7 +197,7 @@ public class ACIItemGeneralComposite ext
}
} );
- userOrItemFirstLabel = new Label( composite, SWT.NONE );
+ Label userOrItemFirstLabel = new Label( composite, SWT.NONE );
userOrItemFirstLabel.setText( Messages.getString( "ACIItemGeneralComposite.userOrItemFirst.label" ) ); //$NON-NLS-1$
userFirstRadioButton = new Button( composite, SWT.RADIO );
userFirstRadioButton.setText( Messages.getString( "ACIItemGeneralComposite.userFirst.label" ) ); //$NON-NLS-1$
@@ -246,8 +229,12 @@ public class ACIItemGeneralComposite ext
public void addWidgetModifyListener( WidgetModifyListener listener )
{
checkWidget();
+
if ( listener == null )
+ {
SWT.error( SWT.ERROR_NULL_ARGUMENT );
+ }
+
listenerList.add( listener );
}
@@ -260,8 +247,12 @@ public class ACIItemGeneralComposite ext
public void removeWidgetModifyListener( WidgetModifyListener listener )
{
checkWidget();
+
if ( listener == null )
+ {
SWT.error( SWT.ERROR_NULL_ARGUMENT );
+ }
+
listenerList.remove( listener );
}
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=1693356&r1=1693355&r2=1693356&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 Wed Jul 29 22:29:46 2015
@@ -58,28 +58,9 @@ import org.eclipse.swt.widgets.TreeColum
*/
public class ACIItemGrantsAndDenialsComposite extends Composite
{
-
- /** The description label */
- private Label label = null;
-
- /** The tree control for the tree viewer */
- private Tree tree = null;
-
/** The tree viewer containing all grants and denials */
private TreeViewer treeViewer = null;
- /** The composite containing the buttons */
- private Composite buttonComposite = null;
-
- /** The grant all button */
- private Button grantAllButton = null;
-
- /** The deny all button */
- private Button denyAllButton = null;
-
- /** The deselect all button */
- private Button deselectAllButton = null;
-
/** The undo button */
private Button undoButton = null;
@@ -87,13 +68,13 @@ public class ACIItemGrantsAndDenialsComp
private Button redoButton = null;
/** Colum 1 */
- private static String PERMISSION = Messages.getString( "ACIItemGrantsAndDenialsComposite.column1.header" ); //$NON-NLS-1$
+ private static final String PERMISSION = Messages.getString( "ACIItemGrantsAndDenialsComposite.column1.header" ); //$NON-NLS-1$
/** Colum2 */
- private static String STATE = Messages.getString( "ACIItemGrantsAndDenialsComposite.column2.header" ); //$NON-NLS-1$
+ private static final String STATE = Messages.getString( "ACIItemGrantsAndDenialsComposite.column2.header" ); //$NON-NLS-1$
/** The colums */
- private static String[] COLUMNS = new String[]
+ private static final String[] COLUMNS = new String[]
{ PERMISSION, STATE };
/** The undo/redo stack size */
@@ -225,7 +206,7 @@ public class ACIItemGrantsAndDenialsComp
labelGridData.grabExcessHorizontalSpace = true;
labelGridData.horizontalAlignment = GridData.FILL;
- label = new Label( this, SWT.NONE );
+ Label label = new Label( this, SWT.NONE );
label.setText( Messages.getString( "ACIItemGrantsAndDenialsComposite.description" ) ); //$NON-NLS-1$
label.setLayoutData( labelGridData );
@@ -248,18 +229,18 @@ public class ACIItemGrantsAndDenialsComp
tableGridData.horizontalAlignment = GridData.FILL;
//tableGridData.heightHint = 100;
- tree = new Tree( this, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION
+ Tree tree = new Tree( this, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION
| SWT.HIDE_SELECTION );
tree.setHeaderVisible( true );
tree.setLayoutData( tableGridData );
tree.setLinesVisible( true );
- TreeColumn c1 = new TreeColumn( tree, SWT.LEFT, 0 );
- c1.setText( COLUMNS[0] );
- c1.setWidth( 160 );
- TreeColumn c2 = new TreeColumn( tree, SWT.LEFT, 1 );
- c2.setText( COLUMNS[1] );
- c2.setWidth( 80 );
+ TreeColumn treeColumn1 = new TreeColumn( tree, SWT.LEFT, 0 );
+ treeColumn1.setText( COLUMNS[0] );
+ treeColumn1.setWidth( 160 );
+ TreeColumn treeColumn2 = new TreeColumn( tree, SWT.LEFT, 1 );
+ treeColumn2.setText( COLUMNS[1] );
+ treeColumn2.setWidth( 80 );
// TreeColumn c3 = new TreeColumn( tree, SWT.LEFT, 2 );
// c3.setText( " " ); //$NON-NLS-1$
// c3.setWidth( 0 );
@@ -337,16 +318,16 @@ public class ACIItemGrantsAndDenialsComp
gridData.grabExcessVerticalSpace = false;
gridData.verticalAlignment = GridData.FILL;
- buttonComposite = new Composite( this, SWT.NONE );
+ Composite buttonComposite = new Composite( this, SWT.NONE );
buttonComposite.setLayoutData( gridData );
buttonComposite.setLayout( gridLayout );
- grantAllButton = new Button( buttonComposite, SWT.NONE );
+ Button grantAllButton = new Button( buttonComposite, SWT.NONE );
grantAllButton.setText( Messages.getString( "ACIItemGrantsAndDenialsComposite.grantAll.button" ) ); //$NON-NLS-1$
grantAllButton.setLayoutData( grantAllButtonGridData );
grantAllButton.addSelectionListener( new SelectionAdapter()
{
- public void widgetSelected( SelectionEvent e )
+ public void widgetSelected( SelectionEvent event )
{
backup();
for ( GrantAndDenialCategory grantAndDenialCategory : grantAndDenialCategories )
@@ -360,12 +341,12 @@ public class ACIItemGrantsAndDenialsComp
}
} );
- denyAllButton = new Button( buttonComposite, SWT.NONE );
+ Button denyAllButton = new Button( buttonComposite, SWT.NONE );
denyAllButton.setText( Messages.getString( "ACIItemGrantsAndDenialsComposite.denyAll.button" ) ); //$NON-NLS-1$
denyAllButton.setLayoutData( denyAllButtonGridData );
denyAllButton.addSelectionListener( new SelectionAdapter()
{
- public void widgetSelected( SelectionEvent e )
+ public void widgetSelected( SelectionEvent event )
{
backup();
for ( GrantAndDenialCategory grantAndDenialCategory : grantAndDenialCategories )
@@ -379,12 +360,12 @@ public class ACIItemGrantsAndDenialsComp
}
} );
- deselectAllButton = new Button( buttonComposite, SWT.NONE );
+ Button deselectAllButton = new Button( buttonComposite, SWT.NONE );
deselectAllButton.setText( Messages.getString( "ACIItemGrantsAndDenialsComposite.deselectAll.button" ) ); //$NON-NLS-1$
deselectAllButton.setLayoutData( deselectAllButtonGridData );
deselectAllButton.addSelectionListener( new SelectionAdapter()
{
- public void widgetSelected( SelectionEvent e )
+ public void widgetSelected( SelectionEvent event )
{
backup();
for ( GrantAndDenialCategory grantAndDenialCategory : grantAndDenialCategories )
@@ -403,7 +384,7 @@ public class ACIItemGrantsAndDenialsComp
undoButton.setLayoutData( undoButtonGridData );
undoButton.addSelectionListener( new SelectionAdapter()
{
- public void widgetSelected( SelectionEvent e )
+ public void widgetSelected( SelectionEvent event )
{
undo();
treeViewer.refresh();
@@ -416,7 +397,7 @@ public class ACIItemGrantsAndDenialsComp
redoButton.setLayoutData( redoButtonGridData );
redoButton.addSelectionListener( new SelectionAdapter()
{
- public void widgetSelected( SelectionEvent e )
+ public void widgetSelected( SelectionEvent event )
{
redo();
treeViewer.refresh();
@@ -463,12 +444,9 @@ public class ACIItemGrantsAndDenialsComp
*/
public Object getValue( Object element, String property )
{
- if ( element instanceof GrantAndDenialWrapper )
+ if ( ( element instanceof GrantAndDenialWrapper ) && property.equals( STATE ) )
{
- if ( property.equals( STATE ) )
- {
- return new Boolean( true );
- }
+ return Boolean.TRUE;
}
return null;
@@ -484,14 +462,16 @@ public class ACIItemGrantsAndDenialsComp
*/
public void modify( Object element, String property, Object value )
{
+ Object target = element;
+
if ( element instanceof Item )
{
- element = ( ( Item ) element ).getData();
+ target = ( ( Item ) element ).getData();
}
- if ( element instanceof GrantAndDenialWrapper )
+ if ( target instanceof GrantAndDenialWrapper )
{
- GrantAndDenialWrapper grantAndDenialWrapper = ( GrantAndDenialWrapper ) element;
+ GrantAndDenialWrapper grantAndDenialWrapper = ( GrantAndDenialWrapper ) target;
if ( property.equals( STATE ) )
{
@@ -637,13 +617,11 @@ public class ACIItemGrantsAndDenialsComp
return cat.name;
}
}
- else if ( element instanceof GrantAndDenialWrapper )
+ else if ( ( element instanceof GrantAndDenialWrapper ) && ( columnIndex == 0 ) )
{
- if ( columnIndex == 0 )
- {
- GrantAndDenialWrapper wrapper = ( GrantAndDenialWrapper ) element;
- return wrapper.grant.getMicroOperation().getName();
- }
+ GrantAndDenialWrapper wrapper = ( GrantAndDenialWrapper ) element;
+
+ return wrapper.grant.getMicroOperation().getName();
}
return ""; //$NON-NLS-1$
@@ -715,7 +693,7 @@ public class ACIItemGrantsAndDenialsComp
{
for ( GrantAndDenialWrapper grantAndDenialWrapper : grantAndDenialCategory.grantAndDenialWrappers )
{
- if ( grantAndDenialWrapper.undoStack.size() > 0 )
+ if ( !grantAndDenialWrapper.undoStack.isEmpty() )
{
grantAndDenialWrapper.redoStack.add( 0, grantAndDenialWrapper.activeGrantAndDenial );
grantAndDenialWrapper.activeGrantAndDenial = grantAndDenialWrapper.undoStack.remove( 0 );
@@ -737,7 +715,7 @@ public class ACIItemGrantsAndDenialsComp
{
for ( GrantAndDenialWrapper grantAndDenialWrapper : grantAndDenialCategory.grantAndDenialWrappers )
{
- if ( grantAndDenialWrapper.redoStack.size() > 0 )
+ if ( !grantAndDenialWrapper.redoStack.isEmpty() )
{
grantAndDenialWrapper.undoStack.add( 0, grantAndDenialWrapper.activeGrantAndDenial );
grantAndDenialWrapper.activeGrantAndDenial = grantAndDenialWrapper.redoStack.remove( 0 );
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java?rev=1693356&r1=1693355&r2=1693356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java Wed Jul 29 22:29:46 2015
@@ -22,7 +22,6 @@ package org.apache.directory.studio.acii
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import org.apache.directory.api.ldap.aci.GrantAndDenial;
@@ -58,28 +57,15 @@ import org.eclipse.swt.widgets.Table;
*/
public class ACIItemItemPermissionsComposite extends Composite
{
-
/** The context. */
private ACIItemValueWithContext context;
/** The inner composite for all the content */
private Composite composite = null;
- /** The description label */
- private Label label = null;
-
- /** The table control for the table viewer */
- private Table table = null;
-
/** The table viewer containing all item classes */
private TableViewer tableViewer = null;
- /** The composite containing the buttons */
- private Composite buttonComposite = null;
-
- /** The add button */
- private Button addButton = null;
-
/** The edit button */
private Button editButton = null;
@@ -124,44 +110,63 @@ public class ACIItemItemPermissionsCompo
}
else
{
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
+
if ( ( itemPermission.getPrecedence() != null ) && ( itemPermission.getPrecedence() > -1 ) )
{
buffer.append( '(' );
buffer.append( itemPermission.getPrecedence() );
- buffer.append( ')' );
- buffer.append( ' ' );
+ buffer.append( ") " );
}
- for ( Iterator<UserClass> it = ( ( Collection<UserClass> ) itemPermission.getUserClasses() ).iterator(); it
- .hasNext(); )
- {
- UserClass uc = it.next();
- String s = UserClassWrapper.classToDisplayMap.get( uc.getClass() );
- buffer.append( s );
- if ( it.hasNext() )
+ boolean isFirst = true;
+
+ for ( UserClass userClass : itemPermission.getUserClasses() )
+ {
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
buffer.append( ',' );
}
+
+ String s = UserClassWrapper.CLASS_TO_DISPLAY_MAP.get( userClass.getClass() );
+ buffer.append( s );
}
- buffer.append( ':' );
- buffer.append( ' ' );
- for ( Iterator<GrantAndDenial> it = ( ( Collection<GrantAndDenial> ) itemPermission
- .getGrantsAndDenials() ).iterator(); it.hasNext(); )
- {
- GrantAndDenial gd = it.next();
- buffer.append( gd.isGrant() ? '+' : '-' );
- buffer.append( gd.getMicroOperation().getName() );
+
+ buffer.append( ": " );
- if ( it.hasNext() )
+ isFirst = true;
+
+ for ( GrantAndDenial grantAndDenial : itemPermission.getGrantsAndDenials() )
+ {
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
buffer.append( ',' );
}
+
+ if ( grantAndDenial.isGrant() )
+ {
+ buffer.append( '+' );
+ }
+ else
+ {
+ buffer.append( '-' );
+ }
+
+ buffer.append( grantAndDenial.getMicroOperation().getName() );
}
String s = buffer.toString();
s = s.replace( '\r', ' ' );
s = s.replace( '\n', ' ' );
+
if ( s.length() > 50 )
{
String temp = s;
@@ -169,6 +174,7 @@ public class ACIItemItemPermissionsCompo
s = s + "..."; //$NON-NLS-1$
s = s + temp.substring( temp.length() - 25, temp.length() );
}
+
return s;
}
}
@@ -230,12 +236,11 @@ public class ACIItemItemPermissionsCompo
composite.setLayoutData( gridData );
composite.setLayout( gridLayout );
- label = new Label( composite, SWT.NONE );
+ Label label = new Label( composite, SWT.NONE );
label.setText( Messages.getString( "ACIItemItemPermissionsComposite.description" ) ); //$NON-NLS-1$
label.setLayoutData( labelGridData );
createTable();
-
createButtonComposite();
}
@@ -252,7 +257,7 @@ public class ACIItemItemPermissionsCompo
tableGridData.horizontalAlignment = GridData.FILL;
//tableGridData.heightHint = 100;
- table = new Table( composite, SWT.BORDER );
+ Table table = new Table( composite, SWT.BORDER );
table.setHeaderVisible( false );
table.setLayoutData( tableGridData );
table.setLinesVisible( false );
@@ -312,11 +317,11 @@ public class ACIItemItemPermissionsCompo
gridData.grabExcessVerticalSpace = false;
gridData.verticalAlignment = GridData.FILL;
- buttonComposite = new Composite( composite, SWT.NONE );
+ Composite buttonComposite = new Composite( composite, SWT.NONE );
buttonComposite.setLayoutData( gridData );
buttonComposite.setLayout( gridLayout );
- addButton = new Button( buttonComposite, SWT.NONE );
+ Button addButton = new Button( buttonComposite, SWT.NONE );
addButton.setText( Messages.getString( "ACIItemItemPermissionsComposite.add.button" ) ); //$NON-NLS-1$
addButton.setLayoutData( addButtonGridData );
addButton.addSelectionListener( new SelectionAdapter()