You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/07/27 17:15:52 UTC
svn commit: r1692895 [1/2] - in /directory/studio/trunk/plugins:
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/
ldapbrowser.common/src/main/java...
Author: elecharny
Date: Mon Jul 27 15:15:52 2015
New Revision: 1692895
URL: http://svn.apache.org/r1692895
Log:
o Cleaned up the editors :
- No need to test (x == null) when it's followed by (x instonceof X)
- Added a hasValue(IValue) method
- Moved some constants in the interface
- Minor code refactoring
o Removed some useless 'this.' and 'super.'
o Factored a call to action.getText()
o Added some Javadoc
o Removed some cond ? expr1 : expr2 expressions
o Used for (X x : xs ) whenever possible
o Speedup the OpenLdapAclValueEditor.getPrecedence() method
Modified:
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/valueeditors/AttributeTypeAndValueValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ShowDecoratedValuesAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorter.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/EntryValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/HexValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/IValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/InPlaceTextValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/MultivaluedValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java
directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/dialogs/OpenLdapAclDialog.java
directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/editor/OpenLdapAclValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/address/AddressValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/administrativerole/AdministrativeRoleValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/adtime/ActiveDirectoryTimeValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/oid/InPlaceOidValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordValueEditor.java
directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditor.java
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=1692895&r1=1692894&r2=1692895&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 Mon Jul 27 15:15:52 2015
@@ -36,7 +36,6 @@ import org.eclipse.swt.widgets.Shell;
*/
public class ACIItemValueEditor extends AbstractDialogStringValueEditor
{
-
/**
* The Constructor.
*/
@@ -56,17 +55,21 @@ public class ACIItemValueEditor extends
public boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof ACIItemValueWithContext )
+
+ if ( value instanceof ACIItemValueWithContext )
{
ACIItemValueWithContext context = ( ACIItemValueWithContext ) value;
ACIItemDialog dialog = new ACIItemDialog( shell, context );
- if ( dialog.open() == ACIItemDialog.OK && !"".equals( dialog.getACIItemValue() ) ) //$NON-NLS-1$
+
+ if ( ( dialog.open() == ACIItemDialog.OK ) && !EMPTY.equals( dialog.getACIItemValue() ) ) //$NON-NLS-1$
{
setValue( dialog.getACIItemValue() );
+
return true;
}
}
+
return false;
}
@@ -86,27 +89,26 @@ public class ACIItemValueEditor extends
*/
public Object getRawValue( AttributeHierarchy attributeHierarchy )
{
- if ( attributeHierarchy == null )
- {
- return null;
- }
- else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 0 )
- {
- IEntry entry = attributeHierarchy.getAttribute().getEntry();
- IBrowserConnection connection = entry.getBrowserConnection();
- return new ACIItemValueWithContext( connection, entry, "" ); //$NON-NLS-1$
- }
- else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 1 )
- {
- IEntry entry = attributeHierarchy.getAttribute().getEntry();
- IBrowserConnection connection = entry.getBrowserConnection();
- String value = getDisplayValue( attributeHierarchy );
- return new ACIItemValueWithContext( connection, entry, value );
- }
- else
+ if ( ( attributeHierarchy != null ) && ( attributeHierarchy.size() == 1 ) )
{
- return null;
+ if ( attributeHierarchy.getAttribute().getValueSize() == 0 )
+ {
+ IEntry entry = attributeHierarchy.getAttribute().getEntry();
+ IBrowserConnection connection = entry.getBrowserConnection();
+
+ return new ACIItemValueWithContext( connection, entry, EMPTY ); //$NON-NLS-1$
+ }
+ else if ( attributeHierarchy.getAttribute().getValueSize() == 1 )
+ {
+ IEntry entry = attributeHierarchy.getAttribute().getEntry();
+ IBrowserConnection connection = entry.getBrowserConnection();
+ String value = getDisplayValue( attributeHierarchy );
+
+ return new ACIItemValueWithContext( connection, entry, value );
+ }
}
+
+ return null;
}
@@ -121,15 +123,16 @@ public class ACIItemValueEditor extends
public Object getRawValue( IValue value )
{
Object o = super.getRawValue( value );
- if ( o != null && o instanceof String )
+
+ if ( o instanceof String )
{
IEntry entry = value.getAttribute().getEntry();
IBrowserConnection connection = entry.getBrowserConnection();
String v = ( String ) o;
+
return new ACIItemValueWithContext( connection, entry, v );
}
return null;
}
-
}
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=1692895&r1=1692894&r2=1692895&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 15:15:52 2015
@@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Shell;
public class AttributeTypeAndValueValueEditor extends AbstractDialogStringValueEditor
{
- private static final String EMPTY = ""; //$NON-NLS-1$
+
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java Mon Jul 27 15:15:52 2015
@@ -86,6 +86,7 @@ public class BrowserCommonPreferencesIni
Collection<AttributeValueEditorRelation> avprs = new ArrayList<AttributeValueEditorRelation>();
Collection<SyntaxValueEditorRelation> svprs = new ArrayList<SyntaxValueEditorRelation>();
Collection<ValueEditorExtension> valueEditorExtensions = ValueEditorManager.getValueEditorExtensions();
+
for ( ValueEditorExtension vee : valueEditorExtensions )
{
for ( String attributeType : vee.attributeTypes )
@@ -93,12 +94,14 @@ public class BrowserCommonPreferencesIni
AttributeValueEditorRelation aver = new AttributeValueEditorRelation( attributeType, vee.className );
avprs.add( aver );
}
+
for ( String syntaxOid : vee.syntaxOids )
{
SyntaxValueEditorRelation sver = new SyntaxValueEditorRelation( syntaxOid, vee.className );
svprs.add( sver );
}
}
+
BrowserCommonActivator.getDefault().getValueEditorsPreferences().setDefaultAttributeValueEditorRelations(
avprs.toArray( new AttributeValueEditorRelation[0] ) );
BrowserCommonActivator.getDefault().getValueEditorsPreferences().setDefaultSyntaxValueEditorRelations(
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java Mon Jul 27 15:15:52 2015
@@ -102,7 +102,7 @@ public abstract class BrowserAction exte
*/
protected BrowserAction()
{
- this.init();
+ init();
}
@@ -111,7 +111,7 @@ public abstract class BrowserAction exte
*/
public void init( IWorkbenchWindow window )
{
- this.init();
+ init();
}
@@ -175,8 +175,7 @@ public abstract class BrowserAction exte
/**
* Returns the command identifier.
*
- * @return
- * the command identifier
+ * @return the command identifier
*/
public abstract String getCommandId();
@@ -208,24 +207,24 @@ public abstract class BrowserAction exte
*/
private void init()
{
- this.selectedBrowserViewCategories = new BrowserCategory[0];
- this.selectedEntries = new IEntry[0];
- this.selectedBrowserEntryPages = new BrowserEntryPage[0];
- this.selectedSearches = new ISearch[0];
- this.selectedSearchResults = new ISearchResult[0];
- this.selectedBrowserSearchResultPages = new BrowserSearchResultPage[0];
- this.selectedBookmarks = new IBookmark[0];
- this.selectedAttributes = new IAttribute[0];
- this.selectedAttributeHierarchies = new AttributeHierarchy[0];
- this.selectedValues = new IValue[0];
-
- this.selectedLdifModel = null;
- this.selectedLdifContainers = new LdifContainer[0];
- this.selectedLdifParts = new LdifPart[0];
+ selectedBrowserViewCategories = new BrowserCategory[0];
+ selectedEntries = new IEntry[0];
+ selectedBrowserEntryPages = new BrowserEntryPage[0];
+ selectedSearches = new ISearch[0];
+ selectedSearchResults = new ISearchResult[0];
+ selectedBrowserSearchResultPages = new BrowserSearchResultPage[0];
+ selectedBookmarks = new IBookmark[0];
+ selectedAttributes = new IAttribute[0];
+ selectedAttributeHierarchies = new AttributeHierarchy[0];
+ selectedValues = new IValue[0];
+
+ selectedLdifModel = null;
+ selectedLdifContainers = new LdifContainer[0];
+ selectedLdifParts = new LdifPart[0];
- this.selectedProperties = new String[0];
+ selectedProperties = new String[0];
- this.input = null;
+ input = null;
}
@@ -234,32 +233,31 @@ public abstract class BrowserAction exte
*/
public void dispose()
{
- this.selectedBrowserViewCategories = new BrowserCategory[0];
- this.selectedEntries = new IEntry[0];
- this.selectedBrowserEntryPages = new BrowserEntryPage[0];
- this.selectedSearches = new ISearch[0];
- this.selectedSearchResults = new ISearchResult[0];
- this.selectedBrowserSearchResultPages = new BrowserSearchResultPage[0];
- this.selectedBookmarks = new IBookmark[0];
- this.selectedAttributes = new IAttribute[0];
- this.selectedAttributeHierarchies = new AttributeHierarchy[0];
- this.selectedValues = new IValue[0];
-
- this.selectedLdifModel = null;
- this.selectedLdifContainers = new LdifContainer[0];
- this.selectedLdifParts = new LdifPart[0];
+ selectedBrowserViewCategories = new BrowserCategory[0];
+ selectedEntries = new IEntry[0];
+ selectedBrowserEntryPages = new BrowserEntryPage[0];
+ selectedSearches = new ISearch[0];
+ selectedSearchResults = new ISearchResult[0];
+ selectedBrowserSearchResultPages = new BrowserSearchResultPage[0];
+ selectedBookmarks = new IBookmark[0];
+ selectedAttributes = new IAttribute[0];
+ selectedAttributeHierarchies = new AttributeHierarchy[0];
+ selectedValues = new IValue[0];
+
+ selectedLdifModel = null;
+ selectedLdifContainers = new LdifContainer[0];
+ selectedLdifParts = new LdifPart[0];
- this.selectedProperties = new String[0];
+ selectedProperties = new String[0];
- this.input = null;
+ input = null;
}
/**
* Returns the current active shell
*
- * @return
- * the current active shell
+ * @return the current active shell
*/
protected Shell getShell()
{
@@ -270,8 +268,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Attributes.
*
- * @return
- * the selected attributes
+ * @return the selected attributes
*/
public IAttribute[] getSelectedAttributes()
{
@@ -282,8 +279,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Attributes.
*
- * @param selectedAttributes
- * the selected attributes to set
+ * @param selectedAttributes the selected attributes to set
*/
public void setSelectedAttributes( IAttribute[] selectedAttributes )
{
@@ -294,8 +290,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Bookmarks.
*
- * @return
- * the selected Bookmarks
+ * @return the selected Bookmarks
*/
public IBookmark[] getSelectedBookmarks()
{
@@ -306,8 +301,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Bookmarks.
*
- * @param selectedBookmarks
- * the selected Bookmarks to set
+ * @param selectedBookmarks the selected Bookmarks to set
*/
public void setSelectedBookmarks( IBookmark[] selectedBookmarks )
{
@@ -318,8 +312,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Browser View categories.
*
- * @return
- * the selected Browser View categories
+ * @return the selected Browser View categories
*/
public BrowserCategory[] getSelectedBrowserViewCategories()
{
@@ -330,8 +323,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Browser View categories.
*
- * @param selectedBrowserViewCategories
- * the selected Browser View categories to set
+ * @param selectedBrowserViewCategories the selected Browser View categories to set
*/
public void setSelectedBrowserViewCategories( BrowserCategory[] selectedBrowserViewCategories )
{
@@ -353,8 +345,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Entries.
*
- * @param selectedEntries
- * the selected Entries to set
+ * @param selectedEntries the selected Entries to set
*/
public void setSelectedEntries( IEntry[] selectedEntries )
{
@@ -365,8 +356,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Searches.
*
- * @return
- * the selected Searches
+ * @return the selected Searches
*/
public ISearch[] getSelectedSearches()
{
@@ -377,8 +367,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Searches.
*
- * @param selectedSearches
- * the selected Searches to set
+ * @param selectedSearches the selected Searches to set
*/
public void setSelectedSearches( ISearch[] selectedSearches )
{
@@ -389,8 +378,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Search Results.
*
- * @return
- * the selected Search Results
+ * @return the selected Search Results
*/
public ISearchResult[] getSelectedSearchResults()
{
@@ -401,8 +389,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Search Results.
*
- * @param selectedSearchResults
- * the selected Search Results to set
+ * @param selectedSearchResults the selected Search Results to set
*/
public void setSelectedSearchResults( ISearchResult[] selectedSearchResults )
{
@@ -413,8 +400,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Values.
*
- * @return
- * the selected Values
+ * @return the selected Values
*/
public IValue[] getSelectedValues()
{
@@ -425,8 +411,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Values.
*
- * @param selectedValues
- * the selected values to set
+ * @param selectedValues the selected values to set
*/
public void setSelectedValues( IValue[] selectedValues )
{
@@ -437,8 +422,7 @@ public abstract class BrowserAction exte
/**
* Gets the input.
*
- * @return
- * the input
+ * @return the input
*/
public Object getInput()
{
@@ -449,8 +433,7 @@ public abstract class BrowserAction exte
/**
* Sets the input.
*
- * @param input
- * the input to set
+ * @param input the input to set
*/
public void setInput( Object input )
{
@@ -461,8 +444,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected LDIF Containers.
*
- * @return
- * the selected LDIF Containers
+ * @return the selected LDIF Containers
*/
public LdifContainer[] getSelectedLdifContainers()
{
@@ -473,8 +455,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected LDIF Containers.
*
- * @param selectedLdifContainers
- * the selected LDIF Containers to set
+ * @param selectedLdifContainers the selected LDIF Containers to set
*/
public void setSelectedLdifContainers( LdifContainer[] selectedLdifContainers )
{
@@ -485,8 +466,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected LDIF Model.
*
- * @return
- * the selected LDIF Model
+ * @return the selected LDIF Model
*/
public LdifFile getSelectedLdifModel()
{
@@ -497,8 +477,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected LDIF Model.
*
- * @param selectedLdifModel
- * the selected LDIF Model to set
+ * @param selectedLdifModel the selected LDIF Model to set
*/
public void setSelectedLdifModel( LdifFile selectedLdifModel )
{
@@ -509,8 +488,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected LDIF Parts.
*
- * @return
- * the selected LDIF Parts
+ * @return the selected LDIF Parts
*/
public LdifPart[] getSelectedLdifParts()
{
@@ -521,8 +499,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected LDIF Parts.
*
- * @param selectedLdifParts
- * the selected LDIF Parts to set
+ * @param selectedLdifParts the selected LDIF Parts to set
*/
public void setSelectedLdifParts( LdifPart[] selectedLdifParts )
{
@@ -533,8 +510,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Browser Entry Pages.
*
- * @return
- * the selected Browser Entru Pages
+ * @return the selected Browser Entru Pages
*/
public BrowserEntryPage[] getSelectedBrowserEntryPages()
{
@@ -545,8 +521,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Browser Entry Pages.
*
- * @param selectedBrowserEntryPages
- * the selected Browser Entry Pages to set
+ * @param selectedBrowserEntryPages the selected Browser Entry Pages to set
*/
public void setSelectedBrowserEntryPages( BrowserEntryPage[] selectedBrowserEntryPages )
{
@@ -557,8 +532,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Browser Search Result Pages.
*
- * @return
- * the selected Browser Search Result Pages
+ * @return the selected Browser Search Result Pages
*/
public BrowserSearchResultPage[] getSelectedBrowserSearchResultPages()
{
@@ -569,8 +543,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Browser Search Result Pages.
*
- * @param selectedBrowserSearchResultPages
- * the selected Browser Search result Pages to set
+ * @param selectedBrowserSearchResultPages the selected Browser Search result Pages to set
*/
public void setSelectedBrowserSearchResultPages( BrowserSearchResultPage[] selectedBrowserSearchResultPages )
{
@@ -581,8 +554,7 @@ public abstract class BrowserAction exte
/**
* Gets the selected Attribute Hierarchies.
*
- * @return
- * the selected Attribute Hierarchies
+ * @return the selected Attribute Hierarchies
*/
public AttributeHierarchy[] getSelectedAttributeHierarchies()
{
@@ -593,8 +565,7 @@ public abstract class BrowserAction exte
/**
* Sets the selected Attribute Hierarchies.
*
- * @param ahs
- * the selected Attribute Hierarchies to set
+ * @param ahs the selected Attribute Hierarchies to set
*/
public void setSelectedAttributeHierarchies( AttributeHierarchy[] ahs )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ShowDecoratedValuesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ShowDecoratedValuesAction.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ShowDecoratedValuesAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ShowDecoratedValuesAction.java Mon Jul 27 15:15:52 2015
@@ -39,8 +39,8 @@ public class ShowDecoratedValuesAction e
public ShowDecoratedValuesAction()
{
super( Messages.getString( "ShowDecoratedValuesAction.ShowDecoratedValues" ), AS_CHECK_BOX ); //$NON-NLS-1$
- super.setToolTipText( getText() );
- super.setEnabled( true );
+ setToolTipText( getText() );
+ setEnabled( true );
super.setChecked( !BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean(
BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES ) );
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java Mon Jul 27 15:15:52 2015
@@ -47,7 +47,7 @@ import org.eclipse.jface.viewers.Structu
public abstract class BrowserActionProxy extends Action implements ISelectionChangedListener, EntryUpdateListener,
SearchUpdateListener, BookmarkUpdateListener, ConnectionUpdateListener
{
-
+ /** The action */
protected BrowserAction action;
protected ISelectionProvider selectionProvider;
@@ -243,8 +243,9 @@ public abstract class BrowserActionProxy
{
if ( !isDisposed() )
{
- setText( action.getText() );
- setToolTipText( action.getText() );
+ String text = action.getText();
+ setText( text );
+ setToolTipText( text );
setEnabled( action.isEnabled() );
setImageDescriptor( action.getImageDescriptor() );
setChecked( action.isChecked() );
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java Mon Jul 27 15:15:52 2015
@@ -33,7 +33,6 @@ import org.eclipse.jface.viewers.Viewer;
*/
public class EntryEditorActionProxy extends BrowserActionProxy implements ISelectionChangedListener
{
-
/**
* Creates a new instance of EntryEditorActionProxy.
*
@@ -44,5 +43,4 @@ public class EntryEditorActionProxy exte
{
super( viewer, action );
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetCellModifier.java Mon Jul 27 15:15:52 2015
@@ -77,7 +77,7 @@ public class EntryEditorWidgetCellModifi
if ( EntryEditorWidgetTableMetadata.VALUE_COLUMN_NAME.equals( property ) )
{
- return valueEditorManager.getCurrentValueEditor( attributeValue ).getRawValue( attributeValue ) != null;
+ return valueEditorManager.getCurrentValueEditor( attributeValue ).hasValue( attributeValue );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java Mon Jul 27 15:15:52 2015
@@ -34,7 +34,6 @@ import org.eclipse.jface.viewers.TreeVie
*/
public class EntryEditorWidgetConfiguration
{
-
/** The disposed flag */
private boolean disposed = false;
@@ -240,5 +239,4 @@ public class EntryEditorWidgetConfigurat
return preferences;
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java Mon Jul 27 15:15:52 2015
@@ -53,8 +53,8 @@ public class EntryEditorWidgetFilter ext
*/
public EntryEditorWidgetFilter()
{
- this.quickFilterAttribute = ""; //$NON-NLS-1$
- this.quickFilterValue = ""; //$NON-NLS-1$
+ quickFilterAttribute = ""; //$NON-NLS-1$
+ quickFilterValue = ""; //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java Mon Jul 27 15:15:52 2015
@@ -30,12 +30,21 @@ import org.eclipse.jface.viewers.Viewer;
/**
* This class is a wrapper for the preferences of the entry editor widget.
+ * The preferences we handle for the EntryEditor are the following :
+ * <ul>
+ * <li>PREFERENCE_ENTRYEDITOR_ENABLE_FOLDING : </li>
+ * <li>PREFERENCE_ENTRYEDITOR_FOLDING_THRESHOLD : </li>
+ * <li>PREFERENCE_ENTRYEDITOR_AUTO_EXPAND_FOLDED_ATTRIBUTES</li>
+ * <li>PREFERENCE_ENTRYEDITOR_OBJECTCLASS_AND_MUST_ATTRIBUTES_FIRST : put the ObjectClass and the MUST attributes first</li>
+ * <li>PREFERENCE_ENTRYEDITOR_OPERATIONAL_ATTRIBUTES_LAST : show the operational attributes at the end</li>
+ * <li>PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_BY: sort either by the attribute or by the values</li>
+ * <li>PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_ORDER : defines the sort order (none, ascending or descending)</li>
+ * </ul>
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class EntryEditorWidgetPreferences
{
-
/** The viewer. */
protected Viewer viewer;
@@ -156,5 +165,4 @@ public class EntryEditorWidgetPreference
return BrowserCommonActivator.getDefault().getPreferenceStore().getInt(
BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_ORDER );
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorter.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorter.java Mon Jul 27 15:15:52 2015
@@ -34,6 +34,7 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
@@ -81,11 +82,9 @@ public class EntryEditorWidgetSorter ext
this.viewer = viewer;
viewer.setSorter( this );
- TreeColumn[] columns = ( ( TreeViewer ) viewer ).getTree().getColumns();
-
- for ( int i = 0; i < columns.length; i++ )
+ for ( TreeColumn column : ( ( TreeViewer ) viewer ).getTree().getColumns() )
{
- columns[i].addSelectionListener( this );
+ column.addSelectionListener( this );
}
}
@@ -113,20 +112,21 @@ public class EntryEditorWidgetSorter ext
*
* Switches the sort property and sort order when clicking the table headers.
*/
- public void widgetSelected( SelectionEvent e )
+ public void widgetSelected( SelectionEvent event )
{
- if ( e.widget instanceof TreeColumn && viewer != null )
+ if ( ( event.widget instanceof TreeColumn ) && ( viewer != null ) )
{
- int index = viewer.getTree().indexOf( ( ( TreeColumn ) e.widget ) );
+ Tree tree = viewer.getTree();
+ TreeColumn treeColumn = ( ( TreeColumn ) event.widget );
+
+ int index = tree.indexOf( treeColumn );
+
switch ( index )
{
case EntryEditorWidgetTableMetadata.KEY_COLUMN_INDEX:
if ( sortBy == BrowserCoreConstants.SORT_BY_ATTRIBUTE_DESCRIPTION )
{
- // toggle sort order
- sortOrder = sortOrder == BrowserCoreConstants.SORT_ORDER_NONE ? BrowserCoreConstants.SORT_ORDER_ASCENDING
- : sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING ? BrowserCoreConstants.SORT_ORDER_DESCENDING
- : BrowserCoreConstants.SORT_ORDER_NONE;
+ toggleSortOrder();
}
else
{
@@ -134,14 +134,13 @@ public class EntryEditorWidgetSorter ext
sortBy = BrowserCoreConstants.SORT_BY_ATTRIBUTE_DESCRIPTION;
sortOrder = BrowserCoreConstants.SORT_ORDER_ASCENDING;
}
+
break;
+
case EntryEditorWidgetTableMetadata.VALUE_COLUMN_INDEX:
if ( sortBy == BrowserCoreConstants.SORT_BY_VALUE )
{
- // toggle sort order
- sortOrder = sortOrder == BrowserCoreConstants.SORT_ORDER_NONE ? BrowserCoreConstants.SORT_ORDER_ASCENDING
- : sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING ? BrowserCoreConstants.SORT_ORDER_DESCENDING
- : BrowserCoreConstants.SORT_ORDER_NONE;
+ toggleSortOrder();
}
else
{
@@ -149,29 +148,31 @@ public class EntryEditorWidgetSorter ext
sortBy = BrowserCoreConstants.SORT_BY_VALUE;
sortOrder = BrowserCoreConstants.SORT_ORDER_ASCENDING;
}
+
break;
+
default:
;
}
+
if ( sortOrder == BrowserCoreConstants.SORT_ORDER_NONE )
{
sortBy = BrowserCoreConstants.SORT_BY_NONE;
}
- TreeColumn[] columns = viewer.getTree().getColumns();
- for ( int i = 0; i < columns.length; i++ )
+ for ( TreeColumn column : tree.getColumns() )
{
- columns[i].setImage( null );
+ column.setImage( null );
}
if ( sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING )
{
- ( ( TreeColumn ) e.widget ).setImage( BrowserCommonActivator.getDefault().getImage(
+ treeColumn.setImage( BrowserCommonActivator.getDefault().getImage(
BrowserCommonConstants.IMG_SORT_ASCENDING ) );
}
else if ( sortOrder == BrowserCoreConstants.SORT_ORDER_DESCENDING )
{
- ( ( TreeColumn ) e.widget ).setImage( BrowserCommonActivator.getDefault().getImage(
+ treeColumn.setImage( BrowserCommonActivator.getDefault().getImage(
BrowserCommonConstants.IMG_SORT_DESCENDING ) );
}
@@ -179,6 +180,29 @@ public class EntryEditorWidgetSorter ext
}
}
+
+ /**
+ * Rotate the sort order. If it was none, change it to ascending. If it was
+ * ascending, change it to descending, and if it was descending, change it to none.
+ */
+ private void toggleSortOrder()
+ {
+ switch ( sortOrder )
+ {
+ case BrowserCoreConstants.SORT_ORDER_NONE :
+ sortOrder = BrowserCoreConstants.SORT_ORDER_ASCENDING;
+ break;
+
+ case BrowserCoreConstants.SORT_ORDER_ASCENDING :
+ sortOrder = BrowserCoreConstants.SORT_ORDER_DESCENDING;
+ break;
+
+ case BrowserCoreConstants.SORT_ORDER_DESCENDING :
+ sortOrder = BrowserCoreConstants.SORT_ORDER_NONE;
+ break;
+ }
+ }
+
/**
* {@inheritDoc}
@@ -204,6 +228,7 @@ public class EntryEditorWidgetSorter ext
// check o1
IAttribute attribute1 = null;
IValue value1 = null;
+
if ( o1 instanceof IAttribute )
{
attribute1 = ( IAttribute ) o1;
@@ -217,6 +242,7 @@ public class EntryEditorWidgetSorter ext
// check o2
IAttribute attribute2 = null;
IValue value2 = null;
+
if ( o2 instanceof IAttribute )
{
attribute2 = ( IAttribute ) o2;
@@ -250,7 +276,7 @@ public class EntryEditorWidgetSorter ext
return equal();
}
}
- else if ( attribute1 != null && attribute2 != null )
+ else if ( ( attribute1 != null ) && ( attribute2 != null ) )
{
return compareAttributes( attribute1, attribute2 );
}
@@ -293,7 +319,8 @@ public class EntryEditorWidgetSorter ext
return greaterThan();
}
}
- if ( preferences == null || preferences.isOperationalAttributesLast() )
+
+ if ( ( preferences == null ) || preferences.isOperationalAttributesLast() )
{
if ( attribute1.isOperationalAttribute() && !attribute2.isOperationalAttribute() )
{
@@ -320,15 +347,18 @@ public class EntryEditorWidgetSorter ext
*/
private int compareValues( IValue value1, IValue value2 )
{
- if ( value1.isEmpty() && value2.isEmpty() )
+ if ( value1.isEmpty() )
{
- return equal();
- }
- else if ( value1.isEmpty() && !value2.isEmpty() )
- {
- return greaterThan();
+ if ( value2.isEmpty() )
+ {
+ return equal();
+ }
+ else
+ {
+ return greaterThan();
+ }
}
- else if ( !value1.isEmpty() && value2.isEmpty() )
+ else if ( !value2.isEmpty() )
{
return lessThan();
}
@@ -390,7 +420,14 @@ public class EntryEditorWidgetSorter ext
*/
private int lessThan()
{
- return this.getSortOrderOrDefault() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? -1 : 1;
+ if ( getSortOrderOrDefault() == BrowserCoreConstants.SORT_ORDER_ASCENDING )
+ {
+ return -1;
+ }
+ else
+ {
+ return 1;
+ }
}
@@ -412,7 +449,14 @@ public class EntryEditorWidgetSorter ext
*/
private int greaterThan()
{
- return this.getSortOrderOrDefault() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? 1 : -1;
+ if ( getSortOrderOrDefault() == BrowserCoreConstants.SORT_ORDER_ASCENDING )
+ {
+ return 1;
+ }
+ else
+ {
+ return -1;
+ }
}
@@ -427,8 +471,13 @@ public class EntryEditorWidgetSorter ext
*/
private int compare( String s1, String s2 )
{
- return this.getSortOrderOrDefault() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? s1.compareToIgnoreCase( s2 )
- : s2.compareToIgnoreCase( s1 );
+ if ( getSortOrderOrDefault() == BrowserCoreConstants.SORT_ORDER_ASCENDING )
+ {
+ return s1.compareToIgnoreCase( s2 );
+ }
+ else
+ {
+ return s2.compareToIgnoreCase( s1 );
+ }
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java Mon Jul 27 15:15:52 2015
@@ -46,7 +46,6 @@ import org.eclipse.swt.widgets.Shell;
*/
public class EntryEditorWidgetSorterDialog extends Dialog
{
-
/** The Constant DIALOG_TITLE. */
public static final String DIALOG_TITLE = Messages.getString( "EntryEditorWidgetSorterDialog.EntryEditorSorting" ); //$NON-NLS-1$
@@ -189,5 +188,4 @@ public class EntryEditorWidgetSorterDial
applyDialogFont( composite );
return composite;
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java Mon Jul 27 15:15:52 2015
@@ -107,7 +107,14 @@ public class OpenBestEditorAction extend
*/
public String getText()
{
- return isEnabled() ? bestValueEditor.getValueEditorName() : null;
+ if ( bestValueEditor != null )
+ {
+ return bestValueEditor.getValueEditorName();
+ }
+ else
+ {
+ return null;
+ }
}
@@ -129,6 +136,7 @@ public class OpenBestEditorAction extend
}
else
{
+ bestValueEditor = null;
return false;
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java Mon Jul 27 15:15:52 2015
@@ -129,6 +129,7 @@ public class OpenEditorAction extends Ab
// EntryEditorWidgetTableMetadata.VALUE_COLUMN_NAME )
{
IValueEditor[] alternativeVps = valueEditorManager.getAlternativeValueEditors( getSelectedValues()[0] );
+
return Arrays.asList( alternativeVps ).contains( valueEditor )
&& valueEditor.getRawValue( getSelectedValues()[0] ) != null;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java Mon Jul 27 15:15:52 2015
@@ -29,17 +29,16 @@ import org.eclipse.ui.PlatformUI;
public class OpenSortDialogAction extends Action
{
-
private EntryEditorWidgetPreferences preferences;
public OpenSortDialogAction( EntryEditorWidgetPreferences preferences )
{
- super.setText( Messages.getString( "OpenSortDialogAction.Sorting" ) ); //$NON-NLS-1$
- super.setToolTipText( Messages.getString( "OpenSortDialogAction.Sorting" ) ); //$NON-NLS-1$
- super.setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor(
+ setText( Messages.getString( "OpenSortDialogAction.Sorting" ) ); //$NON-NLS-1$
+ setToolTipText( Messages.getString( "OpenSortDialogAction.Sorting" ) ); //$NON-NLS-1$
+ setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor(
BrowserCommonConstants.IMG_SORT ) );
- super.setEnabled( true );
+ setEnabled( true );
this.preferences = preferences;
}
@@ -48,8 +47,7 @@ public class OpenSortDialogAction extend
public void run()
{
EntryEditorWidgetSorterDialog dlg = new EntryEditorWidgetSorterDialog( PlatformUI.getWorkbench().getDisplay()
- .getActiveShell(), this.preferences );
+ .getActiveShell(), preferences );
dlg.open();
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java Mon Jul 27 15:15:52 2015
@@ -60,7 +60,7 @@ public abstract class AbstractDialogBina
{
if ( value == null )
{
- return "NULL"; //$NON-NLS-1$
+ return NULL; //$NON-NLS-1$
}
else if ( value.isBinary() )
{
@@ -87,13 +87,14 @@ public abstract class AbstractDialogBina
{
if ( value == null )
{
- return "NULL"; //$NON-NLS-1$
+ return NULL; //$NON-NLS-1$
}
else if ( value.isBinary() )
{
byte[] data = value.getBinaryValue();
StringBuffer sb = new StringBuffer();
- for ( int i = 0; data != null && i < data.length && i < 512; i++ )
+
+ for ( int i = 0; ( data != null ) && ( i < data.length ) && ( i < 512 ); i++ )
{
if ( data[i] > 32 && data[i] < 127 )
sb.append( ( char ) data[i] );
@@ -108,7 +109,7 @@ public abstract class AbstractDialogBina
}
else
{
- return "NULL"; //$NON-NLS-1$
+ return NULL; //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java Mon Jul 27 15:15:52 2015
@@ -34,7 +34,6 @@ import org.apache.directory.studio.ldapb
*/
public abstract class AbstractDialogStringValueEditor extends AbstractDialogValueEditor
{
-
/**
* Creates a new instance of AbstractDialogStringValueEditor.
*/
@@ -51,8 +50,16 @@ public abstract class AbstractDialogStri
*/
public String getDisplayValue( IValue value )
{
- Object obj = this.getRawValue( value );
- return obj == null ? "NULL" : obj.toString(); //$NON-NLS-1$
+ Object obj = getRawValue( value );
+
+ if ( obj == null )
+ {
+ return NULL;
+ }
+ else
+ {
+ return obj.toString();
+ }
}
@@ -91,9 +98,9 @@ public abstract class AbstractDialogStri
{
return value.getStringValue();
}
- else if ( value.isBinary() )
+ else if ( value.isBinary() && isEditable( value.getBinaryValue() ) )
{
- return isEditable( value.getBinaryValue() ) ? value.getStringValue() : null;
+ return value.getStringValue();
}
else
{
@@ -114,7 +121,7 @@ public abstract class AbstractDialogStri
for ( int i = 0; i < b.length; i++ )
{
- if ( !( b[i] == '\n' || b[i] == '\r' || ( b[i] >= '\u0020' && b[i] <= '\u007F' ) ) )
+ if ( ( b[i] > '\u007F' ) || ( ( b[i] < '\u0020' ) && ( b[i] != '\n' ) && ( b[i] != '\r' ) ) )
{
return false;
}
@@ -145,5 +152,4 @@ public abstract class AbstractDialogStri
return null;
}
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogValueEditor.java Mon Jul 27 15:15:52 2015
@@ -46,7 +46,6 @@ import org.eclipse.swt.widgets.Shell;
*/
public abstract class AbstractDialogValueEditor extends CellEditor implements IValueEditor
{
-
/** The value to handle */
private Object value;
@@ -58,8 +57,7 @@ public abstract class AbstractDialogValu
/** The image of this value editor */
private ImageDescriptor imageDescriptor;
-
-
+
/**
*
* Creates a new instance of AbstractDialogEditor.
@@ -205,7 +203,7 @@ public abstract class AbstractDialogValu
{
if ( attributeHierarchy == null )
{
- return "NULL"; //$NON-NLS-1$
+ return NULL; //$NON-NLS-1$
}
List<IValue> valueList = new ArrayList<IValue>();
@@ -254,6 +252,15 @@ public abstract class AbstractDialogValu
return null;
}
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean hasValue( IValue value )
+ {
+ return ( value != null ) && ( value.isString() || value.isBinary() );
+ }
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java Mon Jul 27 15:15:52 2015
@@ -23,7 +23,6 @@ package org.apache.directory.studio.valu
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -45,7 +44,6 @@ import org.eclipse.jface.viewers.TextCel
*/
public abstract class AbstractInPlaceStringValueEditor extends TextCellEditor implements IValueEditor
{
-
/** The name of this value editor */
private String name;
@@ -90,21 +88,29 @@ public abstract class AbstractInPlaceStr
}
List<IValue> valueList = new ArrayList<IValue>();
+
for ( IAttribute attribute : attributeHierarchy )
{
valueList.addAll( Arrays.asList( attribute.getValues() ) );
}
StringBuffer sb = new StringBuffer();
- for ( Iterator<IValue> it = valueList.iterator(); it.hasNext(); )
+ boolean isFirst = true;
+
+ for ( IValue value : valueList )
{
- IValue value = it.next();
- sb.append( getDisplayValue( value ) );
- if ( it.hasNext() )
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
sb.append( ", " ); //$NON-NLS-1$
}
+
+ sb.append( getDisplayValue( value ) );
}
+
return sb.toString();
}
@@ -116,8 +122,16 @@ public abstract class AbstractInPlaceStr
*/
public String getDisplayValue( IValue value )
{
- Object obj = this.getRawValue( value );
- return obj == null ? "NULL" : obj.toString(); //$NON-NLS-1$
+ Object obj = getRawValue( value );
+
+ if ( obj == null )
+ {
+ return "NULL";
+ }
+ else
+ {
+ return obj.toString();
+ }
}
@@ -130,32 +144,38 @@ public abstract class AbstractInPlaceStr
*/
public Object getRawValue( AttributeHierarchy attributeHierarchy )
{
- if ( attributeHierarchy == null )
+ if ( ( attributeHierarchy != null ) && ( attributeHierarchy.size() == 1 ) )
{
- return null;
- }
- else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 0 )
- {
- if ( attributeHierarchy.getAttribute().isString() )
+ if ( attributeHierarchy.getAttribute().getValueSize() == 0 )
{
- return IValue.EMPTY_STRING_VALUE;
+ if ( attributeHierarchy.getAttribute().isString() )
+ {
+ return IValue.EMPTY_STRING_VALUE;
+ }
+ else
+ {
+ return IValue.EMPTY_BINARY_VALUE;
+ }
}
- else
+ else if ( attributeHierarchy.getAttribute().getValueSize() == 1 )
{
- return IValue.EMPTY_BINARY_VALUE;
+ return getRawValue( attributeHierarchy.getAttribute().getValues()[0] );
}
}
- else if ( attributeHierarchy.size() == 1 && attributeHierarchy.getAttribute().getValueSize() == 1 )
- {
- return getRawValue( attributeHierarchy.getAttribute().getValues()[0] );
- }
- else
- {
- return null;
- }
- }
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean hasValue( IValue value )
+ {
+ return ( value != null ) && ( value.isString() || value.isBinary() );
+ }
+
/**
* {@inheritDoc}
*
@@ -164,22 +184,19 @@ public abstract class AbstractInPlaceStr
*/
public Object getRawValue( IValue value )
{
- if ( value == null )
- {
- return null;
- }
- else if ( value.isString() )
+ if ( value != null )
{
- return value.getStringValue();
- }
- else if ( value.isBinary() )
- {
- return isEditable( value.getBinaryValue() ) ? value.getStringValue() : null;
- }
- else
- {
- return null;
+ if ( value.isString() )
+ {
+ return value.getStringValue();
+ }
+ else if ( value.isBinary() && isEditable( value.getBinaryValue() ) )
+ {
+ return value.getStringValue();
+ }
}
+
+ return null;
}
@@ -195,7 +212,7 @@ public abstract class AbstractInPlaceStr
for ( int i = 0; i < b.length; i++ )
{
- if ( !( b[i] == '\n' || b[i] == '\r' || ( b[i] >= '\u0020' && b[i] <= '\u007F' ) ) )
+ if ( ( b[i] > '\u007F') || ( ( b[i] < '\u0020' ) && ( b[i] != '\n' ) && ( b[i] != '\r' ) ) )
{
return false;
}
@@ -242,7 +259,14 @@ public abstract class AbstractInPlaceStr
*/
protected Object doGetValue()
{
- return "".equals( text.getText() ) ? null : text.getText(); //$NON-NLS-1$
+ if ( EMPTY.equals( text.getText() ) )
+ {
+ return null;
+ }
+ else
+ {
+ return text.getText();
+ }
}
@@ -251,10 +275,11 @@ public abstract class AbstractInPlaceStr
*/
protected void doSetValue( Object value )
{
- if ( value != null && value instanceof IValue.EmptyValue )
+ if ( value instanceof IValue.EmptyValue )
{
value = ( ( IValue.EmptyValue ) value ).getStringValue();
}
+
super.doSetValue( value );
}
@@ -293,5 +318,4 @@ public abstract class AbstractInPlaceStr
{
return imageDescriptor;
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/EntryValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/EntryValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/EntryValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/EntryValueEditor.java Mon Jul 27 15:15:52 2015
@@ -23,7 +23,6 @@ package org.apache.directory.studio.valu
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.directory.studio.ldapbrowser.common.wizards.EditEntryWizard;
@@ -46,7 +45,6 @@ import org.eclipse.swt.widgets.Control;
*/
public class EntryValueEditor extends CellEditor implements IValueEditor
{
-
/** The value to handle */
private Object value;
@@ -129,9 +127,12 @@ public class EntryValueEditor extends Ce
*/
public void activate()
{
- if ( getValue() != null && getValue() instanceof IEntry )
+ Object value = getValue();
+
+ if ( value instanceof IEntry )
{
- IEntry entry = ( IEntry ) getValue();
+ IEntry entry = ( IEntry ) value;
+
if ( entry != null )
{
EditEntryWizard wizard = new EditEntryWizard( entry );
@@ -166,26 +167,36 @@ public class EntryValueEditor extends Ce
public String getDisplayValue( AttributeHierarchy attributeHierarchy )
{
List<IValue> valueList = new ArrayList<IValue>();
+
for ( IAttribute attribute : attributeHierarchy )
{
valueList.addAll( Arrays.asList( attribute.getValues() ) );
}
StringBuffer sb = new StringBuffer();
+
if ( valueList.size() > 1 )
{
sb.append( NLS.bind( Messages.getString( "EntryValueEditor.n_values" ), valueList.size() ) ); //$NON-NLS-1$
}
- for ( Iterator<IValue> it = valueList.iterator(); it.hasNext(); )
+
+ boolean isFirst = true;
+
+ for ( IValue value : valueList )
{
- IValue value = it.next();
- IValueEditor vp = getValueEditor( value );
- sb.append( vp.getDisplayValue( value ) );
- if ( it.hasNext() )
+ if ( isFirst )
{
- sb.append( ", " ); //$NON-NLS-1$
+ isFirst = false;
}
+ else
+ {
+ sb.append( ", " );
+ }
+
+ IValueEditor vp = getValueEditor( value );
+ sb.append( vp.getDisplayValue( value ) );
}
+
return sb.toString();
}
@@ -198,6 +209,7 @@ public class EntryValueEditor extends Ce
public String getDisplayValue( IValue value )
{
IValueEditor vp = getValueEditor( value );
+
return vp.getDisplayValue( value );
}
@@ -231,6 +243,16 @@ public class EntryValueEditor extends Ce
return attributeHierarchy.getEntry();
}
+
+ /**
+ * {@inheritDoc}
+ * @return
+ */
+ public boolean hasValue( IValue value )
+ {
+ return value.getAttribute().getEntry() != null;
+ }
+
/**
* {@inheritDoc}
@@ -288,5 +310,4 @@ public class EntryValueEditor extends Ce
{
return imageDescriptor;
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/HexValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/HexValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/HexValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/HexValueEditor.java Mon Jul 27 15:15:52 2015
@@ -45,16 +45,20 @@ public class HexValueEditor extends Abst
protected boolean openDialog( Shell shell )
{
Object value = getValue();
- if ( value != null && value instanceof byte[] )
+
+ if ( value instanceof byte[] )
{
byte[] initialData = ( byte[] ) value;
HexDialog dialog = new HexDialog( shell, initialData );
- if ( dialog.open() == HexDialog.OK && dialog.getData() != null )
+
+ if ( ( dialog.open() == HexDialog.OK ) && dialog.getData() != null )
{
setValue( dialog.getData() );
+
return true;
}
}
+
return false;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/IValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/IValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/IValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/IValueEditor.java Mon Jul 27 15:15:52 2015
@@ -85,6 +85,16 @@ public interface IValueEditor
public abstract Object getRawValue( AttributeHierarchy attributeHierarchy );
+
+
+ /**
+ * Tells if there is a value
+ *
+ * @return true if there is a value, false if it's null.
+ */
+ boolean hasValue( IValue value );
+
+
/**
* Returns the raw value if this value editor can handle the given
* value. The returned value is used as input for the CellEditor
@@ -185,4 +195,8 @@ public interface IValueEditor
*
*/
public abstract CellEditor getCellEditor();
+
+ // A constant for the emtpy string and null string.
+ static final String EMPTY = ""; //$NON-NLS-1$
+ static final String NULL = "NULL"; //$NON-NLS-1$
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/InPlaceTextValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/InPlaceTextValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/InPlaceTextValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/InPlaceTextValueEditor.java Mon Jul 27 15:15:52 2015
@@ -28,5 +28,4 @@ package org.apache.directory.studio.valu
*/
public class InPlaceTextValueEditor extends AbstractInPlaceStringValueEditor
{
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/MultivaluedValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/MultivaluedValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/MultivaluedValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/MultivaluedValueEditor.java Mon Jul 27 15:15:52 2015
@@ -23,7 +23,6 @@ package org.apache.directory.studio.valu
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.directory.studio.ldapbrowser.common.dialogs.MultivaluedDialog;
@@ -44,7 +43,6 @@ import org.eclipse.swt.widgets.Control;
*/
public class MultivaluedValueEditor extends CellEditor implements IValueEditor
{
-
/** The value to handle */
private Object value;
@@ -127,9 +125,10 @@ public class MultivaluedValueEditor exte
*/
public void activate()
{
- if ( getValue() != null && getValue() instanceof AttributeHierarchy )
+ if ( getValue() instanceof AttributeHierarchy )
{
AttributeHierarchy ah = ( AttributeHierarchy ) getValue();
+
if ( ah != null )
{
MultivaluedDialog dialog = new MultivaluedDialog( parent.getShell(), ah );
@@ -161,27 +160,37 @@ public class MultivaluedValueEditor exte
public String getDisplayValue( AttributeHierarchy attributeHierarchy )
{
List<IValue> valueList = new ArrayList<IValue>();
+
for ( IAttribute attribute : attributeHierarchy )
{
valueList.addAll( Arrays.asList( attribute.getValues() ) );
}
StringBuffer sb = new StringBuffer();
+
if ( valueList.size() > 1 )
{
sb.append( NLS.bind( Messages.getString( "EntryValueEditor.n_values" ), valueList.size() ) ); //$NON-NLS-1$
}
- for ( Iterator<IValue> it = valueList.iterator(); it.hasNext(); )
+
+ boolean isFirst = true;
+
+ for ( IValue value : valueList )
{
- IValue value = it.next();
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ sb.append( ", " );
+ }
+
IValueEditor vp = valueEditorManager.getCurrentValueEditor( value.getAttribute().getEntry(), value
.getAttribute().getDescription() );
sb.append( vp.getDisplayValue( value ) );
- if ( it.hasNext() )
- {
- sb.append( ", " ); //$NON-NLS-1$
- }
}
+
return sb.toString();
}
@@ -194,7 +203,7 @@ public class MultivaluedValueEditor exte
*/
public String getDisplayValue( IValue value )
{
- return ""; //$NON-NLS-1$
+ return EMPTY; //$NON-NLS-1$
}
@@ -208,6 +217,14 @@ public class MultivaluedValueEditor exte
return attributeHierarchy;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean hasValue( IValue value )
+ {
+ return false;
+ }
/**
* {@inheritDoc}
@@ -267,5 +284,4 @@ public class MultivaluedValueEditor exte
{
return imageDescriptor;
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java Mon Jul 27 15:15:52 2015
@@ -23,7 +23,6 @@ package org.apache.directory.studio.valu
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import org.apache.directory.api.ldap.model.name.Rdn;
@@ -50,7 +49,6 @@ import org.eclipse.swt.widgets.Control;
*/
public class RenameValueEditor extends CellEditor implements IValueEditor
{
-
/** The value to handle */
private Object value;
@@ -133,21 +131,21 @@ public class RenameValueEditor extends C
*/
public void activate()
{
- if ( getValue() != null && getValue() instanceof IEntry )
+ if ( getValue() instanceof IEntry )
{
IEntry entry = ( IEntry ) getValue();
- if ( entry != null )
+
+ RenameEntryDialog renameDialog = new RenameEntryDialog( parent.getShell(), entry );
+
+ if ( renameDialog.open() == Dialog.OK )
{
- RenameEntryDialog renameDialog = new RenameEntryDialog( parent.getShell(), entry );
- if ( renameDialog.open() == Dialog.OK )
+ Rdn newRdn = renameDialog.getRdn();
+
+ if ( ( newRdn != null ) && !newRdn.equals( entry.getRdn() ) )
{
- Rdn newRdn = renameDialog.getRdn();
- if ( newRdn != null && !newRdn.equals( entry.getRdn() ) )
- {
- IEntry originalEntry = entry.getBrowserConnection().getEntryFromCache( entry.getDn() );
- new StudioBrowserJob( new RenameEntryRunnable( originalEntry, newRdn,
- new SimulateRenameDialogImpl( parent.getShell() ) ) ).execute();
- }
+ IEntry originalEntry = entry.getBrowserConnection().getEntryFromCache( entry.getDn() );
+ new StudioBrowserJob( new RenameEntryRunnable( originalEntry, newRdn,
+ new SimulateRenameDialogImpl( parent.getShell() ) ) ).execute();
}
}
}
@@ -176,26 +174,36 @@ public class RenameValueEditor extends C
public String getDisplayValue( AttributeHierarchy attributeHierarchy )
{
List<IValue> valueList = new ArrayList<IValue>();
+
for ( IAttribute attribute : attributeHierarchy )
{
valueList.addAll( Arrays.asList( attribute.getValues() ) );
}
StringBuffer sb = new StringBuffer();
+
if ( valueList.size() > 1 )
{
sb.append( NLS.bind( Messages.getString( "EntryValueEditor.n_values" ), valueList.size() ) ); //$NON-NLS-1$
}
- for ( Iterator<IValue> it = valueList.iterator(); it.hasNext(); )
+
+ boolean isFirst = true;
+
+ for ( IValue value : valueList )
{
- IValue value = it.next();
- IValueEditor vp = getValueEditor( value );
- sb.append( vp.getDisplayValue( value ) );
- if ( it.hasNext() )
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
- sb.append( ", " ); //$NON-NLS-1$
+ sb.append( ", " );
}
+
+ IValueEditor vp = getValueEditor( value );
+ sb.append( vp.getDisplayValue( value ) );
}
+
return sb.toString();
}
@@ -208,6 +216,7 @@ public class RenameValueEditor extends C
public String getDisplayValue( IValue value )
{
IValueEditor vp = getValueEditor( value );
+
return vp.getDisplayValue( value );
}
@@ -241,6 +250,15 @@ public class RenameValueEditor extends C
return attributeHierarchy.getEntry();
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean hasValue( IValue value )
+ {
+ return value.getAttribute().getEntry() != null;
+ }
+
/**
* {@inheritDoc}
@@ -298,5 +316,4 @@ public class RenameValueEditor extends C
{
return imageDescriptor;
}
-
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java Mon Jul 27 15:15:52 2015
@@ -35,10 +35,9 @@ import org.eclipse.jface.viewers.TreeVie
*/
public class EntryEditorConfiguration extends EntryEditorWidgetConfiguration
{
-
+ /** The entry editor */
private EntryEditor entryEditor;
-
/**
* Creates a new instance of EntryEditorConfiguration.
*/
@@ -64,5 +63,4 @@ public class EntryEditorConfiguration ex
return valueEditorManager;
}
-
}
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/dialogs/OpenLdapAclDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/dialogs/OpenLdapAclDialog.java?rev=1692895&r1=1692894&r2=1692895&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/dialogs/OpenLdapAclDialog.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/dialogs/OpenLdapAclDialog.java Mon Jul 27 15:15:52 2015
@@ -192,6 +192,7 @@ public class OpenLdapAclDialog extends D
composite.setFocus();
applyDialogFont( composite );
+
return composite;
}
@@ -214,6 +215,7 @@ public class OpenLdapAclDialog extends D
// Precendence values
hasPrecedence = context.isHasPrecedence();
precedenceValue = context.getPrecedenceValue();
+
if ( precedenceValue <= 0 )
{
precedenceValue = 1;