directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r741930 [3/6] - in /directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio: ldapbrowser/common/ ldapbrowser/common/actions/ ldapbrowser/common/dialogs/ ldapbrowser/common/dialogs/preferences/ ldapbrowser/common/...
Date Sat, 07 Feb 2009 18:26:31 GMT
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java Sat Feb  7 18:26:27 2009
@@ -70,9 +70,9 @@
      */
     public EntryEditorPreferencePage()
     {
-        super( "Entry Editor" );
+        super( Messages.getString("EntryEditorPreferencePage.EntryEditor") ); //$NON-NLS-1$
         super.setPreferenceStore( BrowserCommonActivator.getDefault().getPreferenceStore() );
-        super.setDescription( "General settings for the LDAP entry editor:" );
+        super.setDescription( Messages.getString("EntryEditorPreferencePage.GeneralSettings") ); //$NON-NLS-1$
     }
 
 
@@ -94,31 +94,31 @@
         BaseWidgetUtils.createSpacer( composite, 1 );
         BaseWidgetUtils.createSpacer( composite, 1 );
         Group visibleAttributesGroup = BaseWidgetUtils.createGroup( BaseWidgetUtils.createColumnContainer( composite,
-            1, 1 ), "Visible Attributes", 1 );
+            1, 1 ), Messages.getString("EntryEditorPreferencePage.VisibleAttributes"), 1 ); //$NON-NLS-1$
         Composite visibleAttributesComposite = BaseWidgetUtils.createColumnContainer( visibleAttributesGroup, 1, 1 );
         showObjectClassAttributeButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite,
-            "Show objectClass attribute", 1 );
+            Messages.getString("EntryEditorPreferencePage.ShowObjectClassAttributes"), 1 ); //$NON-NLS-1$
         showObjectClassAttributeButton.setSelection( getPreferenceStore().getBoolean(
             BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES ) );
-        showMustAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, "Show must attributes",
+        showMustAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, Messages.getString("EntryEditorPreferencePage.ShowMustAttributes"), //$NON-NLS-1$
             1 );
         showMustAttributesButton.setSelection( getPreferenceStore().getBoolean(
             BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES ) );
-        showMayAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, "Show may attributes", 1 );
+        showMayAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, Messages.getString("EntryEditorPreferencePage.ShowMayAttributes"), 1 ); //$NON-NLS-1$
         showMayAttributesButton.setSelection( getPreferenceStore().getBoolean(
             BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES ) );
         showOperationalAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite,
-            "Show operational attributes", 1 );
+            Messages.getString("EntryEditorPreferencePage.ShowOperationalAttributes"), 1 ); //$NON-NLS-1$
         showOperationalAttributesButton.setSelection( getPreferenceStore().getBoolean(
             BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) );
 
         BaseWidgetUtils.createSpacer( composite, 1 );
         BaseWidgetUtils.createSpacer( composite, 1 );
-        String foldingTooltip = "If an attribute has more than the specified number of values it will be folded to one line. You may expand and collapse the values.";
+        String foldingTooltip = Messages.getString("EntryEditorPreferencePage.FoldingToolTip"); //$NON-NLS-1$
         Group foldingGroup = BaseWidgetUtils.createGroup( BaseWidgetUtils.createColumnContainer( composite, 1, 1 ),
-            "Folding", 1 );
+            Messages.getString("EntryEditorPreferencePage.Folding"), 1 ); //$NON-NLS-1$
         Composite pagingGroupComposite = BaseWidgetUtils.createColumnContainer( foldingGroup, 3, 1 );
-        enableFoldingButton = BaseWidgetUtils.createCheckbox( pagingGroupComposite, "Enable folding", 3 );
+        enableFoldingButton = BaseWidgetUtils.createCheckbox( pagingGroupComposite, Messages.getString("EntryEditorPreferencePage.EnableFolding"), 3 ); //$NON-NLS-1$
         enableFoldingButton.setToolTipText( foldingTooltip );
         enableFoldingButton.setSelection( getPreferenceStore().getBoolean(
             BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_ENABLE_FOLDING ) );
@@ -130,7 +130,7 @@
             }
         } );
         BaseWidgetUtils.createRadioIndent( pagingGroupComposite, 1 );
-        foldingThresholdLabel = BaseWidgetUtils.createLabel( pagingGroupComposite, "Folding threshold: ", 1 );
+        foldingThresholdLabel = BaseWidgetUtils.createLabel( pagingGroupComposite, Messages.getString("EntryEditorPreferencePage.FoldingThreshold"), 1 ); //$NON-NLS-1$
         foldingThresholdLabel.setToolTipText( foldingTooltip );
         foldingThresholdLabel.setEnabled( enableFoldingButton.getSelection() );
         foldingThresholdText = BaseWidgetUtils.createText( pagingGroupComposite, getPreferenceStore().getString(
@@ -141,11 +141,11 @@
         {
             public void verifyText( VerifyEvent e )
             {
-                if ( !e.text.matches( "[0-9]*" ) )
+                if ( !e.text.matches( "[0-9]*" ) ) //$NON-NLS-1$
                 {
                     e.doit = false;
                 }
-                if ( "".equals( foldingThresholdText.getText() ) && e.text.matches( "[0]" ) )
+                if ( "".equals( foldingThresholdText.getText() ) && e.text.matches( "[0]" ) ) //$NON-NLS-1$ //$NON-NLS-2$
                 {
                     e.doit = false;
                 }
@@ -153,7 +153,7 @@
         } );
         BaseWidgetUtils.createRadioIndent( pagingGroupComposite, 1 );
         autoExpandFoldedAttributesButton = BaseWidgetUtils.createCheckbox( pagingGroupComposite,
-            "Auto-expand folded attributes", 2 );
+            Messages.getString("EntryEditorPreferencePage.AutoExpandFoldedAttributes"), 2 ); //$NON-NLS-1$
         autoExpandFoldedAttributesButton.setEnabled( enableFoldingButton.getSelection() );
         autoExpandFoldedAttributesButton.setSelection( getPreferenceStore().getBoolean(
             BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_AUTO_EXPAND_FOLDED_ATTRIBUTES ) );

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/MainPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/MainPreferencePage.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/MainPreferencePage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/MainPreferencePage.java Sat Feb  7 18:26:27 2009
@@ -27,6 +27,7 @@
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
@@ -53,9 +54,9 @@
      */
     public MainPreferencePage()
     {
-        super( "LDAP" );
+        super( Messages.getString("MainPreferencePage.LDAP") ); //$NON-NLS-1$
         super.setPreferenceStore( BrowserCommonActivator.getDefault().getPreferenceStore() );
-        super.setDescription( "General settings for the LDAP browser:" );
+        super.setDescription( Messages.getString("MainPreferencePage.GeneralSettings") ); //$NON-NLS-1$
     }
 
 
@@ -78,13 +79,13 @@
         BaseWidgetUtils.createSpacer( composite, 1 );
 
         Group group = BaseWidgetUtils.createGroup( BaseWidgetUtils.createColumnContainer( composite, 1, 1 ),
-            "JNDI LDAP context provider", 1 );
+            Messages.getString("MainPreferencePage.ContextProvider"), 1 ); //$NON-NLS-1$
 
         Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
         String ldapCtxFactory = preferences.getString( ConnectionCoreConstants.PREFERENCE_LDAP_CONTEXT_FACTORY );
         String defaultLdapCtxFactory = preferences
             .getDefaultString( ConnectionCoreConstants.PREFERENCE_LDAP_CONTEXT_FACTORY );
