directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r523240 - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main: java/org/apache/directory/ldapstudio/schemas/view/dialogs/ java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/ java/org/apache/directory/ldaps...
Date Wed, 28 Mar 2007 09:16:41 GMT
Author: pamarcelot
Date: Wed Mar 28 02:16:40 2007
New Revision: 523240

URL: http://svn.apache.org/viewvc?view=rev&rev=523240
Log:
Renamed the ManageAliasesDialog into EditAliasesDialog.

Added:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/EditAliasesDialog.java
      - copied, changed from r522512, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/ManageAliasesDialog.java
Removed:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/ManageAliasesDialog.java
Modified:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/messages.properties

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/EditAliasesDialog.java
(from r522512, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/ManageAliasesDialog.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/EditAliasesDialog.java?view=diff&rev=523240&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/ManageAliasesDialog.java&r1=522512&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/EditAliasesDialog.java&r2=523240
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/ManageAliasesDialog.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/dialogs/EditAliasesDialog.java
Wed Mar 28 02:16:40 2007
@@ -64,7 +64,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ManageAliasesDialog extends Dialog
+public class EditAliasesDialog extends Dialog
 {
     /** The aliases List */
     private List<String> aliases;
@@ -83,12 +83,12 @@
 
 
     /**
-     * Creates a new instance of ManageAliasesDialog.
+     * Creates a new instance of EditAliasesDialog.
      *
      * @param aliases
      *      the array containing the aliases
      */
-    public ManageAliasesDialog( String[] aliases )
+    public EditAliasesDialog( String[] aliases )
     {
         super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
         this.aliases = new ArrayList<String>();
@@ -107,7 +107,7 @@
     protected void configureShell( Shell newShell )
     {
         super.configureShell( newShell );
-        newShell.setText( Messages.getString( "ManageAliasesDialog.Manage_aliases" ) ); //$NON-NLS-1$
+        newShell.setText( Messages.getString( "EditAliasesDialog.Manage_aliases" ) ); //$NON-NLS-1$
     }
 
 
@@ -122,7 +122,7 @@
 
         // ALIASES Label
         Label aliases_label = new Label( composite, SWT.NONE );
-        aliases_label.setText( Messages.getString( "ManageAliasesDialog.Aliases" ) ); //$NON-NLS-1$
+        aliases_label.setText( Messages.getString( "EditAliasesDialog.Aliases" ) ); //$NON-NLS-1$
         aliases_label.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, true, 2,
1 ) );
 
         // ALIASES Table
@@ -137,7 +137,7 @@
 
         // ADD Label
         Label add_label = new Label( composite, SWT.NONE );
-        add_label.setText( Messages.getString( "ManageAliasesDialog.Add_an_alias" ) ); //$NON-NLS-1$
+        add_label.setText( Messages.getString( "EditAliasesDialog.Add_an_alias" ) ); //$NON-NLS-1$
         add_label.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, true, 2, 1
) );
 
         // NEW ALIAS Field
@@ -146,7 +146,7 @@
 
         // Add Button
         newAliasAddButton = new Button( composite, SWT.PUSH );
-        newAliasAddButton.setText( Messages.getString( "ManageAliasesDialog.Add" ) ); //$NON-NLS-1$
+        newAliasAddButton.setText( Messages.getString( "EditAliasesDialog.Add" ) ); //$NON-NLS-1$
         newAliasAddButton.setLayoutData( new GridData( SWT.NONE, SWT.NONE, false, false )
);
         newAliasAddButton.setEnabled( false );
 
@@ -218,7 +218,7 @@
         Menu menu = new Menu( getShell(), SWT.POP_UP );
         aliasesTable.setMenu( menu );
         MenuItem deleteMenuItem = new MenuItem( menu, SWT.PUSH );
