Author: rob.stryker(a)jboss.com Date: 2009-07-27 15:32:57 -0400 (Mon, 27 Jul 2009) New Revision: 16827 Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/META-INF/MANIFEST.MF workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ExternalJarReferenceWizardFragment.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/JarReferenceWizardFragment.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ProjectReferenceWizardFragment.java Log: Some cleanup for eclipse patch 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 18:51:58 UTC (rev 16826) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/META-INF/MANIFEST.MF 2009-07-27 19:32:57 UTC (rev 16827) @@ -21,7 +21,6 @@ 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.jboss.ide.eclipse.as.wtp.override.core;bundle-version="1.0.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", Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-27 18:51:58 UTC (rev 16826) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-27 19:32:57 UTC (rev 16827) @@ -75,13 +75,12 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.eclipse.wst.common.componentcore.ui.Messages; +import org.eclipse.wst.common.componentcore.ui.WTPOveridePlugin; 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; -import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils; -import org.eclipse.wst.common.componentcore.ui.Messages; -import org.eclipse.wst.common.componentcore.ui.WTPOveridePlugin; public class AddModuleDependenciesPropertiesPage implements Listener, IModuleDependenciesControl { @@ -838,21 +837,6 @@ WTPOveridePlugin.logError(e); } } - /** - * Method returns the name of the given IVirtualComponent being sure the correct extension - * is on the end of the name, this is important for internal projects. Added for [Bug 241509] - * - * Note (rs) : I do not believe this ever gets called with a binary virtComp - * - * @param virtComp the IVirtualComponent to get the name of with the correct extension - * @return the name of the given IVirtualComponent with the correct extension - */ - protected String getVirtualComponentNameWithExtension(IVirtualComponent virtComp) { - String virtCompURIMapName = this.getURIMappingName(virtComp); - String extension = ComponentUtils.getDefaultProjectExtension(virtComp); - virtCompURIMapName += extension; - return virtCompURIMapName; - } /** * [Bug 238264] Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ExternalJarReferenceWizardFragment.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-07-27 18:51:58 UTC (rev 16826) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-07-27 19:32:57 UTC (rev 16827) @@ -1,43 +1,16 @@ package org.eclipse.wst.common.componentcore.ui.propertypage; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties; -import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.server.ui.wizard.IWizardHandle; -import org.eclipse.wst.server.ui.wizard.WizardFragment; -import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils; public class ExternalJarReferenceWizardFragment extends JarReferenceWizardFragment { public Composite createComposite(Composite parent, IWizardHandle handle) { Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/JarReferenceWizardFragment.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/JarReferenceWizardFragment.java 2009-07-27 18:51:58 UTC (rev 16826) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/JarReferenceWizardFragment.java 2009-07-27 19:32:57 UTC (rev 16827) @@ -1,23 +1,17 @@ package org.eclipse.wst.common.componentcore.ui.propertypage; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties; -import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -27,17 +21,11 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.server.ui.wizard.IWizardHandle; import org.eclipse.wst.server.ui.wizard.WizardFragment; -import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils; public class JarReferenceWizardFragment extends WizardFragment { protected LabelProvider labelProvider = null; Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ProjectReferenceWizardFragment.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ProjectReferenceWizardFragment.java 2009-07-27 18:51:58 UTC (rev 16826) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.componentcore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ProjectReferenceWizardFragment.java 2009-07-27 19:32:57 UTC (rev 16827) @@ -32,7 +32,6 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.server.ui.wizard.IWizardHandle; import org.eclipse.wst.server.ui.wizard.WizardFragment; -import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils; public class ProjectReferenceWizardFragment extends WizardFragment { private LabelProvider labelProvider = null; @@ -83,8 +82,10 @@ } IVirtualComponent comp = ComponentCore.createComponent(selected); String path = selected.getName(); - String extension = ComponentUtils.getDefaultProjectExtension(comp); - path += extension; + + // TODO extension point? API? Something?! + //String extension = ComponentUtils.getDefaultProjectExtension(comp); + path += ".jar"; //extension; getTaskModel().putObject(NewReferenceWizard.COMPONENT, comp); getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, path);