[jbosstools-commits] JBoss Tools SVN: r24155 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui: src/org/jboss/tools/cdi/ui and 1 other directories.

Author: scabanovich Date: 2010-08-13 11:22:56 -0400 (Fri, 13 Aug 2010) New Revision: 24155 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties Log: https://jira.jboss.org/browse/JBIDE-3136 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2010-08-13 15:22:23 UTC (rev 24154) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2010-08-13 15:22:56 UTC (rev 24155) @@ -191,6 +191,18 @@ </description> </wizard> + <wizard + category="org.jboss.tools.cdi.ui" + class="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard" + icon="icons/cdi16.png" + id="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard" + name="Decorator Type" + project="false"> + <description> + Create an Decorator Java File + </description> + </wizard> + </extension> - + </plugin> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-13 15:22:23 UTC (rev 24154) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-08-13 15:22:56 UTC (rev 24155) @@ -40,6 +40,9 @@ public static String NEW_INTERCEPTOR_WIZARD_TITLE; public static String NEW_INTERCEPTOR_WIZARD_PAGE_NAME; + public static String NEW_DECORATOR_WIZARD_TITLE; + public static String NEW_DECORATOR_WIZARD_PAGE_NAME; + public static String SELECT_STEREOTYPE; public static String SELECT_INTERCEPTOR_BINDING; @@ -51,4 +54,7 @@ public static String MESSAGE_METHOD_NAME_EMPTY; public static String MESSAGE_METHOD_NAME_NOT_VALID; + public static String MESSAGE_FIELD_NAME_EMPTY; + public static String MESSAGE_FIELD_NAME_NOT_VALID; + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-13 15:22:23 UTC (rev 24154) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-08-13 15:22:56 UTC (rev 24155) @@ -29,6 +29,9 @@ NEW_INTERCEPTOR_WIZARD_TITLE=New Interceptor NEW_INTERCEPTOR_WIZARD_PAGE_NAME=Interceptor Type +NEW_DECORATOR_WIZARD_TITLE=New Decorator +NEW_DECORATOR_WIZARD_PAGE_NAME=Decorator Type + SELECT_STEREOTYPE=Select Stereotype Annotation Type SELECT_INTERCEPTOR_BINDING=Select Interceptor Binding Annotation Type @@ -38,4 +41,8 @@ FIELD_EDITOR_STEREOTYPES_LABEL=Stereotypes: MESSAGE_METHOD_NAME_EMPTY=Method Name is empty. -MESSAGE_METHOD_NAME_NOT_VALID=Method Name is not valid. {0} \ No newline at end of file +MESSAGE_METHOD_NAME_NOT_VALID=Method Name is not valid. {0} + +MESSAGE_FIELD_NAME_EMPTY=Field Name is empty. +MESSAGE_FIELD_NAME_NOT_VALID=Field Name is not valid. {0} + Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java 2010-08-13 15:22:56 UTC (rev 24155) @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (c) 2010 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.wizard; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.internal.ui.wizards.NewElementWizard; +import org.eclipse.jdt.ui.wizards.NewClassWizardPage; +import org.jboss.tools.cdi.ui.CDIUIMessages; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class NewDecoratorCreationWizard extends NewElementWizard { + private NewClassWizardPage fPage; + private boolean fOpenEditorOnFinish = true; + + + public NewDecoratorCreationWizard() { + setWindowTitle(CDIUIMessages.NEW_DECORATOR_WIZARD_TITLE); + } + + /* + * @see Wizard#createPages + */ + public void addPages() { + super.addPages(); + if (fPage == null) { + fPage = new NewDecoratorWizardPage(); + fPage.init(getSelection()); + } + addPage(fPage); + } + + /*(non-Javadoc) + * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#canRunForked() + */ + protected boolean canRunForked() { + return !fPage.isEnclosingTypeSelected(); + } + + /* (non-Javadoc) + * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor) + */ + protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { + fPage.createType(monitor); // use the full progress monitor + } + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.IWizard#performFinish() + */ + public boolean performFinish() { + warnAboutTypeCommentDeprecation(); + boolean res= super.performFinish(); + if (res) { + IResource resource= fPage.getModifiedResource(); + if (resource != null) { + selectAndReveal(resource); + if (fOpenEditorOnFinish) { + openResource((IFile) resource); + } + } + } + return res; + } + + /* (non-Javadoc) + * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#getCreatedElement() + */ + public IJavaElement getCreatedElement() { + return fPage.getCreatedType(); + } + + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorCreationWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2010-08-13 15:22:56 UTC (rev 24155) @@ -0,0 +1,401 @@ +/******************************************************************************* + * Copyright (c) 2010 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.wizard; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IBuffer; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.ISourceRange; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.formatter.CodeFormatter; +import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings; +import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; +import org.eclipse.jdt.internal.corext.util.JavaConventionsUtil; +import org.eclipse.jdt.internal.corext.util.JavaModelUtil; +import org.eclipse.jdt.internal.ui.IJavaHelpContextIds; +import org.eclipse.jdt.internal.ui.dialogs.StatusInfo; +import org.eclipse.jdt.internal.ui.dialogs.StatusUtil; +import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings; +import org.eclipse.jdt.ui.CodeGeneration; +import org.eclipse.jdt.ui.wizards.NewClassWizardPage; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.ui.CDIUIMessages; +import org.jboss.tools.common.java.generation.JavaBeanGenerator; +import org.jboss.tools.common.ui.widget.editor.CompositeEditor; +import org.jboss.tools.common.ui.widget.editor.IFieldEditor; +import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory; +import org.jboss.tools.common.ui.widget.editor.LabelFieldEditor; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class NewDecoratorWizardPage extends NewClassWizardPage { + protected InterceptorBindingSelectionProvider interceptorBindingsProvider = new InterceptorBindingSelectionProvider(); + IFieldEditor fieldName = null; + + protected StatusInfo fieldNameStatus = new StatusInfo(); + + public NewDecoratorWizardPage() { + setTitle(CDIUIMessages.NEW_DECORATOR_WIZARD_PAGE_NAME); + } + + public void init(IStructuredSelection selection) { + super.init(selection); + if (!selection.isEmpty()) { + Object o = selection.iterator().next(); + IType type = null; + if (o instanceof IType) { + type = (IType) o; + } else if (o instanceof ICompilationUnit) { + ICompilationUnit cu = (ICompilationUnit) o; + try { + IType[] ts = cu.getTypes(); + if (ts != null && ts.length > 0) + type = ts[0]; + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + + } + boolean isInterface = false; + try { + isInterface = type != null && type.isInterface(); + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + if (isInterface) { + ArrayList<String> interfacesNames = new ArrayList<String>(); + String name = ""; + try { + name = type.getFullyQualifiedParameterizedName(); + } catch (JavaModelException e) { + name = type.getFullyQualifiedName(); + } + interfacesNames.add(name); + setSuperInterfaces(interfacesNames, true); + superInterfacesChanged(); + setDefaultTypeName(name); + } + } + setModifiers(getModifiers() | Flags.AccAbstract, true); + + doStatusUpdate(); + } + + void setDefaultTypeName(String interfaceName) { + int d = interfaceName.lastIndexOf('.'); + int b = interfaceName.indexOf('<'); + if (b < 0) + b = interfaceName.length(); + String elementName = interfaceName.substring(d + 1, b); + String typeName = elementName + "Decorator"; + typeName += interfaceName.substring(b); + setTypeName(typeName, true); + typeNameChanged(); + String defaultFieldName = elementName; + if(defaultFieldName.length() > 0) { + defaultFieldName = defaultFieldName.substring(0, 1).toLowerCase() + defaultFieldName.substring(1); + if(fieldName != null) { + fieldName.setValue(defaultFieldName); + } + } + + } + + public void createControl(Composite parent) { + initializeDialogUnits(parent); + + Composite composite = new Composite(parent, SWT.NONE); + composite.setFont(parent.getFont()); + + int nColumns = 4; + + GridLayout layout = new GridLayout(); + layout.numColumns = nColumns; + composite.setLayout(layout); + + // pick & choose the wanted UI components + + createContainerControls(composite, nColumns); + createPackageControls(composite, nColumns); + // createEnclosingTypeControls(composite, nColumns); + + createSeparator(composite, nColumns); + + createTypeNameControls(composite, nColumns); + createModifierControls(composite, nColumns); + + // createSuperClassControls(composite, nColumns); + createSuperInterfacesControls(composite, nColumns); + + // createMethodStubSelectionControls(composite, nColumns); + + createCustomFields(composite); + + createCommentControls(composite, nColumns); + enableCommentControl(true); + + setControl(composite); + + Dialog.applyDialogFont(composite); + PlatformUI.getWorkbench().getHelpSystem() + .setHelp(composite, IJavaHelpContextIds.NEW_CLASS_WIZARD_PAGE); + + // onInterceptorBindingChange(); + doStatusUpdate(); + } + + protected void createTypeMembers(IType newType, + final ImportsManager imports, IProgressMonitor monitor) + throws CoreException { + createInheritedMethods(newType, true, true, imports, + new SubProgressMonitor(monitor, 1)); + + ISourceRange range = newType.getSourceRange(); + IBuffer buf = newType.getCompilationUnit().getBuffer(); + String lineDelimiter = StubUtility.getLineDelimiterUsed(newType + .getJavaProject()); + StringBuffer sb = new StringBuffer(); + addAnnotations(imports, sb, lineDelimiter); + buf.replace(range.getOffset(), 0, sb.toString()); + createDelegateField(newType, imports, monitor, lineDelimiter); + modifyMethodContent(newType, imports, monitor, lineDelimiter); + } + + void addAnnotations(ImportsManager imports, StringBuffer sb, + String lineDelimiter) { + addDecoratorAnnotation(imports, sb, lineDelimiter); + } + + protected void addDecoratorAnnotation(ImportsManager imports, + StringBuffer sb, String lineDelimiter) { + NewCDIAnnotationWizardPage.addAnnotation( + CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME, imports, sb, + lineDelimiter); + } + + protected void createCustomFields(Composite composite) { + createFieldNameField(composite); + } + + protected void createFieldNameField(Composite composite) { + String label = "Delegate Field Name:"; + List is = getSuperInterfaces(); + String defaultFieldName = ""; + if (is != null && !is.isEmpty()) { + defaultFieldName = is.get(0).toString(); + int i = defaultFieldName.lastIndexOf('.'); + if (i >= 0) + defaultFieldName = defaultFieldName.substring(i + 1); + if (defaultFieldName.length() > 0) { + defaultFieldName = defaultFieldName.substring(0, 1) + .toLowerCase() + defaultFieldName.substring(1); + } + i = defaultFieldName.indexOf('<'); + if (i >= 0) { + defaultFieldName = defaultFieldName.substring(0, i); + } + } + fieldName = IFieldEditorFactory.INSTANCE.createTextEditor("fieldName", + label, defaultFieldName); + ((CompositeEditor) fieldName) + .addFieldEditors(new IFieldEditor[] { new LabelFieldEditor( + "fieldName", "") }); + fieldName.doFillIntoGrid(composite); + fieldName.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + onFieldNameChange(); + doStatusUpdate(); + } + }); + } + + void onFieldNameChange() { + String methodName = this.fieldName.getValueAsString(); + fieldNameStatus = new StatusInfo(); + if (methodName.length() == 0) { + fieldNameStatus.setError(CDIUIMessages.MESSAGE_FIELD_NAME_EMPTY); + return; + } + IStatus val = JavaConventionsUtil.validateMethodName(methodName, null); + if (val != null && val.getSeverity() == IStatus.ERROR) { + fieldNameStatus.setError(NLS.bind( + CDIUIMessages.MESSAGE_FIELD_NAME_NOT_VALID, + val.getMessage())); + } + + } + + protected IField createDelegateField(IType type, ImportsManager imports, + IProgressMonitor monitor, String lineDelimiter) + throws CoreException { + String fieldName = "" + this.fieldName.getValue(); + + imports.addImport("javax.interceptor.InvocationContext"); + imports.addImport("javax.interceptor.AroundInvoke"); + imports.addImport(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); + imports.addImport(CDIConstants.ANY_QUALIFIER_TYPE_NAME); + imports.addImport(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME); + + ICompilationUnit cu = type.getCompilationUnit(); + JavaModelUtil.reconcile(cu); + CodeGenerationSettings settings = JavaPreferencesSettings + .getCodeGenerationSettings(type.getJavaProject()); + settings.createComments = isAddComments(); + String access = "private"; + String javatype = "Object"; + List is = getSuperInterfaces(); + if (is != null) + for (int i = 0; i < is.size(); i++) { + String in = is.get(i).toString(); + int d = in.lastIndexOf('.'); + if (d >= 0) + in = in.substring(d + 1); + javatype = in; + break; + } + + String fieldHeader = "@Inject @Delegate @Any " + access + " " + javatype + " " + fieldName + ";" + lineDelimiter; //$NON-NLS-1$ //$NON-NLS-2$ + IJavaElement[] cs = type.getChildren(); + IJavaElement sibling = cs == null || cs.length == 0 ? null : cs[0]; + IField m = type.createField(fieldHeader, sibling, true, null); + + editField(cu, m, javatype, fieldHeader, lineDelimiter); + return m; + } + + void editField(ICompilationUnit cu, IField m, String javatype, String fieldHeader, + String lineDelimiter) throws CoreException { + synchronized (cu) { + cu.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + ISourceRange range = m.getSourceRange(); + IBuffer buf = cu.getBuffer(); + StringBuffer sb = new StringBuffer(lineDelimiter); + if (isAddComments()) { + String fieldComment = CodeGeneration.getFieldComment(cu, + javatype, m.getElementName(), lineDelimiter); + sb.append(fieldComment).append(lineDelimiter); + } + sb.append(fieldHeader); + String formattedContent = JavaBeanGenerator.codeFormat2( + CodeFormatter.K_CLASS_BODY_DECLARATIONS, sb.toString(), 1, + lineDelimiter, cu.getJavaProject()); + if (formattedContent != null && formattedContent.startsWith("\t")) { //$NON-NLS-1$ + formattedContent = formattedContent.substring(1); + } + buf.replace(range.getOffset(), range.getLength(), formattedContent); + } + + protected IStatus superInterfacesChanged() { + List list = getSuperInterfaces(); + if(list != null && !list.isEmpty()) { + setDefaultTypeName(list.get(0).toString()); + } + StatusInfo result = (StatusInfo) super.superInterfacesChanged(); + if (!result.isError()) { + if (list == null || list.isEmpty()) { + result.setError("Please select decorated type."); + } + } + return result; + } + + private void doStatusUpdate() { + // status of all used components + IStatus[] status = new IStatus[] { + fContainerStatus, + isEnclosingTypeSelected() ? fEnclosingTypeStatus + : fPackageStatus, fTypeNameStatus, fModifierStatus, + fSuperClassStatus, fSuperInterfacesStatus }; + + // the mode severe status will be displayed and the OK button + // enabled/disabled. + updateStatus(status); + } + + protected void updateStatus(IStatus[] status) { + IStatus[] ns = new IStatus[status.length + 1]; + System.arraycopy(status, 0, ns, 0, status.length); + ns[status.length] = fieldNameStatus; + status = ns; + updateStatus(StatusUtil.getMostSevere(status)); + } + + protected void modifyMethodContent(IType type, ImportsManager imports, + IProgressMonitor monitor, String lineDelimiter) throws CoreException { + IMethod[] ms = type.getMethods(); + for (int i = 0; i < ms.length; i++) { + if(ms[i].isConstructor()) continue; + ICompilationUnit cu = type.getCompilationUnit(); + synchronized (cu) { + cu.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + IBuffer buf = cu.getBuffer(); + ISourceRange range = ms[i].getSourceRange(); + + int start = -1; + int end = -1; + StringBuffer sb = new StringBuffer(); + if("void".equals(ms[i].getReturnType()) || "V".equals(ms[i].getReturnType())) { + end = buf.getContents().indexOf("}", range.getOffset()); + if(end < 0) continue; + end = buf.getContents().lastIndexOf(lineDelimiter, end); + if(end < 0 || end < range.getOffset()) continue; +// end += lineDelimiter.length(); + start = end; + } else { + start = buf.getContents().indexOf("return", range.getOffset()); + if(start < 0 || start > range.getOffset() + range.getLength()) continue; + start += 7; + end = buf.getContents().indexOf(";", start); + if(end < 0) continue; + end++; + } + String fieldName = "" + this.fieldName.getValue(); + String methodName = ms[i].getElementName(); + String[] ps = ms[i].getParameterNames(); + sb.append(fieldName).append('.').append(methodName).append('('); + for (int k = 0; k < ps.length; k++) { + if(k > 0) sb.append(", "); + sb.append(ps[k]); + } + sb.append(");"); + buf.replace(start, end - start, sb.toString()); + } + + } + +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain