directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1333965 - in /directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions: RenameAction.java messages.properties messages_de.properties messages_fr.properties
Date Fri, 04 May 2012 13:55:27 GMT
Author: pamarcelot
Date: Fri May  4 13:55:27 2012
New Revision: 1333965

URL: http://svn.apache.org/viewvc?rev=1333965&view=rev
Log:
Part of a fix for DIRSTUDIO-811 (Review and remove any source file under Eclipse Public License
(EPL) v 1.0).

Modified:
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java?rev=1333965&r1=1333964&r2=1333965&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
(original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
Fri May  4 13:55:27 2012
@@ -17,16 +17,6 @@
  *  under the License. 
  *  
  */
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
 package org.apache.directory.studio.apacheds.actions;
 
 
@@ -36,24 +26,12 @@ import org.apache.directory.studio.apach
 import org.apache.directory.studio.apacheds.views.ServersView;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TreeEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.actions.TextActionHandler;
 
 
 /**
@@ -65,25 +43,6 @@ public class RenameAction extends Action
 {
     /** The associated view */
     private ServersView view;
-    private Tree tree;
-    private TreeEditor treeEditor;
-    protected Composite textEditorParent;
-    protected Text textEditor;
-    private TextActionHandler textActionHandler;
-    // The server being edited if this is being done inline
-    protected Server editedServer;
-
-    protected boolean saving = false;
-
-
-    /**
-     * Creates a new instance of RenameAction.
-     */
-    public RenameAction()
-    {
-        super( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
-        init();
-    }
 
 
     /**
@@ -94,22 +53,11 @@ public class RenameAction extends Action
      */
     public RenameAction( ServersView view )
     {
-        super( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
         this.view = view;
-        this.tree = view.getViewer().getTree();
-        this.treeEditor = new TreeEditor( tree );
-        init();
-    }
-
-
-    /**
-     * Initializes the action.
-     */
-    private void init()
-    {
+        setText( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
+        setToolTipText( Messages.getString( "RenameAction.RenameToolTip" ) ); //$NON-NLS-1$
         setId( ApacheDsPluginConstants.CMD_RENAME );
         setActionDefinitionId( ApacheDsPluginConstants.CMD_RENAME );
-        setToolTipText( Messages.getString( "RenameAction.RenameToolTip" ) ); //$NON-NLS-1$
     }
 
 
@@ -120,235 +68,45 @@ public class RenameAction extends Action
     {
         if ( view != null )
         {
-            // What we get from the TableViewer is a StructuredSelection
+            // Getting the selected server
             StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
+            final Server server = ( Server ) selection.getFirstElement();
 
-            // Here's the real object
-            Server server = ( Server ) selection.getFirstElement();
             if ( server != null )
             {
-                queryNewServerNameInline( server );
-            }
-        }
-    }
-
-
-    /**
-     * Return the new name to be given to the target resource or
-     * <code>null<code>
-     * if the query was canceled. Rename the currently selected server using the table editor.

-     * Continue the action when the user is done.
-     *
-     * @param server the server to rename
-     */
-    private void queryNewServerNameInline( final Server server )
-    {
-        // Make sure text editor is created only once. Simply reset text
-        // editor when action is executed more than once. Fixes bug 22269
-        if ( textEditorParent == null )
-        {
-            createTextEditor( server );
-        }
-        textEditor.setText( server.getName() );
-
-        // Open text editor with initial size
-        textEditorParent.setVisible( true );
-        Point textSize = textEditor.computeSize( SWT.DEFAULT, SWT.DEFAULT );
-        textSize.x += textSize.y; // Add extra space for new characters
-        Point parentSize = textEditorParent.getSize();
-        int inset = getCellEditorInset( textEditorParent );
-        textEditor.setBounds( 2, inset, Math.min( textSize.x, parentSize.x - 4 ), parentSize.y
- 2 * inset );
-        textEditorParent.redraw();
-        textEditor.selectAll();
-        textEditor.setFocus();
-    }
-
-
-    /**
-     * Create the text editor widget.
-     * 
-     * @param server the server to rename
-     */
-    private void createTextEditor( final Server server )
-    {
-        // Create text editor parent. This draws a nice bounding rect
-        textEditorParent = createParent();
-        textEditorParent.setVisible( false );
-        final int inset = getCellEditorInset( textEditorParent );
-        if ( inset > 0 )
-        {
-            textEditorParent.addListener( SWT.Paint, new Listener()
-            {
-                public void handleEvent( Event e )
+                IInputValidator validator = new IInputValidator()
                 {
-                    Point textSize = textEditor.getSize();
-                    Point parentSize = textEditorParent.getSize();
-                    e.gc.drawRectangle( 0, 0, Math.min( textSize.x + 4, parentSize.x - 1
), parentSize.y - 1 );
-                }
-            } );
-        }
-        // Create inner text editor
-        textEditor = new Text( textEditorParent, SWT.NONE );
-        textEditor.setFont( tree.getFont() );
-        textEditorParent.setBackground( textEditor.getBackground() );
-        textEditor.addListener( SWT.Modify, new Listener()
-        {
-            public void handleEvent( Event e )
-            {
-                Point textSize = textEditor.computeSize( SWT.DEFAULT, SWT.DEFAULT );
-                textSize.x += textSize.y; // Add extra space for new
-                // characters.
-                Point parentSize = textEditorParent.getSize();
-                textEditor.setBounds( 2, inset, Math.min( textSize.x, parentSize.x - 4 ),
parentSize.y - 2 * inset );
-                textEditorParent.redraw();
-            }
-        } );
-        textEditor.addListener( SWT.Traverse, new Listener()
-        {
-            public void handleEvent( Event event )
-            {
-
-                // Workaround for Bug 20214 due to extra
-                // traverse events
-                switch ( event.detail )
-                {
-                    case SWT.TRAVERSE_ESCAPE:
-                        // Do nothing in this case
-                        disposeTextWidget();
-                        event.doit = true;
-                        event.detail = SWT.TRAVERSE_NONE;
-                        break;
-                    case SWT.TRAVERSE_RETURN:
-                        saveChangesAndDispose( server );
-                        event.doit = true;
-                        event.detail = SWT.TRAVERSE_NONE;
-                        break;
-                }
-            }
-        } );
-        textEditor.addFocusListener( new FocusAdapter()
-        {
-            public void focusLost( FocusEvent fe )
-            {
-                saveChangesAndDispose( server );
-            }
-        } );
-
-        if ( textActionHandler != null )
-        {
-            textActionHandler.addText( textEditor );
-        }
-    }
-
-
-    private Composite createParent()
-    {
-        Tree tree2 = tree;
-        Composite result = new Composite( tree2, SWT.NONE );
-        TreeItem[] selectedItems = tree2.getSelection();
-        treeEditor.horizontalAlignment = SWT.LEFT;
-        treeEditor.grabHorizontal = true;
-        treeEditor.setEditor( result, selectedItems[0] );
-        return result;
-    }
-
-
-    /**
-     * Close the text widget and reset the editorText field.
-     */
-    protected void disposeTextWidget()
-    {
-        if ( textActionHandler != null )
-            textActionHandler.removeText( textEditor );
-
-        if ( textEditorParent != null )
-        {
-            textEditorParent.dispose();
-            textEditorParent = null;
-            textEditor = null;
-            treeEditor.setEditor( null, null );
-        }
-    }
-
-
-    /**
-     * Save the changes and dispose of the text widget.
-     * 
-     * @param server the server to rename
-     */
-    protected void saveChangesAndDispose( Server server )
-    {
-        if ( saving == true )
-            return;
-
-        saving = true;
-        // Cache the resource to avoid selection loss since a selection of
-        // another item can trigger this method
-        editedServer = server;
-        final String newName = textEditor.getText();
-        // Run this in an async to make sure that the operation that triggered
-        // this action is completed. Otherwise this leads to problems when the
-        // icon of the item being renamed is clicked (i.e., which causes the
-        // rename text widget to lose focus and trigger this method)
-        tree.getShell().getDisplay().asyncExec( new Runnable()
-        {
-            public void run()
-            {
-                try
-                {
-                    if ( !newName.equals( editedServer.getName() ) )
+                    public String isValid( String newName )
                     {
-                        if ( !ServersHandler.getDefault().isNameAvailable( newName ) )
+                        if ( server.getName().equals( newName ) )
                         {
-                            MessageDialog.openError( tree.getShell(), Messages.getString(
"RenameAction.Server" ), //$NON-NLS-1$
-                                Messages.getString( "RenameAction.ErrorNameInUse" ) ); //$NON-NLS-1$
+                            return null;
+                        }
+                        else if ( !ServersHandler.getDefault().isNameAvailable( newName )
)
+                        {
+                            return Messages.getString( "RenameAction.ErrorNameInUse" ); //$NON-NLS-1$
                         }
                         else
                         {
-                            editedServer.setName( newName );
+                            return null;
                         }
                     }
-                    editedServer = null;
-                    // Dispose the text widget regardless
-                    disposeTextWidget();
-                    // Ensure the Navigator tree has focus, which it may not if
-                    // the text widget previously had focus
-                    if ( tree != null && !tree.isDisposed() )
-                    {
-                        tree.setFocus();
-                    }
-                }
-                finally
-                {
-                    saving = false;
-                }
-            }
-        } );
-    }
+                };
 
+                // Opening a dialog to ask the user a new name for the server
+                InputDialog dialog = new InputDialog( view.getSite().getShell(),
+                    Messages.getString( "RenameAction.RenameServer" ), //$NON-NLS-1$ 
+                    Messages.getString( "RenameAction.NewName" ), //$NON-NLS-1$ 
+                    server.getName(), validator );
+                dialog.open();
 
-    /**
-     * On Mac the text widget already provides a border when it has focus, so
-     * there is no need to draw another one. The value of returned by this
-     * method is usd to control the inset we apply to the text field bound's in
-     * order to get space for drawing a border. A value of 1 means a one-pixel
-     * wide border around the text field. A negative value supresses the border.
-     * However, in M9 the system property
-     * "org.eclipse.swt.internal.carbon.noFocusRing" has been introduced as a
-     * temporary workaround for bug #28842. The existence of the property turns
-     * the native focus ring off if the widget is contained in a main window
-     * (not dialog). The check for the property should be removed after a final
-     * fix for #28842 has been provided.
-     */
-    private static int getCellEditorInset( Control c )
-    {
-        // special case for MacOS X
-        if ( "carbon".equals( SWT.getPlatform() ) ) { //$NON-NLS-1$
-            if ( System.getProperty( "org.eclipse.swt.internal.carbon.noFocusRing" ) == null
|| c.getShell().getParent() != null ) { //$NON-NLS-1$
-                return -2; // native border
+                String newName = dialog.getValue();
+                if ( newName != null )
+                {
+                    server.setName( newName );
+                }
             }
         }
-        return 1; // one pixel wide black border
     }
 
 

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties?rev=1333965&r1=1333964&r2=1333965&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties
(original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties
Fri May  4 13:55:27 2012
@@ -36,9 +36,10 @@ PropertiesAction.Properties=&Properties
 PropertiesAction.PropertiesFor=Properties for "{0}"
 PropertiesAction.PropertiesToolTip=Properties
 RenameAction.ErrorNameInUse=The name is already in use. Specify a different name.
+RenameAction.NewName=New name:
 RenameAction.Rename=R&ename...
 RenameAction.RenameToolTip=Rename...
-RenameAction.Server=Server
+RenameAction.RenameServer=Rename Server
 RunAction.ChangePasswordPort=ChangePassword (port {0})
 RunAction.Continue=Do you wish to continue?
 RunAction.DNSPort=DNS (port {0})

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties?rev=1333965&r1=1333964&r2=1333965&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties
(original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties
Fri May  4 13:55:27 2012
@@ -35,8 +35,10 @@ PropertiesAction.Properties=&Eigenschaft
 PropertiesAction.PropertiesFor=Eigenschaften f\u00FCr "{0}"
 PropertiesAction.PropertiesToolTip=Eigenschaften
 RenameAction.ErrorNameInUse=Der Name wird bereits verwendet. Geben Sie einen anderen Namen
an.
+RenameAction.NewName=Neuer Name\:
 RenameAction.Rename=Umb&enennen...
 RenameAction.RenameToolTip=Umbenennen...
+RenameAction.RenameServer=Server umbenennen
 RunAction.Continue=Wollen Sie weiterfahren?
 RunAction.FollowingErrorOccurred=Folgender Fehler ist aufgetreten\: 
 RunAction.PortInUse=Der Port wird bereits verwendet

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties?rev=1333965&r1=1333964&r2=1333965&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties
(original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties
Fri May  4 13:55:27 2012
@@ -43,9 +43,10 @@ PropertiesAction.Properties=&Propri\u00E
 PropertiesAction.PropertiesFor=Propri\u00E9t\u00E9s du serveur "{0}"
 PropertiesAction.PropertiesToolTip=Propri\u00E9t\u00E9s
 RenameAction.ErrorNameInUse=Ce nom est d\u00E9j\u00E0 utilis\u00E9. Veuillez en s\u00E9lectionner
un autre.
+RenameAction.NewName=Nouveau nom:
 RenameAction.Rename=&Renommer...
 RenameAction.RenameToolTip=Renommer...
-RenameAction.Server=Serveur
+RenameAction.RenameServer=Renommer le serveur
 RunAction.Continue=Voulez-vous poursuivre l'op\u00E9ration ?
 RunAction.FollowingErrorOccurred=L'erreur suivante est survenue \:
 RunAction.PortInUse=Le port est d\u00E9j\u00E0 utilis\u00E9



Mime
View raw message