*** empty log message ***

ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/WorkspaceModelManager.java

diff --git a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/WorkspaceModelManager.java b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/WorkspaceModelManager.java
index 2717f97..82714d1 100644
--- a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/WorkspaceModelManager.java
+++ b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/WorkspaceModelManager.java
@@ -251,7 +251,11 @@
 

 	if (delta.getKind() == IResourceDelta.ADDED) {

 		// manifest added - add the model

-		addWorkspaceModel(createWorkspacePluginModel(file));

+		IPluginModelBase model = getWorkspaceModel(file);

+		if (model==null)

+		   addWorkspaceModel(createWorkspacePluginModel(file));

+		else

+			reloadWorkspaceModel(model);

 	} else {

 		IPluginModelBase model = getWorkspaceModel(file);

 		if (delta.getKind() == IResourceDelta.REMOVED) {

ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/AbstractPluginModelBase.java

diff --git a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/AbstractPluginModelBase.java b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/AbstractPluginModelBase.java
index 5b6b668..816b91a 100644
--- a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/AbstractPluginModelBase.java
+++ b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/AbstractPluginModelBase.java
@@ -43,6 +43,11 @@
 	XMLErrorHandler errorHandler = new XMLErrorHandler();

 	DOMParser parser = new DOMParser();

 	parser.setErrorHandler(errorHandler);

+	if (pluginBase == null) {

+		pluginBase = (PluginBase)createPluginBase();

+		pluginBase.setModel(this);

+	}

+	pluginBase.reset();

 	try {

 		InputSource source = new InputSource(stream);

 		parser.parse(source);

@@ -60,17 +65,13 @@
 }

 private void processDocument(Document doc) {

 	Node pluginNode = doc.getDocumentElement();

-	if (pluginBase == null) {

-		pluginBase = (PluginBase)createPluginBase();

-		pluginBase.setModel(this);

-	} else {

-		pluginBase.reset();

-	}

 	pluginBase.load(pluginNode);

 }

 public void reload(InputStream stream) throws CoreException {

+/*

 	if (pluginBase != null)

 		pluginBase.reset();

+*/

 	load(stream);

 	fireModelChanged(

 		new ModelChangedEvent(

ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/Fragment.java

diff --git a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/Fragment.java b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/Fragment.java
index 9746283..246917a 100644
--- a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/Fragment.java
+++ b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/Fragment.java
@@ -16,8 +16,8 @@
 import org.eclipse.core.runtime.PlatformObject;

 

 public class Fragment extends PluginBase implements IFragment {

-	private String pluginId;

-	private String pluginVersion;

+	private String pluginId="";

+	private String pluginVersion="";

 

 public Fragment() {

 }

@@ -39,8 +39,8 @@
 	super.load(node);

 }

 public void reset() {

-	pluginId = null;

-	pluginVersion = null;

+	pluginId = "";

+	pluginVersion = "";

 	super.reset();

 }

 public void setPluginId(String newPluginId) throws CoreException {

ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/PluginBase.java

diff --git a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/PluginBase.java b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/PluginBase.java
index 152f16a..2a0ca90 100644
--- a/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/PluginBase.java
+++ b/ui/org.eclipse.pde.ui/Eclipse PDE UI/org/eclipse/pde/internal/model/PluginBase.java
@@ -180,9 +180,14 @@
 	extensionPoints = new Vector();

 	libraries = new Vector();

 	providerName = null;

-	version = null;

-	this.name = null;

-	this.id=null;

+	version ="";

+	this.name ="";

+	this.id="";

+	if (getModel()!=null && getModel().getUnderlyingResource()!=null) {

+		this.id = getModel().getUnderlyingResource().getProject().getName();

+		this.name = this.id;

+		this.version = "0.0.0";

+	}

 }

 public void setProviderName(String providerName) throws CoreException {

 	ensureModelEditable();

ui/org.eclipse.pde.ui/icons/full/wizban/form_banner.gif

diff --git a/ui/org.eclipse.pde.ui/icons/full/wizban/form_banner.gif b/ui/org.eclipse.pde.ui/icons/full/wizban/form_banner.gif
index 0cad72d..aebc0b2 100644
--- a/ui/org.eclipse.pde.ui/icons/full/wizban/form_banner.gif
+++ b/ui/org.eclipse.pde.ui/icons/full/wizban/form_banner.gif
Binary files differ