Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 12665 invoked from network); 8 Mar 2007 10:05:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Mar 2007 10:05:47 -0000 Received: (qmail 60867 invoked by uid 500); 8 Mar 2007 10:05:50 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 60839 invoked by uid 500); 8 Mar 2007 10:05:50 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 60824 invoked by uid 99); 8 Mar 2007 10:05:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Mar 2007 02:05:50 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Mar 2007 02:05:41 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id E1A431A9838; Thu, 8 Mar 2007 02:05:20 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r515995 - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions: LinkWithEditorHierarchyView.java LinkWithEditorSchemasView.java Date: Thu, 08 Mar 2007 10:05:20 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070308100520.E1A431A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Thu Mar 8 02:05:20 2007 New Revision: 515995 URL: http://svn.apache.org/viewvc?view=rev&rev=515995 Log: Code cleaning. Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java?view=diff&rev=515995&r1=515994&r2=515995 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java Thu Mar 8 02:05:20 2007 @@ -62,6 +62,9 @@ /** The associated view */ private HierarchyView hierarchyView; + + /** The Schema Pool */ + private SchemaPool schemaPool; /** The listener listening on changes on editors */ private IPartListener2 editorListener = new IPartListener2() @@ -174,6 +177,7 @@ PluginConstants.IMG_LINK_WITH_EDITOR ) ); setEnabled( true ); hierarchyView = view; + schemaPool = SchemaPool.getInstance(); // Setting up the default key value (if needed) if ( Activator.getDefault().getDialogSettings().get( LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY ) == null ) @@ -245,7 +249,7 @@ // Only editors for attribute types and object class are accepted if ( editorID.equals( AttributeTypeFormEditor.ID ) ) { - AttributeType at = SchemaPool.getInstance().getAttributeType( editorName ); + AttributeType at = schemaPool.getAttributeType( editorName ); wrapper = new AttributeTypeWrapper( at, null ); structuredSelection = new StructuredSelection( wrapper ); @@ -253,7 +257,7 @@ } else if ( editorID.equals( ObjectClassFormEditor.ID ) ) { - ObjectClass oc = SchemaPool.getInstance().getObjectClass( editorName ); + ObjectClass oc = schemaPool.getObjectClass( editorName ); wrapper = new ObjectClassWrapper( oc, null ); structuredSelection = new StructuredSelection( wrapper ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java?view=diff&rev=515995&r1=515994&r2=515995 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java Thu Mar 8 02:05:20 2007 @@ -63,6 +63,9 @@ /** The associated view */ private SchemasView schemasView; + + /** The Schema Pool */ + private SchemaPool schemaPool; /** The listener listening on changes on editors */ private IPartListener2 editorListener = new IPartListener2() @@ -176,6 +179,7 @@ PluginConstants.IMG_LINK_WITH_EDITOR ) ); setEnabled( true ); schemasView = view; + schemaPool = SchemaPool.getInstance(); // Setting up the default key value (if needed) if ( Activator.getDefault().getDialogSettings().get( LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY ) == null ) @@ -247,7 +251,7 @@ // Only editors for attribute types and object class are accepted if ( editorID.equals( AttributeTypeFormEditor.ID ) ) { - AttributeType at = SchemaPool.getInstance().getAttributeType( editorName ); + AttributeType at = schemaPool.getAttributeType( editorName ); wrapper = new AttributeTypeWrapper( at, null ); structuredSelection = new StructuredSelection( wrapper ); @@ -255,13 +259,13 @@ } else if ( editorID.equals( ObjectClassFormEditor.ID ) ) { - ObjectClass oc = SchemaPool.getInstance().getObjectClass( editorName ); + ObjectClass oc = schemaPool.getObjectClass( editorName ); wrapper = new ObjectClassWrapper( oc, null ); structuredSelection = new StructuredSelection( wrapper ); } else if ( editorID.equals( SchemaFormEditor.ID ) ) { - Schema schema = SchemaPool.getInstance().getSchema( editorName ); + Schema schema = schemaPool.getSchema( editorName ); wrapper = new SchemaWrapper( schema, null ); structuredSelection = new StructuredSelection( wrapper ); }