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 2007/08/21 14:28:21 UTC
svn commit: r568097 - in
/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view:
dialogs/ editors/attributetype/ preferences/ search/ views/
Author: pamarcelot
Date: Tue Aug 21 05:28:19 2007
New Revision: 568097
URL: http://svn.apache.org/viewvc?rev=568097&view=rev
Log:
Replaced the deprecated GridData.FILL by SWT.FILL
Modified:
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/EditAliasesDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/PreviousSearchesDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/RenameProjectDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/HierarchyViewPreferencePage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SchemaViewPreferencePage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SearchViewPreferencePage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchViewSortingDialog.java
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java Tue Aug 21 05:28:19 2007
@@ -109,10 +109,10 @@
Label chooseLabel = new Label( composite, SWT.NONE );
chooseLabel.setText( "Choose an attribute type" );
- chooseLabel.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ chooseLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
searchText = new Text( composite, SWT.BORDER );
- searchText.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ searchText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
searchText.addModifyListener( new ModifyListener()
{
public void modifyText( ModifyEvent e )
@@ -133,11 +133,11 @@
Label matchingLabel = new Label( composite, SWT.NONE );
matchingLabel.setText( "Matching attribute type(s)" );
- matchingLabel.setLayoutData( new GridData( GridData.FILL, SWT.None, true, false ) );
+ matchingLabel.setLayoutData( new GridData( SWT.FILL, SWT.None, true, false ) );
attributeTypesTable = new Table( composite, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
| SWT.FULL_SELECTION | SWT.HIDE_SELECTION );
- GridData gridData = new GridData( GridData.FILL, GridData.FILL, true, true );
+ GridData gridData = new GridData( SWT.FILL, SWT.FILL, true, true );
gridData.heightHint = 148;
gridData.minimumHeight = 148;
gridData.widthHint = 350;
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/EditAliasesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/EditAliasesDialog.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/EditAliasesDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/EditAliasesDialog.java Tue Aug 21 05:28:19 2007
@@ -117,17 +117,17 @@
{
Composite composite = new Composite( parent, SWT.NONE );
composite.setLayout( new GridLayout( 2, false ) );
- composite.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
+ composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
// ALIASES Label
Label aliases_label = new Label( composite, SWT.NONE );
aliases_label.setText( "Aliases" );
- aliases_label.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, true, 2, 1 ) );
+ aliases_label.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, true, 2, 1 ) );
// ALIASES Table
aliasesTable = new Table( composite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION
| SWT.HIDE_SELECTION );
- GridData gridData = new GridData( GridData.FILL, GridData.FILL, true, true, 2, 1 );
+ GridData gridData = new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 );
gridData.heightHint = 100;
gridData.minimumHeight = 100;
gridData.widthHint = 200;
@@ -137,11 +137,11 @@
// ADD Label
Label add_label = new Label( composite, SWT.NONE );
add_label.setText( "Add an alias" );
- add_label.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, true, 2, 1 ) );
+ add_label.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, true, 2, 1 ) );
// NEW ALIAS Field
newAliasText = new Text( composite, SWT.BORDER );
- newAliasText.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ newAliasText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Add Button
newAliasAddButton = new Button( composite, SWT.PUSH );
@@ -152,7 +152,7 @@
// Error Composite
errorComposite = new Composite( composite, SWT.NONE );
errorComposite.setLayout( new GridLayout( 2, false ) );
- errorComposite.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true, 2, 1 ) );
+ errorComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 ) );
errorComposite.setVisible( false );
// Error Image
@@ -163,7 +163,7 @@
// Error Label
errorLabel = new Label( errorComposite, SWT.NONE );
- errorLabel.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
+ errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
errorLabel.setText( "An element with the same alias already exists." );
// Table initialization
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java Tue Aug 21 05:28:19 2007
@@ -109,10 +109,10 @@
Label chooseLabel = new Label( composite, SWT.NONE );
chooseLabel.setText( "Choose an object class" );
- chooseLabel.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ chooseLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
searchText = new Text( composite, SWT.BORDER );
- searchText.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ searchText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
searchText.addModifyListener( new ModifyListener()
{
public void modifyText( ModifyEvent e )
@@ -133,11 +133,11 @@
Label matchingLabel = new Label( composite, SWT.NONE );
matchingLabel.setText( "Matching object class(es)" );
- matchingLabel.setLayoutData( new GridData( GridData.FILL, SWT.None, true, false ) );
+ matchingLabel.setLayoutData( new GridData( SWT.FILL, SWT.None, true, false ) );
objectClassesTable = new Table( composite, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
| SWT.FULL_SELECTION | SWT.HIDE_SELECTION );
- GridData gridData = new GridData( GridData.FILL, GridData.FILL, true, true );
+ GridData gridData = new GridData( SWT.FILL, SWT.FILL, true, true );
gridData.heightHint = 148;
gridData.minimumHeight = 148;
gridData.widthHint = 350;
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/PreviousSearchesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/PreviousSearchesDialog.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/PreviousSearchesDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/PreviousSearchesDialog.java Tue Aug 21 05:28:19 2007
@@ -94,7 +94,7 @@
{
Composite composite = new Composite( parent, SWT.NONE );
composite.setLayout( new GridLayout( 2, false ) );
- composite.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
+ composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
Label label = new Label( composite, SWT.NONE );
label.setText( "Select the search to show in the search results view:" );
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/RenameProjectDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/RenameProjectDialog.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/RenameProjectDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/RenameProjectDialog.java Tue Aug 21 05:28:19 2007
@@ -97,13 +97,13 @@
{
Composite composite = new Composite( parent, SWT.NONE );
composite.setLayout( new GridLayout( 2, false ) );
- composite.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
+ composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
// New Name
Label newNameLabel = new Label( composite, SWT.NONE );
newNameLabel.setText( "New name:" );
newNameText = new Text( composite, SWT.BORDER );
- newNameText.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ newNameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
newNameText.setText( originalName );
newNameText.addModifyListener( new ModifyListener()
{
@@ -130,7 +130,7 @@
// Error Composite
errorComposite = new Composite( composite, SWT.NONE );
errorComposite.setLayout( new GridLayout( 2, false ) );
- errorComposite.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true, 2, 1 ) );
+ errorComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 ) );
errorComposite.setVisible( false );
// Error Image
@@ -141,7 +141,7 @@
// Error Label
errorLabel = new Label( errorComposite, SWT.NONE );
- errorLabel.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
+ errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
errorLabel.setText( "A project with the same name already exists." );
newNameText.setFocus();
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Tue Aug 21 05:28:19 2007
@@ -277,10 +277,10 @@
mandatoryAttributeSectionClient.setLayout( new GridLayout() );
toolkit.paintBordersFor( mandatoryAttributeSectionClient );
mandatoryAttributeSection.setClient( mandatoryAttributeSectionClient );
- mandatoryAttributeSection.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
+ mandatoryAttributeSection.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
mandatoryAttributeTable = toolkit.createTable( mandatoryAttributeSectionClient, SWT.NONE );
- GridData gridData = new GridData( GridData.FILL, GridData.FILL, true, true );
+ GridData gridData = new GridData( SWT.FILL, SWT.FILL, true, true );
gridData.heightHint = 1;
mandatoryAttributeTable.setLayoutData( gridData );
mandatoryAttributeTableViewer = new TableViewer( mandatoryAttributeTable );
@@ -320,10 +320,10 @@
optionalAttributeSectionClient.setLayout( new GridLayout() );
toolkit.paintBordersFor( optionalAttributeSectionClient );
optionalAttributeSection.setClient( optionalAttributeSectionClient );
- optionalAttributeSection.setLayoutData( new GridData( GridData.FILL, GridData.FILL, true, true ) );
+ optionalAttributeSection.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
optionalAttibuteTable = toolkit.createTable( optionalAttributeSectionClient, SWT.NONE );
- GridData gridData = new GridData( GridData.FILL, GridData.FILL, true, true );
+ GridData gridData = new GridData( SWT.FILL, SWT.FILL, true, true );
gridData.heightHint = 1;
optionalAttibuteTable.setLayoutData( gridData );
optionalAttibuteTableViewer = new TableViewer( optionalAttibuteTable );
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/HierarchyViewPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/HierarchyViewPreferencePage.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/HierarchyViewPreferencePage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/HierarchyViewPreferencePage.java Tue Aug 21 05:28:19 2007
@@ -95,21 +95,21 @@
// Label Group
Group labelGroup = new Group( composite, SWT.NONE );
- labelGroup.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ labelGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
labelGroup.setText( "Label" );
labelGroup.setLayout( new GridLayout() );
Composite labelGroupComposite = new Composite( labelGroup, SWT.NONE );
GridLayout gl = new GridLayout( 1, false );
gl.marginHeight = gl.marginWidth = 0;
labelGroupComposite.setLayout( gl );
- labelGroupComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ labelGroupComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Label row composite
Composite labelComposite = new Composite( labelGroupComposite, SWT.NONE );
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
labelComposite.setLayout( gl );
- GridData gd = new GridData( GridData.FILL_HORIZONTAL );
+ GridData gd = new GridData( SWT.FILL, SWT.NONE, true, false );
gd.horizontalSpan = 1;
labelComposite.setLayoutData( gd );
@@ -133,7 +133,7 @@
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
abbreviateComposite.setLayout( gl );
- gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd = new GridData( SWT.FILL, SWT.NONE, true, false );
gd.horizontalSpan = 1;
abbreviateComposite.setLayoutData( gd );
@@ -172,14 +172,14 @@
// Secondary Label Group
Group secondaryLabelGroup = new Group( composite, SWT.NONE );
- secondaryLabelGroup.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ secondaryLabelGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
secondaryLabelGroup.setText( "Secondary label" );
secondaryLabelGroup.setLayout( new GridLayout() );
Composite secondaryLabelGroupComposite = new Composite( secondaryLabelGroup, SWT.NONE );
gl = new GridLayout( 1, false );
gl.marginHeight = gl.marginWidth = 0;
secondaryLabelGroupComposite.setLayout( gl );
- secondaryLabelGroupComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ secondaryLabelGroupComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
secondaryLabelButtonDisplay = new Button( secondaryLabelGroupComposite, SWT.CHECK );
secondaryLabelButtonDisplay.setText( "Display secondary label." );
@@ -189,7 +189,7 @@
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
secondaryLabelComposite.setLayout( gl );
- gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd = new GridData( SWT.FILL, SWT.NONE, true, false );
gd.horizontalSpan = 1;
secondaryLabelComposite.setLayoutData( gd );
@@ -213,7 +213,7 @@
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
abbreviateComposite2.setLayout( gl );
- gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd = new GridData( SWT.FILL, SWT.NONE, true, false );
gd.horizontalSpan = 1;
abbreviateComposite2.setLayoutData( gd );
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SchemaViewPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SchemaViewPreferencePage.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SchemaViewPreferencePage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SchemaViewPreferencePage.java Tue Aug 21 05:28:19 2007
@@ -171,14 +171,14 @@
// Secondary Label Group
Group secondaryLabelGroup = new Group( composite, SWT.NONE );
- secondaryLabelGroup.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ secondaryLabelGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
secondaryLabelGroup.setText( "Secondary label" );
secondaryLabelGroup.setLayout( new GridLayout() );
Composite secondaryLabelGroupComposite = new Composite( secondaryLabelGroup, SWT.NONE );
gl = new GridLayout( 1, false );
gl.marginHeight = gl.marginWidth = 0;
secondaryLabelGroupComposite.setLayout( gl );
- secondaryLabelGroupComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ secondaryLabelGroupComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
secondaryLabelButtonDisplay = new Button( secondaryLabelGroupComposite, SWT.CHECK );
secondaryLabelButtonDisplay.setText( "Display secondary label." );
@@ -188,7 +188,7 @@
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
secondaryLabelComposite.setLayout( gl );
- gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd = new GridData( SWT.FILL, SWT.NONE, true, false ) ;
gd.horizontalSpan = 1;
secondaryLabelComposite.setLayoutData( gd );
@@ -212,7 +212,7 @@
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
abbreviateComposite2.setLayout( gl );
- gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd = new GridData( SWT.FILL, SWT.NONE, true, false ) ;
gd.horizontalSpan = 1;
abbreviateComposite2.setLayoutData( gd );
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SearchViewPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SearchViewPreferencePage.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SearchViewPreferencePage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/preferences/SearchViewPreferencePage.java Tue Aug 21 05:28:19 2007
@@ -172,14 +172,14 @@
// Secondary Label Group
Group secondaryLabelGroup = new Group( composite, SWT.NONE );
- secondaryLabelGroup.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ secondaryLabelGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
secondaryLabelGroup.setText( "Secondary label" );
secondaryLabelGroup.setLayout( new GridLayout() );
Composite secondaryLabelGroupComposite = new Composite( secondaryLabelGroup, SWT.NONE );
gl = new GridLayout( 1, false );
gl.marginHeight = gl.marginWidth = 0;
secondaryLabelGroupComposite.setLayout( gl );
- secondaryLabelGroupComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ secondaryLabelGroupComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
secondaryLabelButtonDisplay = new Button( secondaryLabelGroupComposite, SWT.CHECK );
secondaryLabelButtonDisplay.setText( "Display secondary label." );
@@ -189,7 +189,7 @@
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
secondaryLabelComposite.setLayout( gl );
- gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd = new GridData( SWT.FILL, SWT.NONE, true, false ) ;
gd.horizontalSpan = 1;
secondaryLabelComposite.setLayoutData( gd );
@@ -213,7 +213,7 @@
gl = new GridLayout( 3, false );
gl.marginHeight = gl.marginWidth = 0;
abbreviateComposite2.setLayout( gl );
- gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd = new GridData( SWT.FILL, SWT.NONE, true, false ) ;
gd.horizontalSpan = 1;
abbreviateComposite2.setLayoutData( gd );
@@ -252,14 +252,14 @@
// Schema Label Group
Group schemaLabelGroup = new Group( composite, SWT.NONE );
- schemaLabelGroup.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ schemaLabelGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
schemaLabelGroup.setText( "Schema label" );
schemaLabelGroup.setLayout( new GridLayout() );
Composite schemaLabelGroupComposite = new Composite( schemaLabelGroup, SWT.NONE );
gl = new GridLayout( 1, false );
gl.marginHeight = gl.marginWidth = 0;
schemaLabelGroupComposite.setLayout( gl );
- schemaLabelGroupComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ schemaLabelGroupComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
schemaLabelButtonDisplay = new Button( schemaLabelGroupComposite, SWT.CHECK );
schemaLabelButtonDisplay.setText( "Display schema name in label." );
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/search/SearchPage.java Tue Aug 21 05:28:19 2007
@@ -90,11 +90,11 @@
// Search String Label
Label searchStringLabel = new Label( parent, SWT.NONE );
searchStringLabel.setText( "Search string (*=any string, ?=any character):" );
- searchStringLabel.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ searchStringLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Search Combo
searchCombo = new Combo( parent, SWT.DROP_DOWN | SWT.BORDER );
- searchCombo.setLayoutData( new GridData( GridData.FILL, SWT.NONE, true, false ) );
+ searchCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
searchCombo.addModifyListener( new ModifyListener()
{
public void modifyText( ModifyEvent arg0 )
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SchemaViewSortingDialog.java Tue Aug 21 05:28:19 2007
@@ -91,13 +91,11 @@
protected Control createDialogArea( Composite parent )
{
Composite composite = ( Composite ) super.createDialogArea( parent );
- GridData gd = new GridData( GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL );
- // gd.widthHint = convertHorizontalDLUsToPixels( IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH );
- composite.setLayoutData( gd );
+ composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
// Grouping Group
Group groupingGroup = new Group( composite, SWT.NONE );
- groupingGroup.setLayoutData( new GridData( GridData.FILL_BOTH ) );
+ groupingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ));
groupingGroup.setText( "Grouping" );
groupingGroup.setLayout( new GridLayout() );
@@ -113,14 +111,14 @@
// Sorting Group
Group sortingGroup = new Group( composite, SWT.NONE );
- sortingGroup.setLayoutData( new GridData( GridData.FILL_BOTH ) );
+ sortingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ));
sortingGroup.setText( "Sorting" );
sortingGroup.setLayout( new GridLayout() );
Composite sortingGroupComposite = new Composite( sortingGroup, SWT.NONE );
GridLayout gl = new GridLayout( 4, false );
gl.marginHeight = gl.marginWidth = 0;
sortingGroupComposite.setLayout( gl );
- sortingGroupComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ sortingGroupComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Sort by Label
Label sortByLabel = new Label( sortingGroupComposite, SWT.NONE );
@@ -128,7 +126,7 @@
// Sorting Combo
sortingCombo = new Combo( sortingGroupComposite, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER );
- sortingCombo.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ sortingCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
sortingCombo.setItems( new String[]
{ SORTING_FISTNAME, SORTING_OID } );
sortingCombo.setEnabled( true );
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchViewSortingDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchViewSortingDialog.java?rev=568097&r1=568096&r2=568097&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchViewSortingDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchViewSortingDialog.java Tue Aug 21 05:28:19 2007
@@ -92,12 +92,12 @@
protected Control createDialogArea( Composite parent )
{
Composite composite = ( Composite ) super.createDialogArea( parent );
- GridData gd = new GridData( GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL );
+ GridData gd = new GridData( SWT.FILL, SWT.FILL, true, true );
composite.setLayoutData( gd );
// Grouping Group
Group groupingGroup = new Group( composite, SWT.NONE );
- groupingGroup.setLayoutData( new GridData( GridData.FILL_BOTH ) );
+ groupingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
groupingGroup.setText( "Grouping" );
groupingGroup.setLayout( new GridLayout() );
@@ -118,14 +118,14 @@
// Sorting Group
Group sortingGroup = new Group( composite, SWT.NONE );
- sortingGroup.setLayoutData( new GridData( GridData.FILL_BOTH ) );
+ sortingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
sortingGroup.setText( "Sorting" );
sortingGroup.setLayout( new GridLayout() );
Composite sortingGroupComposite = new Composite( sortingGroup, SWT.NONE );
GridLayout gl = new GridLayout( 4, false );
gl.marginHeight = gl.marginWidth = 0;
sortingGroupComposite.setLayout( gl );
- sortingGroupComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ sortingGroupComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Sort by Label
Label sortByLabel = new Label( sortingGroupComposite, SWT.NONE );
@@ -133,7 +133,7 @@
// Sorting Combo
sortingCombo = new Combo( sortingGroupComposite, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER );
- sortingCombo.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
+ sortingCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
sortingCombo.setItems( new String[]
{ SORTING_FISTNAME, SORTING_OID } );
sortingCombo.setEnabled( true );