[293575] [validation] NPE and BadLocation exception occur when we edit a page

[272968] HTML Cleanup Dialog disables the OK button for some selections

9 files changed, 17 insertions, 17 deletions

diff --git a/releng.sourceediting/maps/jst-jsp-tests.map b/releng.sourceediting/maps/jst-jsp-tests.map
index 6af556cd4..bf5a37729 100644
--- a/releng.sourceediting/maps/jst-jsp-tests.map
+++ b/releng.sourceediting/maps/jst-jsp-tests.map
@@ -6,6 +6,6 @@ plugin@org.eclipse.jst.jsp.core.tests=v200911302206,:pserver:anonymous@dev.eclip
 plugin@org.eclipse.jst.jsp.ui.tests=v200909301948,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.ui.tests
 plugin@org.eclipse.jst.jsp.tests.encoding=v200911302206,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.tests.encoding
 
-plugin@org.eclipse.jst.jsp.ui.tests.performance=v200901290905,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.ui.tests.performance
+plugin@org.eclipse.jst.jsp.ui.tests.performance=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.jst.jsp.ui.tests.performance
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/jst-jsp.map b/releng.sourceediting/maps/jst-jsp.map
index 062850325..6a781345c 100644
--- a/releng.sourceediting/maps/jst-jsp.map
+++ b/releng.sourceediting/maps/jst-jsp.map
@@ -2,7 +2,7 @@
 ! This map file is for the WTP 3.2 release
 ! These bundles are currently being developed and released from the HEAD branch
 
-plugin@org.eclipse.jst.jsp.core=v200912021535,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.core
+plugin@org.eclipse.jst.jsp.core=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.core
 plugin@org.eclipse.jst.jsp.ui=v200912082014,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.jsp.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-jsdt-web-tests.map b/releng.sourceediting/maps/wst-jsdt-web-tests.map
index 32f3c05e9..a6738810b 100644
--- a/releng.sourceediting/maps/wst-jsdt-web-tests.map
+++ b/releng.sourceediting/maps/wst-jsdt-web-tests.map
@@ -2,8 +2,8 @@
 ! This map file is for the WTP 3.2 release
 ! These bundles are currently being developed and released from the HEAD branch
 
-plugin@org.eclipse.wst.jsdt.web.core.tests=v200910272050,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.web.core.tests
-plugin@org.eclipse.wst.jsdt.web.ui.tests=v200911251936,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.web.ui.tests
+plugin@org.eclipse.wst.jsdt.web.core.tests=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.web.core.tests
+plugin@org.eclipse.wst.jsdt.web.ui.tests=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.jsdt.web.ui.tests
 
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-jsdt-web.map b/releng.sourceediting/maps/wst-jsdt-web.map
index 16460032c..9402a5e9d 100644
--- a/releng.sourceediting/maps/wst-jsdt-web.map
+++ b/releng.sourceediting/maps/wst-jsdt-web.map
@@ -2,7 +2,7 @@
 ! This map file is for the WTP 3.2 release
 ! These bundles are currently being developed and released from the HEAD branch
 
-plugin@org.eclipse.wst.jsdt.web.core=v200911251936,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.core
+plugin@org.eclipse.wst.jsdt.web.core=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.core
 plugin@org.eclipse.wst.jsdt.web.support.jsp=v200906300123,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.support.jsp
 plugin@org.eclipse.wst.jsdt.web.ui=v200911251936,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.jsdt.web.ui
 
diff --git a/releng.sourceediting/maps/wst-web-core.map b/releng.sourceediting/maps/wst-web-core.map
index 390c4f8da..1679b643d 100644
--- a/releng.sourceediting/maps/wst-web-core.map
+++ b/releng.sourceediting/maps/wst-web-core.map
@@ -4,6 +4,6 @@
 
 plugin@org.eclipse.wst.web=v200912161930,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.wst.web
 plugin@org.eclipse.wst.css.core=v200912012217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.core
-plugin@org.eclipse.wst.html.core=v200911302150,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.core
+plugin@org.eclipse.wst.html.core=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.core
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-web-ui.map b/releng.sourceediting/maps/wst-web-ui.map
index c43dad534..cd8d2a7b6 100644
--- a/releng.sourceediting/maps/wst-web-ui.map
+++ b/releng.sourceediting/maps/wst-web-ui.map
@@ -4,6 +4,6 @@
 
 plugin@org.eclipse.wst.web.ui=v200912161930,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.wst.web.ui
 plugin@org.eclipse.wst.css.ui=v200912030320,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.css.ui
