directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1490681 - in /directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor: controller/ controller/actions/ view/editors/objectclass/ view/views/ view/wrappers/
Date Fri, 07 Jun 2013 15:22:48 GMT
Author: pamarcelot
Date: Fri Jun  7 15:22:46 2013
New Revision: 1490681

URL: http://svn.apache.org/r1490681
Log:
Fix for DIRSTUDIO-921 (Schema Pane does not refresh when creating a new object class)

Modified:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java?rev=1490681&r1=1490680&r2=1490681&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
Fri Jun  7 15:22:46 2013
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.api.ldap.model.schema.AttributeType;
-import org.apache.directory.api.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.api.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -153,7 +152,7 @@ public class SchemaViewController
         /**
          * {@inheritDoc}
          */
-        public void objectClassAdded( MutableObjectClass oc )
+        public void objectClassAdded( ObjectClass oc )
         {
             SchemaViewContentProvider contentProvider = ( SchemaViewContentProvider ) viewer.getContentProvider();
             contentProvider.objectClassAdded( oc );
@@ -169,7 +168,7 @@ public class SchemaViewController
         /**
          * {@inheritDoc}
          */
-        public void objectClassModified( MutableObjectClass oc )
+        public void objectClassModified( ObjectClass oc )
         {
             ( ( SchemaViewContentProvider ) viewer.getContentProvider() ).objectClassModified(
oc );
         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java?rev=1490681&r1=1490680&r2=1490681&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
Fri Jun  7 15:22:46 2013
@@ -127,7 +127,8 @@ public class RenameSchemaElementAction e
                 // OBJECT CLASS
                 else if ( selectedElement instanceof ObjectClassWrapper )
                 {
-                    MutableObjectClass objectClass = ( ( ObjectClassWrapper ) selectedElement
).getObjectClass();
+                    MutableObjectClass objectClass = ( MutableObjectClass ) ( ( ObjectClassWrapper
) selectedElement )
+                        .getObjectClass();
 
                     RenameObjectClassDialog dialog = new RenameObjectClassDialog( objectClass.getNames()
);
                     if ( dialog.open() == RenameObjectClassDialog.OK )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java?rev=1490681&r1=1490680&r2=1490681&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
Fri Jun  7 15:22:46 2013
@@ -165,7 +165,7 @@ public class ObjectClassEditor extends F
         setInput( input );
         setPartName( input.getName() );
 
-        originalObjectClass = ( ( ObjectClassEditorInput ) getEditorInput() ).getObjectClass();
+        originalObjectClass = ( MutableObjectClass ) ( ( ObjectClassEditorInput ) getEditorInput()
).getObjectClass();
         modifiedObjectClass = PluginUtils.getClone( originalObjectClass );
 
         SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=1490681&r1=1490680&r2=1490681&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
Fri Jun  7 15:22:46 2013
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
-import org.apache.directory.api.ldap.model.schema.MutableObjectClass;
+import org.apache.directory.api.ldap.model.schema.ObjectClass;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IEditorInput;
@@ -35,7 +35,8 @@ import org.eclipse.ui.IPersistableElemen
  */
 public class ObjectClassEditorInput implements IEditorInput
 {
-    private MutableObjectClass objectClass;
+    /** The input object class */
+    private ObjectClass objectClass;
 
 
     /**
@@ -44,7 +45,7 @@ public class ObjectClassEditorInput impl
      * @param obj
      *      the object class
      */
-    public ObjectClassEditorInput( MutableObjectClass obj )
+    public ObjectClassEditorInput( ObjectClass obj )
     {
         super();
         objectClass = obj;
@@ -135,7 +136,7 @@ public class ObjectClassEditorInput impl
      * @return
      *      the input object class
      */
-    public MutableObjectClass getObjectClass()
+    public ObjectClass getObjectClass()
     {
         return this.objectClass;
     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java?rev=1490681&r1=1490680&r2=1490681&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
Fri Jun  7 15:22:46 2013
@@ -821,7 +821,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the added object class
      */
-    public void objectClassAdded( MutableObjectClass oc )
+    public void objectClassAdded( ObjectClass oc )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION
);
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -842,7 +842,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the added object class
      */
-    public void objectClassAddedFlatPresentation( MutableObjectClass oc )
+    public void objectClassAddedFlatPresentation( ObjectClass oc )
     {
         SchemaWrapper schemaWrapper = ( SchemaWrapper ) getWrapper( Activator.getDefault().getSchemaHandler()
             .getSchema( oc.getSchemaName() ) );
@@ -879,7 +879,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the added object class
      */
-    public void objectClassAddedHierarchicalPresentation( MutableObjectClass oc )
+    public void objectClassAddedHierarchicalPresentation( ObjectClass oc )
     {
         // Removing unattached nodes for "top"
         List<Object> ocChildren = new ArrayList<Object>();
@@ -1014,7 +1014,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the modified object class
      */
-    public void objectClassModified( MutableObjectClass oc )
+    public void objectClassModified( ObjectClass oc )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION
);
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -1048,7 +1048,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the modified object class
      */
-    public void objectClassModifiedHierarchicalPresentation( MutableObjectClass oc )
+    public void objectClassModifiedHierarchicalPresentation( ObjectClass oc )
     {
         // Propagating the modification to the hierarchy manager
         hierarchyManager.objectClassModified( oc );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java?rev=1490681&r1=1490680&r2=1490681&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
Fri Jun  7 15:22:46 2013
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.schemaeditor.view.wrappers;
 
 
-import org.apache.directory.api.ldap.model.schema.MutableObjectClass;
+import org.apache.directory.api.ldap.model.schema.ObjectClass;
 import org.eclipse.osgi.util.NLS;
 
 
@@ -32,7 +32,7 @@ import org.eclipse.osgi.util.NLS;
 public class ObjectClassWrapper extends AbstractTreeNode
 {
     /** The wrapped ObjectClass */
-    private MutableObjectClass objectClass;
+    private ObjectClass objectClass;
 
 
     /**
@@ -41,7 +41,7 @@ public class ObjectClassWrapper extends 
      * @param oc
      *      the wrapped ObjectClass
      */
-    public ObjectClassWrapper( MutableObjectClass oc )
+    public ObjectClassWrapper( ObjectClass oc )
     {
         super( null );
         objectClass = oc;
@@ -56,7 +56,7 @@ public class ObjectClassWrapper extends 
      * @param parent
      *      the parent TreeNode
      */
-    public ObjectClassWrapper( MutableObjectClass oc, TreeNode parent )
+    public ObjectClassWrapper( ObjectClass oc, TreeNode parent )
     {
         super( parent );
         objectClass = oc;
@@ -69,7 +69,7 @@ public class ObjectClassWrapper extends 
      * @return
      *      the wrapped ObjectClass
      */
-    public MutableObjectClass getObjectClass()
+    public ObjectClass getObjectClass()
     {
         return objectClass;
     }



Mime
View raw message