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/06/07 16:17:30 UTC
svn commit: r664342 [5/7] - in /directory/sandbox/seelmann/testingframework:
./ apacheds-configuration-help/src/main/docbook/
apacheds-configuration-help/src/main/resources/html/images/
apacheds-configuration-help/src/main/resources/html/images/getting...
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Sat Jun 7 07:17:06 2008
@@ -266,7 +266,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNames() );
+ EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNamesRef() );
if ( editDialog.open() != Window.OK )
{
return;
@@ -274,9 +274,9 @@
if ( editDialog.isDirty() )
{
modifiedObjectClass.setNames( editDialog.getAliases() );
- if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().length != 0 ) )
+ if ( ( modifiedObjectClass.getNamesRef() != null ) && ( modifiedObjectClass.getNamesRef().length != 0 ) )
{
- aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames() ) );
+ aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNamesRef() ) );
}
else
{
@@ -477,7 +477,7 @@
newMusts.add( must );
}
}
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
newMusts.add( names[0] );
@@ -516,7 +516,7 @@
if ( selectedElement instanceof AttributeTypeImpl )
{
- for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
+ for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNamesRef() )
{
newMusts.remove( name );
}
@@ -614,7 +614,7 @@
newMays.add( may );
}
}
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
newMays.add( names[0] );
@@ -653,7 +653,7 @@
if ( selectedElement instanceof AttributeTypeImpl )
{
- for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
+ for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNamesRef() )
{
newMays.remove( name );
}
@@ -745,7 +745,7 @@
{
superiors.add( sup );
}
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
superiors.add( names[0] );
@@ -784,7 +784,7 @@
if ( selectedElement instanceof ObjectClassImpl )
{
- for ( String name : ( ( ObjectClassImpl ) selectedElement ).getNames() )
+ for ( String name : ( ( ObjectClassImpl ) selectedElement ).getNamesRef() )
{
superiors.remove( name );
}
@@ -1036,9 +1036,9 @@
private void fillInUiFields()
{
// ALIASES Label
- if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().length != 0 ) )
+ if ( ( modifiedObjectClass.getNamesRef() != null ) && ( modifiedObjectClass.getNamesRef().length != 0 ) )
{
- aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames() ) );
+ aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNamesRef() ) );
}
else
{
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java Sat Jun 7 07:17:06 2008
@@ -88,8 +88,8 @@
{
if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
{
- String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
- String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+ String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
+ String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
&& ( oc2Names.length > 0 ) )
@@ -99,7 +99,7 @@
}
else if ( o1 instanceof ObjectClassImpl && o2 instanceof NonExistingObjectClass )
{
- String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
+ String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
String oc2Name = ( ( NonExistingObjectClass ) o2 ).getName();
if ( ( oc1Names != null ) && ( oc2Name != null ) && ( oc1Names.length > 0 ) )
@@ -110,7 +110,7 @@
else if ( o1 instanceof NonExistingObjectClass && o2 instanceof ObjectClassImpl )
{
String oc1Name = ( ( NonExistingObjectClass ) o1 ).getName();
- String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+ String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
if ( ( oc1Name != null ) && ( oc2Names != null ) && ( oc2Names.length > 0 ) )
{
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java Sat Jun 7 07:17:06 2008
@@ -63,7 +63,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() + ")";
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java Sat Jun 7 07:17:06 2008
@@ -61,8 +61,8 @@
{
if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
{
- String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
- String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+ String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+ String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 )
&& ( at2Names.length > 0 ) )
@@ -72,8 +72,8 @@
}
else if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
{
- String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
- String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+ String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
+ String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
&& ( oc2Names.length > 0 ) )
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java Sat Jun 7 07:17:06 2008
@@ -67,7 +67,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() + ")";
@@ -81,7 +81,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() + ")";
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Sat Jun 7 07:17:06 2008
@@ -176,7 +176,7 @@
{
StringBuffer sb = new StringBuffer();
- String[] names = object.getNames();
+ String[] names = object.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
sb.append( ViewUtils.concateAliases( names ) );
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java Sat Jun 7 07:17:06 2008
@@ -87,7 +87,7 @@
// Label
if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -99,7 +99,7 @@
}
else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = ViewUtils.concateAliases( names );
@@ -116,7 +116,7 @@
else
// Default
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -140,7 +140,7 @@
// Label
if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -152,7 +152,7 @@
}
else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = ViewUtils.concateAliases( names );
@@ -169,7 +169,7 @@
else
// Default
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -197,7 +197,7 @@
if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = names[0];
@@ -209,7 +209,7 @@
}
else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = ViewUtils.concateAliases( names );
@@ -230,7 +230,7 @@
if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = names[0];
@@ -242,7 +242,7 @@
}
else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
secondaryLabel = ViewUtils.concateAliases( names );
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Sat Jun 7 07:17:06 2008
@@ -92,7 +92,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];
@@ -104,7 +104,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 );
@@ -121,7 +121,7 @@
else
// Default
{
- String[] names = at.getNames();
+ String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -145,7 +145,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];
@@ -157,7 +157,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 );
@@ -174,7 +174,7 @@
else
// Default
{
- String[] names = oc.getNames();
+ String[] names = oc.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
label = names[0];
@@ -215,7 +215,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];
@@ -227,7 +227,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 );
@@ -248,7 +248,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];
@@ -260,7 +260,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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Sat Jun 7 07:17:06 2008
@@ -703,7 +703,7 @@
// Aliases
if ( searchScope.contains( SearchInEnum.ALIASES ) )
{
- if ( checkArray( pattern, at.getNames() ) )
+ if ( checkArray( pattern, at.getNamesRef() ) )
{
searchResults.add( at );
continue;
@@ -787,7 +787,7 @@
// Aliases
if ( searchScope.contains( SearchInEnum.ALIASES ) )
{
- if ( checkArray( pattern, oc.getNames() ) )
+ if ( checkArray( pattern, oc.getNamesRef() ) )
{
searchResults.add( oc );
continue;
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java Sat Jun 7 07:17:06 2008
@@ -74,32 +74,32 @@
AttributeTypeImpl at1 = ( AttributeTypeImpl ) o1;
AttributeTypeImpl at2 = ( AttributeTypeImpl ) o2;
- o1Names = at1.getNames();
- o2Names = at2.getNames();
+ o1Names = at1.getNamesRef();
+ o2Names = at2.getNamesRef();
}
else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof ObjectClassImpl ) )
{
ObjectClassImpl oc1 = ( ObjectClassImpl ) o1;
ObjectClassImpl oc2 = ( ObjectClassImpl ) o2;
- o1Names = oc1.getNames();
- o2Names = oc2.getNames();
+ o1Names = oc1.getNamesRef();
+ o2Names = oc2.getNamesRef();
}
else if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof ObjectClassImpl ) )
{
AttributeTypeImpl at = ( AttributeTypeImpl ) o1;
ObjectClassImpl oc = ( ObjectClassImpl ) o2;
- o1Names = at.getNames();
- o2Names = oc.getNames();
+ o1Names = at.getNamesRef();
+ o2Names = oc.getNamesRef();
}
else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof AttributeTypeImpl ) )
{
ObjectClassImpl oc = ( ObjectClassImpl ) o1;
AttributeTypeImpl at = ( AttributeTypeImpl ) o2;
- o1Names = oc.getNames();
- o2Names = at.getNames();
+ o1Names = oc.getNamesRef();
+ o2Names = at.getNamesRef();
}
// Comparing the First Name
Modified: directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java (original)
+++ directory/sandbox/seelmann/testingframework/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java Sat Jun 7 07:17:06 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/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractResponseTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractResponseTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractResponseTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractResponseTest.java Sat Jun 7 07:17:06 2008
@@ -49,7 +49,7 @@
{
Dsmlv2ResponseParser parser = new Dsmlv2ResponseParser();
- parser.setInputFile( testClass.getResource( filename ).getFile() );
+ parser.setInput( testClass.getResource( filename ).openStream(), "UTF-8" );
parser.parse();
}
Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractTest.java Sat Jun 7 07:17:06 2008
@@ -21,6 +21,8 @@
package org.apache.directory.studio.dsmlv2;
+import java.io.FileInputStream;
+
import junit.framework.TestCase;
import org.apache.directory.studio.dsmlv2.Dsmlv2Parser;
@@ -49,7 +51,7 @@
{
Dsmlv2Parser parser = new Dsmlv2Parser();
- parser.setInputFile( testClass.getResource( filename ).getFile() );
+ parser.setInput( testClass.getResource( filename ).openStream(), "UTF-8" );
parser.parse();
}
Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/abandonRequest/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/abandonRequest/AbandonRequestTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/abandonRequest/AbandonRequestTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/abandonRequest/AbandonRequestTest.java Sat Jun 7 07:17:06 2008
@@ -55,8 +55,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AbandonRequestTest.class.getResource( "request_with_abandonID_attribute.xml" )
- .getFile() );
+ parser.setInput( AbandonRequestTest.class.getResource( "request_with_abandonID_attribute.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -76,9 +76,10 @@
*/
public void testRequestWithRequestIdEquals0()
{
- testParsingFail( AbandonRequestTest.class, "request_with_requestID_equals_0.xml" );
+ testParsingFail( AbandonRequestTest.class, "request_with_requestID_equals_0.xml" );
}
-
+
+
/**
* Test parsing of a request with the (optional) requestID attribute
*/
@@ -89,8 +90,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AbandonRequestTest.class.getResource( "request_with_requestID_attribute.xml" )
- .getFile() );
+ parser.setInput( AbandonRequestTest.class.getResource( "request_with_requestID_attribute.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -116,7 +117,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AbandonRequestTest.class.getResource( "request_with_1_control.xml" ).getFile() );
+ parser
+ .setInput( AbandonRequestTest.class.getResource( "request_with_1_control.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -127,13 +129,14 @@
AbandonRequest abandonRequest = ( AbandonRequest ) parser.getBatchRequest().getCurrentRequest();
Control control = abandonRequest.getCurrentControl();
-
+
assertEquals( 1, abandonRequest.getControls().size() );
assertTrue( control.getCriticality() );
assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
}
-
+
+
/**
* Test parsing of a request with a (optional) Control element with Base64 value
*/
@@ -145,7 +148,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AbandonRequestTest.class.getResource( "request_with_1_control_base64_value.xml" ).getFile() );
+ parser.setInput( AbandonRequestTest.class.getResource( "request_with_1_control_base64_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -156,7 +160,7 @@
AbandonRequest abandonRequest = ( AbandonRequest ) parser.getBatchRequest().getCurrentRequest();
Control control = abandonRequest.getCurrentControl();
-
+
assertEquals( 1, abandonRequest.getControls().size() );
assertTrue( control.getCriticality() );
assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
@@ -175,8 +179,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AbandonRequestTest.class.getResource( "request_with_1_control_empty_value.xml" )
- .getFile() );
+ parser.setInput( AbandonRequestTest.class.getResource( "request_with_1_control_empty_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -187,7 +191,7 @@
AbandonRequest abandonRequest = ( AbandonRequest ) parser.getBatchRequest().getCurrentRequest();
Control control = abandonRequest.getCurrentControl();
-
+
assertEquals( 1, abandonRequest.getControls().size() );
assertTrue( control.getCriticality() );
assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
@@ -206,7 +210,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AbandonRequestTest.class.getResource( "request_with_2_controls.xml" ).getFile() );
+ parser.setInput( AbandonRequestTest.class.getResource( "request_with_2_controls.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -217,7 +222,7 @@
AbandonRequest abandonRequest = ( AbandonRequest ) parser.getBatchRequest().getCurrentRequest();
Control control = abandonRequest.getCurrentControl();
-
+
assertEquals( 2, abandonRequest.getControls().size() );
assertFalse( control.getCriticality() );
assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
@@ -236,8 +241,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AbandonRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
- .getFile() );
+ parser.setInput( AbandonRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -248,14 +253,14 @@
AbandonRequest abandonRequest = ( AbandonRequest ) parser.getBatchRequest().getCurrentRequest();
Control control = abandonRequest.getCurrentControl();
-
+
assertEquals( 3, abandonRequest.getControls().size() );
assertTrue( control.getCriticality() );
assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
}
-
-
+
+
/**
* Test parsing of a request with a needed requestID attribute
*
Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addRequest/AddRequestTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addRequest/AddRequestTest.java Sat Jun 7 07:17:06 2008
@@ -60,7 +60,7 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_dn_attribute.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_dn_attribute.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -85,7 +85,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_requestID_attribute.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_requestID_attribute.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -119,7 +120,7 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_1_control.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_1_control.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -152,8 +153,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_1_control_base64_value.xml" )
- .getFile() );
+ parser.setInput(
+ AddRequestTest.class.getResource( "request_with_1_control_base64_value.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -182,8 +183,8 @@
{
parser = new Dsmlv2Parser();
- parser
- .setInputFile( AddRequestTest.class.getResource( "request_with_1_control_empty_value.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_1_control_empty_value.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -212,7 +213,7 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_2_controls.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_2_controls.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -241,8 +242,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
- .getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -271,7 +272,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_1_attr_without_value.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_1_attr_without_value.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -326,7 +328,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_1_attr_empty_value.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_1_attr_empty_value.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -381,7 +384,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_1_attr_with_value.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_1_attr_with_value.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -446,8 +450,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_1_attr_with_base64_value.xml" )
- .getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_1_attr_with_base64_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -512,7 +516,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_2_attr_with_value.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_2_attr_with_value.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -597,7 +602,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AddRequestTest.class.getResource( "request_with_1_attr_with_2_values.xml" ).getFile() );
+ parser.setInput( AddRequestTest.class.getResource( "request_with_1_attr_with_2_values.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addResponse/AddResponseTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addResponse/AddResponseTest.java Sat Jun 7 07:17:06 2008
@@ -55,8 +55,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser
- .setInputFile( AddResponseTest.class.getResource( "response_with_requestID_attribute.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_requestID_attribute.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -69,7 +69,8 @@
assertEquals( 456, addResponse.getMessageId() );
}
-
+
+
/**
* Test parsing of a Response with the (optional) requestID attribute equals 0
*/
@@ -89,7 +90,7 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_1_control.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_1_control.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -111,6 +112,7 @@
assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
}
+
/**
* Test parsing of a response with a (optional) Control element with emptyValue
*/
@@ -121,7 +123,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_1_control_empty_value.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_1_control_empty_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -132,13 +135,14 @@
AddResponse addResponse = ( AddResponse ) parser.getBatchResponse().getCurrentResponse();
Control control = addResponse.getCurrentControl();
-
+
assertEquals( 1, addResponse.getControls().size() );
assertTrue( control.getCriticality() );
assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
}
+
/**
* Test parsing of a response with 2 (optional) Control elements
*/
@@ -149,7 +153,7 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_2_controls.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_2_controls.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -182,8 +186,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_3_controls_without_value.xml" )
- .getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_3_controls_without_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -234,7 +238,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_result_code.xml" ).getFile() );
+ parser
+ .setInput( AddResponseTest.class.getResource( "response_with_result_code.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -261,7 +266,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_error_message.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_error_message.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -277,7 +283,8 @@
assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult
.getErrorMessage() );
}
-
+
+
/**
* Test parsing of a response with empty Error Message
*/
@@ -288,7 +295,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_empty_error_message.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_empty_error_message.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -315,7 +323,7 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_1_referral.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_1_referral.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -343,7 +351,8 @@
fail();
}
}
-
+
+
/**
* Test parsing of a response with an empty Referral
*/
@@ -354,7 +363,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_1_empty_referral.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_1_empty_referral.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -383,7 +393,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_2_referrals.xml" ).getFile() );
+ parser
+ .setInput( AddResponseTest.class.getResource( "response_with_2_referrals.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -434,8 +445,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser.setInputFile( AddResponseTest.class.getResource( "response_with_1_referral_and_error_message.xml" )
- .getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_1_referral_and_error_message.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -475,8 +486,8 @@
{
parser = new Dsmlv2ResponseParser();
- parser
- .setInputFile( AddResponseTest.class.getResource( "response_with_matchedDN_attribute.xml" ).getFile() );
+ parser.setInput( AddResponseTest.class.getResource( "response_with_matchedDN_attribute.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
Modified: directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authRequest/AuthRequestTest.java?rev=664342&r1=664341&r2=664342&view=diff
==============================================================================
--- directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/sandbox/seelmann/testingframework/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authRequest/AuthRequestTest.java Sat Jun 7 07:17:06 2008
@@ -55,7 +55,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AuthRequestTest.class.getResource( "request_with_principal_attribute.xml" ).getFile() );
+ parser.setInput( AuthRequestTest.class.getResource( "request_with_principal_attribute.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -80,7 +81,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AuthRequestTest.class.getResource( "request_with_requestID_attribute.xml" ).getFile() );
+ parser.setInput( AuthRequestTest.class.getResource( "request_with_requestID_attribute.xml" ).openStream(),
+ "UTF-8" );
parser.parse();
}
@@ -114,7 +116,7 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AuthRequestTest.class.getResource( "request_with_1_control.xml" ).getFile() );
+ parser.setInput( AuthRequestTest.class.getResource( "request_with_1_control.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -143,8 +145,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AuthRequestTest.class.getResource( "request_with_1_control_base64_value.xml" )
- .getFile() );
+ parser.setInput( AuthRequestTest.class.getResource( "request_with_1_control_base64_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}
@@ -173,8 +175,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AuthRequestTest.class.getResource( "request_with_1_control_empty_value.xml" )
- .getFile() );
+ parser.setInput(
+ AuthRequestTest.class.getResource( "request_with_1_control_empty_value.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -203,7 +205,7 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AuthRequestTest.class.getResource( "request_with_2_controls.xml" ).getFile() );
+ parser.setInput( AuthRequestTest.class.getResource( "request_with_2_controls.xml" ).openStream(), "UTF-8" );
parser.parse();
}
@@ -232,8 +234,8 @@
{
parser = new Dsmlv2Parser();
- parser.setInputFile( AuthRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
- .getFile() );
+ parser.setInput( AuthRequestTest.class.getResource( "request_with_3_controls_without_value.xml" )
+ .openStream(), "UTF-8" );
parser.parse();
}