Author: akazakov Date: 2009-12-02 15:04:07 -0500 (Wed, 02 Dec 2009) New Revision: 19006 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDataModelProvider.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDelegate.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetUninstallDelegate.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/ICDIFacetDataModelProperties.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java Log: https://jira.jboss.org/jira/browse/JBIDE-5355 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-12-02 18:09:08 UTC (rev 19005) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2009-12-02 20:04:07 UTC (rev 19006) @@ -10,9 +10,16 @@ org.jboss.tools.common, org.eclipse.jdt.core, org.eclipse.core.resources, - org.jboss.tools.common.model + org.jboss.tools.common.model, + org.eclipse.wst.common.project.facet.core, + org.eclipse.wst.common.modulecore, + org.eclipse.wst.common.frameworks, + org.jboss.tools.jst.web.kb Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Export-Package: org.jboss.tools.cdi.core, + org.jboss.tools.cdi.internal.core.impl, + org.jboss.tools.cdi.internal.core.project.facet, + org.jboss.tools.cdi.internal.core.scanner, org.jboss.tools.cdi.internal.core.scanner.lib Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2009-12-02 18:09:08 UTC (rev 19005) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2009-12-02 20:04:07 UTC (rev 19006) @@ -27,4 +27,60 @@ </builder> </extension> + <extension + point="org.eclipse.wst.common.project.facet.core.facets"> + <project-facet + id="jst.cdi"> + <label> + CDI + </label> + <description> + Enables the project to work with CDI + </description> + </project-facet> + <project-facet-version + facet="jst.cdi" + version="1.0"> + <constraint> + <requires + facet="jst.java" + version="[5.0"> + </requires> + </constraint> + </project-facet-version> + <action + facet="jst.cdi" + id="jst.cdi.1.0.install" + type="install" + version="1.0"> + <delegate + class="org.jboss.tools.cdi.internal.core.project.facet.CDIFacetInstallDelegate"> + </delegate> + <config-factory + class="org.jboss.tools.cdi.internal.core.project.facet.CDIFacetInstallDataModelProvider"> + </config-factory> + </action> + <action + facet="jst.cdi" + id="jst.cdi.1.0.uninstall" + type="uninstall" + version="1.0"> + <delegate + class="org.jboss.tools.cdi.internal.core.project.facet.CDIFacetUninstallDelegate"> + </delegate> + </action> + </extension> + + <extension + point="org.eclipse.wst.common.project.facet.core.runtimes"> + <supported> + <runtime-component + any="true"> + </runtime-component> + <facet + id="jst.cdi" + version="[1.0"> + </facet> + </supported> + </extension> </plugin> \ No newline at end of file Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java 2009-12-02 20:04:07 UTC (rev 19006) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2009 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.core; + +import org.eclipse.osgi.util.NLS; + +/** + * @author Alexey Kazakov + */ +public class CDICoreMessages { + private static final String BUNDLE_NAME = "org.jboss.tools.cdi.core.messages"; //$NON-NLS-1$ + + static { + NLS.initializeMessages(BUNDLE_NAME, CDICoreMessages.class); + } + + public static String CDI_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED; + public static String CDI_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW; + public static String CDI_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR; +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2009-12-02 20:04:07 UTC (rev 19006) @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2009 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.core; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.common.EclipseUtil; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.web.kb.IKbProject; + +/** + * @author Alexey Kazakov + */ +public class CDIUtil { + + /** + * Adds CDI and KB builders to the project. + * + * @param project + */ + public static void enableCDI(IProject project) { + try { + EclipseUtil.addNatureToProject(project, CDICoreNature.NATURE_ID); + if (!project.hasNature(IKbProject.NATURE_ID)) { + EclipseResourceUtil.addNatureToProject(project, + IKbProject.NATURE_ID); + } + } catch (CoreException e) { + CDICorePlugin.getDefault().logError(e); + } + } + + /** + * Removes CDI builder from the project. + * + * @param project + */ + public static void disableCDI(IProject project) { + try { + EclipseUtil.removeNatureFromProject(project, + CDICoreNature.NATURE_ID); + } catch (CoreException e) { + CDICorePlugin.getDefault().logError(e); + } + } +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties 2009-12-02 20:04:07 UTC (rev 19006) @@ -0,0 +1,3 @@ +CDI_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR=Error +CDI_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED=Error occured during installing CDI facet +CDI_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW=Check Errors View for details \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDataModelProvider.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDataModelProvider.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDataModelProvider.java 2009-12-02 20:04:07 UTC (rev 19006) @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2009 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.internal.core.project.facet; + +import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; + +/** + * Data model provider for CDI facet wizard page + * + * @author Alexey Kazakov + * + */ +public class CDIFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ICDIFacetDataModelProperties { + /** + * Returns default value for a given property + * + * @param propertyName name of property which default value requested + * @return default value + */ + public Object getDefaultProperty(String propertyName) { + if (propertyName.equals(FACET_ID)) { + return ICDIFacetDataModelProperties.CDI_FACET_ID; + } + return super.getDefaultProperty(propertyName); + } +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDataModelProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDelegate.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDelegate.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDelegate.java 2009-12-02 20:04:07 UTC (rev 19006) @@ -0,0 +1,74 @@ +/******************************************************************************* + * Copyright (c) 2009 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.internal.core.project.facet; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILogListener; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.swt.widgets.Display; +import org.eclipse.wst.common.project.facet.core.IDelegate; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.jboss.tools.cdi.core.CDICoreMessages; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIUtil; + +/** + * @author Alexey Kazakov + */ +public class CDIFacetInstallDelegate implements ILogListener, IDelegate, + ICDIFacetDataModelProperties { + + private boolean errorOccurs = false; + + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, java.lang.String) + */ + public void logging(IStatus status, String plugin) { + if(status.getPlugin().equals(CDICorePlugin.PLUGIN_ID)) { + errorOccurs = true; + } + } + + /* + * (non-Javadoc) + * @see org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) + */ + public void execute(IProject project, IProjectFacetVersion fv, + Object config, IProgressMonitor monitor) throws CoreException { + CDIUtil.enableCDI(project); + if(errorOccurs) { + errorOccurs = false; + Display.getDefault().syncExec( + new Runnable() { + public void run() { + ErrorDialog.openError(Display.getCurrent().getActiveShell(), + CDICoreMessages.CDI_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR, + CDICoreMessages.CDI_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW, + new Status(IStatus.ERROR,CDICorePlugin.PLUGIN_ID, + CDICoreMessages.CDI_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED)); + } + }); + } + } + + /* + * (non-Javadoc) + * @see org.eclipse.wst.common.project.facet.core.IActionConfigFactory#create() + */ + public Object create() throws CoreException { + return null; + } +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetInstallDelegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetUninstallDelegate.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetUninstallDelegate.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetUninstallDelegate.java 2009-12-02 20:04:07 UTC (rev 19006) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2009 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.internal.core.project.facet; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.wst.common.project.facet.core.IDelegate; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.jboss.tools.cdi.core.CDIUtil; + +/** + * @author Alexey Kazakov + */ +public class CDIFacetUninstallDelegate implements IDelegate { + + /* + * (non-Javadoc) + * @see org.eclipse.wst.common.project.facet.core.IDelegate#execute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) + */ + public void execute(IProject project, IProjectFacetVersion fv, + Object config, IProgressMonitor monitor) throws CoreException { + CDIUtil.disableCDI(project); + } +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/CDIFacetUninstallDelegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/ICDIFacetDataModelProperties.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/ICDIFacetDataModelProperties.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/ICDIFacetDataModelProperties.java 2009-12-02 20:04:07 UTC (rev 19006) @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2009 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.internal.core.project.facet; + +import org.eclipse.wst.common.project.facet.core.IActionConfigFactory; + +/** + * CDI facet properties. + + * @author Alexey Kazakov + */ +public interface ICDIFacetDataModelProperties extends IActionConfigFactory { + + /** + * CDI Facet ID constant + */ + String CDI_FACET_ID = "jst.cdi"; //$NON-NLS-1$ + + /** + * CDI 1.0 Facet Version constant + */ + String CDI_FACET_VERSION_1 = "1.0"; //$NON-NLS-1$ +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/project/facet/ICDIFacetDataModelProperties.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2009-12-02 18:09:08 UTC (rev 19005) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2009-12-02 20:04:07 UTC (rev 19006) @@ -14,4 +14,5 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.jboss.tools.cdi.ui +Export-Package: org.jboss.tools.cdi.ui, + org.jboss.tools.cdi.ui.preferences Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java 2009-12-02 18:09:08 UTC (rev 19005) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDISettingsPreferencePage.java 2009-12-02 20:04:07 UTC (rev 19006) @@ -14,17 +14,14 @@ import java.beans.PropertyChangeListener; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.common.EclipseUtil; -import org.jboss.tools.common.ui.CommonUIPlugin; +import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.common.ui.preferences.SettingsPage; import org.jboss.tools.common.ui.widget.editor.IFieldEditor; import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory; @@ -119,19 +116,11 @@ if(project==null) { return; } - try { - EclipseUtil.addNatureToProject(project, CDICoreNature.NATURE_ID); - } catch (CoreException e) { - CommonUIPlugin.getDefault().logError(e); - } + CDIUtil.enableCDI(project); } private void removeCDISupport(IProject project) { - try { - EclipseUtil.removeNatureFromProject(project, CDICoreNature.NATURE_ID); - } catch (CoreException e) { - CommonUIPlugin.getDefault().logError(e); - } + CDIUtil.disableCDI(project); } private boolean isCDIEnabled(IProject project) {