Author: max.andersen(a)jboss.com Date: 2007-11-04 14:09:11 -0500 (Sun, 04 Nov 2007) New Revision: 4691 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java Log: trying to fix jbide-1254 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2007-11-04 18:41:42 UTC (rev 4690) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2007-11-04 19:09:11 UTC (rev 4691) @@ -173,7 +173,7 @@ return control; } protected int getComboWidth() { - return 30; + return 75; } protected String getLabelText() { return "Max results:"; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java 2007-11-04 18:41:42 UTC (rev 4690) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ComboContribution.java 2007-11-04 19:09:11 UTC (rev 4691) @@ -39,15 +39,17 @@ gd.horizontalAlignment = GridData.END; } comboControl = new Combo( panel, SWT.DROP_DOWN | (isReadOnly()?SWT.READ_ONLY:SWT.NONE) ); - + populateComboBox(); + comboControl.pack(); GridData gd = new GridData(); gd.grabExcessHorizontalSpace = true; + gd.verticalIndent = -8; gd.widthHint = getComboWidth(); gd.verticalAlignment = GridData.CENTER; gd.horizontalAlignment = GridData.END; comboControl.setLayoutData( gd ); - populateComboBox(); + if(getSelectionAdapter()!=null) { comboControl.addSelectionListener( getSelectionAdapter() );