[268180] Delete dead code referencing DeleteMe interfaces
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java
deleted file mode 100644
index 3771f15..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.datamodel.properties;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-
-
-/**
- * <p>
- * IJ2EEComponentCreationDataModelProperties provides properties to the
- * J2EEComponentCreationDataModelProvider as well as all extending interfaces extending
- * IJ2EEComponentCreationDataModelProperties
- * @see org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- * @see org.eclipse.jst.j2ee.datamodel.properties.IJavaComponentCreationDataModelProperties
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- *
- * @deprecated
- *
- * @see IJ2EEFacetProjectCreationDataModelProperties
- */
-public interface IJ2EEComponentCreationDataModelProperties extends IJavaComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15{
-
- /**
- * Required, type Boolean, the default value is <code>Boolean.FALSE</code>.
- */
- public static final String ADD_TO_EAR = "IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-
- public static final String MODULE_URI = "IJ2EEComponentCreationDataModelProperties.MODULE_URI"; //$NON-NLS-1$
- /**
- * type String, this property needs to be set if the value of the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>
- */
- public static final String EAR_COMPONENT_NAME = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * type String, this property needs to be set if the value of the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>
- */
- public static final String EAR_COMPONENT_DEPLOY_NAME = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_DEPLOY_NAME"; //$NON-NLS-1$
- /**
- * type ComponentHandle, this property needs to be set if the value of the property ADD_TO_EAR is set to <code>Boolean.TRUE</code>. Represents
- * a handle to the EAR
- */
- public static final String EAR_COMPONENT_PROJECT = "IJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_PROJECT"; //$NON-NLS-1$
-
- /**
- * type Boolean; the default value is <code>Boolean.TRUE</code>, this is UI only property
- */
- public static final String UI_SHOW_EAR_SECTION = "IJ2EEComponentCreationDataModelProperties.UI_SHOW_EAR_SECTION"; //$NON-NLS-1$
-
- /**
- * Optional, type String
- * String indicates the name of the the folder where the deployment descriptor exists.
- * Each J2EE componenr provider will default the Deployment descriptor folder.
- *
- */
-
- public static final String DD_FOLDER = "IJ2EEComponentCreationDataModelProperties.DD_FOLDER"; //$NON-NLS-1$
-
- /**
- * Required, type Integer. The user defined version of the component.
- */
- public static final String COMPONENT_VERSION = "IComponentCreationDataModelProperties.COMPONENT_VERSION"; //$NON-NLS-1$
-
- /**
- * type Integer
- */
- public static final String VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME = "IComponentCreationDataModelProperties.VALID_COMPONENT_VERSIONS_FOR_PROJECT_RUNTIME"; //$NON-NLS-1$
- /**
- * type AddComponentToEnterpriseApplicationDataModel
- */
- public static final String NESTED_ADD_COMPONENT_TO_EAR_DM = "IComponentCreationDataModelProperties.NESTED_ADD_COMPONENT_TO_EAR_DM"; //$NON-NLS-1$
- /**
- * type EARComponentCreationDataModel
- */
- public static final String NESTED_EAR_COMPONENT_CREATION_DM = "IComponentCreationDataModelProperties.NESTED_EAR_COMPONENT_CREATION_DM"; //$NON-NLS-1$
- /**
- * type UpdateManifestDataModel
- */
- public static final String NESTED_UPDATE_MANIFEST_DM = "IComponentCreationDataModelProperties.NESTED_UPDATE_MANIFEST_DM"; //$NON-NLS-1$
- /**
- * type ClassPathSelection
- */
- public static final String CLASSPATH_SELECTION = "IComponentCreationDataModelProperties.CLASSPATH_SELECTION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java
index 25c1ca9..5a7d2f7 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJ2EEModuleImportDataModelProperties.java
@@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.jst.j2ee.datamodel.properties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-
/**
* <p>
* IJ2EEModuleImportDataModelProperties provides properties to the IDataModel associated with the
@@ -33,20 +30,6 @@
*/
public interface IJ2EEModuleImportDataModelProperties extends IJ2EEComponentImportDataModelProperties {
- /**
- * @deprecated use the {@link IJ2EEFacetProjectCreationDataModelProperties#EAR_PROJECT_NAME} on the nested project creation model
- *
- * @see DoNotUseMeThisWillBeDeletedPost15
- */
- public static final String EAR_COMPONENT_NAME = "IJ2EEModuleImportDataModelProperties.EAR_COMPONENT_NAME"; //$NON-NLS-1$
- /**
- * @deprecated use the {@link IJ2EEFacetProjectCreationDataModelProperties#ADD_TO_EAR} on the nested project creation model
- *
- * @see DoNotUseMeThisWillBeDeletedPost15
- */
- public static final String ADD_TO_EAR = "IJ2EEModuleImportDataModelProperties.ADD_TO_EAR"; //$NON-NLS-1$
-
public static final String EXTENDED_IMPORT_FACTORY = "IJ2EEModuleImportDataModelProperties.EXTENDED_IMPORT_FACTORY"; //$NON-NLS-1$
-
}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java
deleted file mode 100644
index dd037fd..0000000
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/datamodel/properties/IJavaComponentCreationDataModelProperties.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.datamodel.properties;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IJ2EEProjectServerTargetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
-
-/**
- * <p>
- * IJavaComponentCreationDataModelProperties provides properties to the
- * JavaComponentCreationDataModelProvider as well as all extending interfaces extending
- * IJavaComponentCreationDataModelProperties specifically, but not limited to all J2EE component related
- * creation.
- * @see org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentCreationDataModelProvider
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-
-/**
- * This has been slated for removal post WTP 1.5. Do not use this class/interface
- *
- * @deprecated
- *
- * @see IJavaFacetInstallDataModelProperties
- */
-public interface IJavaComponentCreationDataModelProperties extends IComponentCreationDataModelProperties, DoNotUseMeThisWillBeDeletedPost15 {
- /**
- * Optional, type String
- * String indicating the name of the the root Java Source Folder in the component being created.
- * The DataModelProvider will default the Java Source Folder to the Component folder.
- *
- */
- public static final String JAVASOURCE_FOLDER = "IJavaComponentCreationDataModelProperties.JAVASOURCE_FOLDER";
- /**
- * Optional, type String
- * String indicating the name of the the root folder containing the Manifest.MF in the component being created.
- * The DataModelProvider will default the Manifest folder to the Component folder/META-INF.
- */
- public static final String MANIFEST_FOLDER = "IJavaComponentCreationDataModelProperties.MANIFEST_FOLDER";
-
- /**
- * Required, type String. This is used to specify the server target.
- *
- */
- public static final String RUNTIME_TARGET_ID = IJ2EEProjectServerTargetDataModelProperties.RUNTIME_TARGET_ID;
-}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveSaveAdapter.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveSaveAdapter.java
index 07c1be8..801904d 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveSaveAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveSaveAdapter.java
@@ -47,7 +47,6 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
// hari: make abstract
public class ComponentArchiveSaveAdapter extends AbstractArchiveSaveAdapter {
@@ -205,7 +204,7 @@
* @throws Exception
*/
protected void saveAsArchiveComponent(IArchive archive, IPath projectRelativePath, InputStream in) throws Exception {
- IFile iFile = saveToOutputPathIFile(projectRelativePath, in);
+ IFile iFile = saveToOutputPath(projectRelativePath, in);
// TODO investigate removing this block and related variables and
// linkArchiveComponents(); see bugzilla 159160
if (shouldLinkAsComponentRef(archive)) {
@@ -248,15 +247,7 @@
* @param in
* @throws Exception
*/
- protected void saveToOutputPath(IPath projectRelativePath, InputStream in) throws Exception {
- saveToOutputPathIFile(projectRelativePath, in);
- }
-
- /**
- * TODO refactor change the method above to return IFile
- * {@link DoNotUseMeThisWillBeDeletedPost15}
- */
- protected IFile saveToOutputPathIFile(IPath projectRelativePath, InputStream in) throws Exception {
+ protected IFile saveToOutputPath(IPath projectRelativePath, InputStream in) throws Exception {
IFile iFile = vComponent.getProject().getFile(projectRelativePath);
saveToIFile(iFile, in);
return iFile;
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
index 117c4d6..f6ff762 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
@@ -45,7 +45,6 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
public abstract class ComponentSaveStrategyImpl extends SaveStrategyImpl {
@@ -197,7 +196,7 @@
* @throws Exception
*/
protected void saveAsArchiveComponent(Archive archive, IPath projectRelativePath, InputStream in) throws Exception {
- IFile iFile = saveToOutputPathIFile(projectRelativePath, in);
+ IFile iFile = saveToOutputPath(projectRelativePath, in);
//TODO investigate removing this block and related variables and linkArchiveComponents(); see bugzilla 159160
if (shouldLinkAsComponentRef(archive)) {
IVirtualComponent archiveComponent = ComponentCore.createArchiveComponent(vComponent.getProject(), VirtualArchiveComponent.LIBARCHIVETYPE + iFile.getFullPath().toString());
@@ -235,28 +234,18 @@
}
/**
- * Saves to the specified project relative output path. Warning this method
- * will be changed post 1.5 to return an IFile
+ * Saves to the specified project relative output path.
*
* @param projectRelativePath
* @param in
* @throws Exception
*/
- protected void saveToOutputPath(IPath projectRelativePath, InputStream in) throws Exception {
- saveToOutputPathIFile(projectRelativePath, in);
- }
-
- /**
- * TODO refactor change the method above to return IFile
- * {@link DoNotUseMeThisWillBeDeletedPost15}
- */
- protected IFile saveToOutputPathIFile(IPath projectRelativePath, InputStream in) throws Exception {
+ protected IFile saveToOutputPath(IPath projectRelativePath, InputStream in) throws Exception {
IFile iFile = vComponent.getProject().getFile(projectRelativePath);
saveToIFile(iFile, in);
return iFile;
}
-
protected void saveToIFile(IFile iFile, InputStream in) throws Exception {
validateEdit(iFile);
if (iFile.exists())
