Author: Grid.Qian Date: 2010-12-29 01:58:56 -0500 (Wed, 29 Dec 2010) New Revision: 27790 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java Log: JBIDE-7913: partly fixed this issue by change the method of finding classes that contain webservice annotation Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-12-29 01:30:07 UTC (rev 27789) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-12-29 06:58:56 UTC (rev 27790) @@ -37,7 +37,8 @@ org.eclipse.jdt.launching, org.eclipse.debug.core, org.eclipse.jst.jee.web, - javax.wsdl;visibility:=reexport + javax.wsdl;visibility:=reexport, + org.eclipse.jst.ws.annotations.core Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.core, org.jboss.tools.ws.creation.core.commands, Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2010-12-29 01:30:07 UTC (rev 27789) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2010-12-29 06:58:56 UTC (rev 27790) @@ -89,7 +89,7 @@ List<ICompilationUnit> serviceUnits = JBossWSCreationUtils .findJavaUnitsByAnnotation( project, - JBossWSCreationCoreMessages.Webservice_Annotation_Check, + JBossWSCreationCoreMessages.Webservice_Annotation, model.getCustomPackage()); if (clientUnits.size() == 0) { @@ -160,7 +160,6 @@ return StatusUtils .errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } - System.out.println(sb.toString()); return Status.OK_STATUS; } @@ -390,13 +389,11 @@ sb.append(argsNum).append("])"); //$NON-NLS-1$ countArgs(j, sb, list); argsNum += 1; - System.out.println(argsNum); return true; } else if ("String".equals(para.getType().toString())) { //$NON-NLS-1$ sb.append("args[").append(argsNum).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ countArgs(j, sb, list); argsNum += 1; - System.out.println(argsNum); return true; } if (list.get(j) instanceof Object) { Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2010-12-29 01:30:07 UTC (rev 27789) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2010-12-29 06:58:56 UTC (rev 27790) @@ -102,7 +102,7 @@ List<ICompilationUnit> serviceUnits = JBossWSCreationUtils .findJavaUnitsByAnnotation( javaPrj, - JBossWSCreationCoreMessages.Webservice_Annotation_Check, + JBossWSCreationCoreMessages.Webservice_Annotation, model.getCustomPackage()); packageName = model.getCustomPackage(); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2010-12-29 01:30:07 UTC (rev 27789) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2010-12-29 06:58:56 UTC (rev 27790) @@ -3,10 +3,9 @@ Value_Target_0=2.0 Value_Target_1=2.1 Separator_Java=/ -WebserviceClient_Annotation=@WebServiceClient +WebserviceClient_Annotation=WebServiceClient Webservice_Annotation=WebService Webservice_Annotation_Prefix=javax.jws.WebService -Webservice_Annotation_Check=@WebService( Client_Sample_Package_Name=.clientsample Client_Sample_Class_Name=ClientSample WebEndpoint=WebEndpoint Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2010-12-29 01:30:07 UTC (rev 27789) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2010-12-29 06:58:56 UTC (rev 27790) @@ -11,7 +11,6 @@ public static String Value_Target_1; public static String Separator_Java; public static String WebserviceClient_Annotation; - public static String Webservice_Annotation_Check; public static String Webservice_Annotation; public static String Webservice_Annotation_Prefix; public static String WebEndpoint; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-12-29 01:30:07 UTC (rev 27789) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-12-29 06:58:56 UTC (rev 27790) @@ -43,6 +43,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.IParent; +import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -446,23 +447,27 @@ return path; } - public static String composeSrcPackageClassPath ( IProject project, String packageName, String className) { + public static String composeSrcPackageClassPath(IProject project, + String packageName, String className) { String classFilePath = null; try { - String srcPath = JBossWSCreationUtils.getJavaProjectSrcLocation(project); + String srcPath = JBossWSCreationUtils + .getJavaProjectSrcLocation(project); if (srcPath != null && srcPath.trim().length() > 0) { String pathSeparator = "" + File.separatorChar; //$NON-NLS-1$ - String packageToFolderPath = packageName.replace(".", pathSeparator); //$NON-NLS-1$ - classFilePath = srcPath + pathSeparator + packageToFolderPath + pathSeparator + className + JAVA; + String packageToFolderPath = packageName.replace( + ".", pathSeparator); //$NON-NLS-1$ + classFilePath = srcPath + pathSeparator + packageToFolderPath + + pathSeparator + className + JAVA; return classFilePath; } } catch (JavaModelException e) { return null; } return null; - + } - + public static File findFileByPath(String path) { File file = new File(path); if (file.exists()) @@ -534,9 +539,11 @@ } if (javaFiles != null) { for (ICompilationUnit unit : javaFiles) { - if (unit.getSource().contains(annotation)) { - units.add(unit); - + if (unit.getTypes().length > 0) { + IType type = unit.getTypes()[0]; + if (type.getAnnotation(annotation).exists()) { + units.add(unit); + } } } } Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-12-29 01:30:07 UTC (rev 27789) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-12-29 06:58:56 UTC (rev 27790) @@ -33,7 +33,7 @@ ServiceModel model = new ServiceModel(); model.setCustomPackage(""); model.setWebProjectName("WebTest"); - List<ICompilationUnit> list = JBossWSCreationUtils.findJavaUnitsByAnnotation(JavaCore.create(prj), "@WebService", ""); + List<ICompilationUnit> list = JBossWSCreationUtils.findJavaUnitsByAnnotation(JavaCore.create(prj), "WebService", ""); assertTrue("No java files in src!",list.isEmpty()); }