[easystruts-cvs] net.sf.easystruts/src/org/easystruts/eclipse/wizards NewEasyStrutsWizardPage.java,1.1,1.2 NewEasyStrutsWizard.java,1.1,1.2

[Francois G. <far...@us...>]

Update of /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/wizards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6376/src/org/easystruts/eclipse/wizards

Modified Files:
	NewEasyStrutsWizardPage.java NewEasyStrutsWizard.java 
Log Message:
Fixed a lot of compilation errors. Still ~ 400 of them (was 650 before). This requires the plugin "org.eclipse.update.ui.forms", which is not in 3.0 or 3.1 anymore. A solution is to take it from CVS (tag R2_1_3).

Index: NewEasyStrutsWizardPage.java
===================================================================
RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/wizards/NewEasyStrutsWizardPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewEasyStrutsWizardPage.java	15 Apr 2005 04:25:48 -0000	1.1
--- NewEasyStrutsWizardPage.java	27 Apr 2005 05:46:55 -0000	1.2
***************
*** 245,249 ****
  		Button button= input.getChangeControl(composite);
  		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
! 		gd.heightHint = SWTUtil.getButtonHeigthHint(button);
  		gd.widthHint = SWTUtil.getButtonWidthHint(button);
  		button.setLayoutData(gd);
--- 245,250 ----
  		Button button= input.getChangeControl(composite);
  		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
! 		// TODO 3.0: check that this is working OK, it seems that this call is not needed any more, see for an example: http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/Attic/NewTestCaseCreationWizardPage.java.diff?r1=1.28&r2=1.42
! 		//gd.heightHint = SWTUtil.getButtonHeightHint(button);
  		gd.widthHint = SWTUtil.getButtonWidthHint(button);
  		button.setLayoutData(gd);

Index: NewEasyStrutsWizard.java
===================================================================
RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/wizards/NewEasyStrutsWizard.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewEasyStrutsWizard.java	15 Apr 2005 04:25:48 -0000	1.1
--- NewEasyStrutsWizard.java	27 Apr 2005 05:46:55 -0000	1.2
***************
*** 37,40 ****
--- 37,41 ----
  import org.eclipse.core.runtime.CoreException;
  import org.eclipse.core.runtime.IPath;
+ import org.eclipse.core.runtime.IProgressMonitor;
  import org.eclipse.core.runtime.Path;
  import org.eclipse.jdt.core.IClasspathEntry;
***************
*** 268,275 ****
  	public abstract boolean isWizardSupported(int version);
  	public abstract void setPages();
  	/**
  	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
  	 */
! 	public final boolean performFinish() {
  		if ( strutsSupportWizardPage != null ) {
  			try {
--- 269,281 ----
  	public abstract boolean isWizardSupported(int version);
  	public abstract void setPages();
+ 	
  	/**
  	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
  	 */
! 	
! 	// TODO 3.0: check if this works. I moved all the code from performFinish to finishPage
! 	//public final boolean performFinish() {
! 		
! 	protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
  		if ( strutsSupportWizardPage != null ) {
  			try {
***************
*** 320,324 ****
  			}
  		} 
! 		return perform();
  	}
  
--- 326,330 ----
  			}
  		} 
! 		perform();
  	}