265991 - Generator tool needs to recognize when bridgesupport.extras files are out of sync

2 files changed, 10 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java
index 98d2e8d6bd..247556f6de 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java
+++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java
@@ -650,6 +650,7 @@ public void setOutputDir(String dir) {
 
 public void setXmls(String[] xmls) {
 	this.xmls = xmls;
+	this.documents = null;
 }
 
 public void setMainClass(String mainClassName) {
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java
index a544918754..fce8e98532 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java
+++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java
@@ -41,7 +41,7 @@ public class MacGeneratorUI {
 		if (node.getNodeType() == Node.TEXT_NODE) return null;
 		String name = node.getNodeName();
 		TreeItem parentItem = null;
-		if (lastParent != null && lastParent.getParentItem() == superItem && name.equals(lastParent.getData())) {
+		if (lastParent != null && !lastParent.isDisposed() && lastParent.getParentItem() == superItem && name.equals(lastParent.getData())) {
 			parentItem = lastParent;
 		} else {
 			TreeItem[] items = superItem.getItems();
@@ -570,6 +570,14 @@ public class MacGeneratorUI {
 		}
 	}
 	
+	public void refresh () {
+		if (nodesTree == null) return;
+		gen.setXmls(null);
+		nodesTree.removeAll();
+		attribTable.removeAll();
+		updateNodes();
+	}
+	
 	public void setActionsVisible(boolean visible) {
 		this.actions = visible;
 	}