-        String note = "Note: The system detected '" + defaultLdapCtxFactory + "'.";
+        String note = NLS.bind(Messages.getString("MainPreferencePage.SystemDetectedContextFactory"), defaultLdapCtxFactory); //$NON-NLS-1$
 
         jndiLdapContextProvider = BaseWidgetUtils.createText( group, ldapCtxFactory, 1 );
         BaseWidgetUtils.createWrappedLabel( group, note, 1 );

Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/Messages.java?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/Messages.java (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/Messages.java Sat Feb  7 18:26:27 2009
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+
+package org.apache.directory.studio.ldapbrowser.common.dialogs.preferences;
+
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+public class Messages
+{
+    private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.messages"; //$NON-NLS-1$
+
+    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
+
+
+    private Messages()
+    {
+    }
+
+
+    public static String getString( String key )
+    {
+        try
+        {
+            return RESOURCE_BUNDLE.getString( key );
+        }
+        catch ( MissingResourceException e )
+        {
+            return '!' + key + '!';
+        }
+    }
+}

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java Sat Feb  7 18:26:27 2009
@@ -77,7 +77,7 @@
     protected void configureShell( Shell newShell )
     {
         super.configureShell( newShell );
-        newShell.setText( "Select Syntax OID" );
+        newShell.setText( Messages.getString("SyntaxDialog.SelectSyntaxOID") ); //$NON-NLS-1$
     }
 
 
@@ -99,7 +99,7 @@
         Composite composite = ( Composite ) super.createDialogArea( parent );
 
         Composite c = BaseWidgetUtils.createColumnContainer( composite, 2, 1 );
-        BaseWidgetUtils.createLabel( c, "Syntax OID:", 1 );
+        BaseWidgetUtils.createLabel( c, Messages.getString("SyntaxDialog.SyntaxOID"), 1 ); //$NON-NLS-1$
         oidCombo = BaseWidgetUtils.createCombo( c, syntaxOids, -1, 1 );
         if ( currentSyntax != null )
         {
@@ -119,7 +119,7 @@
 
     private void validate()
     {
-        getButton( IDialogConstants.OK_ID ).setEnabled( !"".equals( oidCombo.getText() ) );
+        getButton( IDialogConstants.OK_ID ).setEnabled( !"".equals( oidCombo.getText() ) ); //$NON-NLS-1$
     }
 
 

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=741930&r1=741929&r2=741930&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 Sat Feb  7 18:26:27 2009
@@ -100,7 +100,7 @@
     protected void configureShell( Shell newShell )
     {
         super.configureShell( newShell );
-        newShell.setText( "Attribute Value Editor" );
+        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, "Syntax OID:", 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, "Value Editor:", 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
@@ -160,7 +160,7 @@
     private void validate()
     {
         super.getButton( IDialogConstants.OK_ID ).setEnabled(
-            !"".equals( valueEditorCombo.getText() ) && !"".equals( oidCombo.getText() ) );
+            !"".equals( valueEditorCombo.getText() ) && !"".equals( oidCombo.getText() ) ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 

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=741930&r1=741929&r2=741930&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 Sat Feb  7 18:26:27 2009
@@ -63,16 +63,16 @@
 {
 
     /** The constant used to preselect the 'LDIF' tab */
-    public static final String LDIF_TAB = "LDIF";
+    public static final String LDIF_TAB = "LDIF"; //$NON-NLS-1$
 
     /** The constant used to preselect the 'CSV Export' tab */
-    public static final String CSV_TAB = "CSV";
+    public static final String CSV_TAB = "CSV"; //$NON-NLS-1$
 
     /** The constant used to preselect the 'Excel Export' tab */
-    public static final String XLS_TAB = "XLS";
+    public static final String XLS_TAB = "XLS"; //$NON-NLS-1$
 
     /** The constant used to preselect the 'CSV Copy' tab */
-    public static final String TABLE_TAB = "TABLE";
+    public static final String TABLE_TAB = "TABLE"; //$NON-NLS-1$
 
     private Preferences coreStore = BrowserCorePlugin.getDefault().getPluginPreferences();
 
@@ -124,9 +124,9 @@
      */
     public TextFormatsPreferencePage()
     {
-        super( "Text Formats" );
+        super( Messages.getString("TextFormatsPreferencePage.TextFormats") ); //$NON-NLS-1$
         super.setPreferenceStore( BrowserCommonActivator.getDefault().getPreferenceStore() );
-        super.setDescription( "Settings for text formats" );
+        super.setDescription( Messages.getString("TextFormatsPreferencePage.SettingsForTextFormats") ); //$NON-NLS-1$
     }
 
 
@@ -189,32 +189,32 @@
     private void createTableTab()
     {
         tableTab = new TabItem( tabFolder, SWT.NONE );
-        tableTab.setText( "CSV Copy" );
+        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, "Select CSV copy format options:", 3 );
+        BaseWidgetUtils.createLabel( tableInnerComposite, Messages.getString("TextFormatsPreferencePage.CSVCopyLabel"), 3 ); //$NON-NLS-1$
         BaseWidgetUtils.createSpacer( tableInnerComposite, 3 );
 
-        tableAttributeDelimiterWidget = new OptionsInput( "Attribute Delimiter", "Tabulator (\\t)", "\t", new String[]
-            { "Tabulator (\\t)", "Comma (,)", "Semikolon (;)" }, new String[]
-            { "\t", ",", ";" }, getPreferenceStore().getString(
+        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( "Value Delimiter", "Pipe (|)", "|", new String[]
-            { "Pipe (|)", "Comma (,)", "Semikolon (;)", "Newline (\\n)" }, new String[]
-            { "|", ",", ";", "\n" }, getPreferenceStore().getString(
+        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( "Quote Character", "Double Quote (\")", "\"", new String[]
-            { "Double Quote (\")", "Single Quote (')" }, new String[]
-            { "\"", "'" }, getPreferenceStore().getString(
+        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 );
@@ -231,7 +231,7 @@
 
         Composite copyTableHintComposite = BaseWidgetUtils.createColumnContainer( tableInnerComposite, 3, 3 );
         Text hintText = BaseWidgetUtils.createWrappedLabeledText( copyTableHintComposite,
-            "Hint: The default settings are suitable to paste the copied data into Excel or OpenOffice.", 1 );
+            Messages.getString("TextFormatsPreferencePage.CSVCopyHint"), 1 ); //$NON-NLS-1$
         GridData hintTextGridData = new GridData( SWT.FILL, SWT.NONE, true, false );
         hintTextGridData.widthHint = 300;
         hintText.setLayoutData( hintTextGridData );
@@ -243,32 +243,32 @@
     private void createCsvTab()
     {
         csvTab = new TabItem( tabFolder, SWT.NONE );
-        csvTab.setText( "CSV Export" );
+        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, "Select CSV export file format options:", 3 );
+        BaseWidgetUtils.createLabel( csvInnerComposite, Messages.getString("TextFormatsPreferencePage.CSVExportLabel"), 3 ); //$NON-NLS-1$
         BaseWidgetUtils.createSpacer( csvInnerComposite, 3 );
 
-        csvAttributeDelimiterWidget = new OptionsInput( "Attribute Delimiter", "Comma (,)", ",", new String[]
-            { "Comma (,)", "Semikolon (;)", "Tabulator (\\t)" }, new String[]
-            { ",", ";", "\t" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_ATTRIBUTEDELIMITER ),
+        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( "Value Delimiter", "Pipe (|)", "|", new String[]
-            { "Pipe (|)", "Comma (,)", "Semikolon (;)", "Newline (\\n)" }, new String[]
-            { "|", ",", ";", "\n" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_VALUEDELIMITER ),
+        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( "Quote Character", "Double Quote (\")", "\"", new String[]
-            { "Double Quote (\")", "Single Quote (')" }, new String[]
-            { "\"", "'" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_QUOTECHARACTER ), false,
+        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 );
@@ -295,18 +295,18 @@
     private void createXlsTab()
     {
         xlsTab = new TabItem( tabFolder, SWT.NONE );
-        xlsTab.setText( "Excel Export" );
+        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, "Select Excel export file format options:", 3 );
+        BaseWidgetUtils.createLabel( xlsInnerComposite, Messages.getString("TextFormatsPreferencePage.ExcelExportLabel"), 3 ); //$NON-NLS-1$
         BaseWidgetUtils.createSpacer( xlsInnerComposite, 3 );
 
-        xlsValueDelimiterWidget = new OptionsInput( "Value Delimiter", "Pipe (|)", "|", new String[]
-            { "Pipe (|)", "Comma (,)", "Semikolon (;)", "Newline (\\n)" }, new String[]
-            { "|", ",", ";", "\n" }, coreStore.getString( BrowserCoreConstants.PREFERENCE_FORMAT_XLS_VALUEDELIMITER ),
+        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 );
@@ -323,13 +323,13 @@
     private void createLdifTab()
     {
         ldifTab = new TabItem( tabFolder, SWT.NONE );
-        ldifTab.setText( "LDIF" );
+        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, "Select LDIF format options:", 1 );
+        BaseWidgetUtils.createLabel( ldifInnerComposite, Messages.getString("TextFormatsPreferencePage.LDIFLabel"), 1 ); //$NON-NLS-1$
         BaseWidgetUtils.createSpacer( ldifInnerComposite, 1 );
 
         ldifLineSeparator = new LineSeparatorInput( coreStore
@@ -340,27 +340,27 @@
         BaseWidgetUtils.createSpacer( ldifInnerComposite, 1 );
 
         Composite lineLengthComposite = BaseWidgetUtils.createColumnContainer( ldifInnerComposite, 3, 1 );
-        BaseWidgetUtils.createLabel( lineLengthComposite, "Line length:", 1 );
-        ldifLineLengthText = BaseWidgetUtils.createText( lineLengthComposite, "", 3, 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()
         {
             public void verifyText( VerifyEvent e )
             {
-                if ( !e.text.matches( "[0-9]*" ) )
+                if ( !e.text.matches( "[0-9]*" ) ) //$NON-NLS-1$
                 {
                     e.doit = false;
                 }
-                if ( "".equals( ldifLineLengthText.getText() ) && e.text.matches( "[0]" ) )
+                if ( "".equals( ldifLineLengthText.getText() ) && e.text.matches( "[0]" ) ) //$NON-NLS-1$ //$NON-NLS-2$
                 {
                     e.doit = false;
                 }
             }
         } );
         ldifLineLengthText.addModifyListener( this );
-        BaseWidgetUtils.createLabel( lineLengthComposite, "characters", 1 );
+        BaseWidgetUtils.createLabel( lineLengthComposite, Messages.getString("TextFormatsPreferencePage.LineLength2"), 1 ); //$NON-NLS-1$
 
-        ldifSpaceAfterColonButton = BaseWidgetUtils.createCheckbox( ldifInnerComposite, "Space after colon", 1 );
+        ldifSpaceAfterColonButton = BaseWidgetUtils.createCheckbox( ldifInnerComposite, Messages.getString("TextFormatsPreferencePage.SpaceAfterColon"), 1 ); //$NON-NLS-1$
         ldifSpaceAfterColonButton.setSelection( coreStore
             .getBoolean( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON ) );
 
@@ -471,20 +471,20 @@
 
     protected void validate()
     {
-        setValid( !"".equals( csvAttributeDelimiterWidget.getRawValue() )
-            && !"".equals( csvValueDelimiterWidget.getRawValue() ) && !"".equals( csvQuoteWidget.getRawValue() )
-            && !"".equals( csvLineSeparator.getRawValue() ) && !"".equals( csvBinaryEncodingWidget.getRawValue() )
-            && !"".equals( csvEncodingWidget.getRawValue() ) &&
-
-            !"".equals( tableAttributeDelimiterWidget.getRawValue() )
-            && !"".equals( tableValueDelimiterWidget.getRawValue() ) && !"".equals( tableQuoteWidget.getRawValue() )
-            && !"".equals( tableLineSeparator.getRawValue() ) && !"".equals( tableBinaryEncodingWidget.getRawValue() )
+        setValid( !"".equals( csvAttributeDelimiterWidget.getRawValue() ) //$NON-NLS-1$
+            && !"".equals( csvValueDelimiterWidget.getRawValue() ) && !"".equals( csvQuoteWidget.getRawValue() ) //$NON-NLS-1$ //$NON-NLS-2$
+            && !"".equals( csvLineSeparator.getRawValue() ) && !"".equals( csvBinaryEncodingWidget.getRawValue() ) //$NON-NLS-1$ //$NON-NLS-2$
+            && !"".equals( csvEncodingWidget.getRawValue() ) && //$NON-NLS-1$
+
+            !"".equals( tableAttributeDelimiterWidget.getRawValue() ) //$NON-NLS-1$
+            && !"".equals( tableValueDelimiterWidget.getRawValue() ) && !"".equals( tableQuoteWidget.getRawValue() ) //$NON-NLS-1$ //$NON-NLS-2$
+            && !"".equals( tableLineSeparator.getRawValue() ) && !"".equals( tableBinaryEncodingWidget.getRawValue() ) //$NON-NLS-1$ //$NON-NLS-2$
             &&
 
-            !"".equals( xlsValueDelimiterWidget.getRawValue() ) && !"".equals( xlsBinaryEncodingWidget.getRawValue() )
+            !"".equals( xlsValueDelimiterWidget.getRawValue() ) && !"".equals( xlsBinaryEncodingWidget.getRawValue() ) //$NON-NLS-1$ //$NON-NLS-2$
             &&
 
-            !"".equals( ldifLineLengthText.getText() ) && !"".equals( ldifLineSeparator.getRawValue() ) );
+            !"".equals( ldifLineLengthText.getText() ) && !"".equals( ldifLineSeparator.getRawValue() ) ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 }

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=741930&r1=741929&r2=741930&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 Sat Feb  7 18:26:27 2009
@@ -135,8 +135,8 @@
      */
     public ValueEditorsPreferencePage()
     {
-        super( "Value Editors" );
-        super.setDescription( "Specify value editors:" );
+        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,7 @@
 
     private void createAttributeContents( Composite parent )
     {
-        BaseWidgetUtils.createLabel( parent, "Value Editors by Attribute Types", 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 +293,17 @@
         attributeViewer = new TableViewer( table );
 
         TableColumn c1 = new TableColumn( table, SWT.NONE );
-        c1.setText( "Attribute" );
+        c1.setText( Messages.getString("ValueEditorsPreferencePage.Attribute") ); //$NON-NLS-1$
         c1.setWidth( 80 );
         TableColumn c2 = new TableColumn( table, SWT.NONE );
-        c2.setText( "Alias" );
+        c2.setText( Messages.getString("ValueEditorsPreferencePage.Alias") ); //$NON-NLS-1$
         c2.setWidth( 80 );
         TableColumn c3 = new TableColumn( table, SWT.NONE );
-        c3.setText( "Value Editor" );
+        c3.setText( Messages.getString("ValueEditorsPreferencePage.ValueEditor") ); //$NON-NLS-1$
         c3.setWidth( 200 );
 
         attributeViewer.setColumnProperties( new String[]
-            { "Attribute", "Value Editor" } );
+            { Messages.getString("ValueEditorsPreferencePage.Attribute"), Messages.getString("ValueEditorsPreferencePage.ValueEditor") } ); //$NON-NLS-1$ //$NON-NLS-2$
         attributeViewer.setContentProvider( new ArrayContentProvider() );
         attributeViewer.setLabelProvider( new AttributeLabelProvider() );
 
@@ -315,7 +315,7 @@
             }
         } );
 
-        attributeAddButton = BaseWidgetUtils.createButton( buttonComposite, "Add...", 1 );
+        attributeAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Add"), 1 ); //$NON-NLS-1$
         attributeAddButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -323,7 +323,7 @@
                 addAttribute();
             }
         } );
-        attributeEditButton = BaseWidgetUtils.createButton( buttonComposite, "Edit...", 1 );
+        attributeEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Edit"), 1 ); //$NON-NLS-1$
         attributeEditButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -331,7 +331,7 @@
                 editAttribute();
             }
         } );
-        attributeRemoveButton = BaseWidgetUtils.createButton( buttonComposite, "Remove", 1 );
+        attributeRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Remove"), 1 ); //$NON-NLS-1$
         attributeRemoveButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -344,7 +344,7 @@
 
     private void createSyntaxContents( Composite parent )
     {
-        BaseWidgetUtils.createLabel( parent, "Value Editors by Syntax", 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 +363,17 @@
         syntaxViewer = new TableViewer( table );
 
         TableColumn c1 = new TableColumn( table, SWT.NONE );
-        c1.setText( "Syntax" );
+        c1.setText( Messages.getString("ValueEditorsPreferencePage.Syntax") ); //$NON-NLS-1$
         c1.setWidth( 80 );
         TableColumn c2 = new TableColumn( table, SWT.NONE );
-        c2.setText( "Desc" );
+        c2.setText( Messages.getString("ValueEditorsPreferencePage.Description") ); //$NON-NLS-1$
         c2.setWidth( 80 );
         TableColumn c3 = new TableColumn( table, SWT.NONE );
-        c3.setText( "Value Editor" );
+        c3.setText( Messages.getString("ValueEditorsPreferencePage.ValueEditor") ); //$NON-NLS-1$
         c3.setWidth( 200 );
 
         syntaxViewer.setColumnProperties( new String[]
-            { "Syntax", "Value Editor" } );
+            { Messages.getString("ValueEditorsPreferencePage.Syntax"), Messages.getString("ValueEditorsPreferencePage.ValueEditor") } ); //$NON-NLS-1$ //$NON-NLS-2$
         syntaxViewer.setContentProvider( new ArrayContentProvider() );
         syntaxViewer.setLabelProvider( new SyntaxLabelProvider() );
 
@@ -385,7 +385,7 @@
             }
         } );
 
-        syntaxAddButton = BaseWidgetUtils.createButton( buttonComposite, "Add...", 1 );
+        syntaxAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Add"), 1 ); //$NON-NLS-1$
         syntaxAddButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -393,7 +393,7 @@
                 addSyntax();
             }
         } );
-        syntaxEditButton = BaseWidgetUtils.createButton( buttonComposite, "Edit...", 1 );
+        syntaxEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Edit"), 1 ); //$NON-NLS-1$
         syntaxEditButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -401,7 +401,7 @@
                 editSyntax();
             }
         } );
