[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades ...

[Robert Stryker]

  User: rawb    
  Date: 06/09/28 14:59:38

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades 
                        UpdatePage20.java
  Log:
  Moved description to a label, changed some of the text to make upgrade wizard clearer.
  
  Revision  Changes    Path
  1.3       +33 -5     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades/UpdatePage20.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UpdatePage20.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades/UpdatePage20.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UpdatePage20.java	20 Sep 2006 21:03:42 -0000	1.2
  +++ UpdatePage20.java	28 Sep 2006 18:59:38 -0000	1.3
  @@ -41,11 +41,13 @@
   	private boolean pageComplete;
   	private String errorMessage;
   	
  +	private Label descLabel;
  +	
   	private ConfigDataComposite configDataComposite;
   	
  +	
   	public UpdatePage20() {
   		super("", Messages.UpgradeWizardTitle, null);
  -		setDescription(Messages.UpgradeWizardDescription);
   		rows = new ArrayList();
   	}
   
  @@ -63,13 +65,42 @@
   		
   		main2.setLayout(new FormLayout());
   		
  +		descLabel = new Label(main2, SWT.NONE);
  +		FormData descLabelData = new FormData();
  +		descLabelData.left = new FormAttachment(0,5);
  +		descLabelData.right = new FormAttachment(100,-5);
  +		descLabelData.top = new FormAttachment(0,5);
  +		descLabel.setLayoutData(descLabelData);
  +		
  +		descLabel.setText(Messages.UpgradeWizardDescription);
  +		
  +		if( configs.length != 0 ) {
  +			createFullControl(main2);
  +		} else {
  +			createEmptyControl(main2);
  +		}
  +		setControl(main);
  +	}
  +	
  +	protected void createEmptyControl(Composite main2) {
  +		Label noConfigsLabel = new Label(main2, SWT.NONE);
  +		FormData noConfigsData = new FormData();
  +		noConfigsData.left = new FormAttachment(0,5);
  +		noConfigsData.right = new FormAttachment(100,-5);
  +		noConfigsData.top = new FormAttachment(descLabel,8);
  +		noConfigsLabel.setLayoutData(noConfigsData);
   		
  +		noConfigsLabel.setText(Messages.UpgradeWizardNoConvertableConfigs);
  +		
  +		pageComplete = true;
  +	}
   		
  +	protected void createFullControl(Composite main2) {
   		ScrolledComposite sc = new ScrolledComposite(main2, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
   		FormData scData = new FormData();
   		scData.left = new FormAttachment(0,5);
   		scData.right = new FormAttachment(100,-5);
  -		scData.top = new FormAttachment(0,5);
  +		scData.top = new FormAttachment(descLabel,5);
   		scData.bottom = new FormAttachment(50,-2);
   		sc.setLayoutData(scData);
   		
  @@ -83,9 +114,6 @@
   		cdcData.top = new FormAttachment(sc,5);
   		cdcData.bottom = new FormAttachment(100,-5);
   		configDataComposite.setLayoutData(cdcData);
  -		
  -		
  -		setControl(main);
   		checkPageComplete();
   	}