directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1066496 - in /directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor: controller/ProblemsViewController.java model/schemachecker/SchemaChecker.java
Date Wed, 02 Feb 2011 15:11:46 GMT
Author: pamarcelot
Date: Wed Feb  2 15:11:46 2011
New Revision: 1066496

URL: http://svn.apache.org/viewvc?rev=1066496&view=rev
Log:
Applied changes in APIs of Shared.

Modified:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java?rev=1066496&r1=1066495&r2=1066496&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
Wed Feb  2 15:11:46 2011
@@ -113,34 +113,37 @@ public class ProblemsViewController
                 // Selecting the right editor and input
                 if ( objectSelection instanceof SchemaErrorWrapper )
                 {
-                    SchemaObject object = ( ( SchemaErrorWrapper ) objectSelection ).getLdapSchemaException().getSource();
+                    SchemaObject object = ( ( SchemaErrorWrapper ) objectSelection ).getLdapSchemaException()
+                        .getSourceObject();
 
                     if ( object instanceof AttributeType )
                     {
-                        input = new AttributeTypeEditorInput( ( AttributeType ) object );
+                        input = new AttributeTypeEditorInput( Activator.getDefault().getSchemaHandler()
+                            .getAttributeType( object.getOid() ) );
                         editorId = AttributeTypeEditor.ID;
                     }
                     else if ( object instanceof ObjectClass )
                     {
-                        input = new ObjectClassEditorInput( ( ObjectClass ) object );
+                        input = new ObjectClassEditorInput( Activator.getDefault().getSchemaHandler()
+                            .getObjectClass( object.getOid() ) );
                         editorId = ObjectClassEditor.ID;
                     }
                 }
                 else if ( objectSelection instanceof SchemaWarningWrapper )
                 {
                     // TODO
-//                    SchemaObject object = ( ( SchemaWarningWrapper ) objectSelection ).getSchemaWarning().getSource();
-//
-//                    if ( object instanceof AttributeType )
-//                    {
-//                        input = new AttributeTypeEditorInput( ( AttributeType ) object
);
-//                        editorId = AttributeTypeEditor.ID;
-//                    }
-//                    else if ( object instanceof ObjectClass )
-//                    {
-//                        input = new ObjectClassEditorInput( ( ObjectClass ) object );
-//                        editorId = ObjectClassEditor.ID;
-//                    }
+                    //                    SchemaObject object = ( ( SchemaWarningWrapper
) objectSelection ).getSchemaWarning().getSource();
+                    //
+                    //                    if ( object instanceof AttributeType )
+                    //                    {
+                    //                        input = new AttributeTypeEditorInput( ( AttributeType
) object );
+                    //                        editorId = AttributeTypeEditor.ID;
+                    //                    }
+                    //                    else if ( object instanceof ObjectClass )
+                    //                    {
+                    //                        input = new ObjectClassEditorInput( ( ObjectClass
) object );
+                    //                        editorId = ObjectClassEditor.ID;
+                    //                    }
                 }
                 else if ( ( objectSelection instanceof Folder ) )
                 {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1066496&r1=1066495&r2=1066496&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
Wed Feb  2 15:11:46 2011
@@ -288,7 +288,7 @@ public class SchemaChecker
                     if ( error instanceof LdapSchemaException )
                     {
                         LdapSchemaException ldapSchemaException = (LdapSchemaException) error;
-                        SchemaObject source = ldapSchemaException.getSource();
+                        SchemaObject source = ldapSchemaException.getSourceObject();
                         if ( source != null )
                         {
                             errorsMap.put( source, ldapSchemaException );



Mime
View raw message