*** empty log message ***v20050104

7 files changed, 18 insertions, 27 deletions

diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISite.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISite.java
index af2d21ebe9..44cb6c1d44 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISite.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISite.java
@@ -11,35 +11,48 @@
 package org.eclipse.pde.internal.core.isite;
 
 import org.eclipse.core.runtime.*;
+
 /**
  * The top-level model object of the Eclipse update site model.
  */
 public interface ISite extends ISiteObject {
 	String P_URL = "URL"; //$NON-NLS-1$
+
 	String P_TYPE = "type"; //$NON-NLS-1$
+
 	String P_DESCRIPTION = "description"; //$NON-NLS-1$
-	
+
 	void setType(String type) throws CoreException;
+
 	String getType();
-	
+
 	void setURL(String url) throws CoreException;
+
 	String getURL();
 
 	ISiteDescription getDescription();
+
 	void setDescription(ISiteDescription description) throws CoreException;
 
 	void addFeatures(ISiteFeature[] features) throws CoreException;
+
 	void addArchives(ISiteArchive[] archives) throws CoreException;
+
 	void addCategoryDefinitions(ISiteCategoryDefinition[] defs)
-		throws CoreException;
+			throws CoreException;
 
 	void removeFeatures(ISiteFeature[] features) throws CoreException;
+
 	void removeArchives(ISiteArchive[] archives) throws CoreException;
+
 	void removeCategoryDefinitions(ISiteCategoryDefinition[] defs)
-		throws CoreException;
+			throws CoreException;
 
 	ISiteFeature[] getFeatures();
+
 	ISiteArchive[] getArchives();
+
 	ISiteCategoryDefinition[] getCategoryDefinitions();
+
 	boolean isValid();
 }
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteDescription.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteDescription.java
index ceefd651b7..46257dab38 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteDescription.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteDescription.java
@@ -12,10 +12,6 @@ package org.eclipse.pde.internal.core.isite;
 
 import org.eclipse.core.runtime.*;
 
-/**
- * @author dejan
- *
- */
 public interface ISiteDescription extends ISiteObject {
 	String P_URL = "url"; //$NON-NLS-1$
 	String P_TEXT = "text"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteFeature.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteFeature.java
index 0da38db7b8..e349cad293 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteFeature.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteFeature.java
@@ -14,14 +14,6 @@ import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.pde.internal.core.ifeature.*;
 
-/**
- * @author dejan
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
 public interface ISiteFeature extends IVersionable, ISiteObject {
 	String P_TYPE = "type"; //$NON-NLS-1$
 	String P_URL = "url"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/icons/wizban/form_banner.gif b/ui/org.eclipse.pde.ui/icons/wizban/form_banner.gif
deleted file mode 100644
index aebc0b2a30..0000000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/form_banner.gif
+++ /dev/null
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
index 546e7aaa77..2a819cb93b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
@@ -212,7 +212,6 @@ public class PDEPluginImages {
 	public static final ImageDescriptor DESC_NEWSITEPRJ_WIZ   = create(PATH_WIZBAN, "newsiteprj_wiz.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_CONVJPPRJ_WIZ =create(PATH_WIZBAN, "convjpprj_wiz.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_EXT_POINT_SCHEMA_WIZ = create(PATH_WIZBAN, "schema_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FORM_WIZ     = create(PATH_WIZBAN, "form_wiz.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_DEBUG_WIZ     = create(PATH_WIZBAN, "debug_wiz.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_RUN_WIZ     = create(PATH_WIZBAN, "run_wiz.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_PLUGIN_IMPORT_WIZ  = create(PATH_WIZBAN, "imp_extplug_wiz.gif"); //$NON-NLS-1$
@@ -221,7 +220,6 @@ public class PDEPluginImages {
 	public static final ImageDescriptor DESC_FEATURE_EXPORT_WIZ  = create(PATH_WIZBAN, "exp_deployfeat_wiz.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_PLUGIN2BUNDLE_WIZ  = create(PATH_WIZBAN, "plugin2bundle_wiz.gif"); //$NON-NLS-1$
 	public static final ImageDescriptor DESC_MIGRATE_30_WIZ = create(PATH_WIZBAN, "migrate_30_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FORM_BANNER  = create(PATH_WIZBAN, "form_banner.gif"); //$NON-NLS-1$
 	
 	
 	/**
@@ -239,8 +237,6 @@ public class PDEPluginImages {
 /* package */
 private static final void initialize() {
 	PLUGIN_REGISTRY = new ImageRegistry();
-	manage(IMG_FORM_WIZ, DESC_FORM_WIZ);
-	manage(IMG_FORM_BANNER, DESC_FORM_BANNER);
 	manage(IMG_ATT_CLASS_OBJ,DESC_ATT_CLASS_OBJ);
 	manage(IMG_ATT_FILE_OBJ, DESC_ATT_FILE_OBJ);
 	manage(IMG_ATT_IMPL_OBJ, DESC_ATT_IMPL_OBJ);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
index cb69b38409..dc49c002bf 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
@@ -1552,7 +1552,7 @@ CategorySection.adding = Adding...
 CategorySection.updating = Updating...
 CategorySection.add = Add Feature...
 CategorySection.remove = Remove
-CategorySection.environment = Synchronize Features...
+CategorySection.environment = Synchronize...
 CategorySection.buildAll = Build All
 CategorySection.build = Build
 CategorySection.newCategoryName = new_category_{0}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
index c39c6b1e2b..b5a39a57a1 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
@@ -11,7 +11,6 @@ import org.eclipse.jface.action.*;
 import org.eclipse.pde.core.plugin.*;
 import org.eclipse.pde.internal.ui.*;
 import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.progress.*;
 
 
 public class UnusedDependenciesJob extends Job {
@@ -68,11 +67,6 @@ public class UnusedDependenciesJob extends Job {
 		return new Status(IStatus.OK, PDEPlugin.getPluginId(), IStatus.OK, PDEPlugin.getResourceString("UnusedDependenciesJob.viewResults"), null); //$NON-NLS-1$
 	}
 	
-	protected boolean isModal() {
-		Boolean isModal = (Boolean)getProperty(IProgressConstants.PROPERTY_IN_DIALOG);
-		return (isModal == null) ? false : isModal.booleanValue();
-	}
-
 	private boolean isUnused(IPluginImport plugin, SubProgressMonitor monitor) {
 		IPlugin[] plugins = PluginJavaSearchUtil.getPluginImports(plugin);
 		if (PluginJavaSearchUtil.provideExtensionPoint(fModel, plugins))