Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52223 invoked from network); 5 Mar 2007 10:59:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Mar 2007 10:59:58 -0000 Received: (qmail 78703 invoked by uid 500); 5 Mar 2007 11:00:06 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78672 invoked by uid 500); 5 Mar 2007 11:00:06 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 78661 invoked by uid 99); 5 Mar 2007 11:00:06 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2007 03:00:06 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2007 02:59:57 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 686531A981D; Mon, 5 Mar 2007 02:59:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r514647 - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas: model/AttributeType.java view/editors/AttributeTypeFormEditor.java view/editors/AttributeTypeFormEditorOverviewPage.java Date: Mon, 05 Mar 2007 10:59:36 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070305105936.686531A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon Mar 5 02:59:35 2007 New Revision: 514647 URL: http://svn.apache.org/viewvc?view=rev&rev=514647 Log: Fixed DIRSTUDIO-64 (Unable to modify an Attribute Type's OID). Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditorOverviewPage.java Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java?view=diff&rev=514647&r1=514646&r2=514647 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/model/AttributeType.java Mon Mar 5 02:59:35 2007 @@ -231,7 +231,6 @@ } - //set public void setDescription( String description ) { literal.setDescription( description ); @@ -294,7 +293,14 @@ notifyChanged(); } - + + public void setOid( String oid ) + { + literal.setOid( oid ); + notifyChanged(); + } + + public void setObsolete( boolean bool ) { literal.setObsolete( bool ); @@ -323,7 +329,6 @@ } - //test public boolean isObsolete() { return literal.isObsolete(); Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java?view=diff&rev=514647&r1=514646&r2=514647 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditor.java Mon Mar 5 02:59:35 2007 @@ -275,7 +275,7 @@ at2.setNames( at1.getNames() ); at2.setNoUserModification( at1.isNoUserModification() ); at2.setObsolete( at1.isObsolete() ); - // TODO Need to update the Shared LDAP lirary to be able to modify the OID + at2.setOid( at1.getOid() ); at2.setOrdering( at1.getOrdering() ); at2.setSingleValue( at1.isSingleValue() ); at2.setSubstr( at1.getSubstr() ); Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditorOverviewPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditorOverviewPage.java?view=diff&rev=514647&r1=514646&r2=514647 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditorOverviewPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeFormEditorOverviewPage.java Mon Mar 5 02:59:35 2007 @@ -142,7 +142,15 @@ }; /** The listener for the OID Text Widget */ - // private Object oidTextListener; + private ModifyListener oidTextListener = new ModifyListener() + { + public void modifyText( ModifyEvent e ) + { + modifiedAttributeType.setOid( oidText.getText() ); + setEditorDirty(); + } + }; + /** The listener for the Schema Hyperlink Widget*/ private HyperlinkAdapter schemaLinkListener = new HyperlinkAdapter() { @@ -909,6 +917,7 @@ { // If the attribute type is in a core-schema file, we disable editing nameText.setEditable( false ); + oidText.setEditable( false ); descriptionText.setEditable( false ); supCombo.setEnabled( false ); usageCombo.setEnabled( false ); @@ -922,9 +931,6 @@ orderingCombo.setEnabled( false ); substringCombo.setEnabled( false ); } - - // AT THE MOMENT, WE CANNOT SET A NEW OID TO THE ATTRIBUTE TYPE, SO WE DISABLE THIS FUNCTIONNALITY - oidText.setEditable( false ); } @@ -936,6 +942,7 @@ if ( modifiedAttributeType.getOriginatingSchema().type == Schema.SchemaType.userSchema ) { nameText.addModifyListener( nameTextListener ); + oidText.addModifyListener( oidTextListener ); descriptionText.addModifyListener( descriptionTextListener ); supLabel.addHyperlinkListener( supLabelListener ); supCombo.addModifyListener( supComboListener ); @@ -965,6 +972,7 @@ private void removeListeners() { nameText.removeModifyListener( nameTextListener ); + oidText.removeModifyListener( oidTextListener ); aliasesButton.removeSelectionListener( aliasesButtonListener ); schemaLink.removeHyperlinkListener( schemaLinkListener ); descriptionText.removeModifyListener( descriptionTextListener );