-plugin@org.eclipse.wst.html.ui=v200912071517,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.ui
+plugin@org.eclipse.wst.html.ui=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.html.ui
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-xml-core.map b/releng.sourceediting/maps/wst-xml-core.map
index 592ea0f26..daa1b5ef0 100644
--- a/releng.sourceediting/maps/wst-xml-core.map
+++ b/releng.sourceediting/maps/wst-xml-core.map
@@ -3,11 +3,11 @@
 ! These bundles are currently being developed and released from the HEAD branch
 
 plugin@org.eclipse.wst.dtd.core=v200910121719,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.dtd.core
-plugin@org.eclipse.wst.sse.core=v200912012217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
-plugin@org.eclipse.wst.xml.core=v200911302150,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
-plugin@org.eclipse.wst.xsd.core=v200909221403,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.core
+plugin@org.eclipse.wst.sse.core=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.core
+plugin@org.eclipse.wst.xml.core=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.core
+plugin@org.eclipse.wst.xsd.core=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.core
 
-plugin@org.eclipse.wst.standard.schemas=v200902270215,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.standard.schemas
+plugin@org.eclipse.wst.standard.schemas=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.standard.schemas
 
 plugin@org.eclipse.jst.standard.schemas=v200907180416,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.jst.standard.schemas
 
diff --git a/releng.sourceediting/maps/wst-xml-tests.map b/releng.sourceediting/maps/wst-xml-tests.map
index 2be8f2232..4b21005bf 100644
--- a/releng.sourceediting/maps/wst-xml-tests.map
+++ b/releng.sourceediting/maps/wst-xml-tests.map
@@ -3,10 +3,10 @@
 ! These bundles are currently being developed and released from the HEAD branch
 
 plugin@org.eclipse.wst.sse.core.tests=v200912030320,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.core.tests
-plugin@org.eclipse.wst.sse.ui.tests=v200909090450,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.ui.tests
+plugin@org.eclipse.wst.sse.ui.tests=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.ui.tests
 plugin@org.eclipse.wst.sse.ui.tests.performance=v200901080745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.sse.ui.tests.performance
 
-plugin@org.eclipse.wst.xml.core.tests=v200911302150,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.core.tests
+plugin@org.eclipse.wst.xml.core.tests=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.core.tests
 plugin@org.eclipse.wst.xml.ui.tests=v200910212138,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.ui.tests
 plugin@org.eclipse.wst.xml.tests.encoding=v200904102327,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.tests.encoding
 plugin@org.eclipse.wst.xml.ui.tests.performance=v200908271459,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xml.ui.tests.performance
@@ -18,7 +18,7 @@ plugin@org.eclipse.wst.dtd.ui.tests=v200910212138,:pserver:anonymous@dev.eclipse
 
 plugin@org.eclipse.wst.xsd.validation.tests=v200903091147,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.validation.tests
 plugin@org.eclipse.wst.xsd.tests.performance=v200805140200,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.tests.performance
-plugin@org.eclipse.wst.xsd.core.tests=v200810151959,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.core.tests
+plugin@org.eclipse.wst.xsd.core.tests=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.core.tests
 plugin@org.eclipse.wst.xsd.ui.tests=v200808141745,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/tests/org.eclipse.wst.xsd.ui.tests
 
 !***************
\ No newline at end of file
diff --git a/releng.sourceediting/maps/wst-xml-ui.map b/releng.sourceediting/maps/wst-xml-ui.map
index 233958548..abf762b7b 100644
--- a/releng.sourceediting/maps/wst-xml-ui.map
+++ b/releng.sourceediting/maps/wst-xml-ui.map
@@ -3,8 +3,8 @@
 ! These bundles are currently being developed and released from the HEAD branch
 
 plugin@org.eclipse.wst.dtd.ui=v200911302206,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.dtd.ui
-plugin@org.eclipse.wst.sse.ui=v200912082108,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.ui
-plugin@org.eclipse.wst.xml.ui=v200912071517,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.ui
-plugin@org.eclipse.wst.xsd.ui=v200909162206,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.ui
+plugin@org.eclipse.wst.sse.ui=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.sse.ui
+plugin@org.eclipse.wst.xml.ui=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xml.ui
+plugin@org.eclipse.wst.xsd.ui=v200912170622,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,sourceediting/plugins/org.eclipse.wst.xsd.ui
 
 !*************** 
\ No newline at end of file