Author: rob.stryker(a)jboss.com Date: 2009-07-27 17:53:55 -0400 (Mon, 27 Jul 2009) New Revision: 16831 Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/META-INF/MANIFEST.MF workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/plugin.xml workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ear/EarModuleDependenciesPropertyPage.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/AddModuleDependenciesPropertiesPage.java Log: cleaning up workspace, removing plugin dependencies, moving towards patch for eclipse Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/META-INF/MANIFEST.MF =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/META-INF/MANIFEST.MF 2009-07-27 21:11:27 UTC (rev 16830) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/META-INF/MANIFEST.MF 2009-07-27 21:53:55 UTC (rev 16831) @@ -8,23 +8,20 @@ org.eclipse.core.runtime, org.eclipse.core.resources;bundle-version="3.5.0", org.eclipse.wst.common.modulecore;bundle-version="1.1.300", - org.eclipse.jst.j2ee;bundle-version="1.1.300", - org.eclipse.jst.j2ee.core;bundle-version="1.1.300", - org.eclipse.jst.j2ee.ui;bundle-version="1.1.300", org.eclipse.wst.common.core;bundle-version="1.1.201", org.eclipse.wst.common.frameworks;bundle-version="1.1.300", org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.300", org.eclipse.jst.common.frameworks;bundle-version="1.1.300", org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0", + org.eclipse.jst.j2ee;bundle-version="1.1.300", org.eclipse.jdt;bundle-version="3.5.0", org.eclipse.jdt.core;bundle-version="3.5.0", - org.eclipse.jem.util;bundle-version="2.0.200", - org.eclipse.jst.jee;bundle-version="1.0.200", org.eclipse.jdt.ui;bundle-version="3.5.0", org.eclipse.wst.server.ui;bundle-version="1.1.102", org.eclipse.wst.server.core;bundle-version="1.1.101", org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300", + org.eclipse.jem.util;bundle-version="2.0.200", org.eclipse.emf.ecore;bundle-version="2.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: JBoss by Red Hat +Bundle-Vendor: Eclipse.org Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/plugin.xml =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/plugin.xml 2009-07-27 21:11:27 UTC (rev 16830) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/plugin.xml 2009-07-27 21:53:55 UTC (rev 16831) @@ -22,6 +22,8 @@ </enabledWhen> </page> </extension> + +<!-- <extension point="org.eclipse.wst.common.componentcore.ui.moduleDependencyPropertyPage"> <dependencyPage @@ -29,6 +31,8 @@ id="org.eclipse.wst.common.componentcore.ui.earDependencyPage"> </dependencyPage> </extension> + --> + <extension point="org.eclipse.wst.common.componentcore.ui.referenceWizardFragment"> <referenceFragment Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java 2009-07-27 21:11:27 UTC (rev 16830) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java 2009-07-27 21:53:55 UTC (rev 16831) @@ -10,6 +10,7 @@ public static String ErrorNotVirtualComponent; public static String DeployPathColumn; public static String SourceColumn; + public static String InternalLibJarWarning; public static String AddFolder; public static String AddFolderElipses; public static String AddReference; Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties 2009-07-27 21:11:27 UTC (rev 16830) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties 2009-07-27 21:53:55 UTC (rev 16831) @@ -4,6 +4,7 @@ ErrorNotVirtualComponent=The given project is not a virtual component project DeployPathColumn=Deploy Path SourceColumn=Source +InternalLibJarWarning=This library has been added to the project by using the project tree or the file system. If you want to move / remove it, use the same approach. AddFolder=Add Folder AddFolderElipses=Add Folder... AddReference=Add Reference... Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ear/EarModuleDependenciesPropertyPage.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ear/EarModuleDependenciesPropertyPage.java 2009-07-27 21:11:27 UTC (rev 16830) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ear/EarModuleDependenciesPropertyPage.java 2009-07-27 21:53:55 UTC (rev 16831) @@ -10,22 +10,9 @@ ******************************************************************************/ package org.eclipse.wst.common.componentcore.ui.propertypage.ear; -import java.util.ArrayList; - import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider; -import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider; -import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; -import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider; -import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.ui.propertypage.internal.AddModuleDependenciesPropertiesPage; import org.eclipse.wst.common.componentcore.ui.propertypage.internal.ModuleAssemblyRootPage; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; public class EarModuleDependenciesPropertyPage extends AddModuleDependenciesPropertiesPage { @@ -34,31 +21,31 @@ super(project, page); } - protected IDataModelOperation generateEARDDOperation() { - IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider()); - model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, rootComponent); - model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project); - return model.getDefaultOperation(); - } - - public boolean postHandleChanges(IProgressMonitor monitor) { - return true; - } - - protected void handleRemoved(ArrayList<IVirtualComponent> removed) { - super.handleRemoved(removed); - J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject()); - } - - protected IDataModelProvider getRemoveReferenceDataModelProvider(Object component) { - return new RemoveComponentFromEnterpriseApplicationDataModelProvider(); - } - -// protected void postAddProjects(Set moduleProjects) throws CoreException { -// EarFacetRuntimeHandler.updateModuleProjectRuntime(rootComponent.getProject(), moduleProjects, new NullProgressMonitor()); +// protected IDataModelOperation generateEARDDOperation() { +// IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider()); +// model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, rootComponent); +// model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project); +// return model.getDefaultOperation(); // } - - protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) { - return new AddComponentToEnterpriseApplicationDataModelProvider(); - } +// +// public boolean postHandleChanges(IProgressMonitor monitor) { +// return true; +// } +// +// protected void handleRemoved(ArrayList<IVirtualComponent> removed) { +// super.handleRemoved(removed); +// J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject()); +// } +// +// protected IDataModelProvider getRemoveReferenceDataModelProvider(Object component) { +// return new RemoveComponentFromEnterpriseApplicationDataModelProvider(); +// } +// +//// protected void postAddProjects(Set moduleProjects) throws CoreException { +//// EarFacetRuntimeHandler.updateModuleProjectRuntime(rootComponent.getProject(), moduleProjects, new NullProgressMonitor()); +//// } +// +// protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) { +// return new AddComponentToEnterpriseApplicationDataModelProvider(); +// } } Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/AddModuleDependenciesPropertiesPage.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/AddModuleDependenciesPropertiesPage.java 2009-07-27 21:11:27 UTC (rev 16830) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/AddModuleDependenciesPropertiesPage.java 2009-07-27 21:53:55 UTC (rev 16831) @@ -42,7 +42,6 @@ import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; @@ -319,8 +318,7 @@ label.setBackground(Display.getDefault() .getSystemColor(SWT.COLOR_INFO_BACKGROUND)); label.setData("_TABLEITEM", item); //$NON-NLS-1$ - label.setText(J2EEUIMessages - .getResourceString(J2EEUIMessages.HOVER_HELP_FOR_DISABLED_LIBS)); + label.setText( Messages.InternalLibJarWarning); label.addListener(SWT.MouseExit, labelListener); label.addListener(SWT.MouseDown, labelListener); Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);