-        syntaxRemoveButton = BaseWidgetUtils.createButton( buttonComposite, "Remove", 1 );
+        syntaxRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages.getString("ValueEditorsPreferencePage.Remove"), 1 ); //$NON-NLS-1$
         syntaxRemoveButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -546,7 +546,7 @@
                             {
                                 if ( !relation.getAttributeNumericOidOrType().equals( name ) )
                                 {
-                                    s += ", " + name;
+                                    s += ", " + name; //$NON-NLS-1$
                                 }
                             }
                             return s;

Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties Sat Feb  7 18:26:27 2009
@@ -0,0 +1,124 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+AttributeDialog.AttributeTypeOrOID=Attribute Type or OID:
+AttributeDialog.SelectAttributeTypeOrOID=Select Attribute Type or OID
+AttributesPreferencePage.Attributes=Attributes
+AttributesPreferencePage.GeneralSettings=General settings for attributes:
+AttributesPreferencePage.ShowDecoratedValues=Show decorated values
+AttributeValueEditorDialog.AttributeTypeOrOID=Attribute Type or OID:
+AttributeValueEditorDialog.AttributeValueEditor=Attribute Value Editor
+AttributeValueEditorDialog.ValueEditor=Value Editor:
+BinaryAttributesAndSyntaxesPreferencePage.Add=Add...
+BinaryAttributesAndSyntaxesPreferencePage.Alias=Alias
+BinaryAttributesAndSyntaxesPreferencePage.Attribute=Attribute
+BinaryAttributesAndSyntaxesPreferencePage.BinaryAttributes=Binary Attributes
+BinaryAttributesAndSyntaxesPreferencePage.BinaryAttributesDescription=Specify attributes and syntaxes to handle as binary:
+BinaryAttributesAndSyntaxesPreferencePage.BinarySyntaxes=Binary Syntax Definitions
+BinaryAttributesAndSyntaxesPreferencePage.Desc=Desc
+BinaryAttributesAndSyntaxesPreferencePage.Edit=Edit...
+BinaryAttributesAndSyntaxesPreferencePage.Remove=Remove
+BinaryAttributesAndSyntaxesPreferencePage.Syntax=Syntax
+BrowserPreferencePage.Browser=Browser
+BrowserPreferencePage.CheckForChildren=Check for children
+BrowserPreferencePage.DN=DN
+BrowserPreferencePage.EnableFolding=Enable folding
+BrowserPreferencePage.EntryLabel=Entry label
+BrowserPreferencePage.ExpandBaseEntries=Expand base entries when opening connection
+BrowserPreferencePage.Folding=Folding
+BrowserPreferencePage.FoldingSize=Folding size: 
+BrowserPreferencePage.GeneralSettings=General settings for the LDAP browser view:
+BrowserPreferencePage.LimitLabelLength1=Limit label length to 
+BrowserPreferencePage.LimitLabelLength2=\ characters
+BrowserPreferencePage.RDN=RDN
+BrowserPreferencePage.RDNValue=RDN value
+BrowserPreferencePage.SearchResultLabel=Search result label
+BrowserPreferencePage.UseAsEntryLabel1=Use 
+BrowserPreferencePage.UseAsEntryLabel2=\ as entry label
+BrowserPreferencePage.UseAsSearchResultLabel1=Use 
+BrowserPreferencePage.UseAsSearchResultLabel2=\ as search result label
+ColorsAndFontsPreferencePage.AttributeColorsAndFonts=Attribute Colors and Fonts
+ColorsAndFontsPreferencePage.Bold=Bold
+ColorsAndFontsPreferencePage.colorsAndFonts=Colors and Fonts
+ColorsAndFontsPreferencePage.colorsAndFontsDescription=Color and Font settings for the LDAP browser:
+ColorsAndFontsPreferencePage.Errors=Errors:
+ColorsAndFontsPreferencePage.Italic=Italic
+ColorsAndFontsPreferencePage.MayAttributes=May attributes:
+ColorsAndFontsPreferencePage.MustAttributes=Must attributes:
+ColorsAndFontsPreferencePage.ObjectClassAttribute=Objectclass attribute:
+ColorsAndFontsPreferencePage.OperationalAttributes=Operational attributes:
+ColorsAndFontsPreferencePage.QuickFilter=Quick Filter
+ColorsAndFontsPreferencePage.QuickFilterBackground=Quick Filter Background
+ColorsAndFontsPreferencePage.QuickFilterColorsAndFonts=Quick Filter Colors and Fonts
+ColorsAndFontsPreferencePage.WaringAndErrorColorsAndFonts=Warning and Error Colors and Fonts
+ColorsAndFontsPreferencePage.Warnings=Warnings:
+EntryEditorPreferencePage.AutoExpandFoldedAttributes=Auto-expand folded attributes
+EntryEditorPreferencePage.EnableFolding=Enable folding
+EntryEditorPreferencePage.EntryEditor=Entry Editor
+EntryEditorPreferencePage.Folding=Folding
+EntryEditorPreferencePage.FoldingThreshold=Folding threshold: 
+EntryEditorPreferencePage.FoldingToolTip=If an attribute has more than the specified number of values it will be folded to one line. You may expand and collapse the values.
+EntryEditorPreferencePage.GeneralSettings=General settings for the LDAP entry editor:
+EntryEditorPreferencePage.ShowMayAttributes=Show may attributes
+EntryEditorPreferencePage.ShowMustAttributes=Show must attributes
+EntryEditorPreferencePage.ShowObjectClassAttributes=Show objectClass attribute
+EntryEditorPreferencePage.ShowOperationalAttributes=Show operational attributes
+EntryEditorPreferencePage.VisibleAttributes=Visible Attributes
+MainPreferencePage.ContextProvider=JNDI LDAP context provider
+MainPreferencePage.GeneralSettings=General settings for the LDAP browser:
+MainPreferencePage.LDAP=LDAP
+MainPreferencePage.SystemDetectedContextFactory=Note: The system detected '{0}'.
+SyntaxDialog.SelectSyntaxOID=Select Syntax OID
+SyntaxDialog.SyntaxOID=Syntax OID:
+SyntaxValueEditorDialog.AttributeValueEditor=Attribute Value Editor
+SyntaxValueEditorDialog.SyntaxOID=Syntax OID:
+SyntaxValueEditorDialog.ValueEditor=Value Editor:
+TextFormatsPreferencePage.AttributeDelimiter=Attribute Delimiter
+TextFormatsPreferencePage.Comma=Comma (,)
+TextFormatsPreferencePage.CSVCopy=CSV Copy
+TextFormatsPreferencePage.CSVCopyHint=Hint: The default settings are suitable to paste the copied data into Excel or OpenOffice.
+TextFormatsPreferencePage.CSVCopyLabel=Select CSV copy format options:
+TextFormatsPreferencePage.CSVExport=CSV Export
+TextFormatsPreferencePage.CSVExportLabel=Select CSV export file format options:
+TextFormatsPreferencePage.DoubleQuote=Double Quote (")
+TextFormatsPreferencePage.ExcelExport=Excel Export
+TextFormatsPreferencePage.ExcelExportLabel=Select Excel export file format options:
+TextFormatsPreferencePage.LDIF=LDIF
+TextFormatsPreferencePage.LDIFLabel=Select LDIF format options:
+TextFormatsPreferencePage.LineLength1=Line length:
+TextFormatsPreferencePage.LineLength2=characters
+TextFormatsPreferencePage.Newline=Newline (\\n)
+TextFormatsPreferencePage.Pipe=Pipe (|)
+TextFormatsPreferencePage.QuoteCharacter=Quote Character
+TextFormatsPreferencePage.Semicolon=Semicolon (;)
+TextFormatsPreferencePage.SettingsForTextFormats=Settings for text formats
+TextFormatsPreferencePage.SingleQuote=Single Quote (')
+TextFormatsPreferencePage.SpaceAfterColon=Space after colon
+TextFormatsPreferencePage.Tabulator=Tabulator (\\t)
+TextFormatsPreferencePage.TextFormats=Text Formats
+TextFormatsPreferencePage.ValueDelimiter=Value Delimiter
+ValueEditorsPreferencePage.Add=Add...
+ValueEditorsPreferencePage.Alias=Alias
+ValueEditorsPreferencePage.Attribute=Attribute
+ValueEditorsPreferencePage.Description=Desc
+ValueEditorsPreferencePage.Edit=Edit...
+ValueEditorsPreferencePage.Remove=Remove
+ValueEditorsPreferencePage.SpecifyValueEditors=Specify value editors:
+ValueEditorsPreferencePage.Syntax=Syntax
+ValueEditorsPreferencePage.ValueEditor=Value Editor
+ValueEditorsPreferencePage.ValueEditorBySyntax=Value Editors by Syntax
+ValueEditorsPreferencePage.ValueEditors=Value Editors
+ValueEditorsPreferencePage.ValueEditorsByAttributeType=Value Editors by Attribute Types

Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties Sat Feb  7 18:26:27 2009
@@ -0,0 +1,124 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+AttributeDialog.AttributeTypeOrOID=Attribut Typ oder OID:
+AttributeDialog.SelectAttributeTypeOrOID=Attribut Typ oder OID auswählen
+AttributesPreferencePage.Attributes=Attribute
+AttributesPreferencePage.GeneralSettings=Allgemeine Einstellungen für Attribute:
+AttributesPreferencePage.ShowDecoratedValues=Dekorierte Werte anzeigen
+AttributeValueEditorDialog.AttributeTypeOrOID=Attribut Typ oder OID:
+AttributeValueEditorDialog.AttributeValueEditor=Attribut Wert Editor
+AttributeValueEditorDialog.ValueEditor=Wert Editor:
+BinaryAttributesAndSyntaxesPreferencePage.Add=Hinzufügen...
+BinaryAttributesAndSyntaxesPreferencePage.Alias=Alias
+BinaryAttributesAndSyntaxesPreferencePage.Attribute=Attribut
+BinaryAttributesAndSyntaxesPreferencePage.BinaryAttributes=Binäre Attribute
+BinaryAttributesAndSyntaxesPreferencePage.BinaryAttributesDescription=Attribute, die als binär behandelt werden sollen:
+BinaryAttributesAndSyntaxesPreferencePage.BinarySyntaxes=Binäre Syntax Definitionen
+BinaryAttributesAndSyntaxesPreferencePage.Desc=Desc
+BinaryAttributesAndSyntaxesPreferencePage.Edit=Bearbeiten...
+BinaryAttributesAndSyntaxesPreferencePage.Remove=Entfernen
+BinaryAttributesAndSyntaxesPreferencePage.Syntax=Syntax
+BrowserPreferencePage.Browser=Browser
+BrowserPreferencePage.CheckForChildren=Nach Kind-Einträgen prüfen
+BrowserPreferencePage.DN=DN
+BrowserPreferencePage.EnableFolding=Faltung aktivieren
+BrowserPreferencePage.EntryLabel=Eintrags Beschriftung
+BrowserPreferencePage.ExpandBaseEntries=Basis-Einträge beim öffnen der Verbindung aufklappen
+BrowserPreferencePage.Folding=Falten
+BrowserPreferencePage.FoldingSize=Faltgröße: 
+BrowserPreferencePage.GeneralSettings=Allgemeine Einstellungen für den LDAP Browser:
+BrowserPreferencePage.LimitLabelLength1=Max. Länge der Beschriftung: 
+BrowserPreferencePage.LimitLabelLength2=\ Zeichen
+BrowserPreferencePage.RDN=RDN
+BrowserPreferencePage.RDNValue=RDN Wert
+BrowserPreferencePage.SearchResultLabel=Suchergebnisbeschriftung
+BrowserPreferencePage.UseAsEntryLabel1=Benutze
+BrowserPreferencePage.UseAsEntryLabel2=\ als Eintragsbeschriftung
+BrowserPreferencePage.UseAsSearchResultLabel1=Benutze 
+BrowserPreferencePage.UseAsSearchResultLabel2=\ als Suchergebnisbeschriftung
+ColorsAndFontsPreferencePage.AttributeColorsAndFonts=Attribut Farben und Schriften
+ColorsAndFontsPreferencePage.Bold=Fett
+ColorsAndFontsPreferencePage.colorsAndFonts=Farben und Schriften
+ColorsAndFontsPreferencePage.colorsAndFontsDescription=Farb- und Schrifteinstellungen für den LDAP Browser:
+ColorsAndFontsPreferencePage.Errors=Fehler:
+ColorsAndFontsPreferencePage.Italic=Kursiv
+ColorsAndFontsPreferencePage.MayAttributes=Optionale Attribute:
+ColorsAndFontsPreferencePage.MustAttributes=Pflichtattribute:
+ColorsAndFontsPreferencePage.ObjectClassAttribute=Objektklassen Attribut:
+ColorsAndFontsPreferencePage.OperationalAttributes=Operationale Attribute:
+ColorsAndFontsPreferencePage.QuickFilter=Schnell-Filter
+ColorsAndFontsPreferencePage.QuickFilterBackground=Schnell-Filter Hintergrund
+ColorsAndFontsPreferencePage.QuickFilterColorsAndFonts=Schnell-Filter Farben und Schriften
+ColorsAndFontsPreferencePage.WaringAndErrorColorsAndFonts=Warnung und Fehler Farben und Schriften
+ColorsAndFontsPreferencePage.Warnings=Warnungen:
+EntryEditorPreferencePage.AutoExpandFoldedAttributes=Gefaltete Attribute automatisch aufklappen
+EntryEditorPreferencePage.EnableFolding=Falten aktivieren
+EntryEditorPreferencePage.EntryEditor=Eintrags-Editor
+EntryEditorPreferencePage.Folding=Falten
+EntryEditorPreferencePage.FoldingThreshold=Faltgrenze: 
+EntryEditorPreferencePage.FoldingToolTip=Wenn ein Attribut mehr Werte als die angegebenen Grenze hat, wird es gefaltet dargestellt. Die Werte können auf- und zugeklappt werden.
+EntryEditorPreferencePage.GeneralSettings=Allgemeine Einstellungen für den Eintrags-Editor
+EntryEditorPreferencePage.ShowMayAttributes=Optionale Attribute anzeigen
+EntryEditorPreferencePage.ShowMustAttributes=Pflichattribute anzeigen
+EntryEditorPreferencePage.ShowObjectClassAttributes=Objektklassen anzeigen
+EntryEditorPreferencePage.ShowOperationalAttributes=Operationale Attribute anzeigen
+EntryEditorPreferencePage.VisibleAttributes=Sichtbare Attribute
+MainPreferencePage.ContextProvider=JNDI LDAP Context Provider
+MainPreferencePage.GeneralSettings=Allgemeine Einstellungen für den LDAP Browser:
+MainPreferencePage.LDAP=LDAP
+MainPreferencePage.SystemDetectedContextFactory=Hinweis: Das System hat '{0}' ermittelt.
+SyntaxDialog.SelectSyntaxOID=Syntax OID auswählen
+SyntaxDialog.SyntaxOID=Syntax OID:
+SyntaxValueEditorDialog.AttributeValueEditor=Attribut Wert Editor
+SyntaxValueEditorDialog.SyntaxOID=Syntax OID:
+SyntaxValueEditorDialog.ValueEditor=Wert Editor:
+TextFormatsPreferencePage.AttributeDelimiter=Attribut Trennzeichen
+TextFormatsPreferencePage.Comma=Komma (,)
+TextFormatsPreferencePage.CSVCopy=CSV kopieren
+TextFormatsPreferencePage.CSVCopyHint=Hinweis: Die Standardeinstellungen passen, um kopierte Daten in Excel oder OpenOffice einzufügen.
+TextFormatsPreferencePage.CSVCopyLabel=CSV Kopierformat:
+TextFormatsPreferencePage.CSVExport=CSV Export
+TextFormatsPreferencePage.CSVExportLabel=CSV Exportformat:
+TextFormatsPreferencePage.DoubleQuote=Doppelte Anführungszeichen (")
+TextFormatsPreferencePage.ExcelExport=Excel Export
+TextFormatsPreferencePage.ExcelExportLabel=Excel Exportformat:
+TextFormatsPreferencePage.LDIF=LDIF
+TextFormatsPreferencePage.LDIFLabel=LDIF Format:
+TextFormatsPreferencePage.LineLength1=Zeilenlänge:
+TextFormatsPreferencePage.LineLength2=Zeichen
+TextFormatsPreferencePage.Newline=Zeilenumbruch (\\n)
+TextFormatsPreferencePage.Pipe=Pipe (|)
+TextFormatsPreferencePage.QuoteCharacter=Quotierungszeichen
+TextFormatsPreferencePage.Semicolon=Semikolon (;)
+TextFormatsPreferencePage.SettingsForTextFormats=Einstellungen für Textformate
+TextFormatsPreferencePage.SingleQuote=Einfaches Anführungszeichen (')
+TextFormatsPreferencePage.SpaceAfterColon=Leerzeichen nach Doppelpunkt
+TextFormatsPreferencePage.Tabulator=Tabulator (\\t)
+TextFormatsPreferencePage.TextFormats=Textformate
+TextFormatsPreferencePage.ValueDelimiter=Wert Trennzeichen
+ValueEditorsPreferencePage.Add=Hinzufügen...
+ValueEditorsPreferencePage.Alias=Alias
+ValueEditorsPreferencePage.Attribute=Attribut
+ValueEditorsPreferencePage.Description=Desc
+ValueEditorsPreferencePage.Edit=Bearbeiten...
+ValueEditorsPreferencePage.Remove=Entfernen
+ValueEditorsPreferencePage.SpecifyValueEditors=Wert Editoren angeben:
+ValueEditorsPreferencePage.Syntax=Syntax
+ValueEditorsPreferencePage.ValueEditor=Wert Editor
+ValueEditorsPreferencePage.ValueEditorBySyntax=Wert Editoren nach Syntax
+ValueEditorsPreferencePage.ValueEditors=Wert Editoren
+ValueEditorsPreferencePage.ValueEditorsByAttributeType=Wert Editoren nach Attributtyp

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java Sat Feb  7 18:26:27 2009
@@ -105,10 +105,10 @@
 
                 for ( int i = 0; i < entries.length; i++ )
                 {
-                    byte[] connectionId = entries[i].getBrowserConnection().getConnection().getId().getBytes( "UTF-8" );
+                    byte[] connectionId = entries[i].getBrowserConnection().getConnection().getId().getBytes( "UTF-8" ); //$NON-NLS-1$
                     writeOut.writeInt( connectionId.length );
                     writeOut.write( connectionId );
-                    byte[] dn = entries[i].getDn().getUpName().getBytes( "UTF-8" );
+                    byte[] dn = entries[i].getDn().getUpName().getBytes( "UTF-8" ); //$NON-NLS-1$
                     writeOut.writeInt( dn.length );
                     writeOut.write( dn );
                 }
@@ -162,7 +162,7 @@
                             byte[] connectionId = new byte[size];
                             readIn.read( connectionId );
                             connection = BrowserCorePlugin.getDefault().getConnectionManager()
-                                .getBrowserConnectionById( new String( connectionId, "UTF-8" ) );
+                                .getBrowserConnectionById( new String( connectionId, "UTF-8" ) ); //$NON-NLS-1$
                         }
 
                         IEntry entry = null;
@@ -171,7 +171,7 @@
                             int size = readIn.readInt();
                             byte[] dn = new byte[size];
                             readIn.read( dn );
-                            entry = connection.getEntryFromCache( new LdapDN( new String( dn, "UTF-8" ) ) );
+                            entry = connection.getEntryFromCache( new LdapDN( new String( dn, "UTF-8" ) ) ); //$NON-NLS-1$
                         }
                         else
                         {

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=741930&r1=741929&r2=741930&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 Sat Feb  7 18:26:27 2009
@@ -103,10 +103,10 @@
 
                 for ( int i = 0; i < searches.length; i++ )
                 {
-                    byte[] connectionId = searches[i].getBrowserConnection().getConnection().getId().getBytes( "UTF-8" );
+                    byte[] connectionId = searches[i].getBrowserConnection().getConnection().getId().getBytes( "UTF-8" ); //$NON-NLS-1$
                     writeOut.writeInt( connectionId.length );
                     writeOut.write( connectionId );
-                    byte[] searchName = searches[i].getName().getBytes( "UTF-8" );
+                    byte[] searchName = searches[i].getName().getBytes( "UTF-8" ); //$NON-NLS-1$
                     writeOut.writeInt( searchName.length );
                     writeOut.write( searchName );
                 }
@@ -160,7 +160,7 @@
                             byte[] connectionId = new byte[size];
                             readIn.read( connectionId );
                             connection = BrowserCorePlugin.getDefault().getConnectionManager().getBrowserConnectionById(
-                                new String( connectionId, "UTF-8" ) );
+                                new String( connectionId, "UTF-8" ) ); //$NON-NLS-1$
                         }
 
                         ISearch search = null;
@@ -169,7 +169,7 @@
                             int size = readIn.readInt();
                             byte[] searchName = new byte[size];
                             readIn.read( searchName );
-                            search = connection.getSearchManager().getSearch( new String( searchName, "UTF-8" ) );
+                            search = connection.getSearchManager().getSearch( new String( searchName, "UTF-8" ) ); //$NON-NLS-1$
                         }
                         else
                         {

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java Sat Feb  7 18:26:27 2009
@@ -105,18 +105,18 @@
                 for ( int i = 0; i < values.length; i++ )
                 {
                     byte[] connectionId = values[i].getAttribute().getEntry().getBrowserConnection().getConnection()
-                        .getId().getBytes( "UTF-8" );
+                        .getId().getBytes( "UTF-8" ); //$NON-NLS-1$
                     writeOut.writeInt( connectionId.length );
                     writeOut.write( connectionId );
-                    byte[] dn = values[i].getAttribute().getEntry().getDn().getUpName().getBytes( "UTF-8" );
+                    byte[] dn = values[i].getAttribute().getEntry().getDn().getUpName().getBytes( "UTF-8" ); //$NON-NLS-1$
                     writeOut.writeInt( dn.length );
                     writeOut.write( dn );
-                    byte[] attributeName = values[i].getAttribute().getDescription().getBytes( "UTF-8" );
+                    byte[] attributeName = values[i].getAttribute().getDescription().getBytes( "UTF-8" ); //$NON-NLS-1$
                     writeOut.writeInt( attributeName.length );
                     writeOut.write( attributeName );
                     if ( values[i].isString() )
                     {
-                        byte[] value = values[i].getStringValue().getBytes( "UTF-8" );
+                        byte[] value = values[i].getStringValue().getBytes( "UTF-8" ); //$NON-NLS-1$
                         writeOut.writeBoolean( true );
                         writeOut.writeInt( value.length );
                         writeOut.write( value );
@@ -177,7 +177,7 @@
                             byte[] connectionId = new byte[size];
                             readIn.read( connectionId );
                             connection = BrowserCorePlugin.getDefault().getConnectionManager()
-                                .getBrowserConnectionById( new String( connectionId, "UTF-8" ) );
+                                .getBrowserConnectionById( new String( connectionId, "UTF-8" ) ); //$NON-NLS-1$
                         }
 
                         IEntry entry = null;
@@ -186,7 +186,7 @@
                             int size = readIn.readInt();
                             byte[] dn = new byte[size];
                             readIn.read( dn );
-                            entry = connection.getEntryFromCache( new LdapDN( new String( dn, "UTF-8" ) ) );
+                            entry = connection.getEntryFromCache( new LdapDN( new String( dn, "UTF-8" ) ) ); //$NON-NLS-1$
                         }
                         else
                         {
@@ -199,7 +199,7 @@
                             int size = readIn.readInt();
                             byte[] attributeName = new byte[size];
                             readIn.read( attributeName );
-                            attribute = entry.getAttribute( new String( attributeName, "UTF-8" ) );
+                            attribute = entry.getAttribute( new String( attributeName, "UTF-8" ) ); //$NON-NLS-1$
                         }
                         else
                         {
@@ -213,7 +213,7 @@
                             int size = readIn.readInt();
                             byte[] val = new byte[size];
                             readIn.read( val );
-                            String test = new String( val, "UTF-8" );
+                            String test = new String( val, "UTF-8" ); //$NON-NLS-1$
 
                             IValue[] values = attribute.getValues();
                             for ( int i = 0; i < values.length; i++ )

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=741930&r1=741929&r2=741930&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 Sat Feb  7 18:26:27 2009
@@ -44,7 +44,7 @@
 {
 
     /** The Constant INDENT_STRING. */
-    public static final String INDENT_STRING = "    ";
+    public static final String INDENT_STRING = "    "; //$NON-NLS-1$
 
     /** The filter parser. */
     private LdapFilterParser parser;
@@ -106,7 +106,7 @@
             }
         }
 
-        if ( aep.length > 0 && ( aep.text == null || "".equals( aep.text ) ) )
+        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 
@@ -137,15 +137,15 @@
             
         }
 
