Menu
▾
▴
[jboss-cvs] contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards ClassFragmentWizardPage.java ClassWizardPage.java MethodWizard.java MethodWizardPage.java
|
From: Laurent E. <let...@us...> - 2004-07-15 15:37:58
|
User: letiemble
Date: 04/07/15 08:37:51
Modified: jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards
ClassFragmentWizardPage.java ClassWizardPage.java
MethodWizard.java MethodWizardPage.java
Log:
Final touches for the EJB Test Client wizard. Mandatory fields are now really mandatory in Select Method wizard. HTML and JSP pages are not automatically opened at creation, so no external editor is opened. Primitive type is now accepted in method creation. Correct a few I18N issues.
Revision Changes Path
1.3 +5 -3 contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/ClassFragmentWizardPage.java
Index: ClassFragmentWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/ClassFragmentWizardPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassFragmentWizardPage.java 15 Jul 2004 09:21:38 -0000 1.2
+++ ClassFragmentWizardPage.java 15 Jul 2004 15:37:51 -0000 1.3
@@ -47,7 +47,7 @@
* Description of the Class
*
* @author Laurent Etiemble
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class ClassFragmentWizardPage extends WizardPage implements TypeChooser, FieldsAdapterListener
{
@@ -232,7 +232,6 @@
this.nameStatus = this.fragmentNameChanged();
this.typeStatus = this.fragmentTypeChanged();
-
this.updateStatus(this.findMostSevereStatus());
}
@@ -265,7 +264,10 @@
public void setVisible(boolean visible)
{
super.setVisible(visible);
- this.setFocus();
+ if (visible)
+ {
+ this.setFocus();
+ }
}
1.2 +1 -1 contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/ClassWizardPage.java
Index: ClassWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/ClassWizardPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassWizardPage.java 7 Jul 2004 21:44:18 -0000 1.1
+++ ClassWizardPage.java 15 Jul 2004 15:37:51 -0000 1.2
@@ -26,7 +26,7 @@
* Description of the Class
*
* @author Laurent Etiemble
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class ClassWizardPage extends NewTypeWizardPage implements FieldsAdapterListener
{
@@ -117,7 +117,7 @@
this.initContainerPage(jelem);
this.initTypePage(jelem);
- this.updateStatus(findMostSevereStatus());
+ this.updateStatus(this.findMostSevereStatus());
this.initContent();
}
1.3 +3 -2 contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizard.java
Index: MethodWizard.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizard.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MethodWizard.java 15 Jul 2004 09:21:38 -0000 1.2
+++ MethodWizard.java 15 Jul 2004 15:37:51 -0000 1.3
@@ -19,7 +19,7 @@
* Description of the Class
*
* @author Laurent Etiemble
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class MethodWizard extends ClassFragmentWizard
{
@@ -112,6 +112,7 @@
static
{
+ RETURNS.put("boolean", "return false;");//$NON-NLS-1$ //$NON-NLS-2$
RETURNS.put("byte", "return 0;");//$NON-NLS-1$ //$NON-NLS-2$
RETURNS.put("char", "return '\0';");//$NON-NLS-1$ //$NON-NLS-2$
RETURNS.put("int", "return 0;");//$NON-NLS-1$ //$NON-NLS-2$
@@ -119,6 +120,6 @@
RETURNS.put("short", "return 0;");//$NON-NLS-1$ //$NON-NLS-2$
RETURNS.put("double", "return 0;");//$NON-NLS-1$ //$NON-NLS-2$
RETURNS.put("float", "return 0;");//$NON-NLS-1$ //$NON-NLS-2$
- RETURNS.put("boolean", "return false;");//$NON-NLS-1$ //$NON-NLS-2$
+ RETURNS.put("void", "");//$NON-NLS-1$ //$NON-NLS-2$
}
}
1.2 +21 -0 contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizardPage.java
Index: MethodWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jbosside/org.jboss.ide.eclipse.jdt.ui/src/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizardPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MethodWizardPage.java 7 Jul 2004 21:44:18 -0000 1.1
+++ MethodWizardPage.java 15 Jul 2004 15:37:51 -0000 1.2
@@ -7,6 +7,7 @@
package org.jboss.ide.eclipse.jdt.ui.wizards;
import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
@@ -49,7 +50,7 @@
* Description of the Class
*
* @author Laurent Etiemble
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class MethodWizardPage extends ClassFragmentWizardPage
{
@@ -62,6 +63,9 @@
/** Description of the Field */
protected StructuredViewer parametersViewer;
+ /** Primitive type list */
+ private static List PRIMITIVES = new ArrayList();
+
/**
*Constructor for the MethodWizardPage object
@@ -434,6 +438,10 @@
{
return status;
}
+ if (PRIMITIVES.contains(ftype))
+ {
+ return status;
+ }
IStatus val = JavaConventions.validateJavaTypeName(ftype);
if (val.getSeverity() == IStatus.ERROR)
{
@@ -472,7 +480,7 @@
* Description of the Class
*
* @author Laurent Etiemble
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
private class ParameterLabelProvider extends DefaultLabelProvider
{
@@ -488,4 +496,17 @@
return pair.getName() + " [" + pair.getValue() + "]";//$NON-NLS-1$ //$NON-NLS-2$
}
}
+
+ static
+ {
+ PRIMITIVES.add("boolean");
+ PRIMITIVES.add("byte");
+ PRIMITIVES.add("char");
+ PRIMITIVES.add("double");
+ PRIMITIVES.add("float");
+ PRIMITIVES.add("int");
+ PRIMITIVES.add("long");
+ PRIMITIVES.add("short");
+ PRIMITIVES.add("void");
+ }
}
|