You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2009/10/21 10:07:56 UTC
svn commit: r827915 - in
/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor:
./ controller/actions/ model/ model/alias/ model/io/
view/editors/attributetype/ view/editors/objectclass/ view/preferences/
view/wiza...
Author: pamarcelot
Date: Wed Oct 21 08:07:55 2009
New Revision: 827915
URL: http://svn.apache.org/viewvc?rev=827915&view=rev
Log:
Code formatting.
Modified:
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java Wed Oct 21 08:07:55 2009
@@ -97,12 +97,12 @@
"View_SearchView_id" );
/** The New Attribute Type Wizard ID */
- public static final String NEW_WIZARD_NEW_ATTRIBUTE_TYPE_WIZARD = Activator.getDefault().getPluginProperties().getString(
- "NewWizard_NewAttributeTypeWizard_id" );
+ public static final String NEW_WIZARD_NEW_ATTRIBUTE_TYPE_WIZARD = Activator.getDefault().getPluginProperties()
+ .getString( "NewWizard_NewAttributeTypeWizard_id" );
/** The New Object Class Wizard ID */
- public static final String NEW_WIZARD_NEW_OBJECT_CLASS_WIZARD = Activator.getDefault().getPluginProperties().getString(
- "NewWizard_NewObjectClassWizard_id" );
+ public static final String NEW_WIZARD_NEW_OBJECT_CLASS_WIZARD = Activator.getDefault().getPluginProperties()
+ .getString( "NewWizard_NewObjectClassWizard_id" );
/** The New Project Wizard ID */
public static final String NEW_WIZARD_NEW_PROJECT_WIZARD = Activator.getDefault().getPluginProperties().getString(
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Wed Oct 21 08:07:55 2009
@@ -211,14 +211,16 @@
}
catch ( ProjectsImportException e )
{
- reportError( Messages.getString("PluginUtils.ErrorLoadingProject"), e, Messages.getString("PluginUtils.ProjectsLoadingError"),
- Messages.getString("PluginUtils.ErrorLoadingProject") );
+ reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), e, Messages
+ .getString( "PluginUtils.ProjectsLoadingError" ), Messages
+ .getString( "PluginUtils.ErrorLoadingProject" ) );
return;
}
catch ( FileNotFoundException e )
{
- reportError( Messages.getString("PluginUtils.ErrorLoadingProject"), e, Messages.getString("PluginUtils.ProjectsLoadingError"),
- Messages.getString("PluginUtils.ErrorLoadingProject") );
+ reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), e, Messages
+ .getString( "PluginUtils.ProjectsLoadingError" ), Messages
+ .getString( "PluginUtils.ErrorLoadingProject" ) );
return;
}
@@ -230,8 +232,9 @@
}
else
{
- reportError( Messages.getString("PluginUtils.ErrorLoadingProject"), null, Messages.getString("PluginUtils.ProjectsLoadingError"),
- Messages.getString("PluginUtils.ErrorLoadingProject") );
+ reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), null, Messages
+ .getString( "PluginUtils.ProjectsLoadingError" ), Messages
+ .getString( "PluginUtils.ErrorLoadingProject" ) );
}
}
@@ -275,8 +278,9 @@
catch ( IOException e2 )
{
// If another error occur, we display an error
- reportError( Messages.getString("PluginUtils.ErrorSavingProject"), e2, Messages.getString("PluginUtils.ProjectsSavingError"),
- Messages.getString("PluginUtils.ErrorSavingProject") );
+ reportError( Messages.getString( "PluginUtils.ErrorSavingProject" ), e2, Messages
+ .getString( "PluginUtils.ProjectsSavingError" ), Messages
+ .getString( "PluginUtils.ErrorSavingProject" ) );
}
}
}
@@ -349,8 +353,9 @@
if ( url == null )
{
- reportError( Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + ".", null, //$NON-NLS-2$
- Messages.getString("PluginUtils.ProjectsLoadingError"), Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + "." ); //$NON-NLS-3$
+ reportError(
+ Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", null, //$NON-NLS-2$
+ Messages.getString( "PluginUtils.ProjectsLoadingError" ), Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-3$
}
else
{
@@ -359,18 +364,21 @@
}
catch ( XMLSchemaFileImportException e )
{
- reportError( Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + ".", e, Messages.getString("PluginUtils.ProjectsLoadingError"),//$NON-NLS-2$
- Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + "." ); //$NON-NLS-2$
+ reportError(
+ Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ),//$NON-NLS-2$
+ Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-2$
}
catch ( FileNotFoundException e )
{
- reportError( Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + ".", e, Messages.getString("PluginUtils.ProjectsLoadingError"), //$NON-NLS-2$
- Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + "." ); //$NON-NLS-2$
+ reportError(
+ Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ), //$NON-NLS-2$
+ Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-2$
}
catch ( IOException e )
{
- reportError( Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + ".", e, Messages.getString("PluginUtils.ProjectsLoadingError"), //$NON-NLS-2$
- Messages.getString("PluginUtils.SchemaLoadingError") + schemaName + "." ); //$NON-NLS-2$
+ reportError(
+ Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ), //$NON-NLS-2$
+ Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-2$
}
return schema;
@@ -481,8 +489,9 @@
}
catch ( CoreException e )
{
- PluginUtils.logError( Messages.getString("PluginUtils.ConnectorsLoadingError"), e );
- ViewUtils.displayErrorMessageBox( Messages.getString("PluginUtils.Error"), Messages.getString("PluginUtils.ConnectorsLoadingError") );
+ PluginUtils.logError( Messages.getString( "PluginUtils.ConnectorsLoadingError" ), e );
+ ViewUtils.displayErrorMessageBox( Messages.getString( "PluginUtils.Error" ), Messages
+ .getString( "PluginUtils.ConnectorsLoadingError" ) );
}
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java Wed Oct 21 08:07:55 2009
@@ -46,7 +46,7 @@
*/
public ImportSchemasFromOpenLdapAction()
{
- super( Messages.getString("ImportSchemasFromOpenLdapAction.SchemaFromOpenLDAPFilesAction") ); //$NON-NLS-1$
+ super( Messages.getString( "ImportSchemasFromOpenLdapAction.SchemaFromOpenLDAPFilesAction" ) ); //$NON-NLS-1$
setToolTipText( getText() );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_IMPORT ) );
setEnabled( true );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java Wed Oct 21 08:07:55 2009
@@ -61,6 +61,7 @@
/** The schema object */
private Schema schemaObject;
+
/**
* Creates a new instance of AttributeTypeImpl.
*
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java Wed Oct 21 08:07:55 2009
@@ -46,6 +46,7 @@
/** The schema object */
private Schema schemaObject;
+
/**
* Gets the OID of the syntax.
*
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java Wed Oct 21 08:07:55 2009
@@ -57,6 +57,7 @@
/** The schema object */
private Schema schemaObject;
+
/**
* Creates a new instance of ObjectClassImpl.
*
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java Wed Oct 21 08:07:55 2009
@@ -107,9 +107,10 @@
*/
public Project( ProjectType type )
{
- init( type, null, ProjectState.CLOSED);
+ init( type, null, ProjectState.CLOSED );
}
-
+
+
/**
* Inits the project.
*
@@ -120,7 +121,7 @@
* @param state
* the state of the project
*/
- private void init( ProjectType type, String name, ProjectState state)
+ private void init( ProjectType type, String name, ProjectState state )
{
this.type = type;
this.name = name;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java Wed Oct 21 08:07:55 2009
@@ -39,6 +39,7 @@
/** The schema object */
private Schema schemaObject;
+
/**
* Creates a new instance of SyntaxImpl.
*
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java Wed Oct 21 08:07:55 2009
@@ -187,7 +187,7 @@
else
{
prevChar();
-
+
lastTokenType = AliasesStringToken.ALIAS;
return new AliasesStringToken( lastTokenType, sb.toString(), pos - sb.length() + 1 );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Wed Oct 21 08:07:55 2009
@@ -103,8 +103,9 @@
SearchControls constraintSearch = new SearchControls();
constraintSearch.setSearchScope( SearchControls.ONELEVEL_SCOPE );
- NamingEnumeration<SearchResult> answer = wrapper.search( "ou=schema", "(objectclass=metaSchema)",
- constraintSearch, DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, ( StudioProgressMonitor ) monitor, null );
+ NamingEnumeration<SearchResult> answer = wrapper
+ .search( "ou=schema", "(objectclass=metaSchema)", constraintSearch, DEREF_ALIAS_METHOD,
+ HANDLE_REFERALS_METHOD, null, ( StudioProgressMonitor ) monitor, null );
if ( answer != null )
{
while ( answer.hasMoreElements() )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Wed Oct 21 08:07:55 2009
@@ -546,7 +546,8 @@
}
catch ( IllegalArgumentException e )
{
- throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.UnconvertableValue" ), e ); //$NON-NLS-1$
+ throw new XMLSchemaFileImportException(
+ Messages.getString( "XMLSchemaFileImporter.UnconvertableValue" ), e ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Wed Oct 21 08:07:55 2009
@@ -285,7 +285,7 @@
setEditorDirty();
}
};
-
+
/** The listener for the Edit Aliases Button Widget */
private SelectionAdapter aliasesButtonListener = new SelectionAdapter()
{
@@ -656,20 +656,20 @@
setEditorDirty();
}
};
-
+
/** The filter listener for Mouse Wheel events */
private Listener mouseWheelFilter = new Listener()
{
- public void handleEvent( Event event )
- {
- // Hiding Mouse Wheel events for Combo widgets
- if ( event.widget instanceof Combo )
- {
- event.doit = false;
- }
- }
+ public void handleEvent( Event event )
+ {
+ // Hiding Mouse Wheel events for Combo widgets
+ if ( event.widget instanceof Combo )
+ {
+ event.doit = false;
+ }
+ }
};
-
+
/**
* Default constructor.
@@ -796,7 +796,6 @@
usageCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
initUsageCombo();
-
// SYNTAX Combo
toolkit
.createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.Syntax" ) );
@@ -1201,7 +1200,7 @@
equalityComboViewer.addSelectionChangedListener( equalityComboViewerListener );
orderingComboViewer.addSelectionChangedListener( orderingComboViewerListener );
substringComboViewer.addSelectionChangedListener( substringComboViewerListener );
-
+
Display.getCurrent().addFilter( SWT.MouseWheel, mouseWheelFilter );
}
@@ -1230,7 +1229,7 @@
equalityComboViewer.removeSelectionChangedListener( equalityComboViewerListener );
orderingComboViewer.removeSelectionChangedListener( orderingComboViewerListener );
substringComboViewer.removeSelectionChangedListener( substringComboViewerListener );
-
+
Display.getCurrent().removeFilter( SWT.MouseWheel, mouseWheelFilter );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Wed Oct 21 08:07:55 2009
@@ -830,18 +830,18 @@
}
}
};
-
+
/** The filter listener for Mouse Wheel events */
private Listener mouseWheelFilter = new Listener()
{
- public void handleEvent( Event event )
- {
- // Hiding Mouse Wheel events for Combo widgets
- if ( event.widget instanceof Combo )
- {
- event.doit = false;
- }
- }
+ public void handleEvent( Event event )
+ {
+ // Hiding Mouse Wheel events for Combo widgets
+ if ( event.widget instanceof Combo )
+ {
+ event.doit = false;
+ }
+ }
};
@@ -1226,7 +1226,7 @@
superiorsTable.addMouseListener( superiorsTableListener );
mandatoryAttributesTable.addMouseListener( mandatoryAttributesTableListener );
optionalAttributesTable.addMouseListener( optionalAttributesTableListener );
-
+
Display.getCurrent().addFilter( SWT.MouseWheel, mouseWheelFilter );
}
@@ -1253,7 +1253,7 @@
optionalAttributesTable.removeMouseListener( optionalAttributesTableListener );
addButtonOptionalTable.removeSelectionListener( addButtonOptionalTableListener );
removeButtonOptionalTable.removeSelectionListener( removeButtonOptionalTableListener );
-
+
Display.getCurrent().removeFilter( SWT.MouseWheel, mouseWheelFilter );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/PluginPreferencePage.java Wed Oct 21 08:07:55 2009
@@ -111,7 +111,7 @@
} );
schemaConnectorsTableViewer.setComparator( new ViewerComparator( new Comparator<String>()
- {
+ {
public int compare( String o1, String o2 )
{
if ( ( o1 != null ) && ( o2 != null ) )
@@ -122,7 +122,7 @@
// Default
return 0;
}
- } ) );
+ } ) );
// schemaConnectorsTableViewer.setComparator( new ViewerComparator( new Comparator<SchemaConnector>()
// {
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java Wed Oct 21 08:07:55 2009
@@ -128,11 +128,12 @@
*/
private void reportError( Exception e, File schemaFile, StudioProgressMonitor monitor )
{
- String message = NLS.bind( Messages
- .getString( "ImportSchemasFromOpenLdapWizard.ErrorImportingSchema" ), schemaFile.getName() ); //$NON-NLS-1$
+ String message = NLS.bind(
+ Messages.getString( "ImportSchemasFromOpenLdapWizard.ErrorImportingSchema" ), schemaFile.getName() ); //$NON-NLS-1$
monitor.reportError( message, e );
}
+
public String getName()
{
return Messages.getString( "ImportSchemasFromOpenLdapWizard.ImportingSchemas" ); //$NON-NLS-1$
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java Wed Oct 21 08:07:55 2009
@@ -76,8 +76,9 @@
protected NewObjectClassOptionalAttributesPage()
{
super( "NewObjectClassOptionalAttributesPage" ); //$NON-NLS-1$
- setTitle( Messages.getString("NewObjectClassOptionalAttributesPage.OptionalAttributeTypes") ); //$NON-NLS-1$
- setDescription( Messages.getString("NewObjectClassOptionalAttributesPage.SpecifiyOptionalAttributeTypesForObjectClass") ); //$NON-NLS-1$
+ setTitle( Messages.getString( "NewObjectClassOptionalAttributesPage.OptionalAttributeTypes" ) ); //$NON-NLS-1$
+ setDescription( Messages
+ .getString( "NewObjectClassOptionalAttributesPage.SpecifiyOptionalAttributeTypesForObjectClass" ) ); //$NON-NLS-1$
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
optionalAttributeTypesList = new ArrayList<AttributeTypeImpl>();
}
@@ -94,7 +95,8 @@
// Optional Attribute Types Group
Group optionalAttributeTypesGroup = new Group( composite, SWT.NONE );
- optionalAttributeTypesGroup.setText( Messages.getString("NewObjectClassOptionalAttributesPage.OptionalAttributeTypes") ); //$NON-NLS-1$
+ optionalAttributeTypesGroup.setText( Messages
+ .getString( "NewObjectClassOptionalAttributesPage.OptionalAttributeTypes" ) ); //$NON-NLS-1$
optionalAttributeTypesGroup.setLayout( new GridLayout( 2, false ) );
optionalAttributeTypesGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
@@ -128,11 +130,15 @@
String[] names = at.getNamesRef();
if ( ( names != null ) && ( names.length > 0 ) )
{
- return NLS.bind( Messages.getString("NewObjectClassOptionalAttributesPage.AliasOID"), new String[]{ViewUtils.concateAliases( names ), at.getOid()}); //$NON-NLS-1$
+ return NLS
+ .bind(
+ Messages.getString( "NewObjectClassOptionalAttributesPage.AliasOID" ), new String[] { ViewUtils.concateAliases( names ), at.getOid() } ); //$NON-NLS-1$
}
else
{
- return NLS.bind( Messages.getString("NewObjectClassOptionalAttributesPage.NoneOID"), new String[]{ at.getOid()}); //$NON-NLS-1$
+ return NLS
+ .bind(
+ Messages.getString( "NewObjectClassOptionalAttributesPage.NoneOID" ), new String[] { at.getOid() } ); //$NON-NLS-1$
}
}
// Default
@@ -148,7 +154,7 @@
}
} );
optionalAttributeTypesAddButton = new Button( optionalAttributeTypesGroup, SWT.PUSH );
- optionalAttributeTypesAddButton.setText( Messages.getString("NewObjectClassOptionalAttributesPage.Add") ); //$NON-NLS-1$
+ optionalAttributeTypesAddButton.setText( Messages.getString( "NewObjectClassOptionalAttributesPage.Add" ) ); //$NON-NLS-1$
optionalAttributeTypesAddButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
optionalAttributeTypesAddButton.addSelectionListener( new SelectionAdapter()
{
@@ -158,7 +164,8 @@
}
} );
optionalAttributeTypesRemoveButton = new Button( optionalAttributeTypesGroup, SWT.PUSH );
- optionalAttributeTypesRemoveButton.setText( Messages.getString("NewObjectClassOptionalAttributesPage.Remove") ); //$NON-NLS-1$
+ optionalAttributeTypesRemoveButton
+ .setText( Messages.getString( "NewObjectClassOptionalAttributesPage.Remove" ) ); //$NON-NLS-1$
optionalAttributeTypesRemoveButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
optionalAttributeTypesRemoveButton.addSelectionListener( new SelectionAdapter()
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java?rev=827915&r1=827914&r2=827915&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardInformationPage.java Wed Oct 21 08:07:55 2009
@@ -127,6 +127,7 @@
setPageComplete( false );
}
+
/**
* This method is called when the user modifies something in the UI.
*/