-        if ( (aep.length == 0 || aep.length==currentFilter.length()) && aep.text != null && !"".equals( aep.text ) )
+        if ( (aep.length == 0 || aep.length==currentFilter.length()) && aep.text != null && !"".equals( aep.text ) ) //$NON-NLS-1$
         {
-            boolean isNewFilter = aep.text.equals( "(" );
-            boolean isNewNestedFilter = aep.text.equals( "&" ) || aep.text.equals( "|" ) || aep.text.equals( "!" );
+            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$
             boolean isSurroundNew = false;
             boolean isSurroundNested = false;
             boolean isSurroundBeforeOtherFilter = false;
             boolean isSurroundAfterOtherFilter = false;
-            if( !Character.isWhitespace( aep.text.charAt( 0 ) ) && !aep.text.startsWith( "(" ) && !aep.text.endsWith( ")" ) )
+            if( !Character.isWhitespace( aep.text.charAt( 0 ) ) && !aep.text.startsWith( "(" ) && !aep.text.endsWith( ")" ) ) //$NON-NLS-1$ //$NON-NLS-2$
             {
                 // isSurroundNew
                 isSurroundNew = aep.offset == 0;
@@ -209,7 +209,7 @@
             // add opening parenthesis '('
             if ( isSurroundNew || isSurroundNested || isSurroundAfterOtherFilter || isSurroundBeforeOtherFilter )
             {
-                aep.text = "(" + aep.text;
+                aep.text = "(" + aep.text; //$NON-NLS-1$
                 aep.caretOffset = aep.offset + aep.text.length();
                 aep.shiftsCaret = false;
             }
@@ -217,7 +217,7 @@
             // add parenthesis for nested filters
             if ( isNewNestedFilter )
             {
-                aep.text = aep.text + "()";
+                aep.text = aep.text + "()"; //$NON-NLS-1$
                 aep.caretOffset = aep.offset + aep.text.length() - 1;
                 aep.shiftsCaret = false;
             }
@@ -228,7 +228,7 @@
             {
                 if ( balanced == 0 )
                 {
-                    aep.text = aep.text + ")";
+                    aep.text = aep.text + ")"; //$NON-NLS-1$
                     if( aep.caretOffset == -1 )
                     {
                         aep.caretOffset = aep.offset + aep.text.length() - 1;
@@ -238,7 +238,7 @@
             }
             
             // translate tab to IDENT_STRING
-            if ( aep.text.equals( "\t" ) )
+            if ( aep.text.equals( "\t" ) ) //$NON-NLS-1$
             {
                 aep.text = INDENT_STRING;
             }

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=741930&r1=741929&r2=741930&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 Sat Feb  7 18:26:27 2009
@@ -74,11 +74,11 @@
     {
         public int compare( String s1, String s2 )
         {
-            if ( s1.matches( "[0-9\\.]+" ) && !s2.matches( "[0-9\\.]+" ) )
+            if ( s1.matches( "[0-9\\.]+" ) && !s2.matches( "[0-9\\.]+" ) ) //$NON-NLS-1$ //$NON-NLS-2$
             {
                 return 1;
             }
-            else if ( !s1.matches( "[0-9\\.]+" ) && s2.matches( "[0-9\\.]+" ) )
+            else if ( !s1.matches( "[0-9\\.]+" ) && s2.matches( "[0-9\\.]+" ) ) //$NON-NLS-1$ //$NON-NLS-2$
             {
                 return -1;
             }
@@ -186,11 +186,11 @@
                 }
             }
 
-            possibleFilterTypes.put( "=", "= (equals)" );
-            possibleFilterTypes.put( "=*", "=* (present)" );
-            possibleFilterTypes.put( "<=", "<= (less than or equals)" );
-            possibleFilterTypes.put( ">=", ">= (greater than or equals)" );
-            possibleFilterTypes.put( "~=", "~= (approximately)" );
+            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 )
@@ -313,7 +313,7 @@
                         proposalList.addAll( Arrays.asList( templateProposals ) );
                     }
                 }
-                addPossibleAttributeTypes( proposalList, "", offset );
+                addPossibleAttributeTypes( proposalList, "", offset ); //$NON-NLS-1$
             }
 
             // case A: simple filter
