Author: scabanovich
Date: 2010-05-25 10:09:16 -0400 (Tue, 25 May 2010)
New Revision: 22305
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
Log:
https://jira.jboss.org/browse/JBIDE-6339
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-25
13:31:22 UTC (rev 22304)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-25
14:09:16 UTC (rev 22305)
@@ -12,14 +12,13 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.StringTokenizer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.core.IParameter;
+import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
import org.jboss.tools.common.model.project.ext.impl.ValueInfo;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
@@ -87,8 +86,8 @@
for (int i = 0; i < params.length; i++) {
if(ps.length <= i) {
- System.out.println("Panic");
- continue;
+ CDICorePlugin.getDefault().logError(new IllegalArgumentException("Cannot parse
method parameters for " + paramsString));
+ break;
}
if(!parametersAreInjectionPoints && params[i].indexOf('@') < 0) {
start += params[i].length() + 1;
@@ -165,7 +164,9 @@
while(i < paramsString.length()) {
char c = paramsString.charAt(i);
if(c == ',' && c1 == 0 && c2 == 0 && quote ==
'\0') {
- result.add(sb.toString());
+ if(sb.toString().trim().length() > 0) {
+ result.add(sb.toString());
+ }
sb.setLength(0);
i++;
continue;