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 2007/07/31 16:35:13 UTC
svn commit: r561343 - in
/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view:
editors/objectclass/ wizards/
Author: pamarcelot
Date: Tue Jul 31 07:35:12 2007
New Revision: 561343
URL: http://svn.apache.org/viewvc?view=rev&rev=561343
Log:
Improved the New OC Wizard and OC Editor. It is now possible to select the same AT as optional and mandatory.
Modified:
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?view=diff&rev=561343&r1=561342&r2=561343
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Tue Jul 31 07:35:12 2007
@@ -455,18 +455,6 @@
}
}
}
- String[] maysHidden = modifiedObjectClass.getMayNamesList();
- if ( maysHidden != null )
- {
- for ( String may : maysHidden )
- {
- AttributeTypeImpl at = schemaHandler.getAttributeType( may );
- if ( at != null )
- {
- hiddenATs.add( at );
- }
- }
- }
dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeTypeImpl[0] ) );
if ( dialog.open() != Window.OK )
@@ -592,18 +580,6 @@
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
List<AttributeTypeImpl> hiddenATs = new ArrayList<AttributeTypeImpl>();
- String[] mustsHidden = modifiedObjectClass.getMustNamesList();
- if ( mustsHidden != null )
- {
- for ( String must : mustsHidden )
- {
- AttributeTypeImpl at = schemaHandler.getAttributeType( must );
- if ( at != null )
- {
- hiddenATs.add( at );
- }
- }
- }
String[] maysHidden = modifiedObjectClass.getMayNamesList();
if ( maysHidden != null )
{
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java?view=diff&rev=561343&r1=561342&r2=561343
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java Tue Jul 31 07:35:12 2007
@@ -145,9 +145,6 @@
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
List<AttributeTypeImpl> hiddenAttributes = new ArrayList<AttributeTypeImpl>();
- List<AttributeTypeImpl> optionalAttributes = ( ( NewObjectClassWizard ) getWizard() )
- .getOptionalAttributesPage().getOptionalAttributeTypes();
- hiddenAttributes.addAll( optionalAttributes );
hiddenAttributes.addAll( mandatoryAttributeTypesList );
dialog.setHiddenAttributeTypes( hiddenAttributes );
if ( dialog.open() == Dialog.OK )
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java?view=diff&rev=561343&r1=561342&r2=561343
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java Tue Jul 31 07:35:12 2007
@@ -145,9 +145,6 @@
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
List<AttributeTypeImpl> hiddenAttributes = new ArrayList<AttributeTypeImpl>();
- List<AttributeTypeImpl> mdndatoryAttributes = ( ( NewObjectClassWizard ) getWizard() )
- .getMandatoryAttributesPage().getMandatoryAttributeTypes();
- hiddenAttributes.addAll( mdndatoryAttributes );
hiddenAttributes.addAll( optionalAttributeTypesList );
dialog.setHiddenAttributeTypes( hiddenAttributes );
if ( dialog.open() == Dialog.OK )
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java?view=diff&rev=561343&r1=561342&r2=561343
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassWizard.java Tue Jul 31 07:35:12 2007
@@ -100,30 +100,6 @@
/**
- * Gets the mandatory attributes page.
- *
- * @return
- * the mandatory attributes page
- */
- public NewObjectClassMandatoryAttributesPage getMandatoryAttributesPage()
- {
- return mandatoryAttributesPage;
- }
-
-
- /**
- * Gets the optional attributes page.
- *
- * @return
- * the optional attributes page
- */
- public NewObjectClassOptionalAttributesPage getOptionalAttributesPage()
- {
- return optionalAttributesPage;
- }
-
-
- /**
* Sets the selected schema.
*
* @param schema