directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1005808 - in /directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema: Schema.java SchemaUtils.java
Date Fri, 08 Oct 2010 12:49:20 GMT
Author: pamarcelot
Date: Fri Oct  8 12:49:20 2010
New Revision: 1005808

URL: http://svn.apache.org/viewvc?rev=1005808&view=rev
Log:
Fixed LdapSyntax "Used From" section of the Schema Browser in the LDAP Browser.

Modified:
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1005808&r1=1005807&r2=1005808&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
Fri Oct  8 12:49:20 2010
@@ -311,7 +311,7 @@ public class Schema
         for ( AttributeType atd : getAttributeTypeDescriptions() )
         {
             // assume all received syntaxes in attributes are valid -> create pseudo syntaxes
if missing
-            String syntaxOid = atd.getSyntaxName();
+            String syntaxOid = atd.getSyntaxOid();
             if ( syntaxOid != null && !hasLdapSyntaxDescription( syntaxOid ) )
             {
                 LdapSyntax lsd = new LdapSyntax( syntaxOid );

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java?rev=1005808&r1=1005807&r2=1005808&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
Fri Oct  8 12:49:20 2010
@@ -657,9 +657,9 @@ public class SchemaUtils
      */
     public static String getSyntaxNumericOidTransitive( AttributeType atd, Schema schema
)
     {
-        if ( atd.getSyntaxName() != null )
+        if ( atd.getSyntaxOid() != null )
         {
-            return atd.getSyntaxName();
+            return atd.getSyntaxOid();
         }
 
         if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorOid() ) )



Mime
View raw message