All migrated templates were moved to the original folders (/templates).

28 files changed, 7 insertions, 8 deletions

diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/.project b/plugins/org.eclipse.gmf.graphdef.codegen/.project
index a44c0e17e..0ded701d4 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/.project
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/.project
@@ -25,7 +25,7 @@
 			<arguments>
 				<dictionary>
 					<key>src_container</key>
-					<value>templates.migrated</value>
+					<value>templates</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
index b0e2b6471..fa4b7714b 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Mon Mar 16 19:20:33 CET 2009
+#Mon Mar 16 19:22:30 CET 2009
 eclipse.preferences.version=1
-encoding/templates.migrated=ISO-8859-1
+encoding/templates=ISO-8859-1
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/.xpand-root b/plugins/org.eclipse.gmf.graphdef.codegen/.xpand-root
index d55f09bb6..f8a268712 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/.xpand-root
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/.xpand-root
@@ -1 +1 @@
-templates.migrated
+templates
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/build.properties b/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
index bea408b3b..28da64118 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
@@ -13,9 +13,8 @@ source.. = src/,\
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               templates/,\
                about.html,\
-               templates.migrated/,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               templates/
 jars.compile.order = .
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/internal/graphdef/codegen/Activator.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/internal/graphdef/codegen/Activator.java
index 390b941a5..dc724744a 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/internal/graphdef/codegen/Activator.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/internal/graphdef/codegen/Activator.java
@@ -37,7 +37,7 @@ public class Activator extends Plugin {
 
 	public static ResourceManager createResourceEngine(MapModeCodeGenStrategy strategy, URL... dynamicTemplates) {
 		try {
-			URL baseURL = instance.getBundle().getEntry("/templates.migrated/");
+			URL baseURL = instance.getBundle().getEntry("/templates/");
 			ArrayList<URL> urls = new ArrayList<URL>(3);
 			if (dynamicTemplates != null) {
 				// XXX perhaps, add strategy token to each url
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Attrs.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
index 0abaebdb9..0abaebdb9 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Attrs.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Attrs.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Border.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Border.xpt
index 5261b3d93..5261b3d93 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Border.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Border.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Children.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Children.xpt
index 4cc59d94c..4cc59d94c 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Children.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Children.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Decoration.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Decoration.xpt
index 47331504f..47331504f 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Decoration.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Decoration.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Extras.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
index 5c2806e7f..5c2806e7f 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Extras.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Extras.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Layout.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Layout.xpt
index f3ac3a956..f3ac3a956 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Layout.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Layout.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/LayoutData.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/LayoutData.xpt
index c631dc4e9..c631dc4e9 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/LayoutData.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/LayoutData.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/MapMode.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/MapMode.xpt
index 71d389ef6..71d389ef6 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/MapMode.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/MapMode.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Runtime.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
index a8749b93d..a8749b93d 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Runtime.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Util.qvto b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Util.qvto
index 1cdd73c7c..1cdd73c7c 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/Util.qvto
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/Util.qvto
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/CustomClass.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/CustomClass.xpt
index e0de76eb2..e0de76eb2 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/CustomClass.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/CustomClass.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Decoration.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Decoration.xpt
index 4b935477d..4b935477d 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Decoration.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Decoration.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Figure.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Figure.xpt
index c9268aa40..c9268aa40 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Figure.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Figure.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Shape.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
index 3129577c7..3129577c7 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/attr/Shape.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Activator.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Activator.xpt
index 2455b286f..2455b286f 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Activator.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Activator.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/BuildProperties.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt
index ee6d03784..ee6d03784 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/BuildProperties.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Manifest.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Manifest.xpt
index dcbeeb8d1..dcbeeb8d1 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/Manifest.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/Manifest.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/PluginProperties.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt
index 2e3ee1d45..2e3ee1d45 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/plugin/PluginProperties.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/rt_mm/MapMode.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt
index 424bf03ca..424bf03ca 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/rt_mm/MapMode.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/rt_mm/MapModeUtil.qvto b/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapModeUtil.qvto
index fdb4309e1..fdb4309e1 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/rt_mm/MapModeUtil.qvto
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/rt_mm/MapModeUtil.qvto
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Descriptor.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Descriptor.xpt
index e22ca8a8c..e22ca8a8c 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Descriptor.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Descriptor.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Figure.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt
index 17978d449..17978d449 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/top/Figure.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/top/Figure.xpt
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/xtras/ScalablePolygon.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt
index 6fcd2e6a3..6fcd2e6a3 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates.migrated/xtras/ScalablePolygon.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt