svn commit: r1692492 - in /directory/studio/trunk/plugins: ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/

[el...@apache.org]

Author: elecharny
Date: Fri Jul 24 12:25:58 2015
New Revision: 1692492

URL: http://svn.apache.org/r1692492
Log:
o Made the cellEditor a private member
o Added a setCellEditor() method
o Used the setCellEditor() method where the cellEditor protected field was used

Modified:
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java?rev=1692492&r1=1692491&r2=1692492&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java Fri Jul 24 12:25:58 2015
@@ -48,7 +48,7 @@ public abstract class AbstractOpenEditor
     protected TreeViewer viewer;
 
     /** The cell editor. */
-    protected CellEditor cellEditor;
+    private CellEditor cellEditor;
 
     /** The actionGroup. */
     protected EntryEditorWidgetActionGroup actionGroup;
@@ -92,6 +92,17 @@ public abstract class AbstractOpenEditor
     }
 
 
+    /**
+     * Sets the cell editor.
+     * 
+     * @param cellEditor the cell editor
+     */
+    public void setCellEditor( CellEditor cellEditor )
+    {
+        this.cellEditor = cellEditor;
+    }
+
+
     /**
      * {@inheritDoc}
      */

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=1692492&r1=1692491&r2=1692492&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 Fri Jul 24 12:25:58 2015
@@ -123,7 +123,7 @@ public class OpenBestEditorAction extend
         {
             // update value editor
             bestValueEditor = valueEditorManager.getCurrentValueEditor( getSelectedValues()[0] );
-            super.cellEditor = bestValueEditor.getCellEditor();
+            setCellEditor( bestValueEditor.getCellEditor() );
 
             return true;
         }
@@ -179,7 +179,7 @@ public class OpenBestEditorAction extend
             }
 
             // validate modification of Rdn
-            if ( value.isRdnPart() && ( cellEditor != valueEditorManager.getRenameValueEditor() ) )
+            if ( value.isRdnPart() && ( getCellEditor() != valueEditorManager.getRenameValueEditor() ) )
             {
                 message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.ValueIsRdnPart" ), description ) );//$NON-NLS-1$ 
                 message.append( BrowserCoreConstants.LINE_SEPARATOR );

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=1692492&r1=1692491&r2=1692492&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 Fri Jul 24 12:25:58 2015
@@ -53,7 +53,7 @@ public class OpenEditorAction extends Ab
         EntryEditorWidgetActionGroup actionGroup )
     {
         super( viewer, valueEditorManager, actionGroup );
-        super.cellEditor = valueEditor.getCellEditor();
+        setCellEditor( valueEditor.getCellEditor() );
         this.valueEditor = valueEditor;
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java?rev=1692492&r1=1692491&r2=1692492&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java Fri Jul 24 12:25:58 2015
@@ -57,7 +57,7 @@ public class OpenEntryEditorAction exten
         EntryEditorWidgetActionGroup actionGroup )
     {
         super( viewer, valueEditorManager, actionGroup );
-        super.cellEditor = valueEditor.getCellEditor();
+        setCellEditor( valueEditor.getCellEditor() );
         this.valueEditor = valueEditor;
     }