You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/02/07 19:26:31 UTC
svn commit: r741930 [4/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/...
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages.properties Sat Feb 7 18:26:27 2009
@@ -0,0 +1,22 @@
+# 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.
+FilterContentAssistProcessor.Approximately=~= (approximately)
+FilterContentAssistProcessor.Equals== (equals)
+FilterContentAssistProcessor.GreaterThanOrEquals=>= (greater than or equals)
+FilterContentAssistProcessor.LessThanOrEquals=<= (less than or equals)
+FilterContentAssistProcessor.Present==* (present)
+FilterTextHover.InvalidCharacters=Invalid characters
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages_de.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages_de.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/messages_de.properties Sat Feb 7 18:26:27 2009
@@ -0,0 +1,22 @@
+# 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.
+FilterContentAssistProcessor.Approximately=~= (etwa)
+FilterContentAssistProcessor.Equals== (gleich)
+FilterContentAssistProcessor.GreaterThanOrEquals=>= (größer oder gleich)
+FilterContentAssistProcessor.LessThanOrEquals=<= (kleiner oder gleich)
+FilterContentAssistProcessor.Present==* (präsent)
+FilterTextHover.InvalidCharacters=Ungültige Zeichen
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -46,7 +46,7 @@
*/
public BinaryEncodingInput( String initialRawValue, boolean asGroup )
{
- super( "Binary Encoding", getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(),
+ super( Messages.getString("BinaryEncodingInput.BinaryEncoding"), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
getOtherRawValues(), initialRawValue, asGroup, false );
}
@@ -59,7 +59,7 @@
*/
private static String getDefaultDisplayValue()
{
- return "Ignore";
+ return Messages.getString("BinaryEncodingInput.Ignore"); //$NON-NLS-1$
}
@@ -83,7 +83,7 @@
private static String[] getOtherDisplayValues()
{
return new String[]
- { "Ignore", "BASE-64", "HEX" };
+ { 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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -178,7 +178,7 @@
rdnLineList.get( i ).rdnValueText.setText( ( String ) atav.getUpValue() );
if ( i == 0 )
{
- if ( "".equals( rdnLineList.get( i ).rdnTypeCombo ) )
+ if ( "".equals( rdnLineList.get( i ).rdnTypeCombo ) ) //$NON-NLS-1$
{
rdnLineList.get( i ).rdnTypeCombo.setFocus();
}
@@ -240,7 +240,7 @@
// draw parent
if ( showParent )
{
- parentEntryLabel = BaseWidgetUtils.createLabel( composite, "Parent:", 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 +257,7 @@
// draw RDN group
if ( showRDN )
{
- rdnLabel = BaseWidgetUtils.createLabel( composite, "RDN:", 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,8 +266,8 @@
// draw dn/rdn preview
if ( showRDN )
{
- previewLabel = BaseWidgetUtils.createLabel( composite, showParent ? "DN Preview: " : "RDN Preview: ", 1 );
- previewText = BaseWidgetUtils.createReadonlyText( composite, "", 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 );
}
@@ -348,14 +348,14 @@
}
}
- String s = "";
+ String s = ""; //$NON-NLS-1$
if ( rdnE != null )
{
- s += rdnE.getMessage() != null ? rdnE.getMessage() : "Error in RDN ";
+ s += rdnE.getMessage() != null ? rdnE.getMessage() : Messages.getString("DnBuilderWidget.ErrorInRDN"); //$NON-NLS-1$
}
if ( parentE != null )
{
- s += ", " + parentE.getMessage() != null ? parentE.getMessage() : "Error in Parent DN ";
+ s += ", " + parentE.getMessage() != null ? parentE.getMessage() : Messages.getString("DnBuilderWidget.ErrorInParentDN"); //$NON-NLS-1$ //$NON-NLS-2$
}
if ( previewText != null )
@@ -465,14 +465,14 @@
new ListContentProposalProvider( attributeNames ), null, null, true );
rdnLine.rdnEqualsLabel = new Label( rdnComposite, SWT.NONE );
- rdnLine.rdnEqualsLabel.setText( "=" );
+ rdnLine.rdnEqualsLabel.setText( "=" ); //$NON-NLS-1$
rdnLine.rdnValueText = new Text( rdnComposite, SWT.BORDER );
gd = new GridData( GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL );
rdnLine.rdnValueText.setLayoutData( gd );
rdnLine.rdnAddButton = new Button( rdnComposite, SWT.PUSH );
- rdnLine.rdnAddButton.setText( " + " );
+ rdnLine.rdnAddButton.setText( " + " ); //$NON-NLS-1$
rdnLine.rdnAddButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -493,7 +493,7 @@
} );
rdnLine.rdnDeleteButton = new Button( rdnComposite, SWT.PUSH );
- rdnLine.rdnDeleteButton.setText( " \u2212 " ); // \u2013
+ rdnLine.rdnDeleteButton.setText( " \u2212 " ); //$NON-NLS-1$
rdnLine.rdnDeleteButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -103,7 +103,7 @@
} );
// Button
- browseButton = BaseWidgetUtils.createButton( parent, "Bro&wse...", 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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -47,7 +47,7 @@
*/
public FileEncodingInput( String initialRawValue, boolean asGroup )
{
- super( "File Encoding", getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(),
+ 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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -50,7 +50,7 @@
*/
public LineSeparatorInput( String initialRawValue, boolean asGroup )
{
- super( "Line Separator", getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(),
+ super( Messages.getString("LineSeparatorInput.LineSeparator"), getDefaultDisplayValue(), getDefaultRawValue(), getOtherDisplayValues(), //$NON-NLS-1$
getOtherRawValues(), initialRawValue, asGroup, false );
}
@@ -70,7 +70,7 @@
String v = ( String ) lsMap.get( k );
if ( v.equals( getDefaultRawValue() ) )
{
- k = k + " (" + ( v.replaceAll( "\n", "\\\\n" ).replaceAll( "\r", "\\\\r" ) ) + ")";
+ k = k + " (" + ( v.replaceAll( "\n", "\\\\n" ).replaceAll( "\r", "\\\\r" ) ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
return k;
}
}
@@ -104,9 +104,9 @@
for ( int i = 0; i < displayValues.length; i++ )
{
displayValues[i] = displayValues[i]
- + " ("
- + ( ( ( String ) lsMap.get( displayValues[i] ) ).replaceAll( "\n", "\\\\n" ).replaceAll( "\r", "\\\\r" ) )
- + ")";
+ + " (" //$NON-NLS-1$
+ + ( ( ( String ) lsMap.get( displayValues[i] ) ).replaceAll( "\n", "\\\\n" ).replaceAll( "\r", "\\\\r" ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ + ")"; //$NON-NLS-1$
}
return displayValues;
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ListContentProposalProvider.java Sat Feb 7 18:26:27 2009
@@ -79,7 +79,7 @@
{
final String proposal = proposals.get( k );
if ( proposal.toUpperCase().startsWith( string.toUpperCase() ) && !proposal.equalsIgnoreCase( string )
- && !"".equals( string ) )
+ && !"".equals( string ) ) //$NON-NLS-1$
{
IContentProposal p = new IContentProposal()
{
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/Messages.java?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/Messages.java (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/Messages.java Sat Feb 7 18:26:27 2009
@@ -0,0 +1,50 @@
+/*
+ * 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.widgets;
+
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.common.widgets.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/widgets/ModWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ModWidget.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ModWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ModWidget.java Sat Feb 7 18:26:27 2009
@@ -238,10 +238,10 @@
{
final ModSpec modSpec = new ModSpec();
- modSpec.modGroup = BaseWidgetUtils.createGroup( modComposite, "", 1 );
+ modSpec.modGroup = BaseWidgetUtils.createGroup( modComposite, "", 1 ); //$NON-NLS-1$
Composite modSpecComposite = BaseWidgetUtils.createColumnContainer( modSpec.modGroup, 2, 1 );
modSpec.modType = BaseWidgetUtils.createCombo( modSpecComposite, new String[]
- { "add", "replace", "delete" }, 0, 1 );
+ { "add", "replace", "delete" }, 0, 1 ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
modSpec.modType.addModifyListener( this );
String[] attributeDescriptions = SchemaUtils.getNamesAsArray( schema.getAttributeTypeDescriptions() );
Arrays.sort( attributeDescriptions );
@@ -253,7 +253,7 @@
// add button with listener
modSpec.modAddButton = new Button( modComposite, SWT.PUSH );
- modSpec.modAddButton.setText( " + " );
+ modSpec.modAddButton.setText( " + " ); //$NON-NLS-1$
modSpec.modAddButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -276,7 +276,7 @@
// delete button with listener
modSpec.modDeleteButton = new Button( modComposite, SWT.PUSH );
- modSpec.modDeleteButton.setText( " \u2212 " ); // \u2013
+ modSpec.modDeleteButton.setText( " \u2212 " ); //$NON-NLS-1$
modSpec.modDeleteButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -388,12 +388,12 @@
// text field
valueLine.valueComposite = BaseWidgetUtils.createColumnContainer( modSpec.modGroup, 3, 1 );
- valueLine.valueText = BaseWidgetUtils.createText( valueLine.valueComposite, "", 1 );
+ valueLine.valueText = BaseWidgetUtils.createText( valueLine.valueComposite, "", 1 ); //$NON-NLS-1$
valueLine.valueText.addModifyListener( this );
// add button with listener
valueLine.valueAddButton = new Button( valueLine.valueComposite, SWT.PUSH );
- valueLine.valueAddButton.setText( " + " );
+ valueLine.valueAddButton.setText( " + " ); //$NON-NLS-1$
valueLine.valueAddButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -416,7 +416,7 @@
// delete button with listener
valueLine.valueDeleteButton = new Button( valueLine.valueComposite, SWT.PUSH );
- valueLine.valueDeleteButton.setText( " \u2212 " ); // \u2013
+ valueLine.valueDeleteButton.setText( " \u2212 " ); //$NON-NLS-1$
valueLine.valueDeleteButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -471,7 +471,7 @@
{
StringBuffer sb = new StringBuffer();
- sb.append( "changetype: modify" ).append( BrowserCoreConstants.LINE_SEPARATOR );
+ sb.append( "changetype: modify" ).append( BrowserCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
ModSpec[] modSpecs = ( ModSpec[] ) modSpecList.toArray( new ModSpec[modSpecList.size()] );
@@ -491,16 +491,16 @@
}
// build ldif
- sb.append( type ).append( ": " ).append( attribute ).append( BrowserCoreConstants.LINE_SEPARATOR );
+ sb.append( type ).append( ": " ).append( attribute ).append( BrowserCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
for ( int k = 0; k < values.length; k++ )
{
if ( values[k].length() > 0 )
{
- sb.append( attribute ).append( ": " ).append( values[k] ).append(
+ sb.append( attribute ).append( ": " ).append( values[k] ).append( //$NON-NLS-1$
BrowserCoreConstants.LINE_SEPARATOR );
}
}
- sb.append( "-" ).append( BrowserCoreConstants.LINE_SEPARATOR );
+ sb.append( "-" ).append( BrowserCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
// sb.append(BrowserCoreConstants.NEWLINE);
}
}
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -141,7 +141,7 @@
{
composite = parent;
Composite labelComposite = BaseWidgetUtils.createColumnContainer( composite, 1, 1 );
- BaseWidgetUtils.createLabel( labelComposite, title + ":", 1 );
+ BaseWidgetUtils.createLabel( labelComposite, title + ":", 1 ); //$NON-NLS-1$
}
Composite defaultComposite = BaseWidgetUtils.createColumnContainer( composite, 1, 1 );
@@ -157,7 +157,7 @@
} );
Composite otherComposite = BaseWidgetUtils.createColumnContainer( composite, 2, 1 );
- otherButton = BaseWidgetUtils.createRadiobutton( otherComposite, "Other: ", 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/ViewFormWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ViewFormWidget.java Sat Feb 7 18:26:27 2009
@@ -104,7 +104,7 @@
// infoText = BaseWidgetUtils.createLabeledText(control, "", 1);
Composite infoTextControl = BaseWidgetUtils.createColumnContainer( control, 1, 1 );
infoTextControl.setLayoutData( new GridData( GridData.FILL_BOTH ) );
- infoText = BaseWidgetUtils.createLabeledText( infoTextControl, "", 1 );
+ infoText = BaseWidgetUtils.createLabeledText( infoTextControl, "", 1 ); //$NON-NLS-1$
infoText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, true ) );
control.setTopLeft( infoTextControl );
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -63,19 +63,19 @@
protected CollapseAllAction collapseAllAction;
/** The Constant upAction. */
- protected static final String upAction = "upAction";
+ protected static final String upAction = "upAction"; //$NON-NLS-1$
/** The Constant refreshAction. */
- protected static final String refreshAction = "refreshAction";
+ protected static final String refreshAction = "refreshAction"; //$NON-NLS-1$
/** The Constant filterChildrenAction. */
- protected static final String filterChildrenAction = "filterChildrenAction";
+ protected static final String filterChildrenAction = "filterChildrenAction"; //$NON-NLS-1$
/** The Constant unfilterChildrenAction. */
- protected static final String unfilterChildrenAction = "unfilterChildrenAction";
+ protected static final String unfilterChildrenAction = "unfilterChildrenAction"; //$NON-NLS-1$
/** The Constant propertyDialogAction. */
- protected static final String propertyDialogAction = "propertyDialogAction";
+ protected static final String propertyDialogAction = "propertyDialogAction"; //$NON-NLS-1$
/** The browser action map. */
protected Map<String, BrowserViewActionProxy> browserActionMap;
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -45,13 +45,13 @@
public static final int TYPE_BOOKMARKS = 2;
/** The title for the DIT categoy */
- public static final String TITLE_DIT = "DIT";
+ 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 = "Searches";
+ 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 = "Bookmarks";
+ public static final String TITLE_BOOKMARKS = Messages.getString("BrowserCategory.Bookmarsk"); //$NON-NLS-1$
/** The category's connection */
private IBrowserConnection parent;
@@ -114,7 +114,7 @@
return TITLE_BOOKMARKS;
default:
- return "ERROR";
+ return "ERROR"; //$NON-NLS-1$
}
}
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -282,7 +282,7 @@
if ( objects == null )
{
return new String[]
- { "Fetching Entries..." };
+ { Messages.getString("BrowserContentProvider.FetchingEntries") }; //$NON-NLS-1$
}
else if ( objects instanceof IEntry[] )
{
@@ -303,7 +303,7 @@
new StudioBrowserJob( new InitializeChildrenRunnable( new IEntry[]
{ rootDSE } ) ).execute();
return new String[]
- { "Fetching Entries..." };
+ { Messages.getString("BrowserContentProvider.FetchingEntries") }; //$NON-NLS-1$
}
// get base entries
@@ -331,7 +331,7 @@
new StudioBrowserJob( new InitializeChildrenRunnable( new IEntry[]
{ parentEntry } ) ).execute();
return new String[]
- { "Fetching Entries..." };
+ { Messages.getString("BrowserContentProvider.FetchingEntries") }; //$NON-NLS-1$
}
int childrenCount = parentEntry.getChildrenCount();
@@ -363,7 +363,7 @@
if ( results == null )
{
return new String[]
- { "Fetching Entries..." };
+ { Messages.getString("BrowserContentProvider.FetchingEntries") }; //$NON-NLS-1$
}
else
{
@@ -397,7 +397,7 @@
if ( objects == null )
{
return new String[]
- { "Fetching Search Results..." };
+ { Messages.getString("BrowserContentProvider.FetchingSearchResults") }; //$NON-NLS-1$
}
else if ( objects instanceof ISearchResult[] )
{
@@ -417,12 +417,12 @@
new StudioBrowserJob( new SearchRunnable( new ISearch[]
{ search } ) ).execute();
return new String[]
- { "Performing Search..." };
+ { Messages.getString("BrowserContentProvider.PerformingSearch") }; //$NON-NLS-1$
}
else if ( search.getSearchResults().length == 0 )
{
return new String[]
- { "No Results" };
+ { Messages.getString("BrowserContentProvider.NoResults") }; //$NON-NLS-1$
}
else if ( search.getSearchResults().length <= preferences.getFoldingSize() || !preferences.isUseFolding() )
{
@@ -481,7 +481,7 @@
new StudioBrowserJob( new OpenConnectionsRunnable( browserConnection.getConnection() ) )
.execute();
return new String[]
- { "Opening Connection..." };
+ { Messages.getString("BrowserContentProvider.OpeningConnection") }; //$NON-NLS-1$
}
return new Object[]
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -203,7 +203,7 @@
*/
public String toString()
{
- return entry.toString() + "[" + first + "..." + last + "]" + hashCode();
+ return entry.toString() + "[" + first + "..." + last + "]" + hashCode(); //$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/browser/BrowserLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java Sat Feb 7 18:26:27 2009
@@ -89,21 +89,21 @@
if ( entry.isChildrenInitialized() && ( entry.getChildrenCount() > 0 ) || entry.getChildrenFilter() != null )
{
- append.append( " (" ).append( entry.getChildrenCount() );
+ append.append( " (" ).append( entry.getChildrenCount() ); //$NON-NLS-1$
if ( entry.hasMoreChildren() )
{
- append.append( "+" );
+ append.append( "+" ); //$NON-NLS-1$
}
if ( entry.getChildrenFilter() != null )
{
- append.append( ", filtered" );
+ append.append( ", filtered" ); //$NON-NLS-1$
}
- append.append( ")" );
+ append.append( ")" ); //$NON-NLS-1$
}
if ( entry instanceof IRootDSE )
{
- return "Root DSE" + append.toString();
+ return "Root DSE" + append.toString(); //$NON-NLS-1$
}
else if ( entry instanceof ReferralBaseEntry )
{
@@ -119,7 +119,7 @@
}
else if ( entry.hasParententry() )
{
- String label = "";
+ String label = ""; //$NON-NLS-1$
if ( preferences.getEntryLabel() == BrowserCommonConstants.SHOW_DN )
{
label = entry.getDn().getUpName();
@@ -150,12 +150,12 @@
else if ( obj instanceof BrowserEntryPage )
{
BrowserEntryPage container = ( BrowserEntryPage ) obj;
- return "[" + ( container.getFirst() + 1 ) + "..." + ( container.getLast() + 1 ) + "]";
+ return "[" + ( container.getFirst() + 1 ) + "..." + ( container.getLast() + 1 ) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else if ( obj instanceof BrowserSearchResultPage )
{
BrowserSearchResultPage container = ( BrowserSearchResultPage ) obj;
- return "[" + ( container.getFirst() + 1 ) + "..." + ( container.getLast() + 1 ) + "]";
+ return "[" + ( container.getFirst() + 1 ) + "..." + ( container.getLast() + 1 ) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else if ( obj instanceof ISearch )
{
@@ -164,12 +164,12 @@
StringBuffer append = new StringBuffer( search.getName() );
if ( results != null )
{
- append.append( " (" ).append( results.length );
+ append.append( " (" ).append( results.length ); //$NON-NLS-1$
if ( search.isCountLimitExceeded() )
{
- append.append( "+" );
+ append.append( "+" ); //$NON-NLS-1$
}
- append.append( ")" );
+ append.append( ")" ); //$NON-NLS-1$
}
return append.toString();
}
@@ -188,10 +188,10 @@
}
else if ( sr.getEntry().hasParententry() || sr.getEntry() instanceof IRootDSE )
{
- String label = "";
+ String label = ""; //$NON-NLS-1$
if ( sr.getEntry() instanceof IRootDSE )
{
- label = "Root DSE";
+ label = "Root DSE"; //$NON-NLS-1$
}
else if ( preferences.getSearchResultLabel() == BrowserCommonConstants.SHOW_DN )
{
@@ -230,11 +230,11 @@
ISearch search = ( ISearch ) lockedObject;
if ( obj == search.getTopSearchRunnable() )
{
- return "--- Top Page ---";
+ return Messages.getString("BrowserLabelProvider.TopPage"); //$NON-NLS-1$
}
else if ( obj == search.getNextSearchRunnable() )
{
- return "--- Next Page ---";
+ return Messages.getString("BrowserLabelProvider.NextPage"); //$NON-NLS-1$
}
}
else if ( lockedObject instanceof IEntry )
@@ -242,11 +242,11 @@
IEntry entry = ( IEntry ) lockedObject;
if ( obj == entry.getTopPageChildrenRunnable() )
{
- return "--- Top Page ---";
+ return Messages.getString("BrowserLabelProvider.TopPage"); //$NON-NLS-1$
}
else if ( obj == entry.getNextPageChildrenRunnable() )
{
- return "--- Next Page ---";
+ return Messages.getString("BrowserLabelProvider.NextPage"); //$NON-NLS-1$
}
}
}
@@ -263,7 +263,7 @@
}
else
{
- return "";
+ return ""; //$NON-NLS-1$
}
}
@@ -411,17 +411,17 @@
while ( atavIterator.hasNext() )
{
AttributeTypeAndValue atav = atavIterator.next();
- if ( "cn".equalsIgnoreCase( atav.getUpType() ) || "sn".equalsIgnoreCase( atav.getUpType() )
- || "uid".equalsIgnoreCase( atav.getUpType() ) || "userid".equalsIgnoreCase( atav.getUpType() ) )
+ if ( "cn".equalsIgnoreCase( atav.getUpType() ) || "sn".equalsIgnoreCase( atav.getUpType() ) //$NON-NLS-1$ //$NON-NLS-2$
+ || "uid".equalsIgnoreCase( atav.getUpType() ) || "userid".equalsIgnoreCase( atav.getUpType() ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
return BrowserCommonActivator.getDefault().getImage( BrowserCommonConstants.IMG_ENTRY_PERSON );
}
- else if ( "ou".equalsIgnoreCase( atav.getUpType() ) || "o".equalsIgnoreCase( atav.getUpType() ) )
+ else if ( "ou".equalsIgnoreCase( atav.getUpType() ) || "o".equalsIgnoreCase( atav.getUpType() ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
return BrowserCommonActivator.getDefault().getImage( BrowserCommonConstants.IMG_ENTRY_ORG );
}
- else if ( "dc".equalsIgnoreCase( atav.getUpType() ) || "c".equalsIgnoreCase( atav.getUpType() )
- || "l".equalsIgnoreCase( atav.getUpType() ) )
+ else if ( "dc".equalsIgnoreCase( atav.getUpType() ) || "c".equalsIgnoreCase( atav.getUpType() ) //$NON-NLS-1$ //$NON-NLS-2$
+ || "l".equalsIgnoreCase( atav.getUpType() ) ) //$NON-NLS-1$
{
return BrowserCommonActivator.getDefault().getImage( BrowserCommonConstants.IMG_ENTRY_DC );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSearchResultPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSearchResultPage.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSearchResultPage.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSearchResultPage.java Sat Feb 7 18:26:27 2009
@@ -205,7 +205,7 @@
*/
public String toString()
{
- return search.toString() + "[" + first + "..." + last + "]" + hashCode();
+ return search.toString() + "[" + first + "..." + last + "]" + hashCode(); //$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/browser/BrowserSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java?rev=741930&r1=741929&r2=741930&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java Sat Feb 7 18:26:27 2009
@@ -358,35 +358,35 @@
Rdn rdn1 = entry1.getRdn();
Rdn rdn2 = entry2.getRdn();
- if ( ( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) )
- && ( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) )
+ if ( ( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) ) //$NON-NLS-1$
+ && ( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) ) //$NON-NLS-1$
{
return equal();
}
- else if ( ( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) )
- && !( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) )
+ else if ( ( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) ) //$NON-NLS-1$
+ && !( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) ) //$NON-NLS-1$
{
return greaterThan();
}
- else if ( !( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) )
- && ( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) )
+ else if ( !( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) ) //$NON-NLS-1$
+ && ( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) ) //$NON-NLS-1$
{
return lessThan();
}
String rdn1Value = ( String ) rdn1.getUpValue();
String rdn2Value = ( String ) rdn2.getUpValue();
- if ( rdn1Value.matches( "\\d*" ) && !rdn2Value.matches( "\\d*" ) )
+ if ( rdn1Value.matches( "\\d*" ) && !rdn2Value.matches( "\\d*" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
// return lessThan();
return compare( rdn1Value, rdn2Value );
}
- else if ( !rdn1Value.matches( "\\d*" ) && rdn2Value.matches( "\\d*" ) )
+ else if ( !rdn1Value.matches( "\\d*" ) && rdn2Value.matches( "\\d*" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
// return greaterThan();
return compare( rdn1Value, rdn2Value );
}
- else if ( rdn2Value.matches( "\\d*" ) && rdn2Value.matches( "\\d*" ) )
+ else if ( rdn2Value.matches( "\\d*" ) && rdn2Value.matches( "\\d*" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
BigInteger bi1 = new BigInteger( rdn1Value );
BigInteger bi2 = new BigInteger( rdn2Value );
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -53,16 +53,16 @@
{
/** The dialog title. */
- public static final String DIALOG_TITLE = "Browser Sorting";
+ 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 = "No Sorting";
+ 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 = "RDN";
+ 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 = "RDN Value";
+ public static final String SORT_BY_RDN_VALUE = Messages.getString("BrowserSorterDialog.RDNValue"); //$NON-NLS-1$
/** The browser preferences. */
private BrowserPreferences preferences;
@@ -170,32 +170,32 @@
gd.widthHint = convertHorizontalDLUsToPixels( IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH );
composite.setLayoutData( gd );
- Group groupingGroup = BaseWidgetUtils.createGroup( composite, "Group entries", 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, "Leaf entries first", 1 );
+ leafEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages.getString("BrowserSorterDialog.LeafEntriesFirst"), 1 ); //$NON-NLS-1$
leafEntriesFirstButton
- .setToolTipText( "This option displays entries without children before entries with children." );
+ .setToolTipText( Messages.getString("BrowserSorterDialog.LeafEntriesFirstToolTip") ); //$NON-NLS-1$
leafEntriesFirstButton.setSelection( preferences.isLeafEntriesFirst() );
- containerEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, "Container entries first", 1 );
+ containerEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages.getString("BrowserSorterDialog.ContainerEntriesFirst"), 1 ); //$NON-NLS-1$
containerEntriesFirstButton
- .setToolTipText( "This option displays entries with children before entries without children." );
+ .setToolTipText( Messages.getString("BrowserSorterDialog.ContainerEntriesFirstToolTip") ); //$NON-NLS-1$
containerEntriesFirstButton.setSelection( preferences.isContainerEntriesFirst() );
- mixedButton = BaseWidgetUtils.createRadiobutton( columGroup, "Mixed", 1 );
- mixedButton.setToolTipText( "This option displays entries with and without children mixed." );
+ 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, "Meta entries last", 1 );
+ metaEntriesLastButton = BaseWidgetUtils.createCheckbox( groupingGroup, Messages.getString("BrowserSorterDialog.MetaEntriesLast"), 1 ); //$NON-NLS-1$
metaEntriesLastButton
- .setToolTipText( "This option displays meta entries after normal entries. Meta entries are e.g. the root DSE or the schema entry." );
+ .setToolTipText( Messages.getString("BrowserSorterDialog.MetaEntriesLastToolTip") ); //$NON-NLS-1$
metaEntriesLastButton.setSelection( preferences.isMetaEntriesLast() );
- Group sortingGroup = BaseWidgetUtils.createGroup( composite, "Sort entries", 1 );
+ Group sortingGroup = BaseWidgetUtils.createGroup( composite, Messages.getString("BrowserSorterDialog.SortEntries"), 1 ); //$NON-NLS-1$
Composite sortByComposite = BaseWidgetUtils.createColumnContainer( sortingGroup, 4, 1 );
- BaseWidgetUtils.createLabel( sortByComposite, "Sort by", 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,26 +210,26 @@
}
} );
- sortAcendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, "Ascending", 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, "Descending", 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 = "If there are more than the specified number of children they won't be sorted. Hint: For performance reason the maximum value should be 10.000!";
- Label sortLimitLabel = BaseWidgetUtils.createLabel( sortLimitComposite, "Sort limit:", 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 );
+ sortLimitText = BaseWidgetUtils.createText( sortLimitComposite, "" + preferences.getSortLimit(), 5, 1 ); //$NON-NLS-1$
sortLimitText.setToolTipText( sortLimitTooltip );
sortLimitText.setEnabled( sortByCombo.getSelectionIndex() != 0 );
sortLimitText.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;
}
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/Messages.java?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/Messages.java (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/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.widgets.browser;
+
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.common.widgets.browser.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/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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -47,7 +47,7 @@
*/
public OpenSortDialogAction( BrowserPreferences preferences )
{
- super( "Sorting...", BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_SORT ) );
+ super( Messages.getString("OpenSortDialogAction.Sorting"), BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_SORT ) ); //$NON-NLS-1$
super.setEnabled( true );
this.preferences = preferences;
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties Sat Feb 7 18:26:27 2009
@@ -0,0 +1,46 @@
+# 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.
+BrowserCategory.Bookmarsk=Bookmarks
+BrowserCategory.DIT=DIT
+BrowserCategory.Searches=Searches
+BrowserContentProvider.FetchingEntries=Fetching Entries...
+BrowserContentProvider.FetchingSearchResults=Fetching Search Results...
+BrowserContentProvider.NoResults=No Results
+BrowserContentProvider.OpeningConnection=Opening Connection...
+BrowserContentProvider.PerformingSearch=Performing Search...
+BrowserLabelProvider.NextPage=--- Next Page ---
+BrowserLabelProvider.TopPage=--- Top Page ---
+BrowserSorterDialog.Ascending=Ascending
+BrowserSorterDialog.BrowserSorting=Browser Sorting
+BrowserSorterDialog.ContainerEntriesFirst=Container entries first
+BrowserSorterDialog.ContainerEntriesFirstToolTip=This option displays entries with children before entries without children.
+BrowserSorterDialog.Descending=Descending
+BrowserSorterDialog.GroupEntries=Group entries
+BrowserSorterDialog.LeafEntriesFirst=Leaf entries first
+BrowserSorterDialog.LeafEntriesFirstToolTip=This option displays entries without children before entries with children.
+BrowserSorterDialog.MetaEntriesLast=Meta entries last
+BrowserSorterDialog.MetaEntriesLastToolTip=This option displays meta entries after normal entries. Meta entries are e.g. the root DSE or the schema entry.
+BrowserSorterDialog.Mixed=Mixed
+BrowserSorterDialog.MixedToolTip=This option displays entries with and without children mixed.
+BrowserSorterDialog.NoSorting=No Sorting
+BrowserSorterDialog.RDN=RDN
+BrowserSorterDialog.RDNValue=RDN Value
+BrowserSorterDialog.SortBy=Sort by
+BrowserSorterDialog.SortEntries=Sort entries
+BrowserSorterDialog.SortLimit=Sort limit:
+BrowserSorterDialog.SortLimitToolTip=If there are more than the specified number of children they won't be sorted. Hint: For performance reason the maximum value should be 10.000\!
+OpenSortDialogAction.Sorting=Sorting...
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties Sat Feb 7 18:26:27 2009
@@ -0,0 +1,46 @@
+# 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.
+BrowserCategory.Bookmarsk=Lesezeichen
+BrowserCategory.DIT=DIT
+BrowserCategory.Searches=Suchen
+BrowserContentProvider.FetchingEntries=Einträge werden abgerufen...
+BrowserContentProvider.FetchingSearchResults=Suchergebnisse werden abgerufen...
+BrowserContentProvider.NoResults=Keine Ergebnisse
+BrowserContentProvider.OpeningConnection=Öffne Verbindung
+BrowserContentProvider.PerformingSearch=Suche wird durchgeführt...
+BrowserLabelProvider.NextPage=--- Nächste Seite ---
+BrowserLabelProvider.TopPage=--- Erste Seite ---
+BrowserSorterDialog.Ascending=Aufsteigend
+BrowserSorterDialog.BrowserSorting=Sortierung des Browsers
+BrowserSorterDialog.ContainerEntriesFirst=Container Einträge zuerst
+BrowserSorterDialog.ContainerEntriesFirstToolTip=Diese Option gruppiert Einträge mit Kind-Einträgen vor Einträgen ohne Kind-Einträge.
+BrowserSorterDialog.Descending=Absteigend
+BrowserSorterDialog.GroupEntries=Einträge gruppieren
+BrowserSorterDialog.LeafEntriesFirst=Blatt-Einträge zuerst
+BrowserSorterDialog.LeafEntriesFirstToolTip=Diese Option gruppiert Einträge ohne Kind-Einträge vor Einträgen mit Kind-Einträgen.
+BrowserSorterDialog.MetaEntriesLast=Spezielle Einträge zuletzt
+BrowserSorterDialog.MetaEntriesLastToolTip=Diese Option gruppiert spezielle Einträge nach normalen Einträgen. Spezielle Einträge sind z.B. der Schema Eintrag.
+BrowserSorterDialog.Mixed=Gemischt
+BrowserSorterDialog.MixedToolTip=Diese Option gruppiert Einträge mit oder ohne Kind-Einträge gemischt.
+BrowserSorterDialog.NoSorting=Keine Sortierung
+BrowserSorterDialog.RDN=RDN
+BrowserSorterDialog.RDNValue=RDN Wert
+BrowserSorterDialog.SortBy=Sortieren nach
+BrowserSorterDialog.SortEntries=Einträge sortieren
+BrowserSorterDialog.SortLimit=Sortier-Limit:
+BrowserSorterDialog.SortLimitToolTip=Bei mehr Einträgen wird keine Sortierung durchgeführt. Hinweis: Der Wert sollte 10000 nicht übersteigen\!
+OpenSortDialogAction.Sorting=Sortierung...
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -67,33 +67,33 @@
public class BrowserParameterPage extends AbstractConnectionParameterPage
{
- private static final String X_BASE_DN = "X-BASE-DN";
+ private static final String X_BASE_DN = "X-BASE-DN"; //$NON-NLS-1$
- private static final String X_COUNT_LIMIT = "X-COUNT-LIMIT";
+ private static final String X_COUNT_LIMIT = "X-COUNT-LIMIT"; //$NON-NLS-1$
- private static final String X_TIME_LIMIT = "X-TIME-LIMIT";
+ private static final String X_TIME_LIMIT = "X-TIME-LIMIT"; //$NON-NLS-1$
- private static final String X_ALIAS_HANDLING = "X-ALIAS-HANDLING";
+ private static final String X_ALIAS_HANDLING = "X-ALIAS-HANDLING"; //$NON-NLS-1$
- private static final String X_ALIAS_HANDLING_FINDING = "FINDING";
+ private static final String X_ALIAS_HANDLING_FINDING = "FINDING"; //$NON-NLS-1$
- private static final String X_ALIAS_HANDLING_SEARCHING = "SEARCHING";
+ private static final String X_ALIAS_HANDLING_SEARCHING = "SEARCHING"; //$NON-NLS-1$
- private static final String X_ALIAS_HANDLING_NEVER = "NEVER";
+ private static final String X_ALIAS_HANDLING_NEVER = "NEVER"; //$NON-NLS-1$
- private static final String X_REFERRAL_HANDLING = "X-REFERRAL-HANDLING";
+ private static final String X_REFERRAL_HANDLING = "X-REFERRAL-HANDLING"; //$NON-NLS-1$
- private static final String X_REFERRAL_HANDLING_IGNORE = "IGNORE";
+ private static final String X_REFERRAL_HANDLING_IGNORE = "IGNORE"; //$NON-NLS-1$
- private static final String X_REFERRAL_HANDLING_MANAGE = "MANAGE";
+ private static final String X_REFERRAL_HANDLING_MANAGE = "MANAGE"; //$NON-NLS-1$
- private static final String X_FETCH_SUBENTRIES = "X-FETCH-SUBENTRIES";
+ private static final String X_FETCH_SUBENTRIES = "X-FETCH-SUBENTRIES"; //$NON-NLS-1$
- private static final String X_PAGED_SEARCH = "X-PAGED-SEARCH";
+ private static final String X_PAGED_SEARCH = "X-PAGED-SEARCH"; //$NON-NLS-1$
- private static final String X_PAGED_SEARCH_SIZE = "X-PAGED-SEARCH-SIZE";
+ private static final String X_PAGED_SEARCH_SIZE = "X-PAGED-SEARCH-SIZE"; //$NON-NLS-1$
- private static final String X_PAGED_SEARCH_SCROLL_MODE = "X-PAGED-SEARCH-SCROLL-MODE";
+ private static final String X_PAGED_SEARCH_SCROLL_MODE = "X-PAGED-SEARCH-SCROLL-MODE"; //$NON-NLS-1$
/** The checkbox to fetch the base DN's from namingContexts whenever opening the connection */
private Button autoFetchBaseDnsButton;
@@ -294,21 +294,21 @@
{
Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );
- Group group = BaseWidgetUtils.createGroup( composite, "Base DN", 1 );
+ Group group = BaseWidgetUtils.createGroup( composite, Messages.getString("BrowserParameterPage.BaseDNGroup"), 1 ); //$NON-NLS-1$
Composite groupComposite = BaseWidgetUtils.createColumnContainer( group, 3, 1 );
GridData gd;
- autoFetchBaseDnsButton = BaseWidgetUtils.createCheckbox( groupComposite, "Get base DNs from Root DSE", 2 );
+ autoFetchBaseDnsButton = BaseWidgetUtils.createCheckbox( groupComposite, Messages.getString("BrowserParameterPage.GetBaseDNsFromRootDSE"), 2 ); //$NON-NLS-1$
autoFetchBaseDnsButton.setSelection( true );
fetchBaseDnsButton = new Button( groupComposite, SWT.PUSH );
- fetchBaseDnsButton.setText( "Fetch Base DNs" );
+ fetchBaseDnsButton.setText( Messages.getString("BrowserParameterPage.FetchBaseDNs") ); //$NON-NLS-1$
fetchBaseDnsButton.setEnabled( true );
gd = new GridData();
gd.horizontalAlignment = SWT.RIGHT;
fetchBaseDnsButton.setLayoutData( gd );
- BaseWidgetUtils.createLabel( groupComposite, "Base DN:", 1 );
+ BaseWidgetUtils.createLabel( groupComposite, Messages.getString("BrowserParameterPage.BaseDN"), 1 ); //$NON-NLS-1$
baseDNCombo = BaseWidgetUtils.createCombo( groupComposite, new String[0], 0, 2 );
}
@@ -322,30 +322,26 @@
{
Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );
- Group group = BaseWidgetUtils.createGroup( composite, "Controls", 1 );
+ Group group = BaseWidgetUtils.createGroup( composite, Messages.getString("BrowserParameterPage.Controls"), 1 ); //$NON-NLS-1$
Composite groupComposite = BaseWidgetUtils.createColumnContainer( group, 1, 1 );
// fetch subentries control
fetchSubentriesButton = BaseWidgetUtils.createCheckbox( groupComposite,
- "Fetch subentries while browsing (requires additional search request)", 1 );
+ Messages.getString("BrowserParameterPage.FetchSubentriesWhileBrowsing"), 1 ); //$NON-NLS-1$
fetchSubentriesButton
- .setToolTipText( "If enabled both, normal entries and subentries according to RFC 3672, are retrieved. "
- + "This causes additional search requests while browsing the DIT." );
+ .setToolTipText( Messages.getString("BrowserParameterPage.FetchSubentriesWhileBrowsingTooltip") ); //$NON-NLS-1$
fetchSubentriesButton.setSelection( false );
// paged search control
Composite sprcComposite = BaseWidgetUtils.createColumnContainer( groupComposite, 4, 1 );
- pagedSearchButton = BaseWidgetUtils.createCheckbox( sprcComposite, "Paged Search", 1 );
- pagedSearchButton.setToolTipText( "If enabled simple paged results control is used." );
+ pagedSearchButton = BaseWidgetUtils.createCheckbox( sprcComposite, Messages.getString("BrowserParameterPage.PagedSearch"), 1 ); //$NON-NLS-1$
+ pagedSearchButton.setToolTipText( Messages.getString("BrowserParameterPage.PagedSearchTooltip") ); //$NON-NLS-1$
- pagedSearchSizeLabel = BaseWidgetUtils.createLabel( sprcComposite, " Page Size:", 1 );
- pagedSearchSizeText = BaseWidgetUtils.createText( sprcComposite, "100", 5, 1 );
- pagedSearchScrollModeButton = BaseWidgetUtils.createCheckbox( sprcComposite, "Scroll Mode", 1 );
+ pagedSearchSizeLabel = BaseWidgetUtils.createLabel( sprcComposite, Messages.getString("BrowserParameterPage.PageSize"), 1 ); //$NON-NLS-1$
+ pagedSearchSizeText = BaseWidgetUtils.createText( sprcComposite, "100", 5, 1 ); //$NON-NLS-1$
+ pagedSearchScrollModeButton = BaseWidgetUtils.createCheckbox( sprcComposite, Messages.getString("BrowserParameterPage.ScrollMode"), 1 ); //$NON-NLS-1$
pagedSearchScrollModeButton
- .setToolTipText( "If enabled only one page is fetched from the server at once while browsing, "
- + "you could 'scroll' through the pages by using the 'next page' and 'top page' items. "
- + "If disabled _all_ entries are fetched from the server, the paged result control "
- + "is only used in background to avoid server-side limits." );
+ .setToolTipText( Messages.getString("BrowserParameterPage.ScrollModeTooltip") ); //$NON-NLS-1$
pagedSearchScrollModeButton.setSelection( true );
}
@@ -389,7 +385,7 @@
{
if ( !LdapDN.isValid( getBaseDN() ) )
{
- message = "Please enter a valid base DN.";
+ message = Messages.getString("BrowserParameterPage.EnterValidBaseDN"); //$NON-NLS-1$
}
}
}
@@ -406,7 +402,7 @@
.getExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_FETCH_BASE_DNS );
autoFetchBaseDnsButton.setSelection( fetchBaseDns );
String baseDn = parameter.getExtendedProperty( IBrowserConnection.CONNECTION_PARAMETER_BASE_DN );
- baseDNCombo.setText( baseDn != null ? baseDn : "" );
+ baseDNCombo.setText( baseDn != null ? baseDn : "" ); //$NON-NLS-1$
int countLimit = parameter.getExtendedIntProperty( IBrowserConnection.CONNECTION_PARAMETER_COUNT_LIMIT );
limitWidget.setCountLimit( countLimit );
@@ -433,7 +429,7 @@
pagedSearchButton.setSelection( pagedSearch );
String pagedSearchSize = parameter
.getExtendedProperty( IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SIZE );
- pagedSearchSizeText.setText( pagedSearchSize != null ? pagedSearchSize : "100" );
+ pagedSearchSizeText.setText( pagedSearchSize != null ? pagedSearchSize : "100" ); //$NON-NLS-1$
boolean pagedSearchScrollMode = parameter
.getExtendedBoolProperty( IBrowserConnection.CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE );
pagedSearchScrollModeButton.setSelection( pagedSearch ? pagedSearchScrollMode : true );
@@ -470,17 +466,17 @@
baseDNCombo.setItems( baseDNs.toArray( new String[baseDNs.size()] ) );
baseDNCombo.select( 0 );
- String msg = "The server returned the following base DNs:";
+ String msg = Messages.getString("BrowserParameterPage.BaseDNResult"); //$NON-NLS-1$
for ( String baseDN : baseDNs )
{
- msg += "\n - " + baseDN;
+ msg += "\n - " + baseDN; //$NON-NLS-1$
}
- MessageDialog.openInformation( Display.getDefault().getActiveShell(), "Fetch Base DNs", msg );
+ MessageDialog.openInformation( Display.getDefault().getActiveShell(), Messages.getString("BrowserParameterPage.FetchBaseDNs"), msg ); //$NON-NLS-1$
}
else
{
- MessageDialog.openWarning( Display.getDefault().getActiveShell(), "Fetch Base DNs",
- "No base DN returned from server. Please enter the base DN manually." );
+ MessageDialog.openWarning( Display.getDefault().getActiveShell(), Messages.getString("BrowserParameterPage.FetchBaseDNs"), //$NON-NLS-1$
+ Messages.getString("BrowserParameterPage.NoBaseDNReturnedFromServer") ); //$NON-NLS-1$
autoFetchBaseDnsButton.setSelection( false );
}
}
@@ -514,7 +510,7 @@
{
public void verifyText( VerifyEvent e )
{
- if ( !e.text.matches( "[0-9]*" ) )
+ if ( !e.text.matches( "[0-9]*" ) ) //$NON-NLS-1$
{
e.doit = false;
}
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/Messages.java?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/Messages.java (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/Messages.java Sat Feb 7 18:26:27 2009
@@ -0,0 +1,50 @@
+/*
+ * 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.widgets.connection;
+
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.common.widgets.connection.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 + '!';
+ }
+ }
+}
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages.properties Sat Feb 7 18:26:27 2009
@@ -0,0 +1,32 @@
+# 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.
+
+BrowserParameterPage.BaseDN=Base DN:
+BrowserParameterPage.BaseDNGroup=Base DN
+BrowserParameterPage.BaseDNResult=The server returned the following base DNs:
+BrowserParameterPage.Controls=Controls
+BrowserParameterPage.EnterValidBaseDN=Please enter a valid base DN.
+BrowserParameterPage.FetchBaseDNs=Fetch Base DNs
+BrowserParameterPage.FetchSubentriesWhileBrowsing=Fetch subentries while browsing (requires additional search request)
+BrowserParameterPage.FetchSubentriesWhileBrowsingTooltip=If enabled both, normal entries and subentries according to RFC 3672, are retrieved. This causes additional search requests while browsing the DIT.
+BrowserParameterPage.GetBaseDNsFromRootDSE=Get base DNs from Root DSE
+BrowserParameterPage.NoBaseDNReturnedFromServer=No base DN returned from server. Please enter the base DN manually.
+BrowserParameterPage.PagedSearch=Paged Search
+BrowserParameterPage.PagedSearchTooltip=If enabled simple paged results control is used.
+BrowserParameterPage.PageSize=\ Page Size:
+BrowserParameterPage.ScrollMode=Scroll Mode
+BrowserParameterPage.ScrollModeTooltip=If enabled only one page is fetched from the server at once while browsing, you could 'scroll' through the pages by using the 'next page' and 'top page' items. If disabled _all_ entries are fetched from the server, the paged result control is only used in background to avoid server-side limits.
Added: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_de.properties?rev=741930&view=auto
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_de.properties (added)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_de.properties Sat Feb 7 18:26:27 2009
@@ -0,0 +1,32 @@
+# 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.
+
+BrowserParameterPage.BaseDN=Basis DN:
+BrowserParameterPage.BaseDNGroup=Basis DN
+BrowserParameterPage.BaseDNResult=Der Server hat die folgenden DNs zurückgeliefert:
+BrowserParameterPage.Controls=Controls
+BrowserParameterPage.EnterValidBaseDN=Bitte einen gültigen DN eingeben.
+BrowserParameterPage.FetchBaseDNs=Basis DNs abrufen
+BrowserParameterPage.FetchSubentriesWhileBrowsing=Sub-Einträge während des Browsens abrufen (erfordert zusätzliche Suche)
+BrowserParameterPage.FetchSubentriesWhileBrowsingTooltip=Wenn aktiviert, werden normale Einträge und Sub-Einträge (siehe RFC 3672) abgerufen. Hierfür muss eine zusätzliche Suche durchgeführt werden.
+BrowserParameterPage.GetBaseDNsFromRootDSE=Basis DNs mittels Root DSE bestimmen
+BrowserParameterPage.NoBaseDNReturnedFromServer=Der Server hat keine Basis DNs zurückgeliefert. Bitte die Basis-DN manuell eingeben.
+BrowserParameterPage.PagedSearch=Seitenweise Suche
+BrowserParameterPage.PagedSearchTooltip=Wenn aktiviert, wird eine seitenweise Suche durchgeführt.
+BrowserParameterPage.PageSize=\ Seitengröße:
+BrowserParameterPage.ScrollMode=Blättern
+BrowserParameterPage.ScrollModeTooltip=Wenn aktiviert, wird nur eine Seite vom Server abgerufen. Sie können durch die einzelnen Seiten Blättern indem Sie auf 'Nächste Seite' bzw. 'Erste Seite' klicken. Wenn deaktiviert, werden alle Einträge vom Server abgerufen. Die seitenwiese Suche wird nur im Hintergrund genutzt, um server-seitige Begrenzungen zu vermeiden.
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -85,7 +85,7 @@
@Override
public String getText()
{
- return "Edit Attribute Description";
+ return Messages.getString("EditAttributeDescriptionAction.EditAttributeDescription"); //$NON-NLS-1$
}
@@ -123,7 +123,7 @@
*/
private void renameValues( final IValue[] values )
{
- AttributeWizard wizard = new AttributeWizard( "Edit Attribute Description", true, false, values[0]
+ AttributeWizard wizard = new AttributeWizard( Messages.getString("EditAttributeDescriptionAction.EditAttributeDescription"), true, false, values[0] //$NON-NLS-1$
.getAttribute().getDescription(), values[0].getAttribute().getEntry() );
WizardDialog dialog = new WizardDialog( Display.getDefault().getActiveShell(), wizard );
dialog.setBlockOnOpen( true );
@@ -131,7 +131,7 @@
if ( dialog.open() == Dialog.OK )
{
String newAttributeName = wizard.getAttributeDescription();
- if ( newAttributeName != null && !"".equals( newAttributeName )
+ if ( newAttributeName != null && !"".equals( newAttributeName ) //$NON-NLS-1$
&& !newAttributeName.equals( values[0].getAttribute().getDescription() ) )
{
new RenameValuesJob( values[0].getAttribute().getEntry(), values, newAttributeName ).execute();
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=741930&r1=741929&r2=741930&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 Sat Feb 7 18:26:27 2009
@@ -83,22 +83,22 @@
protected ValueEditorPreferencesAction openValueEditorPreferencesAction;
/** The Constant newValueAction. */
- protected final static String newValueAction = "newValueAction";
+ protected final static String newValueAction = "newValueAction"; //$NON-NLS-1$
/** The Constant copyAction. */
- protected final static String copyAction = "copyAction";
+ protected final static String copyAction = "copyAction"; //$NON-NLS-1$
/** The Constant pasteAction. */
- protected final static String pasteAction = "pasteAction";
+ protected final static String pasteAction = "pasteAction"; //$NON-NLS-1$
/** The Constant deleteAction. */
- protected final static String deleteAction = "deleteAction";
+ protected final static String deleteAction = "deleteAction"; //$NON-NLS-1$
/** The Constant selectAllAction. */
- protected final static String selectAllAction = "selectAllAction";
+ protected final static String selectAllAction = "selectAllAction"; //$NON-NLS-1$
/** The Constant propertyDialogAction. */
- protected final static String propertyDialogAction = "propertyDialogAction";
+ protected final static String propertyDialogAction = "propertyDialogAction"; //$NON-NLS-1$
/** The entry editor action map. */
protected Map<String, EntryEditorActionProxy> entryEditorActionMap;
@@ -289,7 +289,7 @@
protected void addEditMenu( IMenuManager menuManager )
{
menuManager.add( openDefaultValueEditorActionProxy );
- MenuManager editorMenuManager = new MenuManager( "Edit Value With" );
+ MenuManager editorMenuManager = new MenuManager( Messages.getString("EntryEditorWidgetActionGroup.EditValueWith") ); //$NON-NLS-1$
if ( openBestValueEditorActionProxy.isEnabled() )
{
editorMenuManager.add( openBestValueEditorActionProxy );