summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxwu2013-05-22 09:08:15 (EDT)
committer mwu2013-05-22 09:08:15 (EDT)
commit642dac258bb15cf7126421e407bde896ad9c0820 (patch)
tree5aa82818db15224b6cb6e8fde9e12f04e08a05b5
parent457d77a283a92eabb2bb9c76333f87af8c1f4b18 (diff)
downloadorg.eclipse.datatools.enablement.oda-642dac258bb15cf7126421e407bde896ad9c0820.zip
org.eclipse.datatools.enablement.oda-642dac258bb15cf7126421e407bde896ad9c0820.tar.gz
org.eclipse.datatools.enablement.oda-642dac258bb15cf7126421e407bde896ad9c0820.tar.bz2
Fix bugzilla bug [408692] - ">" button become disable if "cancel"v201305222108
"column mapping" window for Web Service data set.
-rw-r--r--plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ColumnMappingPage.java30
1 files changed, 26 insertions, 4 deletions
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ColumnMappingPage.java b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ColumnMappingPage.java
index 7bf82da..b7a97c2 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ColumnMappingPage.java
+++ b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ColumnMappingPage.java
@@ -50,12 +50,14 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.TextProcessor;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -167,17 +169,31 @@ public class ColumnMappingPage extends DataSetWizardPage
*/
public void createPageCustomControl( Composite parent )
{
- setControl( createPageControl( parent ) );
- if( XMLInformationHolder.hasDestroyed( ) )
+ ScrolledComposite sComposite = new ScrolledComposite( parent,
+ SWT.H_SCROLL | SWT.V_SCROLL );
+ sComposite.setLayout( new GridLayout( ) );
+ sComposite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
+ sComposite.setMinWidth( 600 );
+ sComposite.setExpandHorizontal( true );
+
+ Control control = createPageControl( sComposite );
+
+ if ( XMLInformationHolder.hasDestroyed( ) )
XMLInformationHolder.start( this.getInitializationDesign( ) );
initializeControl( );
if ( selectedTreeItemText != null )
populateXMLTree( );
-
+
+ Point size = control.computeSize( SWT.DEFAULT, SWT.DEFAULT );
+ control.setSize( size.x, size.y );
+
+ sComposite.setContent( control );
+ setControl( sComposite );
+
XMLRelationInfoUtil.setSystemHelp( getControl( ),
IHelpConstants.CONEXT_ID_DATASET_XML_COLUMNMAPPING );
}
-
+
/**
* initial the page info property after create the page control
*
@@ -339,6 +355,10 @@ public class ColumnMappingPage extends DataSetWizardPage
{
columnElement = columnDialog.getColumnMapping( );
}
+ else
+ {
+ return;
+ }
}
if ( columnElement != null )
{
@@ -750,6 +770,7 @@ public class ColumnMappingPage extends DataSetWizardPage
public void handleEvent( Event event )
{
+ availableXmlTree.getTree( ).deselectAll( );
if ( columnMappingTable.getViewer( )
.getTable( )
.getSelectionCount( ) == 1 )
@@ -768,6 +789,7 @@ public class ColumnMappingPage extends DataSetWizardPage
.setEnabled( true );
}
}
+ availableXmlTree.getSingleButton( ).setEnabled( false );
}
} );