@@ -343,7 +343,7 @@
                             + ( fc.getFilterToken() != null ? fc.getFilterToken().getLength() : 0 ) )
                     {
                         //String attributeType = fc.getAttributeToken().getValue();
-                        String filterType = fc.getFilterToken() != null ? fc.getFilterToken().getValue() : "";
+                        String filterType = fc.getFilterToken() != null ? fc.getFilterToken().getValue() : ""; //$NON-NLS-1$
                         int filterTypeOffset = fc.getAttributeToken().getOffset() + fc.getAttributeToken().getLength();
                         addPossibleFilterTypes( proposalList, attributeType, filterType, filterTypeOffset );
                     }
@@ -358,7 +358,7 @@
                             + ( fc.getFilterToken() != null ? fc.getFilterToken().getLength() : 0 )
                             + ( fc.getValueToken() != null ? fc.getValueToken().getLength() : 0 ) )
                     {
-                        addPossibleObjectClasses( proposalList, fc.getValueToken() == null ? "" : fc.getValueToken()
+                        addPossibleObjectClasses( proposalList, fc.getValueToken() == null ? "" : fc.getValueToken() //$NON-NLS-1$
                             .getValue(), fc.getValueToken() == null ? offset : fc.getValueToken().getOffset() );
                     }
                 }
