|
|
Author: pamarcelot
Date: Wed Oct 21 11:28:17 2009
New Revision: 827964
URL: http://svn.apache.org/viewvc?rev=827964&view=rev
Log:
Code formatting.
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorActivator.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifSourceViewerConfiguration.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/NonExistingLdifEditorInput.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifRecordAction.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifDocumentAction.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifRecordAction.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAutoEditStrategy.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorActivator.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorActivator.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorActivator.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorActivator.java
Wed Oct 21 11:28:17 2009
@@ -53,7 +53,7 @@
/** Resource bundle */
private ResourceBundle resourceBundle;
-
+
/** The color registry */
private ColorRegistry colorRegistry;
@@ -73,7 +73,7 @@
public LdifEditorActivator()
{
plugin = this;
-
+
try
{
resourceBundle = ResourceBundle.getBundle(
"org.apache.directory.studio.ldifeditor.messages" ); //$NON-NLS-1$
@@ -262,7 +262,7 @@
{
return ldifTemplateContextTypeRegistry;
}
-
+
/**
*
@@ -272,8 +272,8 @@
{
return ldifTemplateStore;
}
-
-
+
+
/**
* Gets the resource bundle.
*
@@ -304,9 +304,8 @@
{
// We can't use the PLUGIN_ID constant since loading the
plugin.properties file has failed,
// So we're using a default plugin id.
- getLog().log(
- new Status( Status.ERROR,
"org.apache.directory.studio.ldifeditor", Status.OK, //$NON-NLS-1$
- "Unable to get the plugin properties.", e ) );
//$NON-NLS-1$
+ getLog().log( new Status( Status.ERROR,
"org.apache.directory.studio.ldifeditor", Status.OK, //$NON-NLS-1$
+ "Unable to get the plugin properties.", e ) );
//$NON-NLS-1$
}
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/LdifEditorConstants.java
Wed Oct 21 11:28:17 2009
@@ -20,7 +20,6 @@
package org.apache.directory.studio.ldifeditor;
-
/**
* Constants for the LDIF editor.
*
@@ -39,14 +38,14 @@
public static final String ACTION_ID_EDIT_ATTRIBUTE_DESCRIPTION =
LdifEditorActivator.getDefault()
.getPluginProperties().getString( "Cmd_EditAttributeDescription_id" );
//$NON-NLS-1$
- public static final String ACTION_ID_FORMAT_LDIF_DOCUMENT =
LdifEditorActivator.getDefault()
- .getPluginProperties().getString( "Cmd_FormatLdifDocument_id" );
//$NON-NLS-1$
+ public static final String ACTION_ID_FORMAT_LDIF_DOCUMENT =
LdifEditorActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_FormatLdifDocument_id" ); //$NON-NLS-1$
- public static final String ACTION_ID_FORMAT_LDIF_RECORD =
LdifEditorActivator.getDefault()
- .getPluginProperties().getString( "Cmd_FormatLdifRecord_id" );
//$NON-NLS-1$
+ public static final String ACTION_ID_FORMAT_LDIF_RECORD =
LdifEditorActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_FormatLdifRecord_id" ); //$NON-NLS-1$
- public static final String ACTION_ID_EXECUTE_LDIF =
LdifEditorActivator.getDefault()
- .getPluginProperties().getString( "Cmd_ExecuteLdif_id" ); //$NON-NLS-1$
+ public static final String ACTION_ID_EXECUTE_LDIF =
LdifEditorActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_ExecuteLdif_id" ); //$NON-NLS-1$
public static final String NEW_WIZARD_NEW_LDIF_FILE =
LdifEditorActivator.getDefault().getPluginProperties()
.getString( "NewWizard_NewLdifFileWizard_id" ); //$NON-NLS-1$
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java
Wed Oct 21 11:28:17 2009
@@ -61,7 +61,7 @@
public LdifEditorContentAssistPreferencePage()
{
- super(
Messages.getString("LdifEditorContentAssistPreferencePage.ContentAssist") );
//$NON-NLS-1$
+ super( Messages.getString(
"LdifEditorContentAssistPreferencePage.ContentAssist" ) ); //$NON-NLS-1$
super.setPreferenceStore(
LdifEditorActivator.getDefault().getPreferenceStore() );
}
@@ -89,15 +89,16 @@
BaseWidgetUtils.createSpacer( composite, 1 );
BaseWidgetUtils.createSpacer( composite, 1 );
- Group caGroup = BaseWidgetUtils.createGroup(
BaseWidgetUtils.createColumnContainer( composite, 1, 1 ),
-
Messages.getString("LdifEditorContentAssistPreferencePage.ContentAssist"), 1 );
//$NON-NLS-1$
+ Group caGroup = BaseWidgetUtils.createGroup(
BaseWidgetUtils.createColumnContainer( composite, 1, 1 ), Messages
+ .getString( "LdifEditorContentAssistPreferencePage.ContentAssist"
), 1 ); //$NON-NLS-1$
- insertSingleProposalAutoButton = BaseWidgetUtils.createCheckbox(
caGroup,
-
Messages.getString("LdifEditorContentAssistPreferencePage.InsertSingleProposalAutomatically"),
1 ); //$NON-NLS-1$
+ insertSingleProposalAutoButton = BaseWidgetUtils.createCheckbox(
caGroup, Messages
+ .getString(
"LdifEditorContentAssistPreferencePage.InsertSingleProposalAutomatically" ), 1
); //$NON-NLS-1$
insertSingleProposalAutoButton.setSelection(
getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_INSERTSINGLEPROPOSALAUTO
) );
- enableAutoActivationButton = BaseWidgetUtils.createCheckbox( caGroup,
Messages.getString("LdifEditorContentAssistPreferencePage.EnableAutoAction"), 1
); //$NON-NLS-1$
+ enableAutoActivationButton = BaseWidgetUtils.createCheckbox( caGroup,
Messages
+ .getString(
"LdifEditorContentAssistPreferencePage.EnableAutoAction" ), 1 ); //$NON-NLS-1$
enableAutoActivationButton.setSelection(
getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_ENABLEAUTOACTIVATION )
);
enableAutoActivationButton.addSelectionListener( new SelectionAdapter()
@@ -110,7 +111,8 @@
Composite autoActivationDelayComposite =
BaseWidgetUtils.createColumnContainer( caGroup, 4, 1 );
BaseWidgetUtils.createRadioIndent( autoActivationDelayComposite, 1 );
- autoActivationDelayLabel = BaseWidgetUtils.createLabel(
autoActivationDelayComposite,
Messages.getString("LdifEditorContentAssistPreferencePage.AutoActivationDelay"),
//$NON-NLS-1$
+ autoActivationDelayLabel = BaseWidgetUtils.createLabel(
autoActivationDelayComposite, Messages
+ .getString(
"LdifEditorContentAssistPreferencePage.AutoActivationDelay" ), //$NON-NLS-1$
1 );
autoActivationDelayText = BaseWidgetUtils.createText(
autoActivationDelayComposite, "", 4, 1 ); //$NON-NLS-1$
autoActivationDelayText.setText( getPreferenceStore().getString(
@@ -129,10 +131,11 @@
}
}
} );
- autoActivationDelayMs = BaseWidgetUtils.createLabel(
autoActivationDelayComposite,
Messages.getString("LdifEditorContentAssistPreferencePage.MilliSecons"), 1 );
//$NON-NLS-1$
+ autoActivationDelayMs = BaseWidgetUtils.createLabel(
autoActivationDelayComposite, Messages
+ .getString( "LdifEditorContentAssistPreferencePage.MilliSecons" ),
1 ); //$NON-NLS-1$
- smartInsertAttributeInModspecButton = BaseWidgetUtils.createCheckbox(
caGroup,
-
Messages.getString("LdifEditorContentAssistPreferencePage.SmartInsertAttributeName"),
1 ); //$NON-NLS-1$
+ smartInsertAttributeInModspecButton = BaseWidgetUtils.createCheckbox(
caGroup, Messages
+ .getString(
"LdifEditorContentAssistPreferencePage.SmartInsertAttributeName" ), 1 );
//$NON-NLS-1$
smartInsertAttributeInModspecButton.setSelection(
getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_SMARTINSERTATTRIBUTEINMODSPEC
) );
@@ -153,7 +156,8 @@
public boolean performOk()
{
- getPreferenceStore().setValue(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_INSERTSINGLEPROPOSALAUTO,
+ getPreferenceStore().setValue(
+
LdifEditorConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_INSERTSINGLEPROPOSALAUTO,
this.insertSingleProposalAutoButton.getSelection() );
getPreferenceStore().setValue(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_ENABLEAUTOACTIVATION,
this.enableAutoActivationButton.getSelection() );
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java
Wed Oct 21 11:28:17 2009
@@ -83,7 +83,7 @@
*/
public LdifEditorPreferencePage()
{
- super( Messages.getString("LdifEditorPreferencePage.LDIFEditor") );
//$NON-NLS-1$
+ super( Messages.getString( "LdifEditorPreferencePage.LDIFEditor" ) );
//$NON-NLS-1$
super.setPreferenceStore(
LdifEditorActivator.getDefault().getPreferenceStore() );
}
@@ -112,7 +112,7 @@
composite.setLayout( layout );
composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- String text =
Messages.getString("LdifEditorPreferencePage.LinkToTextEditors"); //$NON-NLS-1$
+ String text = Messages.getString(
"LdifEditorPreferencePage.LinkToTextEditors" ); //$NON-NLS-1$
Link link = BaseWidgetUtils.createLink( composite, text, 1 );
link.addSelectionListener( new SelectionAdapter()
{
@@ -122,14 +122,14 @@
"org.eclipse.ui.preferencePages.GeneralTextEditor", null,
null ); //$NON-NLS-1$
}
} );
- String text2 =
Messages.getString("LdifEditorPreferencePage.LinkToTextFormats"); //$NON-NLS-1$
+ String text2 = Messages.getString(
"LdifEditorPreferencePage.LinkToTextFormats" ); //$NON-NLS-1$
Link link2 = BaseWidgetUtils.createLink( composite, text2, 1 );
link2.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
{
- PreferencesUtil.createPreferenceDialogOn( getShell(),
LdifEditorConstants.PREFERENCEPAGEID_TEXTFORMATS, null,
- null ); //$NON-NLS-1$
+ PreferencesUtil.createPreferenceDialogOn( getShell(),
LdifEditorConstants.PREFERENCEPAGEID_TEXTFORMATS,
+ null, null ); //$NON-NLS-1$
}
} );
@@ -137,9 +137,10 @@
BaseWidgetUtils.createSpacer( composite, 1 );
Group foldGroup = BaseWidgetUtils.createGroup(
BaseWidgetUtils.createColumnContainer( composite, 1, 1 ),
- Messages.getString("LdifEditorPreferencePage.Folding"), 1 );
//$NON-NLS-1$
+ Messages.getString( "LdifEditorPreferencePage.Folding" ), 1 );
//$NON-NLS-1$
- enableFoldingButton = BaseWidgetUtils.createCheckbox( foldGroup,
Messages.getString("LdifEditorPreferencePage.EnableFolding"), 1 ); //$NON-NLS-1$
+ enableFoldingButton = BaseWidgetUtils.createCheckbox( foldGroup,
Messages
+ .getString( "LdifEditorPreferencePage.EnableFolding" ), 1 );
//$NON-NLS-1$
enableFoldingButton.setSelection( getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_FOLDING_ENABLE ) );
enableFoldingButton.addSelectionListener( new SelectionAdapter()
@@ -151,23 +152,27 @@
} );
Composite initiallyFoldComposiste =
BaseWidgetUtils.createColumnContainer( foldGroup, 4, 1 );
- initiallyFoldLabel = BaseWidgetUtils.createLabel(
initiallyFoldComposiste,
Messages.getString("LdifEditorPreferencePage.InitiallyFold"), 1 ); //$NON-NLS-1$
- initiallyFoldCommentsButton = BaseWidgetUtils.createCheckbox(
initiallyFoldComposiste,
Messages.getString("LdifEditorPreferencePage.Comments"), 1 ); //$NON-NLS-1$
+ initiallyFoldLabel = BaseWidgetUtils.createLabel(
initiallyFoldComposiste, Messages
+ .getString( "LdifEditorPreferencePage.InitiallyFold" ), 1 );
//$NON-NLS-1$
+ initiallyFoldCommentsButton = BaseWidgetUtils.createCheckbox(
initiallyFoldComposiste, Messages
+ .getString( "LdifEditorPreferencePage.Comments" ), 1 );
//$NON-NLS-1$
initiallyFoldCommentsButton.setSelection(
getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_FOLDING_INITIALLYFOLDCOMMENTS ) );
- initiallyFoldRecordsButton = BaseWidgetUtils.createCheckbox(
initiallyFoldComposiste,
Messages.getString("LdifEditorPreferencePage.Records"), 1 ); //$NON-NLS-1$
+ initiallyFoldRecordsButton = BaseWidgetUtils.createCheckbox(
initiallyFoldComposiste, Messages
+ .getString( "LdifEditorPreferencePage.Records" ), 1 );
//$NON-NLS-1$
initiallyFoldRecordsButton.setSelection(
getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_FOLDING_INITIALLYFOLDRECORDS ) );
- initiallyFoldWrappedLinesButton = BaseWidgetUtils.createCheckbox(
initiallyFoldComposiste,
Messages.getString("LdifEditorPreferencePage.WrappedLines"), 1 ); //$NON-NLS-1$
+ initiallyFoldWrappedLinesButton = BaseWidgetUtils.createCheckbox(
initiallyFoldComposiste, Messages
+ .getString( "LdifEditorPreferencePage.WrappedLines" ), 1 );
//$NON-NLS-1$
initiallyFoldWrappedLinesButton.setSelection(
getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_FOLDING_INITIALLYFOLDWRAPPEDLINES ) );
BaseWidgetUtils.createSpacer( composite, 1 );
Group doubleClickGroup = BaseWidgetUtils.createGroup(
BaseWidgetUtils.createColumnContainer( composite, 1, 1 ),
-
Messages.getString("LdifEditorPreferencePage.DoubleClickBehaviour"), 1 );
//$NON-NLS-1$
- useLdifDoubleClickButton = BaseWidgetUtils.createCheckbox(
doubleClickGroup,
-
Messages.getString("LdifEditorPreferencePage.SelectWholeAttributeOnDoubleClick"),
1 ); //$NON-NLS-1$
+ Messages.getString(
"LdifEditorPreferencePage.DoubleClickBehaviour" ), 1 ); //$NON-NLS-1$
+ useLdifDoubleClickButton = BaseWidgetUtils.createCheckbox(
doubleClickGroup, Messages
+ .getString(
"LdifEditorPreferencePage.SelectWholeAttributeOnDoubleClick" ), 1 );
//$NON-NLS-1$
useLdifDoubleClickButton.setSelection( getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_DOUBLECLICK_USELDIFDOUBLECLICK ) );
@@ -175,16 +180,18 @@
// Options
Group optionsGroup = BaseWidgetUtils.createGroup(
BaseWidgetUtils.createColumnContainer( composite, 1, 1 ),
- Messages.getString("LdifEditorPreferencePage.ExecuteOptions"), 1
); //$NON-NLS-1$
+ Messages.getString( "LdifEditorPreferencePage.ExecuteOptions" ), 1
); //$NON-NLS-1$
- updateIfEntryExistsButton = BaseWidgetUtils.createCheckbox(
optionsGroup,
Messages.getString("LdifEditorPreferencePage.UpdateExistingEntries"), 1 );
//$NON-NLS-1$
- updateIfEntryExistsButton
- .setToolTipText(
Messages.getString("LdifEditorPreferencePage.UpdateExistingEntriesToolTip1")
//$NON-NLS-1$
- +
Messages.getString("LdifEditorPreferencePage.UpdateExistingEntriesToolTip2") );
//$NON-NLS-1$
+ updateIfEntryExistsButton = BaseWidgetUtils.createCheckbox(
optionsGroup, Messages
+ .getString( "LdifEditorPreferencePage.UpdateExistingEntries" ), 1
); //$NON-NLS-1$
+ updateIfEntryExistsButton.setToolTipText( Messages
+ .getString(
"LdifEditorPreferencePage.UpdateExistingEntriesToolTip1" ) //$NON-NLS-1$
+ + Messages.getString(
"LdifEditorPreferencePage.UpdateExistingEntriesToolTip2" ) ); //$NON-NLS-1$
updateIfEntryExistsButton.setSelection(
getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_OPTIONS_UPDATEIFENTRYEXISTS ) );
- continueOnErrorButton = BaseWidgetUtils.createCheckbox( optionsGroup,
Messages.getString("LdifEditorPreferencePage.ContinueOnError"), 1 );
//$NON-NLS-1$
+ continueOnErrorButton = BaseWidgetUtils.createCheckbox( optionsGroup,
Messages
+ .getString( "LdifEditorPreferencePage.ContinueOnError" ), 1 );
//$NON-NLS-1$
continueOnErrorButton.setSelection( getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_OPTIONS_CONTINUEONERROR
) );
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
Wed Oct 21 11:28:17 2009
@@ -167,7 +167,8 @@
void savePreferences()
{
IPreferenceStore store =
LdifEditorActivator.getDefault().getPreferenceStore();
- PreferenceConverter.setValue( store, key +
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, rgb );
+ PreferenceConverter
+ .setValue( store, key +
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX, rgb );
store.setValue( key +
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX, getStyle() );
}
@@ -191,7 +192,7 @@
public LdifEditorSyntaxColoringPreferencePage()
{
- super(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.SyntaxColoring") );
//$NON-NLS-1$
+ super( Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.SyntaxColoring" ) ); //$NON-NLS-1$
super.setPreferenceStore(
LdifEditorActivator.getDefault().getPreferenceStore() );
// super.setDescription("");
}
@@ -231,21 +232,29 @@
createPreviewer( composite );
syntaxItems = new SyntaxItem[10];
- syntaxItems[0] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Comments"),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_COMMENT ); //$NON-NLS-1$
- syntaxItems[1] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.DN"),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN ); //$NON-NLS-1$
- syntaxItems[2] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.AttributeDescriptions"),
//$NON-NLS-1$
+ syntaxItems[0] = new SyntaxItem(
+ Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.Comments" ),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_COMMENT ); //$NON-NLS-1$
+ syntaxItems[1] = new SyntaxItem(
+ Messages.getString( "LdifEditorSyntaxColoringPreferencePage.DN" ),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN ); //$NON-NLS-1$
+ syntaxItems[2] = new SyntaxItem( Messages
+ .getString(
"LdifEditorSyntaxColoringPreferencePage.AttributeDescriptions" ), //$NON-NLS-1$
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_ATTRIBUTE );
- syntaxItems[3] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.ValueTypes"),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUETYPE ); //$NON-NLS-1$
- syntaxItems[4] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Values"),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUE ); //$NON-NLS-1$
- syntaxItems[5] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Keywords"),
//$NON-NLS-1$
+ syntaxItems[3] = new SyntaxItem(
+ Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.ValueTypes" ),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUETYPE ); //$NON-NLS-1$
+ syntaxItems[4] = new SyntaxItem(
+ Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.Values" ),
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_VALUE ); //$NON-NLS-1$
+ syntaxItems[5] = new SyntaxItem( Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.Keywords" ), //$NON-NLS-1$
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_KEYWORD );
- syntaxItems[6] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.ChangetypeAdd"),
//$NON-NLS-1$
+ syntaxItems[6] = new SyntaxItem( Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.ChangetypeAdd" ), //$NON-NLS-1$
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEADD );
- syntaxItems[7] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.ChangetypeModify"),
//$NON-NLS-1$
+ syntaxItems[7] = new SyntaxItem(
+ Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.ChangetypeModify" ), //$NON-NLS-1$
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEMODIFY
);
- syntaxItems[8] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.ChangetypeDelete"),
//$NON-NLS-1$
+ syntaxItems[8] = new SyntaxItem(
+ Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.ChangetypeDelete" ), //$NON-NLS-1$
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEDELETE
);
- syntaxItems[9] = new SyntaxItem(
Messages.getString("LdifEditorSyntaxColoringPreferencePage.ChangetypeModdn"),
//$NON-NLS-1$
+ syntaxItems[9] = new SyntaxItem(
+ Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.ChangetypeModdn" ), //$NON-NLS-1$
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_CHANGETYPEMODDN );
syntaxItemViewer.setInput( syntaxItems );
syntaxItemViewer.setSelection( new StructuredSelection( syntaxItems[0]
) );
@@ -257,7 +266,7 @@
private void createSyntaxPage( Composite parent )
{
- BaseWidgetUtils.createLabel( parent,
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Element"), 1 );
//$NON-NLS-1$
+ BaseWidgetUtils.createLabel( parent, Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.Element" ), 1 ); //$NON-NLS-1$
Composite editorComposite = BaseWidgetUtils.createColumnContainer(
parent, 2, 1 );
@@ -273,12 +282,17 @@
Composite stylesComposite = BaseWidgetUtils.createColumnContainer(
editorComposite, 1, 1 );
stylesComposite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
Composite colorComposite = BaseWidgetUtils.createColumnContainer(
stylesComposite, 2, 1 );
- BaseWidgetUtils.createLabel( colorComposite,
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Color"), 1 );
//$NON-NLS-1$
+ BaseWidgetUtils.createLabel( colorComposite, Messages
+ .getString( "LdifEditorSyntaxColoringPreferencePage.Color" ), 1 );
//$NON-NLS-1$
colorSelector = new ColorSelector( colorComposite );
- boldCheckBox = BaseWidgetUtils.createCheckbox( stylesComposite,
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Bold"), 1 );
//$NON-NLS-1$
- italicCheckBox = BaseWidgetUtils.createCheckbox( stylesComposite,
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Italic"), 1 );
//$NON-NLS-1$
- strikethroughCheckBox = BaseWidgetUtils.createCheckbox(
stylesComposite,
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Strikethrough"), 1
); //$NON-NLS-1$
- underlineCheckBox = BaseWidgetUtils.createCheckbox( stylesComposite,
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Underline"), 1 );
//$NON-NLS-1$
+ boldCheckBox = BaseWidgetUtils.createCheckbox( stylesComposite,
Messages
+ .getString( "LdifEditorSyntaxColoringPreferencePage.Bold" ), 1 );
//$NON-NLS-1$
+ italicCheckBox = BaseWidgetUtils.createCheckbox( stylesComposite,
Messages
+ .getString( "LdifEditorSyntaxColoringPreferencePage.Italic" ), 1
); //$NON-NLS-1$
+ strikethroughCheckBox = BaseWidgetUtils.createCheckbox(
stylesComposite, Messages
+ .getString( "LdifEditorSyntaxColoringPreferencePage.Strikethrough"
), 1 ); //$NON-NLS-1$
+ underlineCheckBox = BaseWidgetUtils.createCheckbox( stylesComposite,
Messages
+ .getString( "LdifEditorSyntaxColoringPreferencePage.Underline" ),
1 ); //$NON-NLS-1$
syntaxItemViewer.addSelectionChangedListener( new
ISelectionChangedListener()
{
@@ -416,7 +430,7 @@
private void createPreviewer( Composite parent )
{
- BaseWidgetUtils.createLabel( parent,
Messages.getString("LdifEditorSyntaxColoringPreferencePage.Preview"), 1 );
//$NON-NLS-1$
+ BaseWidgetUtils.createLabel( parent, Messages.getString(
"LdifEditorSyntaxColoringPreferencePage.Preview" ), 1 ); //$NON-NLS-1$
ldifEditorWidget = new LdifEditorWidget( null, LDIF_INITIAL, false );
ldifEditorWidget.createWidget( parent );
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
Wed Oct 21 11:28:17 2009
@@ -49,8 +49,9 @@
*/
public ExecuteLdifAction( LdifEditor editor )
{
- super( Messages.getString("ExecuteLdifAction.ExecuteLDIF"),
LdifEditorActivator.getDefault().getImageDescriptor(
LdifEditorConstants.IMG_EXECUTE ) ); //$NON-NLS-1$
- super.setToolTipText(
Messages.getString("ExecuteLdifAction.ExecuteLDIF") ); //$NON-NLS-1$
+ super(
+ Messages.getString( "ExecuteLdifAction.ExecuteLDIF" ),
LdifEditorActivator.getDefault().getImageDescriptor(
LdifEditorConstants.IMG_EXECUTE ) ); //$NON-NLS-1$
+ super.setToolTipText( Messages.getString(
"ExecuteLdifAction.ExecuteLDIF" ) ); //$NON-NLS-1$
this.editor = editor;
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
Wed Oct 21 11:28:17 2009
@@ -480,7 +480,7 @@
File file = new File( ( ( IEditorInput ) element
).getToolTipText() );
return file.canWrite() || !file.exists(); // Allow to edit new
files
}
-
+
return false;
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
Wed Oct 21 11:28:17 2009
@@ -141,6 +141,7 @@
protected boolean showToolBar = true;
+
/**
* Creates a new instance of LdifEditor.
*/
@@ -159,7 +160,7 @@
setHelpContextId( LdifEditorConstants.PLUGIN_ID + "." +
"tools_ldif_editor" ); //$NON-NLS-1$ //$NON-NLS-2$
}
-
+
/**
* @see
org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
@@ -228,8 +229,8 @@
long fileLength = javaIoFile.length();
if ( fileLength > ( 1 * 1024 * 1024 ) )
{
- MessageDialog.openError( site.getShell(),
Messages.getString("LdifEditor.LDIFFileIsTooBig"), //$NON-NLS-1$
-
Messages.getString("LdifEditor.LDIFFileIsTooBigDescription") ); //$NON-NLS-1$
+ MessageDialog.openError( site.getShell(), Messages.getString(
"LdifEditor.LDIFFileIsTooBig" ), //$NON-NLS-1$
+ Messages.getString(
"LdifEditor.LDIFFileIsTooBigDescription" ) ); //$NON-NLS-1$
super.init( site, new NonExistingLdifEditorInput() );
return;
}
@@ -343,7 +344,7 @@
LdifEditorConstants.ACTION_ID_EDIT_ATTRIBUTE_DESCRIPTION );
addAction( menu, ITextEditorActionConstants.GROUP_EDIT,
BrowserCommonConstants.ACTION_ID_EDIT_VALUE );
- MenuManager valueEditorMenuManager = new MenuManager(
Messages.getString("LdifEditor.EditValueWith") ); //$NON-NLS-1$
+ MenuManager valueEditorMenuManager = new MenuManager(
Messages.getString( "LdifEditor.EditValueWith" ) ); //$NON-NLS-1$
if ( this.openBestValueEditorAction.isEnabled() )
{
valueEditorMenuManager.add( this.openBestValueEditorAction );
@@ -367,7 +368,7 @@
addAction( menu, ITextEditorActionConstants.GROUP_EDIT,
LdifEditorConstants.ACTION_ID_EDIT_RECORD );
// add Format actions
- MenuManager formatMenuManager = new MenuManager(
Messages.getString("LdifEditor.Format") ); //$NON-NLS-1$
+ MenuManager formatMenuManager = new MenuManager( Messages.getString(
"LdifEditor.Format" ) ); //$NON-NLS-1$
addAction( formatMenuManager,
LdifEditorConstants.ACTION_ID_FORMAT_LDIF_DOCUMENT );
addAction( formatMenuManager,
LdifEditorConstants.ACTION_ID_FORMAT_LDIF_RECORD );
menu.appendToGroup( ITextEditorActionConstants.GROUP_EDIT,
formatMenuManager );
@@ -453,7 +454,7 @@
{
setHelpContextId( LdifEditorConstants.PLUGIN_ID + "." +
"tools_ldif_editor" ); //$NON-NLS-1$ //$NON-NLS-2$
- if(showToolBar)
+ if ( showToolBar )
{
// create the toolbar (including connection widget and execute
button) on top of the editor
Composite composite = new Composite( parent, SWT.NONE );
@@ -463,10 +464,10 @@
layout.marginHeight = 0;
layout.verticalSpacing = 0;
composite.setLayout( layout );
-
+
control = new ViewForm( composite, SWT.NONE );
control.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-
+
Composite browserConnectionWidgetControl =
BaseWidgetUtils.createColumnContainer( control, 2, 1 );
browserConnectionWidget = new BrowserConnectionWidget();
browserConnectionWidget.createWidget(
browserConnectionWidgetControl );
@@ -480,16 +481,16 @@
}
} );
control.setTopLeft( browserConnectionWidgetControl );
-
+
// tool bar
actionToolBar = new ToolBar( control, SWT.FLAT | SWT.RIGHT );
actionToolBar.setLayoutData( new GridData( SWT.END, SWT.NONE,
true, false ) );
actionToolBarManager = new ToolBarManager( actionToolBar );
control.setTopCenter( actionToolBar );
-
+
// local menu
control.setTopRight( null );
-
+
// content
Composite editorComposite = new Composite( control, SWT.NONE );
editorComposite.setLayout( new FillLayout() );
@@ -581,7 +582,7 @@
{
this.browserConnection = browserConnection;
getEditorSite().getActionBars().getStatusLineManager().setMessage(
- Messages.getString("LdifEditor.UsedConnection") //$NON-NLS-1$
+ Messages.getString( "LdifEditor.UsedConnection" ) //$NON-NLS-1$
+ ( browserConnection == null ||
browserConnection.getConnection() == null ? "-" : browserConnection
//$NON-NLS-1$
.getConnection().getName() ) );
// getStatusField("ldapconnection").setText();
@@ -741,7 +742,8 @@
final File externalFile = new File( path );
if ( externalFile.exists() )
{
- MessageDialog overwriteDialog = new MessageDialog( shell,
Messages.getString("LdifEditor.Overwrite"), null,
Messages.getString("OverwriteQuestion"), //$NON-NLS-1$ //$NON-NLS-2$
+ MessageDialog overwriteDialog = new MessageDialog( shell,
+ Messages.getString( "LdifEditor.Overwrite" ), null,
Messages.getString( "OverwriteQuestion" ), //$NON-NLS-1$ //$NON-NLS-2$
MessageDialog.WARNING, new String[]
{ IDialogConstants.YES_LABEL,
IDialogConstants.NO_LABEL }, 1 ); // 'No' is the default
if ( overwriteDialog.open() != Window.OK )
@@ -769,8 +771,8 @@
final IStatus status = x.getStatus();
if ( status == null || status.getSeverity() != IStatus.CANCEL )
{
- String title =
Messages.getString("LdifEditor.ErrorInSaveAs"); //$NON-NLS-1$
- String msg =
Messages.getString("LdifEditor.ErrorInSaveAs") + x.getMessage(); //$NON-NLS-1$
+ String title = Messages.getString(
"LdifEditor.ErrorInSaveAs" ); //$NON-NLS-1$
+ String msg = Messages.getString(
"LdifEditor.ErrorInSaveAs" ) + x.getMessage(); //$NON-NLS-1$
MessageDialog.openError( shell, title, msg );
}
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java
Wed Oct 21 11:28:17 2009
@@ -109,8 +109,7 @@
if ( !list.isEmpty() && list.get( 0 ) instanceof
LdifAttrValLine )
{
LdifAttrValLine line = ( LdifAttrValLine )
list.get( 0 );
- ldifEditor.selectAndReveal( line.getOffset(),
line.getRawAttributeDescription()
- .length() );
+ ldifEditor.selectAndReveal( line.getOffset(),
line.getRawAttributeDescription().length() );
}
}
else if ( element instanceof LdifAttrValLine )
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifSourceViewerConfiguration.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifSourceViewerConfiguration.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifSourceViewerConfiguration.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifSourceViewerConfiguration.java
Wed Oct 21 11:28:17 2009
@@ -51,6 +51,7 @@
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.swt.graphics.RGB;
+
/**
* This class enables the features of the editor (Syntax coloring, code
completion, etc.)
*
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/NonExistingLdifEditorInput.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/NonExistingLdifEditorInput.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/NonExistingLdifEditorInput.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/NonExistingLdifEditorInput.java
Wed Oct 21 11:28:17 2009
@@ -115,7 +115,7 @@
{
return this;
}
-
+
return Platform.getAdapterManager().getAdapter( this, adapter );
}
@@ -134,7 +134,7 @@
NonExistingLdifEditorInput input = ( NonExistingLdifEditorInput )
element;
return input.getPath();
}
-
+
return null;
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java
Wed Oct 21 11:28:17 2009
@@ -59,7 +59,7 @@
public AbstractOpenValueEditorAction( LdifEditor editor )
{
- super( Messages.getString("AbstractOpenValueEditorAction.EditValue"),
editor ); //$NON-NLS-1$
+ super( Messages.getString( "AbstractOpenValueEditorAction.EditValue"
), editor ); //$NON-NLS-1$
valueEditorManager = editor.getValueEditorManager();
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
Wed Oct 21 11:28:17 2009
@@ -56,7 +56,7 @@
public EditLdifAttributeAction( LdifEditor editor )
{
- super(
Messages.getString("EditLdifAttributeAction.EditAttributeDescription"), editor
); //$NON-NLS-1$
+ super( Messages.getString(
"EditLdifAttributeAction.EditAttributeDescription" ), editor ); //$NON-NLS-1$
super.setActionDefinitionId(
BrowserCommonConstants.ACTION_ID_EDIT_ATTRIBUTE_DESCRIPTION );
}
@@ -124,7 +124,8 @@
dummyEntry = new DummyEntry( new LdapDN(), dummyConnection
);
}
- AttributeWizard wizard = new AttributeWizard(
Messages.getString("EditLdifAttributeAction.EditAttributeDescription"), true,
false, //$NON-NLS-1$
+ AttributeWizard wizard = new AttributeWizard( Messages
+ .getString(
"EditLdifAttributeAction.EditAttributeDescription" ), true, false, //$NON-NLS-1$
attributeDescription, dummyEntry );
WizardDialog dialog = new WizardDialog(
Display.getDefault().getActiveShell(), wizard );
dialog.setBlockOnOpen( true );
@@ -188,8 +189,8 @@
LdifAttrValLine newLine = LdifAttrValLine.create(
newAttributeDescription, oldValue );
try
{
- document.replace( line.getOffset(),
line.getLength(), newLine
- .toFormattedString(
Utils.getLdifFormatParameters() ) );
+ document.replace( line.getOffset(),
line.getLength(), newLine.toFormattedString( Utils
+ .getLdifFormatParameters() ) );
}
catch ( BadLocationException e )
{
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifRecordAction.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifRecordAction.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifRecordAction.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifRecordAction.java
Wed Oct 21 11:28:17 2009
@@ -37,7 +37,7 @@
public EditLdifRecordAction( LdifEditor editor )
{
- super( Messages.getString("EditLdifRecordAction.EditRecord"), editor
); //$NON-NLS-1$
+ super( Messages.getString( "EditLdifRecordAction.EditRecord" ), editor
); //$NON-NLS-1$
super.setActionDefinitionId( LdifEditorConstants.ACTION_ID_EDIT_RECORD
);
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifDocumentAction.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifDocumentAction.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifDocumentAction.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifDocumentAction.java
Wed Oct 21 11:28:17 2009
@@ -32,7 +32,7 @@
public FormatLdifDocumentAction( LdifEditor editor )
{
- super( Messages.getString("FormatLdifDocumentAction.FormatDocument"),
editor ); //$NON-NLS-1$
+ super( Messages.getString( "FormatLdifDocumentAction.FormatDocument"
), editor ); //$NON-NLS-1$
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifRecordAction.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifRecordAction.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifRecordAction.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/FormatLdifRecordAction.java
Wed Oct 21 11:28:17 2009
@@ -34,7 +34,7 @@
public FormatLdifRecordAction( LdifEditor editor )
{
- super( Messages.getString("FormatLdifRecordAction.FormatRecord"),
editor ); //$NON-NLS-1$
+ super( Messages.getString( "FormatLdifRecordAction.FormatRecord" ),
editor ); //$NON-NLS-1$
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/OpenBestValueEditorAction.java
Wed Oct 21 11:28:17 2009
@@ -50,7 +50,8 @@
Object rawValue = getValueEditorRawValue();
if ( !( valueEditor instanceof AbstractDialogValueEditor ) ||
rawValue == null )
{
- IValueEditor[] vps =
valueEditorManager.getAlternativeValueEditors( connection.getSchema(),
attributeDescription );
+ IValueEditor[] vps =
valueEditorManager.getAlternativeValueEditors( connection.getSchema(),
+ attributeDescription );
for ( int i = 0; i < vps.length
&& ( !( valueEditor instanceof AbstractDialogValueEditor )
|| rawValue == null ); i++ )
{
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAutoEditStrategy.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAutoEditStrategy.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAutoEditStrategy.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifAutoEditStrategy.java
Wed Oct 21 11:28:17 2009
@@ -77,7 +77,7 @@
boolean autoWrap =
LdifEditorActivator.getDefault().getPreferenceStore().getBoolean(
LdifEditorConstants.PREFERENCE_LDIFEDITOR_FORMATTER_AUTOWRAP );
-
+
if ( autoWrap )
{
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java
Wed Oct 21 11:28:17 2009
@@ -143,25 +143,24 @@
{
if ( CT_ADD.startsWith( prefix ) )
proposalList.add( new CompletionProposal( CT_ADD, offset -
prefix.length(), prefix.length(), CT_ADD
- .length(), LdifEditorActivator.getDefault().getImage(
LdifEditorConstants.IMG_LDIF_ADD ), CT_ADD
- .substring( 0, CT_ADD.length() -
BrowserCoreConstants.LINE_SEPARATOR.length() ), null, null ) );
+ .length(), LdifEditorActivator.getDefault().getImage(
LdifEditorConstants.IMG_LDIF_ADD ),
+ CT_ADD.substring( 0, CT_ADD.length() -
BrowserCoreConstants.LINE_SEPARATOR.length() ), null,
+ null ) );
if ( CT_MODIFY.startsWith( prefix ) )
proposalList.add( new CompletionProposal( CT_MODIFY,
offset - prefix.length(), prefix.length(),
- CT_MODIFY.length(),
- LdifEditorActivator.getDefault().getImage(
LdifEditorConstants.IMG_LDIF_MODIFY ), CT_MODIFY
- .substring( 0, CT_MODIFY.length() -
BrowserCoreConstants.LINE_SEPARATOR.length() ), null,
- null ) );
+ CT_MODIFY.length(),
LdifEditorActivator.getDefault().getImage(
+ LdifEditorConstants.IMG_LDIF_MODIFY ),
CT_MODIFY.substring( 0, CT_MODIFY.length()
+ - BrowserCoreConstants.LINE_SEPARATOR.length() ),
null, null ) );
if ( CT_DELETE.startsWith( prefix ) )
proposalList.add( new CompletionProposal( CT_DELETE,
offset - prefix.length(), prefix.length(),
- CT_DELETE.length(),
- LdifEditorActivator.getDefault().getImage(
LdifEditorConstants.IMG_LDIF_DELETE ), CT_DELETE
- .substring( 0, CT_DELETE.length() -
BrowserCoreConstants.LINE_SEPARATOR.length() ), null,
- null ) );
+ CT_DELETE.length(),
LdifEditorActivator.getDefault().getImage(
+ LdifEditorConstants.IMG_LDIF_DELETE ),
CT_DELETE.substring( 0, CT_DELETE.length()
+ - BrowserCoreConstants.LINE_SEPARATOR.length() ),
null, null ) );
if ( CT_MODDN.startsWith( prefix ) )
proposalList.add( new CompletionProposal( CT_MODDN, offset
- prefix.length(), prefix.length(),
- CT_MODDN.length(),
LdifEditorActivator.getDefault().getImage( LdifEditorConstants.IMG_LDIF_RENAME
),
- CT_MODDN.substring( 0, CT_MODDN.length() -
BrowserCoreConstants.LINE_SEPARATOR.length() ),
- null, null ) );
+ CT_MODDN.length(),
LdifEditorActivator.getDefault().getImage(
+ LdifEditorConstants.IMG_LDIF_RENAME ),
CT_MODDN.substring( 0, CT_MODDN.length()
+ - BrowserCoreConstants.LINE_SEPARATOR.length() ),
null, null ) );
}
}
Modified:
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
URL:
http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java?rev=827964&r1=827963&r2=827964&view=diff
==============================================================================
---
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
(original)
+++
directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifDamagerRepairer.java
Wed Oct 21 11:28:17 2009
@@ -131,8 +131,8 @@
{
IPreferenceStore store =
LdifEditorActivator.getDefault().getPreferenceStore();
- RGB rgb = PreferenceConverter
- .getColor( store, key +
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX );
+ RGB rgb = PreferenceConverter.getColor( store, key
+ + LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_RGB_SUFFIX );
int style = store.getInt( key +
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_STYLE_SUFFIX );
if ( textAttributeKeyToValueMap != null )
|
|