You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2007/07/10 17:07:36 UTC
svn commit: r554970 - in
/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io:
XMLSchemaFileExporter.java XMLSchemaFileImporter.java
Author: pamarcelot
Date: Tue Jul 10 08:07:35 2007
New Revision: 554970
URL: http://svn.apache.org/viewvc?view=rev&rev=554970
Log:
Fixed bugs in the XML Schema Importer and Exporter
Modified:
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileExporter.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileExporter.java?view=diff&rev=554970&r1=554969&r2=554970
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileExporter.java Tue Jul 10 08:07:35 2007
@@ -56,7 +56,7 @@
private static final String ALIASES_TAG = "aliases";
private static final String ATTRIBUTE_TYPE_TAG = "attributetype";
private static final String ATTRIBUTE_TYPES_TAG = "attributetypes";
- private static final String BOOLEAN_FALSE = "true";
+ private static final String BOOLEAN_FALSE = "false";
private static final String BOOLEAN_TRUE = "true";
private static final String COLLECTIVE_TAG = "collective";
private static final String DESCRIPTION_TAG = "description";
@@ -182,7 +182,7 @@
Element aliasesNode = atNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
{
- aliasesNode.addElement( ALIAS_TAG, alias );
+ aliasesNode.addElement( ALIAS_TAG ).setText( alias );
}
}
@@ -190,35 +190,35 @@
String description = at.getDescription();
if ( ( description != null ) && ( !description.equals( "" ) ) )
{
- atNode.addElement( DESCRIPTION_TAG, description );
+ atNode.addElement( DESCRIPTION_TAG ).setText( description );
}
// Superior
String superior = at.getSuperiorName();
if ( ( superior != null ) && ( !superior.equals( "" ) ) )
{
- atNode.addElement( SUPERIOR_TAG, superior );
+ atNode.addElement( SUPERIOR_TAG ).setText( superior );
}
// Usage
UsageEnum usage = at.getUsage();
if ( usage != null )
{
- atNode.addElement( USAGE_TAG, usage.toString() );
+ atNode.addElement( USAGE_TAG ).setText( usage.toString() );
}
// Syntax
String syntax = at.getSyntaxOid();
if ( ( syntax != null ) && ( !syntax.equals( "" ) ) )
{
- atNode.addElement( SYNTAX_TAG, syntax );
+ atNode.addElement( SYNTAX_TAG ).setText( syntax );
}
// Syntax Length
int syntaxLength = at.getLength();
- if ( syntaxLength != 0 )
+ if ( syntaxLength != -1 )
{
- atNode.addElement( SYNTAX_LENGTH_TAG, "" + syntaxLength );
+ atNode.addElement( SYNTAX_LENGTH_TAG ).setText( "" + syntaxLength );
}
// Obsolete
@@ -265,21 +265,21 @@
String equality = at.getEqualityName();
if ( ( equality != null ) && ( !equality.equals( "" ) ) )
{
- atNode.addElement( EQUALITY_TAG, equality );
+ atNode.addElement( EQUALITY_TAG ).setText( equality );
}
// Ordering
String ordering = at.getOrderingName();
if ( ( ordering != null ) && ( !ordering.equals( "" ) ) )
{
- atNode.addElement( ORDERING_TAG, ordering );
+ atNode.addElement( ORDERING_TAG ).setText( ordering );
}
// Substring
String substring = at.getSubstrName();
if ( ( substring != null ) && ( !substring.equals( "" ) ) )
{
- atNode.addElement( SUBSTRING_TAG, substring );
+ atNode.addElement( SUBSTRING_TAG ).setText( substring );
}
}
@@ -310,7 +310,7 @@
Element aliasesNode = ocNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
{
- aliasesNode.addElement( ALIAS_TAG, alias );
+ aliasesNode.addElement( ALIAS_TAG ).setText( alias );
}
}
@@ -318,7 +318,7 @@
String description = oc.getDescription();
if ( ( description != null ) && ( !description.equals( "" ) ) )
{
- ocNode.addElement( DESCRIPTION_TAG, description );
+ ocNode.addElement( DESCRIPTION_TAG ).setText( description );
}
// Superiors
@@ -328,7 +328,7 @@
Element superiorsNode = ocNode.addElement( SUPERIORS_TAG );
for ( String superior : superiors )
{
- superiorsNode.addElement( SUPERIOR_TAG, superior );
+ superiorsNode.addElement( SUPERIOR_TAG ).setText( superior );
}
}
@@ -336,7 +336,7 @@
ObjectClassTypeEnum type = oc.getType();
if ( type != null )
{
- ocNode.addElement( TYPE_TAG, type.toString() );
+ ocNode.addElement( TYPE_TAG ).setText( type.toString() );
}
// Obsolete
@@ -356,7 +356,7 @@
Element mandatoryNode = ocNode.addElement( MANDATORY_TAG );
for ( String mandatoryAT : mandatoryATs )
{
- mandatoryNode.addElement( ATTRIBUTE_TYPE_TAG, mandatoryAT );
+ mandatoryNode.addElement( ATTRIBUTE_TYPE_TAG ).setText( mandatoryAT );
}
}
@@ -367,7 +367,7 @@
Element optionalNode = ocNode.addElement( OPTIONAL_TAG );
for ( String optionalAT : optionalATs )
{
- optionalNode.addElement( ATTRIBUTE_TYPE_TAG, optionalAT );
+ optionalNode.addElement( ATTRIBUTE_TYPE_TAG ).setText( optionalAT );
}
}
}
@@ -399,7 +399,7 @@
Element aliasesNode = mrNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
{
- aliasesNode.addElement( ALIAS_TAG, alias );
+ aliasesNode.addElement( ALIAS_TAG ).setText( alias );
}
}
@@ -407,7 +407,7 @@
String description = mr.getDescription();
if ( ( description != null ) && ( !description.equals( "" ) ) )
{
- mrNode.addElement( DESCRIPTION_TAG, description );
+ mrNode.addElement( DESCRIPTION_TAG ).setText( description );
}
// Obsolete
@@ -424,7 +424,7 @@
String syntaxOid = mr.getSyntaxOid();
if ( ( syntaxOid != null ) && ( !syntaxOid.equals( "" ) ) )
{
- mrNode.addElement( SYNTAX_OID_TAG, syntaxOid );
+ mrNode.addElement( SYNTAX_OID_TAG ).setText( syntaxOid );
}
}
@@ -458,7 +458,7 @@
Element aliasesNode = syntaxNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
{
- aliasesNode.addElement( ALIAS_TAG, alias );
+ aliasesNode.addElement( ALIAS_TAG ).setText( alias );
}
}
@@ -466,7 +466,7 @@
String description = syntax.getDescription();
if ( ( description != null ) && ( !description.equals( "" ) ) )
{
- syntaxNode.addElement( DESCRIPTION_TAG, description );
+ syntaxNode.addElement( DESCRIPTION_TAG ).setText( description );
}
// Obsolete
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java?view=diff&rev=554970&r1=554969&r2=554970
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/model/io/XMLSchemaFileImporter.java Tue Jul 10 08:07:35 2007
@@ -53,7 +53,7 @@
private static final String ALIASES_TAG = "aliases";
private static final String ATTRIBUTE_TYPE_TAG = "attributetype";
private static final String ATTRIBUTE_TYPES_TAG = "attributetypes";
- private static final String BOOLEAN_FALSE = "true";
+ private static final String BOOLEAN_FALSE = "false";
private static final String BOOLEAN_TRUE = "true";
private static final String COLLECTIVE_TAG = "collective";
private static final String DESCRIPTION_TAG = "description";