Author: dazarov Date: 2012-02-08 21:06:21 -0500 (Wed, 08 Feb 2012) New Revision: 38529 Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/MemberValuePair.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Method.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java Log: Wizard 'Specify CDI Bean for the Injection Point' does not compute correctly condition 'can finish' https://issues.jboss.org/browse/JBIDE-10637 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-09 02:01:40 UTC (rev 38528) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-09 02:06:21 UTC (rev 38529) @@ -22,13 +22,6 @@ import org.jboss.tools.cdi.core.IQualifierDeclaration; public class ValuedQualifier{ - public static final int STATE_NONE = -1; - public static final int STATE_NEW_QUALIFIER = 0; - public static final int STATE_NEW_QUALIFIER_CHANGED_VALUE = 1; - public static final int STATE_BEAN_QUALIFIER = 2; - public static final int STATE_BEAN_QUALIFIER_CHANGED_VALUE = 3; - - private int state = STATE_NONE; private IQualifier qualifier; private List<Pair> pairs = new ArrayList<Pair>(); @@ -55,10 +48,8 @@ pair.type = Signature.getSignatureSimpleName(method.getReturnType()); pair.name = method.getElementName(); if(mvp != null && mvp.getValue() != null){ - pair.required = false; pair.value = mvp.getValue(); }else{ - pair.required = true; if(pair.type.equals("boolean")){ pair.value = "false"; }else if(pair.type.equals("int") || pair.type.equals("short") || pair.type.equals("long")){ @@ -98,10 +89,6 @@ return false; } - public int getState(){ - return state; - } - public List<Pair> getValuePairs(){ return pairs; } @@ -182,8 +169,7 @@ return false; } - static class Pair{ - public boolean required; + private static class Pair{ public String type=""; public String name=""; public Object value; Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java 2012-02-09 02:06:21 UTC (rev 38529) @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.ui.test.testmodel; + +import org.eclipse.jdt.core.IMemberValuePair; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.JavaModelException; + +/* +Signature Java Type +Z boolean +B byte +C char +S short +I int +J long +F float +D double +L fully-qualified-class ; fully-qualified-class +[ type type[] +( arg-types ) ret-type method type +*/ + +public class AnnotationType extends Type { + private static IMethod[] methods = new IMethod[]{ + new Method("realChanky", "Z", null), + new Method("unrealChanky", "Z", new MemberValuePair("unrealChanky", true, IMemberValuePair.K_BOOLEAN)), + new Method("number", "I", null), + new Method("size", "I", new MemberValuePair("size", 125, IMemberValuePair.K_INT)) + }; + + public AnnotationType(String qualifiedName) { + super(qualifiedName); + } + + @Override + public boolean isAnnotation() throws JavaModelException { + return true; + } + + @Override + public IMethod[] getMethods() throws JavaModelException { + return methods; + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/AnnotationType.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2012-02-09 02:01:40 UTC (rev 38528) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2012-02-09 02:06:21 UTC (rev 38529) @@ -28,7 +28,7 @@ public CDIQualifier(ICDIProject project, String qualifiedName){ this.project = project; - this.cdiClass = new Type(qualifiedName); + this.cdiClass = new AnnotationType(qualifiedName); } @Override Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java 2012-02-09 02:06:21 UTC (rev 38529) @@ -0,0 +1,112 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.ui.test.testmodel; + +import org.eclipse.core.resources.IResource; +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMember; +import org.eclipse.jdt.core.IMemberValuePair; +import org.eclipse.jdt.core.IType; +import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.core.IQualifierDeclaration; +import org.jboss.tools.common.java.IAnnotationType; + +public class CDIQualifierDeclaration implements IQualifierDeclaration { + static private IMemberValuePair[] pairs = new IMemberValuePair[]{ + new MemberValuePair("name", "John", IMemberValuePair.K_STRING), + new MemberValuePair("size", 5, IMemberValuePair.K_INT), + new MemberValuePair("p", 0.5, IMemberValuePair.K_DOUBLE), + new MemberValuePair("char", 'Q', IMemberValuePair.K_CHAR), + }; + + public CDIQualifierDeclaration(){ + + } + + @Override + public IMemberValuePair[] getMemberValuePairs() { + return pairs; + } + + @Override + public Object getMemberValue(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public IMember getParentMember() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getTypeName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IType getType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IAnnotationType getAnnotation() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IAnnotation getJavaAnnotation() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IResource getResource() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getStartPosition() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getLength() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public IMember getSourceMember() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IJavaElement getSourceElement() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IQualifier getQualifier() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifierDeclaration.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/MemberValuePair.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/MemberValuePair.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/MemberValuePair.java 2012-02-09 02:06:21 UTC (rev 38529) @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.ui.test.testmodel; + +import org.eclipse.jdt.core.IMemberValuePair; + +public class MemberValuePair implements IMemberValuePair { + private String memberName; + private Object value; + private int valueKind; + + public MemberValuePair(String memberName, Object value, int valueKind){ + this.memberName = memberName; + this.value = value; + this.valueKind = valueKind; + } + + @Override + public String getMemberName() { + return memberName; + } + + @Override + public Object getValue() { + return value; + } + + @Override + public int getValueKind() { + return valueKind; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/MemberValuePair.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Method.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Method.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Method.java 2012-02-09 02:06:21 UTC (rev 38529) @@ -0,0 +1,391 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.ui.test.testmodel; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IClassFile; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaModel; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.ILocalVariable; +import org.eclipse.jdt.core.IMemberValuePair; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IOpenable; +import org.eclipse.jdt.core.ISourceRange; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.ITypeParameter; +import org.eclipse.jdt.core.ITypeRoot; +import org.eclipse.jdt.core.JavaModelException; + +public class Method implements IMethod { + + private IMemberValuePair defaultValue = null; + private String elementName = ""; + private String returnType = ""; + + public Method(String elementName, String returnType, IMemberValuePair defaultValue){ + this.elementName = elementName; + this.returnType = returnType; + this.defaultValue = defaultValue; + } + + @Override + public String[] getCategories() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public IClassFile getClassFile() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ICompilationUnit getCompilationUnit() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IType getDeclaringType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getFlags() throws JavaModelException { + // TODO Auto-generated method stub + return 0; + } + + @Override + public ISourceRange getJavadocRange() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getOccurrenceCount() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public ITypeRoot getTypeRoot() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IType getType(String name, int occurrenceCount) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isBinary() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean exists() { + // TODO Auto-generated method stub + return false; + } + + @Override + public IJavaElement getAncestor(int ancestorType) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getAttachedJavadoc(IProgressMonitor monitor) + throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public IResource getCorrespondingResource() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getElementType() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getHandleIdentifier() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IJavaModel getJavaModel() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IJavaProject getJavaProject() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IOpenable getOpenable() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IJavaElement getParent() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IPath getPath() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IJavaElement getPrimaryElement() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IResource getResource() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ISchedulingRule getSchedulingRule() { + // TODO Auto-generated method stub + return null; + } + + @Override + public IResource getUnderlyingResource() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isReadOnly() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isStructureKnown() throws JavaModelException { + // TODO Auto-generated method stub + return false; + } + + @Override + public Object getAdapter(Class adapter) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getSource() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public ISourceRange getSourceRange() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public ISourceRange getNameRange() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void copy(IJavaElement container, IJavaElement sibling, + String rename, boolean replace, IProgressMonitor monitor) + throws JavaModelException { + // TODO Auto-generated method stub + + } + + @Override + public void delete(boolean force, IProgressMonitor monitor) + throws JavaModelException { + // TODO Auto-generated method stub + + } + + @Override + public void move(IJavaElement container, IJavaElement sibling, + String rename, boolean replace, IProgressMonitor monitor) + throws JavaModelException { + // TODO Auto-generated method stub + + } + + @Override + public void rename(String name, boolean replace, IProgressMonitor monitor) + throws JavaModelException { + // TODO Auto-generated method stub + + } + + @Override + public IJavaElement[] getChildren() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean hasChildren() throws JavaModelException { + // TODO Auto-generated method stub + return false; + } + + @Override + public IAnnotation getAnnotation(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public IAnnotation[] getAnnotations() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public IMemberValuePair getDefaultValue() throws JavaModelException { + return defaultValue; + } + + @Override + public String getElementName() { + return elementName; + } + + @Override + public String[] getExceptionTypes() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String[] getTypeParameterSignatures() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public ITypeParameter[] getTypeParameters() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getNumberOfParameters() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public ILocalVariable[] getParameters() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getKey() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String[] getParameterNames() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String[] getParameterTypes() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String[] getRawParameterNames() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getReturnType() throws JavaModelException { + return returnType; + } + + @Override + public String getSignature() throws JavaModelException { + // TODO Auto-generated method stub + return null; + } + + @Override + public ITypeParameter getTypeParameter(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isConstructor() throws JavaModelException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isMainMethod() throws JavaModelException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isResolved() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isSimilar(IMethod method) { + // TODO Auto-generated method stub + return false; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Method.java ___________________________________________________________________ Added: svn:mime-type + text/plain