-        deleteMenuItem.setText( Messages.getString( "ManageAliasesDialog.Delete" ) ); //$NON-NLS-1$
+        deleteMenuItem.setText( Messages.getString( "EditAliasesDialog.Delete" ) ); //$NON-NLS-1$
         deleteMenuItem.setImage( PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_TOOL_DELETE
) );
         // Adding the listener
         deleteMenuItem.addListener( SWT.Selection, new Listener()

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java?view=diff&rev=523240&r1=523239&r2=523240
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/attributeType/AttributeTypeEditorOverviewPage.java
Wed Mar 28 02:16:40 2007
@@ -32,7 +32,7 @@
 import org.apache.directory.ldapstudio.schemas.model.Syntax;
 import org.apache.directory.ldapstudio.schemas.model.Syntaxes;
 import org.apache.directory.ldapstudio.schemas.view.ViewUtils;
-import org.apache.directory.ldapstudio.schemas.view.dialogs.ManageAliasesDialog;
+import org.apache.directory.ldapstudio.schemas.view.dialogs.EditAliasesDialog;
 import org.apache.directory.ldapstudio.schemas.view.editors.NonExistingAttributeType;
 import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditor;
 import org.apache.directory.ldapstudio.schemas.view.editors.schema.SchemaEditorInput;
@@ -116,19 +116,19 @@
     private ComboViewer substringComboViewer;
 
     // Listeners
-    /** The listener for the Manage Aliases Button Widget */
+    /** The listener for the Edit Aliases Button Widget */
     private SelectionAdapter aliasesButtonListener = new SelectionAdapter()
     {
         public void widgetSelected( SelectionEvent e )
         {
-            ManageAliasesDialog manageDialog = new ManageAliasesDialog( modifiedAttributeType.getNames()
);
-            if ( manageDialog.open() != Window.OK )
+            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNames()
);
+            if ( editDialog.open() != Window.OK )
             {
                 return;
             }
-            if ( manageDialog.isDirty() )
+            if ( editDialog.isDirty() )
             {
-                modifiedAttributeType.setNames( manageDialog.getAliases() );
+                modifiedAttributeType.setNames( editDialog.getAliases() );
                 if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().length
!= 0 ) )
                 {
                     aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames()
) );
@@ -557,7 +557,7 @@
         aliasesLabel.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, 2, 1
) );
         toolkit.createLabel( client_general_information, "" );
         aliasesButton = toolkit.createButton( client_general_information, Messages
-            .getString( "AttributeTypeFormEditorOverviewPage.Manage_Aliases" ), SWT.PUSH
); //$NON-NLS-1$
+            .getString( "AttributeTypeFormEditorOverviewPage.Edit_Aliases" ), SWT.PUSH );
//$NON-NLS-1$
         aliasesButton.setLayoutData( new GridData( SWT.NONE, SWT.NONE, false, false, 2, 1
) );
 
         // OID Field
@@ -1010,6 +1010,7 @@
     {
         if ( modifiedAttributeType.getOriginatingSchema().type == Schema.SchemaType.userSchema
)
         {
+            aliasesButton.addSelectionListener( aliasesButtonListener );
             oidText.addModifyListener( oidTextModifyListener );
             oidText.addVerifyListener( oidTextVerifyListener );
             descriptionText.addModifyListener( descriptionTextListener );
@@ -1028,9 +1029,6 @@
             substringCombo.addModifyListener( substringComboListener );
         }
 
-        // ALIASES Button
-        // The user can always access to the Manage Aliases Window, but if the object class
is in a core-schema file editing will be disabled
-        aliasesButton.addSelectionListener( aliasesButtonListener );
         schemaLink.addHyperlinkListener( schemaLinkListener );
         supLabel.addHyperlinkListener( supLabelListener );
     }

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java?view=diff&rev=523240&r1=523239&r2=523240
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/objectClass/ObjectClassEditorOverviewPage.java
Wed Mar 28 02:16:40 2007
@@ -31,7 +31,7 @@
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
 import org.apache.directory.ldapstudio.schemas.view.ViewUtils;
 import org.apache.directory.ldapstudio.schemas.view.dialogs.AttributeTypeSelectionDialog;
-import org.apache.directory.ldapstudio.schemas.view.dialogs.ManageAliasesDialog;
+import org.apache.directory.ldapstudio.schemas.view.dialogs.EditAliasesDialog;
 import org.apache.directory.ldapstudio.schemas.view.dialogs.ObjectClassSelectionDialog;
 import org.apache.directory.ldapstudio.schemas.view.editors.NonExistingObjectClass;
 import org.apache.directory.ldapstudio.schemas.view.editors.attributeType.AttributeTypeEditor;
