Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 96823 invoked from network); 26 Nov 2008 13:34:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Nov 2008 13:34:25 -0000 Received: (qmail 56072 invoked by uid 500); 26 Nov 2008 13:34:36 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 56039 invoked by uid 500); 26 Nov 2008 13:34:36 -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 56030 invoked by uid 99); 26 Nov 2008 13:34:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Nov 2008 05:34:36 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Nov 2008 13:33:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E1ED1238897B; Wed, 26 Nov 2008 05:33:34 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r720845 - /directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ Date: Wed, 26 Nov 2008 13:33:34 -0000 To: commits@directory.apache.org From: felixk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081126133334.E1ED1238897B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: felixk Date: Wed Nov 26 05:33:34 2008 New Revision: 720845 URL: http://svn.apache.org/viewvc?rev=720845&view=rev Log: Formatting Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java?rev=720845&r1=720844&r2=720845&view=diff ============================================================================== --- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java (original) +++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java Wed Nov 26 05:33:34 2008 @@ -87,7 +87,7 @@ { if ( !sourceCode.canLeaveThePage() ) { - notifyError( Messages.getString("ObjectClassEditor.CodeError") ); + notifyError( Messages.getString( "ObjectClassEditor.CodeError" ) ); return; } @@ -191,7 +191,7 @@ // Verifying if there is an error on the source code page if ( !sourceCode.canLeaveThePage() ) { - notifyError( Messages.getString("ObjectClassEditor.CodeErrorObject") ); + notifyError( Messages.getString( "ObjectClassEditor.CodeErrorObject" ) ); monitor.setCanceled( true ); return; } Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java?rev=720845&r1=720844&r2=720845&view=diff ============================================================================== --- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java (original) +++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java Wed Nov 26 05:33:34 2008 @@ -71,7 +71,9 @@ } else { - return NLS.bind( Messages.getString("ObjectClassEditorAttributesTableLabelProvider.none"), new String[]{at.getOid()}); //$NON-NLS-1$ + return NLS + .bind( + Messages.getString( "ObjectClassEditorAttributesTableLabelProvider.none" ), new String[] { at.getOid() } ); //$NON-NLS-1$ } } else if ( element instanceof NonExistingAttributeType ) Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=720845&r1=720844&r2=720845&view=diff ============================================================================== --- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original) +++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Wed Nov 26 05:33:34 2008 @@ -98,7 +98,8 @@ */ public String getToolTipText() { - return NLS.bind( Messages.getString("ObjectClassEditorInput.FromSchema"), new String[]{getName(), objectClass.getSchema()}); + return NLS.bind( Messages.getString( "ObjectClassEditorInput.FromSchema" ), new String[] + { getName(), objectClass.getSchema() } ); } Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=720845&r1=720844&r2=720845&view=diff ============================================================================== --- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original) +++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Wed Nov 26 05:33:34 2008 @@ -278,7 +278,7 @@ } else { - aliasesLabel.setText( Messages.getString("ObjectClassEditorOverviewPage.None") ); + aliasesLabel.setText( Messages.getString( "ObjectClassEditorOverviewPage.None" ) ); } setEditorDirty(); } @@ -306,13 +306,13 @@ else { oidText.setForeground( ViewUtils.COLOR_RED ); - oidText.setToolTipText( Messages.getString("ObjectClassEditorOverviewPage.ElementOIDExists") ); + oidText.setToolTipText( Messages.getString( "ObjectClassEditorOverviewPage.ElementOIDExists" ) ); } } else { oidText.setForeground( ViewUtils.COLOR_RED ); - oidText.setToolTipText( Messages.getString("ObjectClassEditorOverviewPage.MalformedOID") ); + oidText.setToolTipText( Messages.getString( "ObjectClassEditorOverviewPage.MalformedOID" ) ); } } }; @@ -810,7 +810,7 @@ */ public ObjectClassEditorOverviewPage( FormEditor editor ) { - super( editor, ID, Messages.getString("ObjectClassEditorOverviewPage.Overview") ); + super( editor, ID, Messages.getString( "ObjectClassEditorOverviewPage.Overview" ) ); schemaHandler = Activator.getDefault().getSchemaHandler(); schemaHandler.addListener( schemaHandlerListener ); } @@ -854,7 +854,8 @@ addListeners(); // Help Context for Dynamic Help - PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "object_class_editor" ); //$NON-NLS-1$ //$NON-NLS-2$ + PlatformUI.getWorkbench().getHelpSystem().setHelp( form, + PluginConstants.PLUGIN_ID + "." + "object_class_editor" ); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -870,8 +871,9 @@ { // General Information Section Section section_general_information = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR ); - section_general_information.setDescription( Messages.getString("ObjectClassEditorOverviewPage.SpecifyGeneralInformation") ); - section_general_information.setText( Messages.getString("ObjectClassEditorOverviewPage.GeneralInformation") ); + section_general_information.setDescription( Messages + .getString( "ObjectClassEditorOverviewPage.SpecifyGeneralInformation" ) ); + section_general_information.setText( Messages.getString( "ObjectClassEditorOverviewPage.GeneralInformation" ) ); section_general_information.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, true ) ); // Creating the layout of the section @@ -881,32 +883,36 @@ section_general_information.setClient( client_general_information ); // ALIASES Button - toolkit.createLabel( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.Aliases") ); + toolkit.createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.Aliases" ) ); aliasesLabel = toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$ aliasesLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$ - aliasesButton = toolkit.createButton( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.EditAliases"), SWT.PUSH ); + aliasesButton = toolkit.createButton( client_general_information, Messages + .getString( "ObjectClassEditorOverviewPage.EditAliases" ), SWT.PUSH ); aliasesButton.setLayoutData( new GridData( SWT.NONE, SWT.NONE, false, false, 2, 1 ) ); // OID Field - toolkit.createLabel( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.OID") ); + toolkit.createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.OID" ) ); oidText = toolkit.createText( client_general_information, "" ); //$NON-NLS-1$ oidText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); // SCHEMA Field - schemaLink = toolkit.createHyperlink( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.Schema"), SWT.WRAP ); + schemaLink = toolkit.createHyperlink( client_general_information, Messages + .getString( "ObjectClassEditorOverviewPage.Schema" ), SWT.WRAP ); schemaLabel = toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$ schemaLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); // DESCRIPTION Field - toolkit.createLabel( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.Description") ); + toolkit.createLabel( client_general_information, Messages + .getString( "ObjectClassEditorOverviewPage.Description" ) ); descriptionText = toolkit.createText( client_general_information, "", SWT.MULTI | SWT.V_SCROLL ); //$NON-NLS-1$ GridData descriptionGridData = new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ); descriptionGridData.heightHint = 42; descriptionText.setLayoutData( descriptionGridData ); // SUPERIORS Table - toolkit.createLabel( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.SuperiorClasses") ); + toolkit.createLabel( client_general_information, Messages + .getString( "ObjectClassEditorOverviewPage.SuperiorClasses" ) ); superiorsTable = toolkit.createTable( client_general_information, SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL ); GridData gridData = new GridData( SWT.FILL, SWT.NONE, true, false ); @@ -918,20 +924,24 @@ superiorsTableViewer.setLabelProvider( new ObjectClassEditorSuperiorsTableLabelProvider() ); Composite superiorsButtonComposite = toolkit.createComposite( client_general_information ); superiorsButtonComposite.setLayout( new GridLayout() ); - addButtonSuperiorsTable = toolkit.createButton( superiorsButtonComposite, Messages.getString("ObjectClassEditorOverviewPage.Add"), SWT.PUSH ); + addButtonSuperiorsTable = toolkit.createButton( superiorsButtonComposite, Messages + .getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH ); addButtonSuperiorsTable.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) ); - removeButtonSuperiorsTable = toolkit.createButton( superiorsButtonComposite, Messages.getString("ObjectClassEditorOverviewPage.Remove"), SWT.PUSH ); + removeButtonSuperiorsTable = toolkit.createButton( superiorsButtonComposite, Messages + .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH ); removeButtonSuperiorsTable.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) ); // CLASS TYPE Combo - toolkit.createLabel( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.ClassType") ); + toolkit + .createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.ClassType" ) ); classTypeCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE ); classTypeCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); initClassTypeCombo(); // OBSOLETE Checkbox toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$ - obsoleteCheckbox = toolkit.createButton( client_general_information, Messages.getString("ObjectClassEditorOverviewPage.Obesolete"), SWT.CHECK ); + obsoleteCheckbox = toolkit.createButton( client_general_information, Messages + .getString( "ObjectClassEditorOverviewPage.Obesolete" ), SWT.CHECK ); obsoleteCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) ); } @@ -948,8 +958,8 @@ { // MANDATORY ATTRIBUTES Section Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR ); - section.setText( Messages.getString("ObjectClassEditorOverviewPage.MandatoryAttributes") ); - section.setDescription( Messages.getString("ObjectClassEditorOverviewPage.SpecifyMandatoryAttributes") ); + section.setText( Messages.getString( "ObjectClassEditorOverviewPage.MandatoryAttributes" ) ); + section.setDescription( Messages.getString( "ObjectClassEditorOverviewPage.SpecifyMandatoryAttributes" ) ); section.setExpanded( true ); Composite client = toolkit.createComposite( section ); section.setClient( client ); @@ -971,8 +981,10 @@ mandatoryAttributesTableViewer.setContentProvider( new ObjectClassEditorAttributesTableContentProvider() ); mandatoryAttributesTableViewer.setLabelProvider( new ObjectClassEditorAttributesTableLabelProvider() ); - addButtonMandatoryTable = toolkit.createButton( client, Messages.getString("ObjectClassEditorOverviewPage.Add"), SWT.PUSH ); - removeButtonMandatoryTable = toolkit.createButton( client, Messages.getString("ObjectClassEditorOverviewPage.Remove"), SWT.PUSH ); + addButtonMandatoryTable = toolkit.createButton( client, Messages + .getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH ); + removeButtonMandatoryTable = toolkit.createButton( client, Messages + .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH ); gd = new GridData( GridData.VERTICAL_ALIGN_BEGINNING ); addButtonMandatoryTable.setLayoutData( gd ); removeButtonMandatoryTable.setLayoutData( gd ); @@ -994,8 +1006,8 @@ { // OPTIONAL ATTRIBUTES Section Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR ); - section.setText( Messages.getString("ObjectClassEditorOverviewPage.OptionalAttributes") ); - section.setDescription( Messages.getString("ObjectClassEditorOverviewPage.SpecifyOptionalAttributes") ); + section.setText( Messages.getString( "ObjectClassEditorOverviewPage.OptionalAttributes" ) ); + section.setDescription( Messages.getString( "ObjectClassEditorOverviewPage.SpecifyOptionalAttributes" ) ); section.setExpanded( true ); Composite client = toolkit.createComposite( section ); section.setClient( client ); @@ -1017,8 +1029,10 @@ optionalAttributesTableViewer.setContentProvider( new ObjectClassEditorAttributesTableContentProvider() ); optionalAttributesTableViewer.setLabelProvider( new ObjectClassEditorAttributesTableLabelProvider() ); - addButtonOptionalTable = toolkit.createButton( client, Messages.getString("ObjectClassEditorOverviewPage.Add"), SWT.PUSH ); - removeButtonOptionalTable = toolkit.createButton( client, Messages.getString("ObjectClassEditorOverviewPage.Remove"), SWT.PUSH ); + addButtonOptionalTable = toolkit.createButton( client, + Messages.getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH ); + removeButtonOptionalTable = toolkit.createButton( client, Messages + .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH ); gd = new GridData( GridData.VERTICAL_ALIGN_BEGINNING ); addButtonOptionalTable.setLayoutData( gd ); removeButtonOptionalTable.setLayoutData( gd ); @@ -1040,7 +1054,7 @@ } else { - aliasesLabel.setText( Messages.getString("ObjectClassEditorOverviewPage.None") ); + aliasesLabel.setText( Messages.getString( "ObjectClassEditorOverviewPage.None" ) ); } // OID Field @@ -1088,9 +1102,9 @@ */ private void initClassTypeCombo() { - classTypeCombo.add( Messages.getString("ObjectClassEditorOverviewPage.Abstract"), 0 ); - classTypeCombo.add( Messages.getString("ObjectClassEditorOverviewPage.Auxiliary"), 1 ); - classTypeCombo.add( Messages.getString("ObjectClassEditorOverviewPage.Structural"), 2 ); + classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Abstract" ), 0 ); + classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Auxiliary" ), 1 ); + classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Structural" ), 2 ); } Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java?rev=720845&r1=720844&r2=720845&view=diff ============================================================================== --- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java (original) +++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java Wed Nov 26 05:33:34 2008 @@ -71,7 +71,9 @@ } else { - return NLS.bind( Messages.getString("ObjectClassEditorSuperiorsTableLabelProvider.None"), new String[]{oc.getOid()}); //$NON-NLS-1$ + return NLS + .bind( + Messages.getString( "ObjectClassEditorSuperiorsTableLabelProvider.None" ), new String[] { oc.getOid() } ); //$NON-NLS-1$ } } else if ( element instanceof NonExistingObjectClass )