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/24 14:23:37 UTC
svn commit: r1692491 -
/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java
Author: elecharny
Date: Fri Jul 24 12:23:37 2015
New Revision: 1692491
URL: http://svn.apache.org/r1692491
Log:
o Added some Javadoc
o Minor refactpring
Modified:
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java?rev=1692491&r1=1692490&r2=1692491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/OpenEntryEditorRunnable.java Fri Jul 24 12:23:37 2015
@@ -45,48 +45,29 @@ import org.eclipse.ui.PlatformUI;
public class OpenEntryEditorRunnable extends StudioConnectionRunnableWithProgressAdapter implements
StudioConnectionBulkRunnableWithProgress
{
+ /** The entries */
private IEntry[] entries;
+
+ /** The entries found in a search operation */
private ISearchResult[] searchResults;
+
+ /** The bookmarked elements */
private IBookmark[] bookmarks;
+
+ /** The extensions, if any */
private EntryEditorExtension extension;
/**
* Creates a new instance of OpenEntryEditorRunnable.
* <p>
- * Opens an entry editor from one of the given entries,
- * search results or bookmarks.
- *
- * @param entries
- * an array of entries
- * @param searchResults
- * an array of search results
- * @param bookmarks
- * an arrays of bookmarks
- */
- public OpenEntryEditorRunnable( IEntry[] entries, ISearchResult[] searchResults, IBookmark[] bookmarks )
- {
- super();
- this.entries = entries;
- this.searchResults = searchResults;
- this.bookmarks = bookmarks;
- }
-
-
- /**
- * Creates a new instance of OpenEntryEditorRunnable.
- * <p>
* Opens an entry editor with the given entry editor extension and one of
* the given entries, search results or bookmarks.
*
- * @param extension
- * the entry editor extension
- * @param entries
- * an array of entries
- * @param searchResults
- * an array of search results
- * @param bookmarks
- * an arrays of bookmarks
+ * @param extension the entry editor extension
+ * @param entries an array of entries
+ * @param searchResults an array of search results
+ * @param bookmarks an arrays of bookmarks
*/
public OpenEntryEditorRunnable( EntryEditorExtension extension, IEntry[] entries, ISearchResult[] searchResults,
IBookmark[] bookmarks )
@@ -190,6 +171,7 @@ public class OpenEntryEditorRunnable ext
if ( entry instanceof IContinuation )
{
IContinuation continuation = ( IContinuation ) entry;
+
if ( continuation.getState() == State.UNRESOLVED )
{
continuation.resolve();
@@ -224,6 +206,7 @@ public class OpenEntryEditorRunnable ext
// Getting the editor's ID and creating the proper editor input
final String editorId = extension.getEditorId();
final EntryEditorInput editorInput;
+
if ( entries.length == 1 )
{
editorInput = new EntryEditorInput( entries[0], extension );