@@ -394,9 +394,9 @@
                 {
                     if ( fc.getDnAttrColonToken() == null )
                     {
-                        addDnAttr( proposalList, "", offset );
+                        addDnAttr( proposalList, "", offset ); //$NON-NLS-1$
                     }
-                    addPossibleMatchingRules( proposalList, "", offset, fc.getEqualsColonToken(), fc.getEqualsToken() );
+                    addPossibleMatchingRules( proposalList, "", offset, fc.getEqualsColonToken(), fc.getEqualsToken() ); //$NON-NLS-1$
                 }
                 if ( fc.getMatchingRuleToken() != null && fc.getMatchingRuleToken().getOffset() <= offset
                     && offset <= fc.getMatchingRuleToken().getOffset() + fc.getMatchingRuleToken().getLength() )
@@ -438,11 +438,11 @@
                     String displayString = possibleAttributeType;
                     if ( displayString.equals( description.getNumericOid() ) )
                     {
-                        displayString += " (" + SchemaUtils.toString( description ) + ")";
+                        displayString += " (" + SchemaUtils.toString( description ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                     }
                     else
                     {
-                        displayString += " (" + description.getNumericOid() + ")";
+                        displayString += " (" + description.getNumericOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                     }
                     String info = SchemaUtils.getLdifLine( description );
                     ICompletionProposal proposal = new CompletionProposal( replacementString, offset, attributeType
@@ -470,14 +470,14 @@
             if ( SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( schema
                 .getAttributeTypeDescription( attributeType ), schema ) == null )
             {
-                copy.remove( "=" );
-                copy.remove( "~=" );
+                copy.remove( "=" ); //$NON-NLS-1$
+                copy.remove( "~=" ); //$NON-NLS-1$
             }
             if ( SchemaUtils.getOrderingMatchingRuleNameOrNumericOidTransitive( schema
                 .getAttributeTypeDescription( attributeType ), schema ) == null )
             {
-                copy.remove( "<=" );
-                copy.remove( ">=" );
+                copy.remove( "<=" ); //$NON-NLS-1$
+                copy.remove( ">=" ); //$NON-NLS-1$
             }
 
             for ( String possibleFilterType : copy.keySet() )
@@ -513,11 +513,11 @@
                     String displayString = possibleObjectClass;
                     if ( displayString.equals( description.getNumericOid() ) )
                     {
-                        displayString += " (" + SchemaUtils.toString( description ) + ")";
+                        displayString += " (" + SchemaUtils.toString( description ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                     }
                     else
                     {
-                        displayString += " (" + description.getNumericOid() + ")";
+                        displayString += " (" + description.getNumericOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                     }
 
                     ICompletionProposal proposal = new CompletionProposal( replacementString, offset, objectClass
@@ -550,20 +550,20 @@
                     String replacementString = possibleMatchingRule;
                     if ( equalsColonToken == null )
                     {
-                        replacementString += ":";
+                        replacementString += ":"; //$NON-NLS-1$
                     }
                     if ( equalsToken == null )
                     {
-                        replacementString += "=";
+                        replacementString += "="; //$NON-NLS-1$
                     }
                     String displayString = possibleMatchingRule;
                     if ( displayString.equals( description.getNumericOid() ) )
                     {
-                        displayString += " (" + SchemaUtils.toString( description ) + ")";
+                        displayString += " (" + SchemaUtils.toString( description ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                     }
                     else
                     {
-                        displayString += " (" + description.getNumericOid() + ")";
+                        displayString += " (" + description.getNumericOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                     }
                     String info = SchemaUtils.getLdifLine( description );
                     ICompletionProposal proposal = new CompletionProposal( replacementString, offset, matchingRule
@@ -584,10 +584,10 @@
      */
     private void addDnAttr( List<ICompletionProposal> proposalList, String dnAttr, int offset )
     {
-        if ( "dn".toUpperCase().startsWith( dnAttr.toUpperCase() ) )
+        if ( "dn".toUpperCase().startsWith( dnAttr.toUpperCase() ) ) //$NON-NLS-1$
         {
-            String replacementString = "dn:";
-            String displayString = "dn: ()";
+            String replacementString = "dn:"; //$NON-NLS-1$
+            String displayString = "dn: ()"; //$NON-NLS-1$
             ICompletionProposal proposal = new CompletionProposal( replacementString, offset, dnAttr.length(),
                 replacementString.length(), null, displayString, null, null );
             proposalList.add( proposal );

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterFormattingStrategy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterFormattingStrategy.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterFormattingStrategy.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterFormattingStrategy.java Sat Feb  7 18:26:27 2009
@@ -115,7 +115,7 @@
         }
         else if ( fc instanceof LdapNotFilterComponent )
         {
-            sb.append( "(!" );
+            sb.append( "(!" ); //$NON-NLS-1$
             LdapNotFilterComponent lnfc = ( LdapNotFilterComponent ) fc;
             if ( lnfc.getFilters().length > 0
                 && lnfc.getFilters()[0].getFilterComponent() instanceof LdapFilterItemComponent )
@@ -134,7 +134,7 @@
         }
         else if ( fc instanceof LdapAndFilterComponent )
         {
-            sb.append( "(&" );
+            sb.append( "(&" ); //$NON-NLS-1$
             sb.append( '\n' );
             LdapFilter[] filters = ( ( LdapAndFilterComponent ) fc ).getFilters();
             for ( int i = 0; i < filters.length; i++ )
@@ -148,7 +148,7 @@
         }
         else if ( fc instanceof LdapOrFilterComponent )
         {
-            sb.append( "(|" );
+            sb.append( "(|" ); //$NON-NLS-1$
             sb.append( '\n' );
             LdapFilter[] filters = ( ( LdapOrFilterComponent ) fc ).getFilters();
             for ( int i = 0; i < filters.length; i++ )

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java Sat Feb  7 18:26:27 2009
@@ -93,8 +93,8 @@
         if ( paintManager == null && sourceViewer.getAnnotationModel() instanceof IAnnotationModelExtension )
         {
             AnnotationPainter ap = new AnnotationPainter( sourceViewer, null );
-            ap.addAnnotationType( "DEFAULT" );
-            ap.setAnnotationTypeColor( "DEFAULT", BrowserCommonActivator.getDefault().getColor( new RGB( 255, 0, 0 ) ) );
+            ap.addAnnotationType( "DEFAULT" ); //$NON-NLS-1$
+            ap.setAnnotationTypeColor( "DEFAULT", BrowserCommonActivator.getDefault().getColor( new RGB( 255, 0, 0 ) ) ); //$NON-NLS-1$
             sourceViewer.getAnnotationModel().addAnnotationModelListener( ap );
 
             FilterCharacterPairMatcher cpm = new FilterCharacterPairMatcher( sourceViewer, parser );
@@ -142,7 +142,7 @@
                         + invalidFilters[i].getStopToken().getLength() : start
                         + invalidFilters[i].getStartToken().getLength();
 
-                    Annotation annotation = new Annotation( "DEFAULT", true, invalidFilters[i].toString() );
+                    Annotation annotation = new Annotation( "DEFAULT", true, invalidFilters[i].toString() ); //$NON-NLS-1$
                     Position position = new Position( start, stop - start );
                     positionList.add( position );
                     sourceViewer.getAnnotationModel().addAnnotation( annotation, position );
@@ -166,7 +166,7 @@
                     }
                     if ( !overlaps )
                     {
-                        Annotation annotation = new Annotation( "DEFAULT", true, tokens[i].getValue() );
+                        Annotation annotation = new Annotation( "DEFAULT", true, tokens[i].getValue() ); //$NON-NLS-1$
                         Position position = new Position( tokens[i].getOffset(), tokens[i].getLength() );
                         sourceViewer.getAnnotationModel().addAnnotation( annotation, position );
                     }

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=741930&r1=741929&r2=741930&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 Sat Feb  7 18:26:27 2009
@@ -166,7 +166,7 @@
                 int stop = start + tokens[i].getLength();
                 if ( start <= hoverRegion.getOffset() && hoverRegion.getOffset() < stop )
                 {
-                    return "Invalid characters";
+                    return Messages.getString("FilterTextHover.InvalidCharacters"); //$NON-NLS-1$
                 }
             }
         }

Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/Messages.java?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/Messages.java (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/Messages.java Sat Feb  7 18:26:27 2009
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+
+package org.apache.directory.studio.ldapbrowser.common.filtereditor;
+
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+public class Messages
+{
+    private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.common.filtereditor.messages"; //$NON-NLS-1$
+
+    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
+
+
+    private Messages()
+    {
+    }
+
+
+    public static String getString( String key )
+    {
+        try
+        {
+            return RESOURCE_BUNDLE.getString( key );
+        }
+        catch ( MissingResourceException e )
+        {
+            return '!' + key + '!';
+        }
+    }
+}



Mime
View raw message