You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/12/13 11:53:47 UTC
svn commit: r1213647 - in /directory/studio/trunk/plugins/schemaeditor: ./
src/main/java/org/apache/directory/studio/schemaeditor/
src/main/java/org/apache/directory/studio/schemaeditor/controller/
src/main/java/org/apache/directory/studio/schemaeditor...
Author: pamarcelot
Date: Tue Dec 13 10:53:46 2011
New Revision: 1213647
URL: http://svn.apache.org/viewvc?rev=1213647&view=rev
Log:
Part of a fix for DIRSTUDIO-446 (Allow the user to rename any item using the F2 shortcut).
Added:
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java
- copied, changed from r1213188, directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java
Modified:
directory/studio/trunk/plugins/schemaeditor/plugin.properties
directory/studio/trunk/plugins/schemaeditor/plugin.xml
directory/studio/trunk/plugins/schemaeditor/plugin_de.properties
directory/studio/trunk/plugins/schemaeditor/plugin_fr.properties
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties
directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties
Modified: directory/studio/trunk/plugins/schemaeditor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/plugin.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/plugin.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/plugin.properties Tue Dec 13 10:53:46 2011
@@ -171,6 +171,10 @@ Cmd_DeleteSchemaElement_id=org.apache.di
Cmd_DeleteSchemaElement_name=Delete Schema Element
Cmd_DeleteSchemaElement_description=Delete the selected schema elements
+Cmd_RenameSchemaElement_id=org.apache.directory.studio.schemaeditor.commands.renameSchemaElement
+Cmd_RenameSchemaElement_name=Rename Schema Element
+Cmd_RenameSchemaElement_description=Renames the selected schema element
+
SchemaConnector_ApacheDS_id=org.apache.directory.studio.schemaeditor.model.io.ApacheDsSchemaConnector
SchemaConnector_ApacheDS_name=ApacheDS Schema Connector
SchemaConnector_ApacheDS_description=The ApacheDS Schema Connector is compatible with ApacheDS (version 1.5 or later)
Modified: directory/studio/trunk/plugins/schemaeditor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/plugin.xml?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/plugin.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/plugin.xml Tue Dec 13 10:53:46 2011
@@ -370,6 +370,12 @@
id="%Cmd_DeleteSchemaElement_id"
name="%Cmd_DeleteSchemaElement_name">
</command>
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_RenameSchemaElement_description"
+ id="%Cmd_RenameSchemaElement_id"
+ name="%Cmd_RenameSchemaElement_name">
+ </command>
</extension>
<extension
point="org.eclipse.ui.bindings">
@@ -427,6 +433,12 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="DEL">
</key>
+ <key
+ commandId="%Cmd_RenameSchemaElement_id"
+ contextId="%Ctx_SchemaView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="F2">
+ </key>
</extension>
<extension
point="org.apache.directory.studio.schemaeditor.schemaConnectors">
Modified: directory/studio/trunk/plugins/schemaeditor/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/plugin_de.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/plugin_de.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/plugin_de.properties Tue Dec 13 10:53:46 2011
@@ -78,7 +78,7 @@ Cmd_RenameProject_name=Project umbenenne
Cmd_RenameProject_description=Benennt ein Projekt um
Cmd_DeleteProject_name=Delete Project
-Cmd_DeleteProject_description=Deletes the selected project(s)
+Cmd_DeleteProject_description=TODO:Deletes the selected project(s)
Cmd_NewSchema_name=Neues Schema
Cmd_NewSchema_description=Erstellt ein neues Schema
@@ -98,6 +98,9 @@ Cmd_OpenTypeHierarchy_description=\u00D6
Cmd_DeleteSchemaElement_name=Schema Element l\u00F6schen
Cmd_DeleteSchemaElement_description=L\u00F6scht das ausgew\u00E4hlte Schema Element
+Cmd_RenameProject_name=Schema Element umbenennen
+Cmd_RenameProject_description=TODO:Renames the selected schema element
+
SchemaConnector_ApacheDS_name=ApacheDS Schema Konnektor
SchemaConnector_ApacheDS_description=Der ApacheDS Schema Konnektor ist kompatibel mit ApacheDS (Version 1.5 oder h\u00F6her)
Modified: directory/studio/trunk/plugins/schemaeditor/plugin_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/plugin_fr.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/plugin_fr.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/plugin_fr.properties Tue Dec 13 10:53:46 2011
@@ -116,6 +116,9 @@ Cmd_OpenTypeHierarchy_description=Ouvrir
Cmd_DeleteSchemaElement_name=Supprimer l'\u00E9l\u00E9ment de sch\u00E9ma
Cmd_DeleteSchemaElement_description=Supprimer l'\u00E9l\u00E9ment de sch\u00E9ma s\u00E9lectionn\u00E9
+Cmd_RenameProject_name=Renommer l'\u00E9l\u00E9ment de sch\u00E9ma
+Cmd_RenameProject_description=Renommer l'\u00E9l\u00E9ment de sch\u00E9ma s\u00E9lectionn\u00E9
+
SchemaConnector_ApacheDS_name=Connecteur de sch\u00E9ma ApacheDS
SchemaConnector_ApacheDS_description=Le connecteur de sch\u00E9ma ApacheDS est compatible avec ApacheDS (version 1.5 ou ult\u00E9rieure)
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java Tue Dec 13 10:53:46 2011
@@ -216,6 +216,8 @@ public final class PluginConstants
"Cmd_NewSchema_id" );
public static final String CMD_RENAME_PROJECT = Activator.getDefault().getPluginProperties().getString(
"Cmd_RenameProject_id" );
+ public static final String CMD_RENAME_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_RenameSchemaElement_id" );
// Preferences - DifferencesWidget
/** The preferences ID for DifferencesWidget Grouping */
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java Tue Dec 13 10:53:46 2011
@@ -45,6 +45,7 @@ import org.apache.directory.studio.schem
import org.apache.directory.studio.schemaeditor.controller.actions.OpenSchemaViewPreferenceAction;
import org.apache.directory.studio.schemaeditor.controller.actions.OpenSchemaViewSortingDialogAction;
import org.apache.directory.studio.schemaeditor.controller.actions.OpenTypeHierarchyAction;
+import org.apache.directory.studio.schemaeditor.controller.actions.RenameSchemaElementAction;
import org.apache.directory.studio.schemaeditor.controller.actions.SwitchSchemaPresentationToFlatAction;
import org.apache.directory.studio.schemaeditor.controller.actions.SwitchSchemaPresentationToHierarchicalAction;
import org.apache.directory.studio.schemaeditor.model.Project;
@@ -240,6 +241,7 @@ public class SchemaViewController
private OpenElementAction openElement;
private OpenTypeHierarchyAction openTypeHierarchy;
private DeleteSchemaElementAction deleteSchemaElement;
+ private RenameSchemaElementAction renameSchemaElement;
private ImportCoreSchemasAction importCoreSchemas;
private ImportSchemasFromOpenLdapAction importSchemasFromOpenLdap;
private ImportSchemasFromXmlAction importSchemasFromXml;
@@ -293,6 +295,7 @@ public class SchemaViewController
openElement = new OpenElementAction( viewer );
openTypeHierarchy = new OpenTypeHierarchyAction( viewer );
deleteSchemaElement = new DeleteSchemaElementAction( viewer );
+ renameSchemaElement = new RenameSchemaElementAction( viewer );
importCoreSchemas = new ImportCoreSchemasAction();
importSchemasFromOpenLdap = new ImportSchemasFromOpenLdapAction();
importSchemasFromXml = new ImportSchemasFromXmlAction();
@@ -371,6 +374,8 @@ public class SchemaViewController
manager.add( new Separator() );
manager.add( deleteSchemaElement );
manager.add( new Separator() );
+ manager.add( renameSchemaElement );
+ manager.add( new Separator() );
manager.add( importManager );
importManager.add( importCoreSchemas );
importManager.add( new Separator() );
@@ -537,8 +542,9 @@ public class SchemaViewController
catch ( PartInitException e )
{
PluginUtils.logError( Messages.getString( "SchemaViewController.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
- ViewUtils.displayErrorMessageDialog( Messages.getString( "SchemaViewController.error" ), Messages //$NON-NLS-1$
- .getString( "SchemaViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageDialog(
+ Messages.getString( "SchemaViewController.error" ), Messages //$NON-NLS-1$
+ .getString( "SchemaViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
}
}
}
@@ -660,6 +666,7 @@ public class SchemaViewController
commandService.getCommand( openElement.getActionDefinitionId() ).setHandler( null );
commandService.getCommand( openTypeHierarchy.getActionDefinitionId() ).setHandler( null );
commandService.getCommand( deleteSchemaElement.getActionDefinitionId() ).setHandler( null );
+ commandService.getCommand( renameSchemaElement.getActionDefinitionId() ).setHandler( null );
}
IContextService contextService = ( IContextService ) PlatformUI.getWorkbench().getAdapter(
@@ -697,6 +704,8 @@ public class SchemaViewController
new ActionHandler( openTypeHierarchy ) );
commandService.getCommand( deleteSchemaElement.getActionDefinitionId() ).setHandler(
new ActionHandler( deleteSchemaElement ) );
+ commandService.getCommand( renameSchemaElement.getActionDefinitionId() ).setHandler(
+ new ActionHandler( renameSchemaElement ) );
}
}
}
Added: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java?rev=1213647&view=auto
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java (added)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java Tue Dec 13 10:53:46 2011
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.controller.actions;
+
+
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
+import org.apache.directory.studio.schemaeditor.model.Schema;
+import org.apache.directory.studio.schemaeditor.view.dialogs.RenameSchemaDialog;
+import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
+import org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper;
+import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaWrapper;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+
+/**
+ * This action launches a rename dialog for schema elements (schema, attribute type and object class).
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class RenameSchemaElementAction extends Action implements IWorkbenchWindowActionDelegate
+{
+ /** The associated viewer */
+ private TreeViewer viewer;
+
+
+ /**
+ * Creates a new instance of RenameProjectAction.
+ *
+ * @param viewer
+ * the associated viewer
+ */
+ public RenameSchemaElementAction( TreeViewer viewer )
+ {
+ super( Messages.getString( "RenameSchemaElementAction.RenameSchemaElementAction" ) ); //$NON-NLS-1$
+ setToolTipText( getText() );
+ setId( PluginConstants.CMD_RENAME_SCHEMA_ELEMENT );
+ setActionDefinitionId( PluginConstants.CMD_RENAME_SCHEMA_ELEMENT );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_RENAME ) );
+ setEnabled( false );
+ this.viewer = viewer;
+ this.viewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ StructuredSelection selection = ( StructuredSelection ) event.getSelection();
+ setEnabled( ( selection.size() == 1 )
+ && ( ( selection.getFirstElement() instanceof SchemaWrapper )
+ || ( selection.getFirstElement() instanceof AttributeTypeWrapper )
+ || ( selection.getFirstElement() instanceof ObjectClassWrapper ) ) );
+ }
+ } );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ StructuredSelection selection = ( StructuredSelection ) viewer.getSelection();
+ if ( ( !selection.isEmpty() ) && ( selection.size() == 1 ) )
+ {
+ Object selectedElement = selection.getFirstElement();
+
+ // SCHEMA
+ if ( selectedElement instanceof SchemaWrapper )
+ {
+ Schema schema = ( ( SchemaWrapper ) selectedElement ).getSchema();
+
+ RenameSchemaDialog dialog = new RenameSchemaDialog( schema.getSchemaName() );
+ if ( dialog.open() == Dialog.OK )
+ {
+ // TODO
+ }
+ }
+ // ATTRIBUTE TYPE
+ else if ( selectedElement instanceof AttributeTypeWrapper )
+ {
+ AttributeType attributeType = ( ( AttributeTypeWrapper ) selectedElement ).getAttributeType();
+
+ // TODO
+ }
+ // OBJECT CLASS
+ else if ( selectedElement instanceof ObjectClassWrapper )
+ {
+ ObjectClass objectClass = ( ( ObjectClassWrapper ) selectedElement ).getObjectClass();
+
+ // TODO
+ }
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run( IAction action )
+ {
+ run();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dispose()
+ {
+ // Nothing to do
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void init( IWorkbenchWindow window )
+ {
+ // Nothing to do
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void selectionChanged( IAction action, ISelection selection )
+ {
+ // Nothing to do
+ }
+}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties Tue Dec 13 10:53:46 2011
@@ -76,6 +76,7 @@ OpenTypeHierarchyAction.ErrorOpeningView
OpenTypeHierarchyAction.OpenTypeAction=Ope&n Type Hierarchy
OpenTypeHierarchyAction.OpenTypeToolTip=Open Type Hierarchy
RenameProjectAction.RenameProjectAction=Re&name Project...
+RenameSchemaElementAction.RenameSchemaElementAction=Re&name...
RunCurrentSearchAgainAction.RerunSearchAction=Run the Current Search Again
ShowSearchFieldAction.ShowSearchFieldAction=Show Search Field
ShowSearchHistoryAction.ClearHistory=Clear History
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties Tue Dec 13 10:53:46 2011
@@ -76,6 +76,7 @@ OpenTypeHierarchyAction.ErrorOpeningView
OpenTypeHierarchyAction.OpenTypeAction=\u00D6ffnen der Type&n Hierarchie
OpenTypeHierarchyAction.OpenTypeToolTip=\u00D6ffnen der Typen Hierarchie
RenameProjectAction.RenameProjectAction=Projekt umbe&nennen
+RenameSchemaElementAction.RenameSchemaElementAction=Umbe&nennen
RunCurrentSearchAgainAction.RerunSearchAction=Suche erneut ausf\u00FChren
ShowSearchFieldAction.ShowSearchFieldAction=Suchfeld anzeigen
ShowSearchHistoryAction.ClearHistory=Vergangenheit l\u00F6schen
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties Tue Dec 13 10:53:46 2011
@@ -76,6 +76,7 @@ OpenTypeHierarchyAction.ErrorOpeningView
OpenTypeHierarchyAction.OpenTypeAction=Ouvri&r la hi\u00E9rarchie des types
OpenTypeHierarchyAction.OpenTypeToolTip=Ouvrir la hi\u00E9rarchie des types
RenameProjectAction.RenameProjectAction=Re&nommer le projet...
+RenameSchemaElementAction.RenameSchemaElementAction=Re&nommer...
RunCurrentSearchAgainAction.RerunSearchAction=Lancer la recherche courante \u00E0 nouveau
ShowSearchFieldAction.ShowSearchFieldAction=Montrer les champs de recherche
ShowSearchHistoryAction.ClearHistory=Effacer l'historique
Copied: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java (from r1213188, directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java?p2=directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java&p1=directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java&r1=1213188&r2=1213647&rev=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java Tue Dec 13 10:53:46 2011
@@ -20,8 +20,6 @@
package org.apache.directory.studio.schemaeditor.view.dialogs;
-import org.apache.directory.studio.schemaeditor.Activator;
-import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.SWT;
@@ -41,11 +39,11 @@ import org.eclipse.ui.PlatformUI;
/**
- * this dialog is used to rename a project.
+ * This dialog is used to rename items like projects or schemas.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class RenameProjectDialog extends Dialog
+public abstract class AbstractRenameDialog extends Dialog
{
/** The original name*/
private String originalName;
@@ -53,9 +51,6 @@ public class RenameProjectDialog extends
/** The new name */
private String newName;
- /** The ProjectsHandler */
- private ProjectsHandler projectsHandler;
-
// UI Fields
private Text newNameText;
private Composite errorComposite;
@@ -65,16 +60,15 @@ public class RenameProjectDialog extends
/**
- * Creates a new instance of RenameProjectDialog.
+ * Creates a new instance of AbstractRenameDialog.
*
* @param originalName
- * the original name of the project
+ * the original name
*/
- public RenameProjectDialog( String originalName )
+ public AbstractRenameDialog( String originalName )
{
super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
this.originalName = originalName;
- projectsHandler = Activator.getDefault().getProjectsHandler();
}
@@ -100,7 +94,7 @@ public class RenameProjectDialog extends
// New Name
Label newNameLabel = new Label( composite, SWT.NONE );
- newNameLabel.setText( Messages.getString( "RenameProjectDialog.NewName" ) ); //$NON-NLS-1$
+ newNameLabel.setText( Messages.getString( "AbstractRenameDialog.NewName" ) ); //$NON-NLS-1$
newNameText = new Text( composite, SWT.BORDER );
newNameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
newNameText.setText( originalName );
@@ -108,21 +102,24 @@ public class RenameProjectDialog extends
{
public void modifyText( ModifyEvent e )
{
+ // Getting the new name
newName = newNameText.getText();
- if ( !newName.equals( originalName ) )
+ if ( !newName.equalsIgnoreCase( originalName ) )
{
- if ( projectsHandler.isProjectNameAlreadyTaken( newName ) )
- {
- okButton.setEnabled( false );
- errorComposite.setVisible( true );
- return;
- }
- }
+ // Checking if the new is already taken
+ boolean checkNewName = isNewNameAlreadyTaken();
- // Default
- okButton.setEnabled( true );
- errorComposite.setVisible( false );
+ // Enabling (or not) the ok button and showing (or not) the error composite
+ okButton.setEnabled( !checkNewName );
+ errorComposite.setVisible( checkNewName );
+ }
+ else
+ {
+ // Enabling the ok button and showing the error composite
+ okButton.setEnabled( true );
+ errorComposite.setVisible( false );
+ }
}
} );
@@ -141,7 +138,7 @@ public class RenameProjectDialog extends
// Error Label
errorLabel = new Label( errorComposite, SWT.NONE );
errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
- errorLabel.setText( Messages.getString( "RenameProjectDialog.NameExists" ) ); //$NON-NLS-1$
+ errorLabel.setText( getErrorMessage() );
newNameText.setFocus();
newNameText.selectAll();
@@ -170,4 +167,21 @@ public class RenameProjectDialog extends
{
return newName;
}
+
+
+ /**
+ * Gets the error message.
+ *
+ * @return the error message
+ */
+ protected abstract String getErrorMessage();
+
+
+ /**
+ * Checks if the new name is already taken.
+ *
+ * @return <code>true</code> if the new name is already taken,
+ * <code>false</code> if not.
+ */
+ protected abstract boolean isNewNameAlreadyTaken();
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java Tue Dec 13 10:53:46 2011
@@ -44,7 +44,6 @@ import org.eclipse.swt.layout.GridLayout
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -66,9 +65,9 @@ import org.eclipse.ui.PlatformUI;
public class EditAliasesDialog extends Dialog
{
/** The aliases List */
- private List<String> initialLowerCasedAliases;
- private List<String> aliases;
- private List<String> lowerCasedAliases;
+ private List<String> initialLowerCasedAliases = new ArrayList<String>();
+ private List<String> aliases =new ArrayList<String>();
+ private List<String> lowerCasedAliases = new ArrayList<String>();
/** The dirty flag */
private boolean dirty = false;
@@ -86,9 +85,6 @@ public class EditAliasesDialog extends D
}
};
- /** The {@link Display} */
- private Display display;
-
// UI Fields
private Table aliasesTable;
private TableEditor tableEditor;
@@ -109,9 +105,6 @@ public class EditAliasesDialog extends D
public EditAliasesDialog( List<String> aliases )
{
super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
- initialLowerCasedAliases = new ArrayList<String>();
- this.aliases = new ArrayList<String>();
- lowerCasedAliases = new ArrayList<String>();
if ( aliases != null )
{
for ( String alias : aliases )
@@ -121,8 +114,6 @@ public class EditAliasesDialog extends D
lowerCasedAliases.add( Strings.toLowerCase( alias ) );
}
}
-
- display = Activator.getDefault().getWorkbench().getDisplay();
}
@@ -386,7 +377,7 @@ public class EditAliasesDialog extends D
newEditor.selectAll();
newEditor.setFocus();
tableEditor.setEditor( newEditor, item, 0 );
- display.addFilter( SWT.Traverse, returnKeyListener );
+ Activator.getDefault().getWorkbench().getDisplay().addFilter( SWT.Traverse, returnKeyListener );
}
@@ -429,7 +420,7 @@ public class EditAliasesDialog extends D
saveTableEditorText();
text.dispose();
}
- display.removeFilter( SWT.Traverse, returnKeyListener );
+ Activator.getDefault().getWorkbench().getDisplay().removeFilter( SWT.Traverse, returnKeyListener );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java Tue Dec 13 10:53:46 2011
@@ -21,23 +21,7 @@ package org.apache.directory.studio.sche
import org.apache.directory.studio.schemaeditor.Activator;
-import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
/**
@@ -45,25 +29,8 @@ import org.eclipse.ui.PlatformUI;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class RenameProjectDialog extends Dialog
+public class RenameProjectDialog extends AbstractRenameDialog
{
- /** The original name*/
- private String originalName;
-
- /** The new name */
- private String newName;
-
- /** The ProjectsHandler */
- private ProjectsHandler projectsHandler;
-
- // UI Fields
- private Text newNameText;
- private Composite errorComposite;
- private Image errorImage;
- private Label errorLabel;
- private Button okButton;
-
-
/**
* Creates a new instance of RenameProjectDialog.
*
@@ -72,9 +39,7 @@ public class RenameProjectDialog extends
*/
public RenameProjectDialog( String originalName )
{
- super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
- this.originalName = originalName;
- projectsHandler = Activator.getDefault().getProjectsHandler();
+ super( originalName );
}
@@ -92,82 +57,17 @@ public class RenameProjectDialog extends
/**
* {@inheritDoc}
*/
- protected Control createDialogArea( Composite parent )
+ protected String getErrorMessage()
{
- Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout( 2, false ) );
- composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
-
- // New Name
- Label newNameLabel = new Label( composite, SWT.NONE );
- newNameLabel.setText( Messages.getString( "RenameProjectDialog.NewName" ) ); //$NON-NLS-1$
- newNameText = new Text( composite, SWT.BORDER );
- newNameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
- newNameText.setText( originalName );
- newNameText.addModifyListener( new ModifyListener()
- {
- public void modifyText( ModifyEvent e )
- {
- newName = newNameText.getText();
-
- if ( !newName.equals( originalName ) )
- {
- if ( projectsHandler.isProjectNameAlreadyTaken( newName ) )
- {
- okButton.setEnabled( false );
- errorComposite.setVisible( true );
- return;
- }
- }
-
- // Default
- okButton.setEnabled( true );
- errorComposite.setVisible( false );
- }
- } );
-
- // Error Composite
- errorComposite = new Composite( composite, SWT.NONE );
- errorComposite.setLayout( new GridLayout( 2, false ) );
- errorComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 ) );
- errorComposite.setVisible( false );
-
- // Error Image
- errorImage = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_OBJS_ERROR_TSK );
- Label label = new Label( errorComposite, SWT.NONE );
- label.setImage( errorImage );
- label.setSize( 16, 16 );
-
- // Error Label
- errorLabel = new Label( errorComposite, SWT.NONE );
- errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
- errorLabel.setText( Messages.getString( "RenameProjectDialog.NameExists" ) ); //$NON-NLS-1$
-
- newNameText.setFocus();
- newNameText.selectAll();
-
- return composite;
+ return Messages.getString( "RenameProjectDialog.NameExists" ); //$NON-NLS-1$
}
/**
* {@inheritDoc}
*/
- protected void createButtonsForButtonBar( Composite parent )
- {
- createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
- okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
- }
-
-
- /**
- * Returns the new name.
- *
- * @return
- * the new name
- */
- public String getNewName()
+ protected boolean isNewNameAlreadyTaken()
{
- return newName;
+ return Activator.getDefault().getProjectsHandler().isProjectNameAlreadyTaken( getNewName() );
}
}
Added: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java?rev=1213647&view=auto
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java (added)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java Tue Dec 13 10:53:46 2011
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.view.dialogs;
+
+
+import org.apache.directory.studio.schemaeditor.Activator;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * this dialog is used to rename a project.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class RenameSchemaDialog extends AbstractRenameDialog
+{
+ /**
+ * Creates a new instance of RenameSchemaDialog.
+ *
+ * @param originalName
+ * the original name of the project
+ */
+ public RenameSchemaDialog( String originalName )
+ {
+ super( originalName );
+
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void configureShell( Shell newShell )
+ {
+ super.configureShell( newShell );
+ newShell.setText( Messages.getString( "RenameSchemaDialog.Rename" ) ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getErrorMessage()
+ {
+ return Messages.getString( "RenameSchemaDialog.NameExists" ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean isNewNameAlreadyTaken()
+ {
+ return Activator.getDefault().getSchemaHandler().isSchemaNameAlreadyTaken( getNewName() );
+ }
+}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties Tue Dec 13 10:53:46 2011
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+AbstractRenameDialog.NewName=New name:
AttributeTypeSelectionDialog.ChooseAType=Choose an attribute type
AttributeTypeSelectionDialog.InvalidSelection=Invalid Selection
AttributeTypeSelectionDialog.MatchingTypes=Matching attribute type(s)
@@ -41,5 +42,6 @@ PreviousSearchesDialog.Previous=Previous
PreviousSearchesDialog.Remove=Remove
PreviousSearchesDialog.ShowResultsInView=Select the search to show in the search results view:
RenameProjectDialog.NameExists=A project with the same name already exists.
-RenameProjectDialog.NewName=New name:
RenameProjectDialog.Rename=Rename Schema Project
+RenameSchemaDialog.NameExists=A schema with the same name already exists.
+RenameSchemaDialog.Rename=Rename Schema
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties Tue Dec 13 10:53:46 2011
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+AbstractRenameDialog.NewName=Neuer Name\:
AttributeTypeSelectionDialog.ChooseAType=W\u00E4hle einen Attribut Typ
AttributeTypeSelectionDialog.InvalidSelection=Ung\u00FCltige Auswahl
AttributeTypeSelectionDialog.MatchingTypes=Passend Attribut Typ(en)
@@ -41,5 +42,6 @@ PreviousSearchesDialog.Previous=Fr\u00FC
PreviousSearchesDialog.Remove=L\u00F6schen
PreviousSearchesDialog.ShowResultsInView=W\u00E4hlen Sie die Suche aus, die in der Resultate-Ansicht angezeigt werden soll\:
RenameProjectDialog.NameExists=Ein Projekt mit diesem Namen existiert bereits.
-RenameProjectDialog.NewName=Neuer Name\:
RenameProjectDialog.Rename=Schema Project umbenennen
+RenameSchemaDialog.NameExists=Ein Schema mit diesem Namen existiert bereits.
+RenameSchemaDialog.Rename=Schema umbenennen
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties?rev=1213647&r1=1213646&r2=1213647&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties Tue Dec 13 10:53:46 2011
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+AbstractRenameDialog.NewName=Nouveau nom:
AttributeTypeSelectionDialog.ChooseAType=Choisissez un type d'attribut
AttributeTypeSelectionDialog.InvalidSelection=S\u00E9lection invalide
AttributeTypeSelectionDialog.MatchingTypes=Types d'attributs correspondant
@@ -41,5 +42,6 @@ PreviousSearchesDialog.Previous=Recherch
PreviousSearchesDialog.Remove=Supprimer
PreviousSearchesDialog.ShowResultsInView=S\u00E9lectionner la recherche \u00E0 afficher dans la vue des r\u00E9sultats de recherches:
RenameProjectDialog.NameExists=Un projet avec un nom identique existe d\u00E9j\u00E0.
-RenameProjectDialog.NewName=Nouveau nom:
RenameProjectDialog.Rename=Renommer le projet de sch\u00E9ma
+RenameSchemaDialog.NameExists=Un sch\u00E9ma avec un nom identique existe d\u00E9j\u00E0.
+RenameSchemaDialog.Rename=Renommer le sch\u00E9ma