You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2008/05/17 21:38:12 UTC
svn commit: r657437 [2/2] - in /directory/studio/trunk: ./
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/
jars/META-INF/ schemaeditor/META-INF/
schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/
schemaedi...
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Sat May 17 12:38:10 2008
@@ -79,7 +79,7 @@
// Label
if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -91,7 +91,7 @@
}
else if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = ViewUtils.concateAliases( names );
@@ -108,7 +108,7 @@
else
// Default
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -132,7 +132,7 @@
// Label
if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -144,7 +144,7 @@
}
else if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = ViewUtils.concateAliases( names );
@@ -161,7 +161,7 @@
else
// Default
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -189,7 +189,7 @@
if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = names[0];
@@ -201,7 +201,7 @@
}
else if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = ViewUtils.concateAliases( names );
@@ -222,7 +222,7 @@
if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = names[0];
@@ -234,7 +234,7 @@
}
else if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = ViewUtils.concateAliases( names );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java Sat May 17 12:38:10 2008
@@ -115,7 +115,7 @@
// Label
if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -127,7 +127,7 @@
}
else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = ViewUtils.concateAliases( names );
@@ -144,7 +144,7 @@
else
// Default
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -186,7 +186,7 @@
// Label
if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -198,7 +198,7 @@
}
else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = ViewUtils.concateAliases( names );
@@ -215,7 +215,7 @@
else
// Default
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -267,7 +267,7 @@
if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = names[0];
@@ -279,7 +279,7 @@
}
else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = ViewUtils.concateAliases( names );
@@ -318,7 +318,7 @@
if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = names[0];
@@ -330,7 +330,7 @@
}
else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = ViewUtils.concateAliases( names );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java Sat May 17 12:38:10 2008
@@ -49,32 +49,32 @@
switch ( atd1.getType() )
{
case ADDED:
- o1Names = ( ( SchemaObject ) atd1.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) atd1.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o1Names = ( ( SchemaObject ) atd1.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) atd1.getDestination() ).getNamesRef();
break;
case REMOVED:
- o1Names = ( ( SchemaObject ) atd1.getSource() ).getNames();
+ o1Names = ( ( SchemaObject ) atd1.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o1Names = ( ( SchemaObject ) atd1.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) atd1.getDestination() ).getNamesRef();
break;
}
switch ( atd2.getType() )
{
case ADDED:
- o2Names = ( ( SchemaObject ) atd2.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) atd2.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o2Names = ( ( SchemaObject ) atd2.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) atd2.getDestination() ).getNamesRef();
break;
case REMOVED:
- o2Names = ( ( SchemaObject ) atd2.getSource() ).getNames();
+ o2Names = ( ( SchemaObject ) atd2.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o2Names = ( ( SchemaObject ) atd2.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) atd2.getDestination() ).getNamesRef();
break;
}
}
@@ -86,32 +86,32 @@
switch ( ocd1.getType() )
{
case ADDED:
- o1Names = ( ( SchemaObject ) ocd1.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd1.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o1Names = ( ( SchemaObject ) ocd1.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd1.getDestination() ).getNamesRef();
break;
case REMOVED:
- o1Names = ( ( SchemaObject ) ocd1.getSource() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd1.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o1Names = ( ( SchemaObject ) ocd1.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd1.getDestination() ).getNamesRef();
break;
}
switch ( ocd2.getType() )
{
case ADDED:
- o2Names = ( ( SchemaObject ) ocd2.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd2.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o2Names = ( ( SchemaObject ) ocd2.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd2.getDestination() ).getNamesRef();
break;
case REMOVED:
- o2Names = ( ( SchemaObject ) ocd2.getSource() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd2.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o2Names = ( ( SchemaObject ) ocd2.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd2.getDestination() ).getNamesRef();
break;
}
}
@@ -123,32 +123,32 @@
switch ( atd.getType() )
{
case ADDED:
- o1Names = ( ( SchemaObject ) atd.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) atd.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o1Names = ( ( SchemaObject ) atd.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) atd.getDestination() ).getNamesRef();
break;
case REMOVED:
- o1Names = ( ( SchemaObject ) atd.getSource() ).getNames();
+ o1Names = ( ( SchemaObject ) atd.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o1Names = ( ( SchemaObject ) atd.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) atd.getDestination() ).getNamesRef();
break;
}
switch ( ocd.getType() )
{
case ADDED:
- o2Names = ( ( SchemaObject ) ocd.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o2Names = ( ( SchemaObject ) ocd.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd.getDestination() ).getNamesRef();
break;
case REMOVED:
- o2Names = ( ( SchemaObject ) ocd.getSource() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o2Names = ( ( SchemaObject ) ocd.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) ocd.getDestination() ).getNamesRef();
break;
}
}
@@ -160,32 +160,32 @@
switch ( ocd.getType() )
{
case ADDED:
- o1Names = ( ( SchemaObject ) ocd.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o1Names = ( ( SchemaObject ) ocd.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd.getDestination() ).getNamesRef();
break;
case REMOVED:
- o1Names = ( ( SchemaObject ) ocd.getSource() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o1Names = ( ( SchemaObject ) ocd.getDestination() ).getNames();
+ o1Names = ( ( SchemaObject ) ocd.getDestination() ).getNamesRef();
break;
}
switch ( atd.getType() )
{
case ADDED:
- o2Names = ( ( SchemaObject ) atd.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) atd.getDestination() ).getNamesRef();
break;
case MODIFIED:
- o2Names = ( ( SchemaObject ) atd.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) atd.getDestination() ).getNamesRef();
break;
case REMOVED:
- o2Names = ( ( SchemaObject ) atd.getSource() ).getNames();
+ o2Names = ( ( SchemaObject ) atd.getSource() ).getNamesRef();
break;
case IDENTICAL:
- o2Names = ( ( SchemaObject ) atd.getDestination() ).getNames();
+ o2Names = ( ( SchemaObject ) atd.getDestination() ).getNamesRef();
break;
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Sat May 17 12:38:10 2008
@@ -252,7 +252,7 @@
holder.setDescription( at.getDescription() );
holder.setEquality( at.getEqualityName() );
List<String> names = new ArrayList<String>();
- for ( String name : at.getNames() )
+ for ( String name : at.getNamesRef() )
{
names.add( name );
}
@@ -345,7 +345,7 @@
}
holder.setMust( mustList );
List<String> names = new ArrayList<String>();
- for ( String name : oc.getNames() )
+ for ( String name : oc.getNamesRef() )
{
names.add( name );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Sat May 17 12:38:10 2008
@@ -136,7 +136,7 @@
if ( dialog.open() == Dialog.OK )
{
AttributeTypeImpl selectedAT = dialog.getSelectedAttributeType();
- String[] aliases = selectedAT.getNames();
+ String[] aliases = selectedAT.getNamesRef();
if ( ( aliases != null ) && ( aliases.length > 0 ) )
{
superiorText.setText( aliases[0] );
@@ -261,8 +261,8 @@
{
if ( ( o1 instanceof SyntaxImpl ) && ( o2 instanceof SyntaxImpl ) )
{
- String[] o1Names = ( ( SyntaxImpl ) o1 ).getNames();
- String[] o2Names = ( ( SyntaxImpl ) o2 ).getNames();
+ String[] o1Names = ( ( SyntaxImpl ) o1 ).getNamesRef();
+ String[] o2Names = ( ( SyntaxImpl ) o2 ).getNamesRef();
// Comparing the First Name
if ( ( o1Names != null ) && ( o2Names != null ) )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java Sat May 17 12:38:10 2008
@@ -174,8 +174,8 @@
{
if ( ( o1 instanceof MatchingRuleImpl ) && ( o2 instanceof MatchingRuleImpl ) )
{
- String[] o1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
- String[] o2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+ String[] o1Names = ( ( MatchingRuleImpl ) o1 ).getNamesRef();
+ String[] o2Names = ( ( MatchingRuleImpl ) o2 ).getNamesRef();
// Comparing the First Name
if ( ( o1Names != null ) && ( o2Names != null ) )
@@ -235,7 +235,7 @@
{
MatchingRuleImpl mr = ( ( MatchingRuleImpl ) selection );
- String[] names = mr.getNames();
+ String[] names = mr.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
return mr.getName();
@@ -264,7 +264,7 @@
{
MatchingRuleImpl mr = ( ( MatchingRuleImpl ) selection );
- String[] names = mr.getNames();
+ String[] names = mr.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
return mr.getName();
@@ -293,7 +293,7 @@
{
MatchingRuleImpl mr = ( ( MatchingRuleImpl ) selection );
- String[] names = mr.getNames();
+ String[] names = mr.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
return mr.getName();
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java Sat May 17 12:38:10 2008
@@ -133,7 +133,7 @@
{
ObjectClassImpl oc = ( ObjectClassImpl ) element;
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
return ViewUtils.concateAliases( names ) + " - (" + oc.getOid() + ")";
@@ -280,8 +280,8 @@
{
public int compare( ObjectClassImpl o1, ObjectClassImpl o2 )
{
- String[] at1Names = o1.getNames();
- String[] at2Names = o2.getNames();
+ String[] at1Names = o1.getNamesRef();
+ String[] at2Names = o2.getNamesRef();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 ) && ( at2Names.length > 0 ) )
{
@@ -308,7 +308,7 @@
List<String> names = new ArrayList<String>();
for ( ObjectClassImpl oc : superiorsList )
{
- String[] aliases = oc.getNames();
+ String[] aliases = oc.getNamesRef();
if ( ( aliases != null ) && ( aliases.length > 0 ) )
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java Sat May 17 12:38:10 2008
@@ -124,7 +124,7 @@
{
AttributeTypeImpl at = ( AttributeTypeImpl ) element;
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
return ViewUtils.concateAliases( names ) + " - (" + at.getOid() + ")";
@@ -214,8 +214,8 @@
{
public int compare( AttributeTypeImpl o1, AttributeTypeImpl o2 )
{
- String[] at1Names = o1.getNames();
- String[] at2Names = o2.getNames();
+ String[] at1Names = o1.getNamesRef();
+ String[] at2Names = o2.getNamesRef();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 ) && ( at2Names.length > 0 ) )
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java Sat May 17 12:38:10 2008
@@ -124,7 +124,7 @@
{
AttributeTypeImpl at = ( AttributeTypeImpl ) element;
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
return ViewUtils.concateAliases( names ) + " - (" + at.getOid() + ")";
@@ -214,8 +214,8 @@
{
public int compare( AttributeTypeImpl o1, AttributeTypeImpl o2 )
{
- String[] at1Names = o1.getNames();
- String[] at2Names = o2.getNames();
+ String[] at1Names = o1.getNamesRef();
+ String[] at2Names = o2.getNamesRef();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 ) && ( at2Names.length > 0 ) )
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java Sat May 17 12:38:10 2008
@@ -45,32 +45,32 @@
AttributeTypeImpl at1 = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
AttributeTypeImpl at2 = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
- o1Names = at1.getNames();
- o2Names = at2.getNames();
+ o1Names = at1.getNamesRef();
+ o2Names = at2.getNamesRef();
}
else if ( ( o1 instanceof ObjectClassWrapper ) && ( o2 instanceof ObjectClassWrapper ) )
{
ObjectClassImpl oc1 = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
ObjectClassImpl oc2 = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
- o1Names = oc1.getNames();
- o2Names = oc2.getNames();
+ o1Names = oc1.getNamesRef();
+ o2Names = oc2.getNamesRef();
}
else if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof ObjectClassWrapper ) )
{
AttributeTypeImpl at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
ObjectClassImpl oc = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
- o1Names = at.getNames();
- o2Names = oc.getNames();
+ o1Names = at.getNamesRef();
+ o2Names = oc.getNamesRef();
}
else if ( ( o1 instanceof ObjectClassWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
{
ObjectClassImpl oc = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
AttributeTypeImpl at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
- o1Names = oc.getNames();
- o2Names = at.getNames();
+ o1Names = oc.getNamesRef();
+ o2Names = at.getNamesRef();
}
// Comparing the First Name
Modified: directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java Sat May 17 12:38:10 2008
@@ -51,6 +51,9 @@
import org.apache.directory.shared.ldap.codec.search.PresentFilter;
import org.apache.directory.shared.ldap.codec.search.SearchRequest;
import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
+import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
+import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
import org.apache.directory.shared.ldap.message.ScopeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
@@ -2471,11 +2474,13 @@
{
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
- assertion.setAssertionValue( Base64.decode( nextText.trim().toCharArray() ) );
+ Value<byte[]> value = new ClientBinaryValue( Base64.decode( nextText.trim().toCharArray() ) );
+ assertion.setAssertionValue( value );
}
else
{
- assertion.setAssertionValue( nextText.trim() );
+ Value<String> value = new ClientStringValue( nextText.trim() );
+ assertion.setAssertionValue( value );
}
}
}
Modified: directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java Sat May 17 12:38:10 2008
@@ -956,7 +956,7 @@
assertEquals( "sn", assertion.getAttributeDesc() );
- assertEquals( "foobar", assertion.getAssertionValue() );
+ assertEquals( "foobar", assertion.getAssertionValue().get() );
}
@@ -993,8 +993,8 @@
AttributeValueAssertion assertion = approxMatchFilter.getAssertion();
assertEquals( "sn", assertion.getAttributeDesc() );
-
- assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+
+ assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
}
@@ -1097,7 +1097,7 @@
assertEquals( "sn", assertion.getAttributeDesc() );
- assertEquals( "foobar", assertion.getAssertionValue() );
+ assertEquals( "foobar", assertion.getAssertionValue().get() );
}
@@ -1135,7 +1135,7 @@
assertEquals( "sn", assertion.getAttributeDesc() );
- assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+ assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
}
@@ -1238,7 +1238,7 @@
assertEquals( "sn", assertion.getAttributeDesc() );
- assertEquals( "foobar", assertion.getAssertionValue() );
+ assertEquals( "foobar", assertion.getAssertionValue().get() );
}
@@ -1276,7 +1276,7 @@
assertEquals( "sn", assertion.getAttributeDesc() );
- assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+ assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
}
@@ -1379,7 +1379,7 @@
assertEquals( "sn", assertion.getAttributeDesc() );
- assertEquals( "foobar", assertion.getAssertionValue() );
+ assertEquals( "foobar", assertion.getAssertionValue().get() );
}
@@ -1417,7 +1417,7 @@
assertEquals( "sn", assertion.getAttributeDesc() );
- assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue() ) );
+ assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) assertion.getAssertionValue().get() ) );
}