You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2009/10/21 14:51:17 UTC
svn commit: r827993 [2/3] - in
/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio:
ldapbrowser/common/ ldapbrowser/common/actions/
ldapbrowser/common/actions/proxy/ ldapbrowser/common/dialogs/
ldapbrowser/common/dialog...
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java Wed Oct 21 12:51:13 2009
@@ -100,7 +100,7 @@
protected void configureShell( Shell newShell )
{
super.configureShell( newShell );
- newShell.setText( Messages.getString("SyntaxValueEditorDialog.AttributeValueEditor") ); //$NON-NLS-1$
+ newShell.setText( Messages.getString( "SyntaxValueEditorDialog.AttributeValueEditor" ) ); //$NON-NLS-1$
}
@@ -123,7 +123,7 @@
Composite composite = ( Composite ) super.createDialogArea( parent );
Composite c = BaseWidgetUtils.createColumnContainer( composite, 2, 1 );
- BaseWidgetUtils.createLabel( c, Messages.getString("SyntaxValueEditorDialog.SyntaxOID"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( c, Messages.getString( "SyntaxValueEditorDialog.SyntaxOID" ), 1 ); //$NON-NLS-1$
oidCombo = BaseWidgetUtils.createCombo( c, syntaxOids, -1, 1 );
if ( relation != null && relation.getSyntaxOID() != null )
{
@@ -137,7 +137,7 @@
}
} );
- BaseWidgetUtils.createLabel( c, Messages.getString("SyntaxValueEditorDialog.ValueEditor"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( c, Messages.getString( "SyntaxValueEditorDialog.ValueEditor" ), 1 ); //$NON-NLS-1$
valueEditorCombo = BaseWidgetUtils.createReadonlyCombo( c, veName2classMap.keySet().toArray( new String[0] ),
-1, 1 );
if ( relation != null && relation.getValueEditorClassName() != null
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java Wed Oct 21 12:51:13 2009
@@ -70,7 +70,7 @@
/** The constant used to preselect the 'Excel Export' tab */
public static final String XLS_TAB = "XLS"; //$NON-NLS-1$
-
+
/** The constant used to preselect the 'ODF Export' tab */
public static final String ODF_TAB = "ODF"; //$NON-NLS-1$
@@ -133,9 +133,9 @@
*/
public TextFormatsPreferencePage()
{
- super( Messages.getString("TextFormatsPreferencePage.TextFormats") ); //$NON-NLS-1$
+ super( Messages.getString( "TextFormatsPreferencePage.TextFormats" ) ); //$NON-NLS-1$
super.setPreferenceStore( BrowserCommonActivator.getDefault().getPreferenceStore() );
- super.setDescription( Messages.getString("TextFormatsPreferencePage.SettingsForTextFormats") ); //$NON-NLS-1$
+ super.setDescription( Messages.getString( "TextFormatsPreferencePage.SettingsForTextFormats" ) ); //$NON-NLS-1$
}
@@ -203,33 +203,40 @@
private void createTableTab()
{
tableTab = new TabItem( tabFolder, SWT.NONE );
- tableTab.setText( Messages.getString("TextFormatsPreferencePage.CSVCopy") ); //$NON-NLS-1$
+ tableTab.setText( Messages.getString( "TextFormatsPreferencePage.CSVCopy" ) ); //$NON-NLS-1$
Composite tableComposite = new Composite( tabFolder, SWT.NONE );
tableComposite.setLayout( new GridLayout( 1, false ) );
Composite tableInnerComposite = BaseWidgetUtils.createColumnContainer( tableComposite, 3, 1 );
- BaseWidgetUtils.createLabel( tableInnerComposite, Messages.getString("TextFormatsPreferencePage.CSVCopyLabel"), 3 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( tableInnerComposite,
+ Messages.getString( "TextFormatsPreferencePage.CSVCopyLabel" ), 3 ); //$NON-NLS-1$
BaseWidgetUtils.createSpacer( tableInnerComposite, 3 );
- tableAttributeDelimiterWidget = new OptionsInput( Messages.getString("TextFormatsPreferencePage.AttributeDelimiter"), Messages.getString("TextFormatsPreferencePage.Tabulator"), "\t", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { Messages.getString("TextFormatsPreferencePage.Tabulator"), Messages.getString("TextFormatsPreferencePage.Comma"), Messages.getString("TextFormatsPreferencePage.Semicolon") }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { "\t", ",", ";" }, getPreferenceStore().getString( //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_ATTRIBUTEDELIMITER ), false, true );
+ tableAttributeDelimiterWidget = new OptionsInput(
+ Messages.getString( "TextFormatsPreferencePage.AttributeDelimiter" ), Messages.getString( "TextFormatsPreferencePage.Tabulator" ), "\t", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ {
+ Messages.getString( "TextFormatsPreferencePage.Tabulator" ), Messages.getString( "TextFormatsPreferencePage.Comma" ), Messages.getString( "TextFormatsPreferencePage.Semicolon" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ { "\t", ",", ";" }, getPreferenceStore().getString( //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_ATTRIBUTEDELIMITER ), false, true );
tableAttributeDelimiterWidget.createWidget( tableInnerComposite );
tableAttributeDelimiterWidget.addWidgetModifyListener( this );
- tableValueDelimiterWidget = new OptionsInput( Messages.getString("TextFormatsPreferencePage.ValueDelimiter"), Messages.getString("TextFormatsPreferencePage.Pipe"), "|", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { Messages.getString("TextFormatsPreferencePage.Pipe"), Messages.getString("TextFormatsPreferencePage.Comma"), Messages.getString("TextFormatsPreferencePage.Semicolon"), Messages.getString("TextFormatsPreferencePage.Newline") }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- { "|", ",", ";", "\n" }, getPreferenceStore().getString( //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_VALUEDELIMITER ), false, true );
+ tableValueDelimiterWidget = new OptionsInput(
+ Messages.getString( "TextFormatsPreferencePage.ValueDelimiter" ), Messages.getString( "TextFormatsPreferencePage.Pipe" ), "|", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ {
+ Messages.getString( "TextFormatsPreferencePage.Pipe" ), Messages.getString( "TextFormatsPreferencePage.Comma" ), Messages.getString( "TextFormatsPreferencePage.Semicolon" ), Messages.getString( "TextFormatsPreferencePage.Newline" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ { "|", ",", ";", "\n" }, getPreferenceStore().getString( //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_VALUEDELIMITER ), false, true );
tableValueDelimiterWidget.createWidget( tableInnerComposite );
tableValueDelimiterWidget.addWidgetModifyListener( this );
- tableQuoteWidget = new OptionsInput( Messages.getString("TextFormatsPreferencePage.QuoteCharacter"), Messages.getString("TextFormatsPreferencePage.DoubleQuote"), "\"", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { Messages.getString("TextFormatsPreferencePage.DoubleQuote"), Messages.getString("TextFormatsPreferencePage.SingleQuote") }, new String[] //$NON-NLS-1$ //$NON-NLS-2$
- { "\"", "'" }, getPreferenceStore().getString( //$NON-NLS-1$ //$NON-NLS-2$
- BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_QUOTECHARACTER ), false, true );
+ tableQuoteWidget = new OptionsInput(
+ Messages.getString( "TextFormatsPreferencePage.QuoteCharacter" ), Messages.getString( "TextFormatsPreferencePage.DoubleQuote" ), "\"", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ {
+ Messages.getString( "TextFormatsPreferencePage.DoubleQuote" ), Messages.getString( "TextFormatsPreferencePage.SingleQuote" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$
+ { "\"", "'" }, getPreferenceStore().getString( //$NON-NLS-1$ //$NON-NLS-2$
+ BrowserCommonConstants.PREFERENCE_FORMAT_TABLE_QUOTECHARACTER ), false, true );
tableQuoteWidget.createWidget( tableInnerComposite );
tableQuoteWidget.addWidgetModifyListener( this );
@@ -244,8 +251,8 @@
tableBinaryEncodingWidget.addWidgetModifyListener( this );
Composite copyTableHintComposite = BaseWidgetUtils.createColumnContainer( tableInnerComposite, 3, 3 );
- Text hintText = BaseWidgetUtils.createWrappedLabeledText( copyTableHintComposite,
- Messages.getString("TextFormatsPreferencePage.CSVCopyHint"), 1 ); //$NON-NLS-1$
+ Text hintText = BaseWidgetUtils.createWrappedLabeledText( copyTableHintComposite, Messages
+ .getString( "TextFormatsPreferencePage.CSVCopyHint" ), 1 ); //$NON-NLS-1$
GridData hintTextGridData = new GridData( SWT.FILL, SWT.NONE, true, false );
hintTextGridData.widthHint = 300;
hintText.setLayoutData( hintTextGridData );
@@ -257,32 +264,39 @@
private void createCsvTab()
{
csvTab = new TabItem( tabFolder, SWT.NONE );
- csvTab.setText( Messages.getString("TextFormatsPreferencePage.CSVExport") ); //$NON-NLS-1$
+ csvTab.setText( Messages.getString( "TextFormatsPreferencePage.CSVExport" ) ); //$NON-NLS-1$
Composite csvComposite = new Composite( tabFolder, SWT.NONE );
csvComposite.setLayout( new GridLayout( 1, false ) );
Composite csvInnerComposite = BaseWidgetUtils.createColumnContainer( csvComposite, 3, 1 );
- BaseWidgetUtils.createLabel( csvInnerComposite, Messages.getString("TextFormatsPreferencePage.CSVExportLabel"), 3 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( csvInnerComposite,
+ Messages.getString( "TextFormatsPreferencePage.CSVExportLabel" ), 3 ); //$NON-NLS-1$
BaseWidgetUtils.createSpacer( csvInnerComposite, 3 );
- csvAttributeDelimiterWidget = new OptionsInput( Messages.getString("TextFormatsPreferencePage.AttributeDelimiter"), Messages.getString("TextFormatsPreferencePage.Comma"), ",", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { Messages.getString("TextFormatsPreferencePage.Comma"), Messages.getString("TextFormatsPreferencePage.Semicolon"), Messages.getString("TextFormatsPreferencePage.Tabulator") }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { ",", ";", "\t" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_ATTRIBUTEDELIMITER ), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ csvAttributeDelimiterWidget = new OptionsInput(
+ Messages.getString( "TextFormatsPreferencePage.AttributeDelimiter" ), Messages.getString( "TextFormatsPreferencePage.Comma" ), ",", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ {
+ Messages.getString( "TextFormatsPreferencePage.Comma" ), Messages.getString( "TextFormatsPreferencePage.Semicolon" ), Messages.getString( "TextFormatsPreferencePage.Tabulator" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ { ",", ";", "\t" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_ATTRIBUTEDELIMITER ), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
false, true );
csvAttributeDelimiterWidget.createWidget( csvInnerComposite );
csvAttributeDelimiterWidget.addWidgetModifyListener( this );
- csvValueDelimiterWidget = new OptionsInput( Messages.getString("TextFormatsPreferencePage.ValueDelimiter"), Messages.getString("TextFormatsPreferencePage.Pipe"), "|", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { Messages.getString("TextFormatsPreferencePage.Pipe"), Messages.getString("TextFormatsPreferencePage.Comma"), Messages.getString("TextFormatsPreferencePage.Semicolon"), Messages.getString("TextFormatsPreferencePage.Newline") }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- { "|", ",", ";", "\n" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_VALUEDELIMITER ), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ csvValueDelimiterWidget = new OptionsInput(
+ Messages.getString( "TextFormatsPreferencePage.ValueDelimiter" ), Messages.getString( "TextFormatsPreferencePage.Pipe" ), "|", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ {
+ Messages.getString( "TextFormatsPreferencePage.Pipe" ), Messages.getString( "TextFormatsPreferencePage.Comma" ), Messages.getString( "TextFormatsPreferencePage.Semicolon" ), Messages.getString( "TextFormatsPreferencePage.Newline" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ { "|", ",", ";", "\n" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_VALUEDELIMITER ), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
false, true );
csvValueDelimiterWidget.createWidget( csvInnerComposite );
csvValueDelimiterWidget.addWidgetModifyListener( this );
- csvQuoteWidget = new OptionsInput( Messages.getString("TextFormatsPreferencePage.QuoteCharacter"), Messages.getString("TextFormatsPreferencePage.DoubleQuote"), "\"", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { Messages.getString("TextFormatsPreferencePage.DoubleQuote"), Messages.getString("TextFormatsPreferencePage.SingleQuote") }, new String[] //$NON-NLS-1$ //$NON-NLS-2$
- { "\"", "'" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_QUOTECHARACTER ), false, //$NON-NLS-1$ //$NON-NLS-2$
+ csvQuoteWidget = new OptionsInput(
+ Messages.getString( "TextFormatsPreferencePage.QuoteCharacter" ), Messages.getString( "TextFormatsPreferencePage.DoubleQuote" ), "\"", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ {
+ Messages.getString( "TextFormatsPreferencePage.DoubleQuote" ), Messages.getString( "TextFormatsPreferencePage.SingleQuote" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$
+ { "\"", "'" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_QUOTECHARACTER ), false, //$NON-NLS-1$ //$NON-NLS-2$
true );
csvQuoteWidget.createWidget( csvInnerComposite );
csvQuoteWidget.addWidgetModifyListener( this );
@@ -309,18 +323,21 @@
private void createXlsTab()
{
xlsTab = new TabItem( tabFolder, SWT.NONE );
- xlsTab.setText( Messages.getString("TextFormatsPreferencePage.ExcelExport") ); //$NON-NLS-1$
+ xlsTab.setText( Messages.getString( "TextFormatsPreferencePage.ExcelExport" ) ); //$NON-NLS-1$
Composite xlsComposite = new Composite( tabFolder, SWT.NONE );
xlsComposite.setLayout( new GridLayout( 1, false ) );
Composite xlsInnerComposite = BaseWidgetUtils.createColumnContainer( xlsComposite, 3, 1 );
- BaseWidgetUtils.createLabel( xlsInnerComposite, Messages.getString("TextFormatsPreferencePage.ExcelExportLabel"), 3 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( xlsInnerComposite, Messages
+ .getString( "TextFormatsPreferencePage.ExcelExportLabel" ), 3 ); //$NON-NLS-1$
BaseWidgetUtils.createSpacer( xlsInnerComposite, 3 );
- xlsValueDelimiterWidget = new OptionsInput( Messages.getString("TextFormatsPreferencePage.ValueDelimiter"), Messages.getString("TextFormatsPreferencePage.Pipe"), "|", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- { Messages.getString("TextFormatsPreferencePage.Pipe"), Messages.getString("TextFormatsPreferencePage.Comma"), Messages.getString("TextFormatsPreferencePage.Semicolon"), Messages.getString("TextFormatsPreferencePage.Newline") }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- { "|", ",", ";", "\n" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_XLS_VALUEDELIMITER ), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ xlsValueDelimiterWidget = new OptionsInput(
+ Messages.getString( "TextFormatsPreferencePage.ValueDelimiter" ), Messages.getString( "TextFormatsPreferencePage.Pipe" ), "|", new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ {
+ Messages.getString( "TextFormatsPreferencePage.Pipe" ), Messages.getString( "TextFormatsPreferencePage.Comma" ), Messages.getString( "TextFormatsPreferencePage.Semicolon" ), Messages.getString( "TextFormatsPreferencePage.Newline" ) }, new String[] //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ { "|", ",", ";", "\n" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_XLS_VALUEDELIMITER ), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
false, true );
xlsValueDelimiterWidget.createWidget( xlsInnerComposite );
xlsValueDelimiterWidget.addWidgetModifyListener( this );
@@ -333,7 +350,7 @@
xlsTab.setControl( xlsComposite );
}
-
+
private void createOdfTab()
{
odfTab = new TabItem( tabFolder, SWT.NONE );
@@ -368,13 +385,14 @@
private void createLdifTab()
{
ldifTab = new TabItem( tabFolder, SWT.NONE );
- ldifTab.setText( Messages.getString("TextFormatsPreferencePage.LDIF") ); //$NON-NLS-1$
+ ldifTab.setText( Messages.getString( "TextFormatsPreferencePage.LDIF" ) ); //$NON-NLS-1$
Composite ldifComposite = new Composite( tabFolder, SWT.NONE );
ldifComposite.setLayout( new GridLayout( 1, false ) );
Composite ldifInnerComposite = BaseWidgetUtils.createColumnContainer( ldifComposite, 1, 1 );
- BaseWidgetUtils.createLabel( ldifInnerComposite, Messages.getString("TextFormatsPreferencePage.LDIFLabel"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils
+ .createLabel( ldifInnerComposite, Messages.getString( "TextFormatsPreferencePage.LDIFLabel" ), 1 ); //$NON-NLS-1$
BaseWidgetUtils.createSpacer( ldifInnerComposite, 1 );
ldifLineSeparator = new LineSeparatorInput( coreStore
@@ -385,7 +403,8 @@
BaseWidgetUtils.createSpacer( ldifInnerComposite, 1 );
Composite lineLengthComposite = BaseWidgetUtils.createColumnContainer( ldifInnerComposite, 3, 1 );
- BaseWidgetUtils.createLabel( lineLengthComposite, Messages.getString("TextFormatsPreferencePage.LineLength1"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( lineLengthComposite,
+ Messages.getString( "TextFormatsPreferencePage.LineLength1" ), 1 ); //$NON-NLS-1$
ldifLineLengthText = BaseWidgetUtils.createText( lineLengthComposite, "", 3, 1 ); //$NON-NLS-1$
ldifLineLengthText.setText( coreStore.getString( BrowserCoreConstants.PREFERENCE_LDIF_LINE_WIDTH ) );
ldifLineLengthText.addVerifyListener( new VerifyListener()
@@ -403,9 +422,11 @@
}
} );
ldifLineLengthText.addModifyListener( this );
- BaseWidgetUtils.createLabel( lineLengthComposite, Messages.getString("TextFormatsPreferencePage.LineLength2"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( lineLengthComposite,
+ Messages.getString( "TextFormatsPreferencePage.LineLength2" ), 1 ); //$NON-NLS-1$
- ldifSpaceAfterColonButton = BaseWidgetUtils.createCheckbox( ldifInnerComposite, Messages.getString("TextFormatsPreferencePage.SpaceAfterColon"), 1 ); //$NON-NLS-1$
+ ldifSpaceAfterColonButton = BaseWidgetUtils.createCheckbox( ldifInnerComposite, Messages
+ .getString( "TextFormatsPreferencePage.SpaceAfterColon" ), 1 ); //$NON-NLS-1$
ldifSpaceAfterColonButton.setSelection( coreStore
.getBoolean( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON ) );
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Wed Oct 21 12:51:13 2009
@@ -135,8 +135,8 @@
*/
public ValueEditorsPreferencePage()
{
- super( Messages.getString("ValueEditorsPreferencePage.ValueEditors") ); //$NON-NLS-1$
- super.setDescription( Messages.getString("ValueEditorsPreferencePage.SpecifyValueEditors") ); //$NON-NLS-1$
+ super( Messages.getString( "ValueEditorsPreferencePage.ValueEditors" ) ); //$NON-NLS-1$
+ super.setDescription( Messages.getString( "ValueEditorsPreferencePage.SpecifyValueEditors" ) ); //$NON-NLS-1$
this.imageMap = new HashMap<ImageDescriptor, Image>();
}
@@ -274,7 +274,8 @@
private void createAttributeContents( Composite parent )
{
- BaseWidgetUtils.createLabel( parent, Messages.getString("ValueEditorsPreferencePage.ValueEditorsByAttributeType"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( parent, Messages
+ .getString( "ValueEditorsPreferencePage.ValueEditorsByAttributeType" ), 1 ); //$NON-NLS-1$
Composite composite = BaseWidgetUtils.createColumnContainer( parent, 2, 1 );
composite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
@@ -293,17 +294,19 @@
attributeViewer = new TableViewer( table );
TableColumn c1 = new TableColumn( table, SWT.NONE );
- c1.setText( Messages.getString("ValueEditorsPreferencePage.Attribute") ); //$NON-NLS-1$
+ c1.setText( Messages.getString( "ValueEditorsPreferencePage.Attribute" ) ); //$NON-NLS-1$
c1.setWidth( 80 );
TableColumn c2 = new TableColumn( table, SWT.NONE );
- c2.setText( Messages.getString("ValueEditorsPreferencePage.Alias") ); //$NON-NLS-1$
+ c2.setText( Messages.getString( "ValueEditorsPreferencePage.Alias" ) ); //$NON-NLS-1$
c2.setWidth( 80 );
TableColumn c3 = new TableColumn( table, SWT.NONE );
- c3.setText( Messages.getString("ValueEditorsPreferencePage.ValueEditor") ); //$NON-NLS-1$
+ c3.setText( Messages.getString( "ValueEditorsPreferencePage.ValueEditor" ) ); //$NON-NLS-1$
c3.setWidth( 200 );
- attributeViewer.setColumnProperties( new String[]
- { Messages.getString("ValueEditorsPreferencePage.Attribute"), Messages.getString("ValueEditorsPreferencePage.ValueEditor") } ); //$NON-NLS-1$ //$NON-NLS-2$
+ attributeViewer
+ .setColumnProperties( new String[]
+ {
+ Messages.getString( "ValueEditorsPreferencePage.Attribute" ), Messages.getString( "ValueEditorsPreferencePage.ValueEditor" ) } ); //$NON-NLS-1$ //$NON-NLS-2$
attributeViewer.setContentProvider( new ArrayContentProvider() );
attributeViewer.setLabelProvider( new AttributeLabelProvider() );
@@ -315,7 +318,8 @@
}
} );
- attributeAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Add"), 1 ); //$NON-NLS-1$
+ attributeAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+ .getString( "ValueEditorsPreferencePage.Add" ), 1 ); //$NON-NLS-1$
attributeAddButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -323,7 +327,8 @@
addAttribute();
}
} );
- attributeEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Edit"), 1 ); //$NON-NLS-1$
+ attributeEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+ .getString( "ValueEditorsPreferencePage.Edit" ), 1 ); //$NON-NLS-1$
attributeEditButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -331,7 +336,8 @@
editAttribute();
}
} );
- attributeRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Remove"), 1 ); //$NON-NLS-1$
+ attributeRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+ .getString( "ValueEditorsPreferencePage.Remove" ), 1 ); //$NON-NLS-1$
attributeRemoveButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -344,7 +350,7 @@
private void createSyntaxContents( Composite parent )
{
- BaseWidgetUtils.createLabel( parent, Messages.getString("ValueEditorsPreferencePage.ValueEditorBySyntax"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( parent, Messages.getString( "ValueEditorsPreferencePage.ValueEditorBySyntax" ), 1 ); //$NON-NLS-1$
Composite composite = BaseWidgetUtils.createColumnContainer( parent, 2, 1 );
composite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
@@ -363,17 +369,19 @@
syntaxViewer = new TableViewer( table );
TableColumn c1 = new TableColumn( table, SWT.NONE );
- c1.setText( Messages.getString("ValueEditorsPreferencePage.Syntax") ); //$NON-NLS-1$
+ c1.setText( Messages.getString( "ValueEditorsPreferencePage.Syntax" ) ); //$NON-NLS-1$
c1.setWidth( 80 );
TableColumn c2 = new TableColumn( table, SWT.NONE );
- c2.setText( Messages.getString("ValueEditorsPreferencePage.Description") ); //$NON-NLS-1$
+ c2.setText( Messages.getString( "ValueEditorsPreferencePage.Description" ) ); //$NON-NLS-1$
c2.setWidth( 80 );
TableColumn c3 = new TableColumn( table, SWT.NONE );
- c3.setText( Messages.getString("ValueEditorsPreferencePage.ValueEditor") ); //$NON-NLS-1$
+ c3.setText( Messages.getString( "ValueEditorsPreferencePage.ValueEditor" ) ); //$NON-NLS-1$
c3.setWidth( 200 );
- syntaxViewer.setColumnProperties( new String[]
- { Messages.getString("ValueEditorsPreferencePage.Syntax"), Messages.getString("ValueEditorsPreferencePage.ValueEditor") } ); //$NON-NLS-1$ //$NON-NLS-2$
+ syntaxViewer
+ .setColumnProperties( new String[]
+ {
+ Messages.getString( "ValueEditorsPreferencePage.Syntax" ), Messages.getString( "ValueEditorsPreferencePage.ValueEditor" ) } ); //$NON-NLS-1$ //$NON-NLS-2$
syntaxViewer.setContentProvider( new ArrayContentProvider() );
syntaxViewer.setLabelProvider( new SyntaxLabelProvider() );
@@ -385,7 +393,8 @@
}
} );
- syntaxAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Add"), 1 ); //$NON-NLS-1$
+ syntaxAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+ .getString( "ValueEditorsPreferencePage.Add" ), 1 ); //$NON-NLS-1$
syntaxAddButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -393,7 +402,8 @@
addSyntax();
}
} );
- syntaxEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Edit"), 1 ); //$NON-NLS-1$
+ syntaxEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+ .getString( "ValueEditorsPreferencePage.Edit" ), 1 ); //$NON-NLS-1$
syntaxEditButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -401,7 +411,8 @@
editSyntax();
}
} );
- syntaxRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Remove"), 1 ); //$NON-NLS-1$
+ syntaxRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages
+ .getString( "ValueEditorsPreferencePage.Remove" ), 1 ); //$NON-NLS-1$
syntaxRemoveButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ViewsPreferencePage.java Wed Oct 21 12:51:13 2009
@@ -42,9 +42,9 @@
*/
public ViewsPreferencePage()
{
- super( Messages.getString("ViewsPreferencePage.Views") ); //$NON-NLS-1$
- setDescription( Messages.getString("ViewsPreferencePage.Description") ); //$NON-NLS-1$
-
+ super( Messages.getString( "ViewsPreferencePage.Views" ) ); //$NON-NLS-1$
+ setDescription( Messages.getString( "ViewsPreferencePage.Description" ) ); //$NON-NLS-1$
+
// Removing Default and Apply buttons
noDefaultAndApplyButton();
}
@@ -65,7 +65,7 @@
protected Control createContents( Composite parent )
{
// Nothing to do
-
+
return parent;
}
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java Wed Oct 21 12:51:13 2009
@@ -167,15 +167,15 @@
int size = readIn.readInt();
byte[] connectionId = new byte[size];
readIn.read( connectionId );
- connection = BrowserCorePlugin.getDefault().getConnectionManager().getBrowserConnectionById(
- new String( connectionId, "UTF-8" ) ); //$NON-NLS-1$
+ connection = BrowserCorePlugin.getDefault().getConnectionManager()
+ .getBrowserConnectionById( new String( connectionId, "UTF-8" ) ); //$NON-NLS-1$
}
ISearch search = null;
if ( readIn.available() > 1 && connection != null )
{
int size = readIn.readInt();
- if(size == 0)
+ if ( size == 0 )
{
search = connection.getSearchManager().getQuickSearch();
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterAutoEditStrategy.java Wed Oct 21 12:51:13 2009
@@ -109,8 +109,7 @@
if ( aep.length > 0 && ( aep.text == null || "".equals( aep.text ) ) ) //$NON-NLS-1$
{
// delete surrounding parenthesis after deleting the last character
- if ( filter.toString().length() - aep.length == 2
- && filter.getStartToken() != null
+ if ( filter.toString().length() - aep.length == 2 && filter.getStartToken() != null
&& filter.getStopToken() != null
&& aep.offset >= filter.getStartToken().getOffset() + filter.getStartToken().getLength()
&& aep.offset + aep.length <= filter.getStopToken().getOffset() )
@@ -123,21 +122,19 @@
aep.shiftsCaret = false;
}
}
-
+
// delete closing parenthesis after deleting the opening parenthesis
- if ( filter.toString().length() - aep.length == 1
- && filter.getStartToken() != null
- && filter.getStopToken() != null
- && aep.offset == filter.getStartToken().getOffset() )
+ if ( filter.toString().length() - aep.length == 1 && filter.getStartToken() != null
+ && filter.getStopToken() != null && aep.offset == filter.getStartToken().getOffset() )
{
aep.length += 1;
aep.caretOffset = aep.offset;
aep.shiftsCaret = false;
}
-
+
}
- if ( (aep.length == 0 || aep.length==currentFilter.length()) && aep.text != null && !"".equals( aep.text ) ) //$NON-NLS-1$
+ if ( ( aep.length == 0 || aep.length == currentFilter.length() ) && aep.text != null && !"".equals( aep.text ) ) //$NON-NLS-1$
{
boolean isNewFilter = aep.text.equals( "(" ); //$NON-NLS-1$
boolean isNewNestedFilter = aep.text.equals( "&" ) || aep.text.equals( "|" ) || aep.text.equals( "!" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -145,7 +142,8 @@
boolean isSurroundNested = false;
boolean isSurroundBeforeOtherFilter = false;
boolean isSurroundAfterOtherFilter = false;
- if( !Character.isWhitespace( aep.text.charAt( 0 ) ) && !aep.text.startsWith( "(" ) && !aep.text.endsWith( ")" ) ) //$NON-NLS-1$ //$NON-NLS-2$
+ if ( !Character.isWhitespace( aep.text.charAt( 0 ) )
+ && !aep.text.startsWith( "(" ) && !aep.text.endsWith( ")" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
// isSurroundNew
isSurroundNew = aep.offset == 0;
@@ -227,14 +225,14 @@
if ( balanced == 0 )
{
aep.text = aep.text + ")"; //$NON-NLS-1$
- if( aep.caretOffset == -1 )
+ if ( aep.caretOffset == -1 )
{
aep.caretOffset = aep.offset + aep.text.length() - 1;
aep.shiftsCaret = false;
}
}
}
-
+
// translate tab to IDENT_STRING
if ( aep.text.equals( "\t" ) ) //$NON-NLS-1$
{
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java Wed Oct 21 12:51:13 2009
@@ -186,11 +186,11 @@
}
}
- possibleFilterTypes.put( "=", Messages.getString("FilterContentAssistProcessor.Equals") ); //$NON-NLS-1$ //$NON-NLS-2$
- possibleFilterTypes.put( "=*", Messages.getString("FilterContentAssistProcessor.Present") ); //$NON-NLS-1$ //$NON-NLS-2$
- possibleFilterTypes.put( "<=", Messages.getString("FilterContentAssistProcessor.LessThanOrEquals") ); //$NON-NLS-1$ //$NON-NLS-2$
- possibleFilterTypes.put( ">=", Messages.getString("FilterContentAssistProcessor.GreaterThanOrEquals") ); //$NON-NLS-1$ //$NON-NLS-2$
- possibleFilterTypes.put( "~=", Messages.getString("FilterContentAssistProcessor.Approximately") ); //$NON-NLS-1$ //$NON-NLS-2$
+ possibleFilterTypes.put( "=", Messages.getString( "FilterContentAssistProcessor.Equals" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ possibleFilterTypes.put( "=*", Messages.getString( "FilterContentAssistProcessor.Present" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ possibleFilterTypes.put( "<=", Messages.getString( "FilterContentAssistProcessor.LessThanOrEquals" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ possibleFilterTypes.put( ">=", Messages.getString( "FilterContentAssistProcessor.GreaterThanOrEquals" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ possibleFilterTypes.put( "~=", Messages.getString( "FilterContentAssistProcessor.Approximately" ) ); //$NON-NLS-1$ //$NON-NLS-2$
Collection<ObjectClassDescription> ocds = schema.getObjectClassDescriptions();
for ( ObjectClassDescription ocd : ocds )
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java Wed Oct 21 12:51:13 2009
@@ -166,7 +166,7 @@
int stop = start + tokens[i].getLength();
if ( start <= hoverRegion.getOffset() && hoverRegion.getOffset() < stop )
{
- return Messages.getString("FilterTextHover.InvalidCharacters"); //$NON-NLS-1$
+ return Messages.getString( "FilterTextHover.InvalidCharacters" ); //$NON-NLS-1$
}
}
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/BinaryEncodingInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/BinaryEncodingInput.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/BinaryEncodingInput.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/BinaryEncodingInput.java Wed Oct 21 12:51:13 2009
@@ -46,7 +46,8 @@
*/
public BinaryEncodingInput( String initialRawValue, boolean asGroup )
{
- super( Messages.getString("BinaryEncodingInput.BinaryEncoding"), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
+ super(
+ Messages.getString( "BinaryEncodingInput.BinaryEncoding" ), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
getOtherRawValues(), initialRawValue, asGroup, false );
}
@@ -59,7 +60,7 @@
*/
private static String getDefaultDisplayValue()
{
- return Messages.getString("BinaryEncodingInput.Ignore"); //$NON-NLS-1$
+ return Messages.getString( "BinaryEncodingInput.Ignore" ); //$NON-NLS-1$
}
@@ -83,7 +84,7 @@
private static String[] getOtherDisplayValues()
{
return new String[]
- { Messages.getString("BinaryEncodingInput.Ignore"), "BASE-64", "HEX" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ { Messages.getString( "BinaryEncodingInput.Ignore" ), "BASE-64", "HEX" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java Wed Oct 21 12:51:13 2009
@@ -240,7 +240,8 @@
// draw parent
if ( showParent )
{
- parentEntryLabel = BaseWidgetUtils.createLabel( composite, Messages.getString("DnBuilderWidget.Parent"), 1 ); //$NON-NLS-1$
+ parentEntryLabel = BaseWidgetUtils.createLabel( composite,
+ Messages.getString( "DnBuilderWidget.Parent" ), 1 ); //$NON-NLS-1$
parentEntryWidget = new EntryWidget();
parentEntryWidget.createWidget( composite );
parentEntryWidget.addWidgetModifyListener( new WidgetModifyListener()
@@ -257,7 +258,7 @@
// draw RDN group
if ( showRDN )
{
- rdnLabel = BaseWidgetUtils.createLabel( composite, Messages.getString("DnBuilderWidget.RDN"), 1 ); //$NON-NLS-1$
+ rdnLabel = BaseWidgetUtils.createLabel( composite, Messages.getString( "DnBuilderWidget.RDN" ), 1 ); //$NON-NLS-1$
rdnComposite = BaseWidgetUtils.createColumnContainer( composite, 5, 2 );
rdnLineList = new ArrayList<RdnLine>();
BaseWidgetUtils.createSpacer( composite, 3 );
@@ -266,7 +267,8 @@
// draw dn/rdn preview
if ( showRDN )
{
- previewLabel = BaseWidgetUtils.createLabel( composite, showParent ? Messages.getString("DnBuilderWidget.DNPreview") : Messages.getString("DnBuilderWidget.RDNPrevei"), 1 ); //$NON-NLS-1$ //$NON-NLS-2$
+ previewLabel = BaseWidgetUtils.createLabel( composite, showParent ? Messages
+ .getString( "DnBuilderWidget.DNPreview" ) : Messages.getString( "DnBuilderWidget.RDNPrevei" ), 1 ); //$NON-NLS-1$ //$NON-NLS-2$
previewText = BaseWidgetUtils.createReadonlyText( composite, "", 2 ); //$NON-NLS-1$
BaseWidgetUtils.createSpacer( composite, 3 );
}
@@ -351,11 +353,11 @@
String s = ""; //$NON-NLS-1$
if ( rdnE != null )
{
- s += rdnE.getMessage() != null ? rdnE.getMessage() : Messages.getString("DnBuilderWidget.ErrorInRDN"); //$NON-NLS-1$
+ s += rdnE.getMessage() != null ? rdnE.getMessage() : Messages.getString( "DnBuilderWidget.ErrorInRDN" ); //$NON-NLS-1$
}
if ( parentE != null )
{
- s += ", " + parentE.getMessage() != null ? parentE.getMessage() : Messages.getString("DnBuilderWidget.ErrorInParentDN"); //$NON-NLS-1$ //$NON-NLS-2$
+ s += ", " + parentE.getMessage() != null ? parentE.getMessage() : Messages.getString( "DnBuilderWidget.ErrorInParentDN" ); //$NON-NLS-1$ //$NON-NLS-2$
}
if ( previewText != null )
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java Wed Oct 21 12:51:13 2009
@@ -103,7 +103,7 @@
} );
// Button
- browseButton = BaseWidgetUtils.createButton( parent, Messages.getString("FileBrowserWidget.BrowseButton"), 1 ); //$NON-NLS-1$
+ browseButton = BaseWidgetUtils.createButton( parent, Messages.getString( "FileBrowserWidget.BrowseButton" ), 1 ); //$NON-NLS-1$
browseButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent event )
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileEncodingInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileEncodingInput.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileEncodingInput.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileEncodingInput.java Wed Oct 21 12:51:13 2009
@@ -47,7 +47,8 @@
*/
public FileEncodingInput( String initialRawValue, boolean asGroup )
{
- super( Messages.getString("FileEncodingInput.FileEncoding"), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
+ super(
+ Messages.getString( "FileEncodingInput.FileEncoding" ), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
getOtherRawValues(), initialRawValue, asGroup, false );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/LineSeparatorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/LineSeparatorInput.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/LineSeparatorInput.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/LineSeparatorInput.java Wed Oct 21 12:51:13 2009
@@ -50,7 +50,8 @@
*/
public LineSeparatorInput( String initialRawValue, boolean asGroup )
{
- super( Messages.getString("LineSeparatorInput.LineSeparator"), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
+ super(
+ Messages.getString( "LineSeparatorInput.LineSeparator" ), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
getOtherRawValues(), initialRawValue, asGroup, false );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/OptionsInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/OptionsInput.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/OptionsInput.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/OptionsInput.java Wed Oct 21 12:51:13 2009
@@ -157,7 +157,7 @@
} );
Composite otherComposite = BaseWidgetUtils.createColumnContainer( composite, 2, 1 );
- otherButton = BaseWidgetUtils.createRadiobutton( otherComposite, Messages.getString("OptionsInput.Other"), 1 ); //$NON-NLS-1$
+ otherButton = BaseWidgetUtils.createRadiobutton( otherComposite, Messages.getString( "OptionsInput.Other" ), 1 ); //$NON-NLS-1$
otherButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java Wed Oct 21 12:51:13 2009
@@ -60,7 +60,7 @@
/** The show quick search action. */
protected ShowQuickSearchAction showQuickSearchAction;
-
+
/** The collapse all action. */
protected CollapseAllAction collapseAllAction;
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java Wed Oct 21 12:51:13 2009
@@ -45,13 +45,13 @@
public static final int TYPE_BOOKMARKS = 2;
/** The title for the DIT categoy */
- public static final String TITLE_DIT = Messages.getString("BrowserCategory.DIT"); //$NON-NLS-1$
+ public static final String TITLE_DIT = Messages.getString( "BrowserCategory.DIT" ); //$NON-NLS-1$
/** The title for the searches categoy */
- public static final String TITLE_SEARCHES = Messages.getString("BrowserCategory.Searches"); //$NON-NLS-1$
+ public static final String TITLE_SEARCHES = Messages.getString( "BrowserCategory.Searches" ); //$NON-NLS-1$
/** The title for the bookmarks categoy */
- public static final String TITLE_BOOKMARKS = Messages.getString("BrowserCategory.Bookmarsk"); //$NON-NLS-1$
+ public static final String TITLE_BOOKMARKS = Messages.getString( "BrowserCategory.Bookmarsk" ); //$NON-NLS-1$
/** The category's connection */
private IBrowserConnection parent;
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java Wed Oct 21 12:51:13 2009
@@ -164,8 +164,8 @@
if ( labelProvider == null )
{
labelProvider = new BrowserLabelProvider( getPreferences() );
- decoratingLabelProvider = new DecoratingLabelProvider( labelProvider, BrowserCommonActivator.getDefault().getWorkbench()
- .getDecoratorManager().getLabelDecorator() );
+ decoratingLabelProvider = new DecoratingLabelProvider( labelProvider, BrowserCommonActivator.getDefault()
+ .getWorkbench().getDecoratorManager().getLabelDecorator() );
}
return decoratingLabelProvider;
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java Wed Oct 21 12:51:13 2009
@@ -351,7 +351,7 @@
else if ( parent instanceof IEntry )
{
final IEntry parentEntry = ( IEntry ) parent;
-
+
if ( parentEntry instanceof IContinuation )
{
IContinuation continuation = ( IContinuation ) parentEntry;
@@ -383,7 +383,8 @@
List<Object> objects = new ArrayList<Object>();
SearchManager sm = parentEntry.getBrowserConnection().getSearchManager();
- if ( sm != null && sm.getQuickSearch() != null && parentEntry.getDn().equals( sm.getQuickSearch().getSearchBase() ) )
+ if ( sm != null && sm.getQuickSearch() != null
+ && parentEntry.getDn().equals( sm.getQuickSearch().getSearchBase() ) )
{
objects.add( sm.getQuickSearch() );
}
@@ -394,7 +395,7 @@
}
objects.addAll( Arrays.asList( results ) );
-
+
if ( parentEntry.getNextPageChildrenRunnable() != null )
{
objects.add( parentEntry.getNextPageChildrenRunnable() );
@@ -442,7 +443,7 @@
return new Object[0];
}
}
-
+
if ( search.getSearchResults() == null || search.getSearchContinuations() == null )
{
new StudioBrowserJob( new SearchRunnable( new ISearch[]
@@ -472,8 +473,8 @@
}
objects.addAll( Arrays.asList( results ) );
-
- if(scs != null)
+
+ if ( scs != null )
{
objects.addAll( Arrays.asList( scs ) );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserEntryPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserEntryPage.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserEntryPage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserEntryPage.java Wed Oct 21 12:51:13 2009
@@ -38,7 +38,7 @@
/** The tree sorter */
private BrowserSorter sorter;
- /** The index of the first child entry in this page */
+ /** The index of the first child entry in this page */
private int first;
/** The index of the last child entry in this page */
@@ -119,7 +119,6 @@
}
-
/**
* Gets the first.
*
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java Wed Oct 21 12:51:13 2009
@@ -53,16 +53,16 @@
{
/** The dialog title. */
- public static final String DIALOG_TITLE = Messages.getString("BrowserSorterDialog.BrowserSorting"); //$NON-NLS-1$
+ public static final String DIALOG_TITLE = Messages.getString( "BrowserSorterDialog.BrowserSorting" ); //$NON-NLS-1$
/** The Constant SORT_BY_NONE. */
- public static final String SORT_BY_NONE = Messages.getString("BrowserSorterDialog.NoSorting"); //$NON-NLS-1$
+ public static final String SORT_BY_NONE = Messages.getString( "BrowserSorterDialog.NoSorting" ); //$NON-NLS-1$
/** The Constant SORT_BY_RDN. */
- public static final String SORT_BY_RDN = Messages.getString("BrowserSorterDialog.RDN"); //$NON-NLS-1$
+ public static final String SORT_BY_RDN = Messages.getString( "BrowserSorterDialog.RDN" ); //$NON-NLS-1$
/** The Constant SORT_BY_RDN_VALUE. */
- public static final String SORT_BY_RDN_VALUE = Messages.getString("BrowserSorterDialog.RDNValue"); //$NON-NLS-1$
+ public static final String SORT_BY_RDN_VALUE = Messages.getString( "BrowserSorterDialog.RDNValue" ); //$NON-NLS-1$
/** The browser preferences. */
private BrowserPreferences preferences;
@@ -170,32 +170,36 @@
gd.widthHint = convertHorizontalDLUsToPixels( IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH );
composite.setLayoutData( gd );
- Group groupingGroup = BaseWidgetUtils.createGroup( composite, Messages.getString("BrowserSorterDialog.GroupEntries"), 1 ); //$NON-NLS-1$
+ Group groupingGroup = BaseWidgetUtils.createGroup( composite, Messages
+ .getString( "BrowserSorterDialog.GroupEntries" ), 1 ); //$NON-NLS-1$
Composite columGroup = BaseWidgetUtils.createColumnContainer( groupingGroup, 3, 1 );
- leafEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages.getString("BrowserSorterDialog.LeafEntriesFirst"), 1 ); //$NON-NLS-1$
- leafEntriesFirstButton
- .setToolTipText( Messages.getString("BrowserSorterDialog.LeafEntriesFirstToolTip") ); //$NON-NLS-1$
+ leafEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages
+ .getString( "BrowserSorterDialog.LeafEntriesFirst" ), 1 ); //$NON-NLS-1$
+ leafEntriesFirstButton.setToolTipText( Messages.getString( "BrowserSorterDialog.LeafEntriesFirstToolTip" ) ); //$NON-NLS-1$
leafEntriesFirstButton.setSelection( preferences.isLeafEntriesFirst() );
- containerEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages.getString("BrowserSorterDialog.ContainerEntriesFirst"), 1 ); //$NON-NLS-1$
- containerEntriesFirstButton
- .setToolTipText( Messages.getString("BrowserSorterDialog.ContainerEntriesFirstToolTip") ); //$NON-NLS-1$
+ containerEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages
+ .getString( "BrowserSorterDialog.ContainerEntriesFirst" ), 1 ); //$NON-NLS-1$
+ containerEntriesFirstButton.setToolTipText( Messages
+ .getString( "BrowserSorterDialog.ContainerEntriesFirstToolTip" ) ); //$NON-NLS-1$
containerEntriesFirstButton.setSelection( preferences.isContainerEntriesFirst() );
-
- mixedButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages.getString("BrowserSorterDialog.Mixed"), 1 ); //$NON-NLS-1$
- mixedButton.setToolTipText( Messages.getString("BrowserSorterDialog.MixedToolTip") ); //$NON-NLS-1$
+
+ mixedButton = BaseWidgetUtils.createRadiobutton( columGroup,
+ Messages.getString( "BrowserSorterDialog.Mixed" ), 1 ); //$NON-NLS-1$
+ mixedButton.setToolTipText( Messages.getString( "BrowserSorterDialog.MixedToolTip" ) ); //$NON-NLS-1$
mixedButton.setSelection( !preferences.isLeafEntriesFirst() && !preferences.isContainerEntriesFirst() );
- metaEntriesLastButton = BaseWidgetUtils.createCheckbox( groupingGroup, Messages.getString("BrowserSorterDialog.MetaEntriesLast"), 1 ); //$NON-NLS-1$
- metaEntriesLastButton
- .setToolTipText( Messages.getString("BrowserSorterDialog.MetaEntriesLastToolTip") ); //$NON-NLS-1$
+ metaEntriesLastButton = BaseWidgetUtils.createCheckbox( groupingGroup, Messages
+ .getString( "BrowserSorterDialog.MetaEntriesLast" ), 1 ); //$NON-NLS-1$
+ metaEntriesLastButton.setToolTipText( Messages.getString( "BrowserSorterDialog.MetaEntriesLastToolTip" ) ); //$NON-NLS-1$
metaEntriesLastButton.setSelection( preferences.isMetaEntriesLast() );
- Group sortingGroup = BaseWidgetUtils.createGroup( composite, Messages.getString("BrowserSorterDialog.SortEntries"), 1 ); //$NON-NLS-1$
+ Group sortingGroup = BaseWidgetUtils.createGroup( composite, Messages
+ .getString( "BrowserSorterDialog.SortEntries" ), 1 ); //$NON-NLS-1$
Composite sortByComposite = BaseWidgetUtils.createColumnContainer( sortingGroup, 4, 1 );
- BaseWidgetUtils.createLabel( sortByComposite, Messages.getString("BrowserSorterDialog.SortBy"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( sortByComposite, Messages.getString( "BrowserSorterDialog.SortBy" ), 1 ); //$NON-NLS-1$
sortByCombo = BaseWidgetUtils.createReadonlyCombo( sortByComposite, new String[]
{ SORT_BY_NONE, SORT_BY_RDN, SORT_BY_RDN_VALUE }, 0, 1 );
sortByCombo.select( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_RDN_VALUE ? 2 : preferences
@@ -210,17 +214,20 @@
}
} );
- sortAcendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages.getString("BrowserSorterDialog.Ascending"), 1 ); //$NON-NLS-1$
+ sortAcendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
+ .getString( "BrowserSorterDialog.Ascending" ), 1 ); //$NON-NLS-1$
sortAcendingButton.setSelection( preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING );
sortAcendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
- sortDescendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages.getString("BrowserSorterDialog.Descending"), 1 ); //$NON-NLS-1$
+ sortDescendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
+ .getString( "BrowserSorterDialog.Descending" ), 1 ); //$NON-NLS-1$
sortDescendingButton.setSelection( preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_DESCENDING );
sortDescendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
Composite sortLimitComposite = BaseWidgetUtils.createColumnContainer( sortingGroup, 2, 1 );
- String sortLimitTooltip = Messages.getString("BrowserSorterDialog.SortLimitToolTip"); //$NON-NLS-1$
- Label sortLimitLabel = BaseWidgetUtils.createLabel( sortLimitComposite, Messages.getString("BrowserSorterDialog.SortLimit"), 1 ); //$NON-NLS-1$
+ String sortLimitTooltip = Messages.getString( "BrowserSorterDialog.SortLimitToolTip" ); //$NON-NLS-1$
+ Label sortLimitLabel = BaseWidgetUtils.createLabel( sortLimitComposite, Messages
+ .getString( "BrowserSorterDialog.SortLimit" ), 1 ); //$NON-NLS-1$
sortLimitLabel.setToolTipText( sortLimitTooltip );
sortLimitText = BaseWidgetUtils.createText( sortLimitComposite, "" + preferences.getSortLimit(), 5, 1 ); //$NON-NLS-1$
sortLimitText.setToolTipText( sortLimitTooltip );
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java Wed Oct 21 12:51:13 2009
@@ -55,7 +55,7 @@
/** The quick search widget. */
private BrowserQuickSearchWidget quickSearchWidget;
-
+
/** The action bars. */
private IActionBars actionBars;
@@ -215,7 +215,7 @@
quickSearchWidget.dispose();
quickSearchWidget = null;
}
-
+
this.tree.dispose();
this.tree = null;
this.viewer = null;
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/OpenSortDialogAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/OpenSortDialogAction.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/OpenSortDialogAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/OpenSortDialogAction.java Wed Oct 21 12:51:13 2009
@@ -47,7 +47,8 @@
*/
public OpenSortDialogAction( BrowserPreferences preferences )
{
- super( Messages.getString("OpenSortDialogAction.Sorting"), BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_SORT ) ); //$NON-NLS-1$
+ super(
+ Messages.getString( "OpenSortDialogAction.Sorting" ), BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_SORT ) ); //$NON-NLS-1$
super.setEnabled( true );
this.preferences = preferences;
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java Wed Oct 21 12:51:13 2009
@@ -632,8 +632,7 @@
parameter.setExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_ALIASES_DEREFERENCING_METHOD,
getAliasesDereferencingMethod().getOrdinal() );
- parameter.setExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_MANAGE_DSA_IT,
- manageDsaIT() );
+ parameter.setExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_MANAGE_DSA_IT, manageDsaIT() );
parameter.setExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_FETCH_SUBENTRIES,
isFetchSubentries() );
parameter.setExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH, isPagedSearch() );
@@ -684,9 +683,8 @@
.getExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE );
return isReconnectionRequired() || countLimit != getCountLimit() || timeLimit != getTimeLimit()
- || manageDsaIT != manageDsaIT() || fetchSubentries != isFetchSubentries()
- || pagedSearch != isPagedSearch() || pagedSearchSize != getPagedSearchSize()
- || pagedSearchScrollMode != isPagedSearchScrollMode();
+ || manageDsaIT != manageDsaIT() || fetchSubentries != isFetchSubentries() || pagedSearch != isPagedSearch()
+ || pagedSearchSize != getPagedSearchSize() || pagedSearchScrollMode != isPagedSearchScrollMode();
}
@@ -913,8 +911,7 @@
// ManageDsaIT control
Extension manageDsaIT = ldapUrl.getExtension( X_MANAGE_DSA_IT );
- parameter.setExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_MANAGE_DSA_IT,
- manageDsaIT != null );
+ parameter.setExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_MANAGE_DSA_IT, manageDsaIT != null );
// fetch subentries
Extension fetchSubentries = ldapUrl.getExtension( X_FETCH_SUBENTRIES );
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java Wed Oct 21 12:51:13 2009
@@ -279,8 +279,7 @@
*/
public void mergeParametersToLdapURL( ConnectionParameter parameter, LdapURL ldapUrl )
{
- int modifyMode = parameter
- .getExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_MODE );
+ int modifyMode = parameter.getExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_MODE );
if ( modifyMode != 0 )
{
ldapUrl.getExtensions().add(
@@ -297,8 +296,7 @@
.getExtendedProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_MODE_NO_EMR ) ) );
}
- int modifyOrder = parameter
- .getExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_ORDER );
+ int modifyOrder = parameter.getExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_MODIFY_ORDER );
if ( modifyOrder != 0 )
{
ldapUrl.getExtensions().add(
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java Wed Oct 21 12:51:13 2009
@@ -85,7 +85,7 @@
@Override
public String getText()
{
- return Messages.getString("EditAttributeDescriptionAction.EditAttributeDescription"); //$NON-NLS-1$
+ return Messages.getString( "EditAttributeDescriptionAction.EditAttributeDescription" ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java Wed Oct 21 12:51:13 2009
@@ -291,7 +291,8 @@
protected void addEditMenu( IMenuManager menuManager )
{
menuManager.add( openDefaultValueEditorActionProxy );
- MenuManager editorMenuManager = new MenuManager( Messages.getString("EntryEditorWidgetActionGroup.EditValueWith") ); //$NON-NLS-1$
+ MenuManager editorMenuManager = new MenuManager( Messages
+ .getString( "EntryEditorWidgetActionGroup.EditValueWith" ) ); //$NON-NLS-1$
if ( openBestValueEditorActionProxy.isEnabled() )
{
editorMenuManager.add( openBestValueEditorActionProxy );
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java Wed Oct 21 12:51:13 2009
@@ -104,7 +104,8 @@
menuManager.add( ( IAction ) entryEditorActionMap.get( pasteAction ) );
menuManager.add( ( IAction ) entryEditorActionMap.get( deleteAction ) );
menuManager.add( ( IAction ) entryEditorActionMap.get( selectAllAction ) );
- MenuManager copyMenuManager = new MenuManager( Messages.getString("EntryEditorWidgetActionGroupWithAttribute.Advanced") ); //$NON-NLS-1$
+ MenuManager copyMenuManager = new MenuManager( Messages
+ .getString( "EntryEditorWidgetActionGroupWithAttribute.Advanced" ) ); //$NON-NLS-1$
copyMenuManager.add( ( IAction ) entryEditorActionMap.get( deleteAllValuesAction ) );
menuManager.add( copyMenuManager );
menuManager.add( new Separator() );
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetSorterDialog.java Wed Oct 21 12:51:13 2009
@@ -49,16 +49,17 @@
{
/** The Constant DIALOG_TITLE. */
- public static final String DIALOG_TITLE = Messages.getString("EntryEditorWidgetSorterDialog.EntryEditorSorting"); //$NON-NLS-1$
+ public static final String DIALOG_TITLE = Messages.getString( "EntryEditorWidgetSorterDialog.EntryEditorSorting" ); //$NON-NLS-1$
/** The Constant SORT_BY_NONE. */
- public static final String SORT_BY_NONE = Messages.getString("EntryEditorWidgetSorterDialog.NoDefaultSorting"); //$NON-NLS-1$
+ public static final String SORT_BY_NONE = Messages.getString( "EntryEditorWidgetSorterDialog.NoDefaultSorting" ); //$NON-NLS-1$
/** The Constant SORT_BY_ATTRIBUTE. */
- public static final String SORT_BY_ATTRIBUTE = Messages.getString("EntryEditorWidgetSorterDialog.AttributeDescription"); //$NON-NLS-1$
+ public static final String SORT_BY_ATTRIBUTE = Messages
+ .getString( "EntryEditorWidgetSorterDialog.AttributeDescription" ); //$NON-NLS-1$
/** The Constant SORT_BY_VALUE. */
- public static final String SORT_BY_VALUE = Messages.getString("EntryEditorWidgetSorterDialog.Value"); //$NON-NLS-1$
+ public static final String SORT_BY_VALUE = Messages.getString( "EntryEditorWidgetSorterDialog.Value" ); //$NON-NLS-1$
/** The preferences. */
private EntryEditorWidgetPreferences preferences;
@@ -121,9 +122,9 @@
store.setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_ORDER, sortDescendingButton
.getSelection() ? BrowserCoreConstants.SORT_ORDER_DESCENDING
: BrowserCoreConstants.SORT_ORDER_ASCENDING );
- store.setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_BY,
- sortByCombo.getSelectionIndex() == 2 ? BrowserCoreConstants.SORT_BY_VALUE : sortByCombo
- .getSelectionIndex() == 1 ? BrowserCoreConstants.SORT_BY_ATTRIBUTE_DESCRIPTION
+ store.setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_DEFAULT_SORT_BY, sortByCombo
+ .getSelectionIndex() == 2 ? BrowserCoreConstants.SORT_BY_VALUE
+ : sortByCombo.getSelectionIndex() == 1 ? BrowserCoreConstants.SORT_BY_ATTRIBUTE_DESCRIPTION
: BrowserCoreConstants.SORT_BY_NONE );
}
@@ -138,22 +139,25 @@
{
Composite composite = ( Composite ) super.createDialogArea( parent );
- Group group = BaseWidgetUtils.createGroup( composite, Messages.getString("EntryEditorWidgetSorterDialog.GroupAttributes"), 1 ); //$NON-NLS-1$
+ Group group = BaseWidgetUtils.createGroup( composite, Messages
+ .getString( "EntryEditorWidgetSorterDialog.GroupAttributes" ), 1 ); //$NON-NLS-1$
GridData gd = new GridData( GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL );
gd.widthHint = convertHorizontalDLUsToPixels( IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH );
group.setLayoutData( gd );
- objectClassAndMustAttributesFirstButton = BaseWidgetUtils.createCheckbox( group,
- Messages.getString("EntryEditorWidgetSorterDialog.ObjectClassAndMustAttributesFirst"), 1 ); //$NON-NLS-1$
+ objectClassAndMustAttributesFirstButton = BaseWidgetUtils.createCheckbox( group, Messages
+ .getString( "EntryEditorWidgetSorterDialog.ObjectClassAndMustAttributesFirst" ), 1 ); //$NON-NLS-1$
objectClassAndMustAttributesFirstButton.setSelection( preferences.isObjectClassAndMustAttributesFirst() );
- operationalAttributesLastButton = BaseWidgetUtils.createCheckbox( group, Messages.getString("EntryEditorWidgetSorterDialog.OperationalAttributesLast"), 1 ); //$NON-NLS-1$
+ operationalAttributesLastButton = BaseWidgetUtils.createCheckbox( group, Messages
+ .getString( "EntryEditorWidgetSorterDialog.OperationalAttributesLast" ), 1 ); //$NON-NLS-1$
operationalAttributesLastButton.setSelection( preferences.isOperationalAttributesLast() );
- Group sortingGroup = BaseWidgetUtils.createGroup( composite, Messages.getString("EntryEditorWidgetSorterDialog.SortAttributes"), 1 ); //$NON-NLS-1$
+ Group sortingGroup = BaseWidgetUtils.createGroup( composite, Messages
+ .getString( "EntryEditorWidgetSorterDialog.SortAttributes" ), 1 ); //$NON-NLS-1$
Composite sortByComposite = BaseWidgetUtils.createColumnContainer( sortingGroup, 4, 1 );
- BaseWidgetUtils.createLabel( sortByComposite, Messages.getString("EntryEditorWidgetSorterDialog.SortBy"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( sortByComposite, Messages.getString( "EntryEditorWidgetSorterDialog.SortBy" ), 1 ); //$NON-NLS-1$
sortByCombo = BaseWidgetUtils.createReadonlyCombo( sortByComposite, new String[]
{ SORT_BY_NONE, SORT_BY_ATTRIBUTE, SORT_BY_VALUE }, 0, 1 );
sortByCombo.select( preferences.getDefaultSortBy() == BrowserCoreConstants.SORT_BY_VALUE ? 2 : preferences
@@ -167,20 +171,21 @@
}
} );
- sortAcendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages.getString("EntryEditorWidgetSorterDialog.Ascending"), 1 ); //$NON-NLS-1$
+ sortAcendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
+ .getString( "EntryEditorWidgetSorterDialog.Ascending" ), 1 ); //$NON-NLS-1$
sortAcendingButton
.setSelection( preferences.getDefaultSortOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING );
sortAcendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
- sortDescendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages.getString("EntryEditorWidgetSorterDialog.Descending"), 1 ); //$NON-NLS-1$
+ sortDescendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
+ .getString( "EntryEditorWidgetSorterDialog.Descending" ), 1 ); //$NON-NLS-1$
sortDescendingButton
.setSelection( preferences.getDefaultSortOrder() == BrowserCoreConstants.SORT_ORDER_DESCENDING );
sortDescendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
BaseWidgetUtils.createSpacer( composite, 2 );
- BaseWidgetUtils.createLabel( composite,
- Messages.getString("EntryEditorWidgetSorterDialog.SortTableHint"), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( composite, Messages.getString( "EntryEditorWidgetSorterDialog.SortTableHint" ), 1 ); //$NON-NLS-1$
applyDialogFont( composite );
return composite;
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetTableMetadata.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetTableMetadata.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetTableMetadata.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetTableMetadata.java Wed Oct 21 12:51:13 2009
@@ -38,10 +38,11 @@
public static final int VALUE_COLUMN_INDEX = 1;
/** The Constant KEY_COLUMN_NAME. */
- public static final String KEY_COLUMN_NAME = Messages.getString("EntryEditorWidgetTableMetadata.AttributeDescription"); //$NON-NLS-1$
+ public static final String KEY_COLUMN_NAME = Messages
+ .getString( "EntryEditorWidgetTableMetadata.AttributeDescription" ); //$NON-NLS-1$
/** The Constant VALUE_COLUMN_NAME. */
- public static final String VALUE_COLUMN_NAME = Messages.getString("EntryEditorWidgetTableMetadata.Value"); //$NON-NLS-1$
+ public static final String VALUE_COLUMN_NAME = Messages.getString( "EntryEditorWidgetTableMetadata.Value" ); //$NON-NLS-1$
/** The Constant COLUM_NAMES. */
public static final String[] COLUM_NAMES =
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java?rev=827993&r1=827992&r2=827993&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenSortDialogAction.java Wed Oct 21 12:51:13 2009
@@ -35,9 +35,10 @@
public OpenSortDialogAction( EntryEditorWidgetPreferences preferences )
{
- super.setText( Messages.getString("OpenSortDialogAction.Sorting") ); //$NON-NLS-1$
- super.setToolTipText( Messages.getString("OpenSortDialogAction.Sorting") ); //$NON-NLS-1$
- super.setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_SORT ) );
+ super.setText( Messages.getString( "OpenSortDialogAction.Sorting" ) ); //$NON-NLS-1$
+ super.setToolTipText( Messages.getString( "OpenSortDialogAction.Sorting" ) ); //$NON-NLS-1$
+ super.setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor(
+ BrowserCommonConstants.IMG_SORT ) );
super.setEnabled( true );
this.preferences = preferences;