@@ -125,14 +125,14 @@
     {
         public void widgetSelected( SelectionEvent e )
         {
-            ManageAliasesDialog manageDialog = new ManageAliasesDialog( modifiedObjectClass.getNames()
);
-            if ( manageDialog.open() != Window.OK )
+            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNames()
);
+            if ( editDialog.open() != Window.OK )
             {
                 return;
             }
-            if ( manageDialog.isDirty() )
+            if ( editDialog.isDirty() )
             {
-                modifiedObjectClass.setNames( manageDialog.getAliases() );
+                modifiedObjectClass.setNames( editDialog.getAliases() );
                 if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().length
!= 0 ) )
                 {
                     aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames()
) );
@@ -716,7 +716,7 @@
         aliasesLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 )
);
         toolkit.createLabel( client_general_information, "" );
         aliasesButton = toolkit.createButton( client_general_information, Messages
-            .getString( "AttributeTypeFormEditorOverviewPage.Manage_Aliases" ), SWT.PUSH
); //$NON-NLS-1$
+            .getString( "ObjectClassFormEditorOverviewPage.Edit_Aliases" ), SWT.PUSH ); //$NON-NLS-1$
         aliasesButton.setLayoutData( new GridData( SWT.NONE, SWT.NONE, false, false, 2, 1
) );
 
         // OID Field
@@ -1011,6 +1011,7 @@
     {
         if ( modifiedObjectClass.getOriginatingSchema().type == Schema.SchemaType.userSchema
)
         {
+            aliasesButton.addSelectionListener( aliasesButtonListener );
             oidText.addModifyListener( oidTextModifyListener );
             oidText.addVerifyListener( oidTextVerifyListener );
             descriptionText.addModifyListener( descriptionTextListener );
@@ -1023,9 +1024,6 @@
             addButtonOptionalTable.addSelectionListener( addButtonOptionalTableListener );
             removeButtonOptionalTable.addSelectionListener( removeButtonOptionalTableListener
);
         }
-
-        // The user can always access to the Manage Aliases Window, but if the object class
is in a core-schema file editing will be disabled
-        aliasesButton.addSelectionListener( aliasesButtonListener );
 
         schemaLink.addHyperlinkListener( schemaLinkListener );
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/messages.properties
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/messages.properties?view=diff&rev=523240&r1=523239&r2=523240
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/messages.properties
(original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/resources/org/apache/directory/ldapstudio/schemas/messages.properties
Wed Mar 28 02:16:40 2007
@@ -92,12 +92,12 @@
 AttributeTypeSelectionDialog.Name=Name
 AttributeTypeSelectionDialog.Schema=Schema
 
-# ManageAliasesDialog  -  org.apache.directory.ldapstudio.schemas.view.dialogs
-ManageAliasesDialog.Manage_aliases=Manage aliases
-ManageAliasesDialog.Aliases=Aliases:
-ManageAliasesDialog.Add_an_alias=Add an alias:
-ManageAliasesDialog.Add=Add
-ManageAliasesDialog.Delete=Delete
+# EditAliasesDialog  -  org.apache.directory.ldapstudio.schemas.view.dialogs
+EditAliasesDialog.Manage_aliases=Manage aliases
+EditAliasesDialog.Aliases=Aliases:
+EditAliasesDialog.Add_an_alias=Add an alias:
+EditAliasesDialog.Add=Add
+EditAliasesDialog.Delete=Delete
 
 # ObjectClassSelectionDialog  -  org.apache.directory.ldapstudio.schemas.view.dialogs
 ObjectClassSelectionDialog.Object_Class_Selection=Object Class Selection
@@ -119,7 +119,7 @@
 AttributeTypeFormEditorOverviewPage.General_Section_Description=Specify general information
(name, OID, etc.).
 AttributeTypeFormEditorOverviewPage.General_Section_Text=General information
 AttributeTypeFormEditorOverviewPage.Aliases=Aliases:
-AttributeTypeFormEditorOverviewPage.Manage_Aliases=Manage Aliases
+AttributeTypeFormEditorOverviewPage.Edit_Aliases=Edit Aliases
 AttributeTypeFormEditorOverviewPage.OID=OID:
 AttributeTypeFormEditorOverviewPage.Description=Description:
 AttributeTypeFormEditorOverviewPage.Superior_type=Superior type:
@@ -149,7 +149,7 @@
 ObjectClassFormEditorOverviewPage.General_Information_Section_Description=Specify general
information (name, OID, etc.).
 ObjectClassFormEditorOverviewPage.General_Information_Section_Text=General information
 ObjectClassFormEditorOverviewPage.Aliases=Aliases:
-ObjectClassFormEditorOverviewPage.Manage_Aliases=Manage aliases
+ObjectClassFormEditorOverviewPage.Edit_Aliases=Edit aliases
 ObjectClassFormEditorOverviewPage.OID=OID:
 ObjectClassFormEditorOverviewPage.Description=Description:
 ObjectClassFormEditorOverviewPage.Superior_classes=Superior classes:



Mime
View raw message