summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-05-22 14:47:21 (EDT)
committerpelder2007-05-22 14:47:21 (EDT)
commite4e178c19d40345d98dbdd43dfe8b9003081141a (patch)
treea610a84fd142294a6bed9460fd998f221cf74261
parent4c7c707014bbf833d4113d52a42efe523bebbb10 (diff)
downloadorg.eclipse.jet-e4e178c19d40345d98dbdd43dfe8b9003081141a.zip
org.eclipse.jet-e4e178c19d40345d98dbdd43dfe8b9003081141a.tar.gz
org.eclipse.jet-e4e178c19d40345d98dbdd43dfe8b9003081141a.tar.bz2
[188352] Compiler settings on some JET projects are not consistent with their Java usage
-rw-r--r--examples/org.eclipse.jet.examples/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TemplatePathUtil.java6
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/DummyMain.java8
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java8
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLEndGenerator.java26
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLStartGenerator.java44
-rw-r--r--tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.jet.tests/.settings/org.eclipse.jdt.ui.prefs3
15 files changed, 68 insertions, 71 deletions
diff --git a/examples/org.eclipse.jet.examples/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.jet.examples/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3abd3fb
--- /dev/null
+++ b/examples/org.eclipse.jet.examples/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Tue May 22 14:41:43 EDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.core.prefs
index 68a96d9..48a6676 100644
--- a/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Apr 03 15:25:19 EDT 2007
+#Tue May 22 14:40:36 EDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
diff --git a/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.ui.prefs
index bb183e1..30bea24 100644
--- a/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.jet.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Tue Apr 03 15:15:00 EDT 2007
+#Tue May 22 14:07:36 EDT 2007
eclipse.preferences.version=1
-internal.default.compliance=user
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * IBM Corporation - initial API and implementation\r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.core.prefs
index c946a8c..121d600 100644
--- a/plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Apr 03 15:25:50 EDT 2007
+#Tue May 22 14:42:08 EDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
diff --git a/plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ab97989..0000000
--- a/plugins/org.eclipse.jet.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 03 15:14:26 EDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=user
diff --git a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs
index b64bd1c..48d724a 100644
--- a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,14 @@
-#Thu May 03 08:35:10 EDT 2007
+#Tue May 22 14:41:09 EDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
@@ -62,7 +62,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=52
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs
index 8aa3e10..fefa629 100644
--- a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,5 @@
-#Thu Apr 12 11:25:46 EDT 2007
+#Tue May 22 14:41:09 EDT 2007
eclipse.preferences.version=1
formatter_profile=_EMFCodeFormatter.profile
formatter_settings_version=11
-internal.default.compliance=user
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/**\r\n * &lt;copyright&gt;\r\n *\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\: \r\n * IBM - Initial API and implementation\r\n *\r\n * &lt;/copyright&gt;\r\n *\r\n * $$Id$$\r\n */\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TemplatePathUtil.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TemplatePathUtil.java
index 37d0fcc..5bad4cd 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TemplatePathUtil.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/TemplatePathUtil.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: TemplatePathUtil.java,v 1.1 2007/04/04 14:59:32 pelder Exp $
+ * $Id: TemplatePathUtil.java,v 1.2 2007/05/22 18:47:16 pelder Exp $
*/
package org.eclipse.jet.compiler;
@@ -61,7 +61,9 @@ class TemplatePathUtil
{
final IContainer[] containers = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(baseLocation);
if(containers.length > 0) {
- assert containers[0].getType() == IResource.PROJECT;
+ if(containers[0].getType() == IResource.PROJECT) {
+ throw new IllegalArgumentException();
+ }
return ((IProject)containers[0]).getFile(templatePath);
} else {
return null;
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/DummyMain.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/DummyMain.java
index 35cfec5..141fbf1 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/DummyMain.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/DummyMain.java
@@ -15,20 +15,18 @@ public class DummyMain implements JET2Template {
private static final String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
- private static final class _TAGS {
- static final TagInfo c_log_2_1 = new TagInfo("c:log", //$NON-NLS-1$
+ private static final TagInfo _td_c_log_2_1 = new TagInfo("c:log", //$NON-NLS-1$
2, 1,
new String[] {
},
new String[] {
} );
- }
public void generate(final JET2Context context, final JET2Writer __out) {
JET2Writer out = __out;
- RuntimeTagElement _jettag_c_log_2_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "log", "c:log", _TAGS.c_log_2_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_log_2_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "log", "c:log", _td_c_log_2_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_log_2_1.setRuntimeParent(null);
- _jettag_c_log_2_1.setTagInfo(_TAGS.c_log_2_1);
+ _jettag_c_log_2_1.setTagInfo(_td_c_log_2_1);
_jettag_c_log_2_1.doStart(context, out);
JET2Writer _jettag_c_log_2_1_saved_out = out;
while (_jettag_c_log_2_1.okToProcessBody()) {
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
index 4131ba7..a5bc178 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
@@ -47,8 +47,7 @@ public class JET2JavaGenerator implements JET2Template {
private static final String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
- private static final class _TAGS {
- static final TagInfo c_include_80_4 = new TagInfo("c:include", //$NON-NLS-1$
+ private static final TagInfo _td_c_include_80_4 = new TagInfo("c:include", //$NON-NLS-1$
80, 4,
new String[] {
"template", //$NON-NLS-1$
@@ -56,7 +55,6 @@ public class JET2JavaGenerator implements JET2Template {
new String[] {
"templates/tagDataDeclarations.jet", //$NON-NLS-1$
} );
- }
public void generate(final JET2Context context, final JET2Writer __out) {
JET2Writer out = __out;
@@ -130,9 +128,9 @@ public class JET2JavaGenerator implements JET2Template {
for(int i = 0; i < allXMLElements.length; i++) {
context.setVariable("element", allXMLElements[i]); //$NON-NLS-1$
- RuntimeTagElement _jettag_c_include_80_4 = context.getTagFactory().createRuntimeTag(_jetns_c, "include", "c:include", _TAGS.c_include_80_4); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_include_80_4 = context.getTagFactory().createRuntimeTag(_jetns_c, "include", "c:include", _td_c_include_80_4); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_include_80_4.setRuntimeParent(null);
- _jettag_c_include_80_4.setTagInfo(_TAGS.c_include_80_4);
+ _jettag_c_include_80_4.setTagInfo(_td_c_include_80_4);
_jettag_c_include_80_4.doStart(context, out);
_jettag_c_include_80_4.doEnd();
}
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLEndGenerator.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLEndGenerator.java
index 72f8151..ab4b8bc 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLEndGenerator.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLEndGenerator.java
@@ -16,8 +16,7 @@ public class XMLEndGenerator implements JET2Template {
private static final String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
- private static final class _TAGS {
- static final TagInfo c_get_7_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_7_1 = new TagInfo("c:get", //$NON-NLS-1$
7, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -25,7 +24,7 @@ public class XMLEndGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_8_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_8_1 = new TagInfo("c:get", //$NON-NLS-1$
8, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -33,7 +32,7 @@ public class XMLEndGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_10_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_10_1 = new TagInfo("c:get", //$NON-NLS-1$
10, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -41,7 +40,7 @@ public class XMLEndGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_13_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_13_1 = new TagInfo("c:get", //$NON-NLS-1$
13, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -49,7 +48,6 @@ public class XMLEndGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- }
public void generate(final JET2Context context, final JET2Writer __out) {
JET2Writer out = __out;
@@ -57,26 +55,26 @@ public class XMLEndGenerator implements JET2Template {
GenXMLElement element = (GenXMLElement) context.getVariable("element"); //$NON-NLS-1$
if(element.hasBody()) {
- RuntimeTagElement _jettag_c_get_7_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_7_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_7_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_7_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_7_1.setRuntimeParent(null);
- _jettag_c_get_7_1.setTagInfo(_TAGS.c_get_7_1);
+ _jettag_c_get_7_1.setTagInfo(_td_c_get_7_1);
_jettag_c_get_7_1.doStart(context, out);
_jettag_c_get_7_1.doEnd();
out.write(" "); //$NON-NLS-1$
out.write( element.getTagVariable() );
out.write(".handleBodyContent(out);"); //$NON-NLS-1$
out.write(NL);
- RuntimeTagElement _jettag_c_get_8_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_8_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_8_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_8_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_8_1.setRuntimeParent(null);
- _jettag_c_get_8_1.setTagInfo(_TAGS.c_get_8_1);
+ _jettag_c_get_8_1.setTagInfo(_td_c_get_8_1);
_jettag_c_get_8_1.doStart(context, out);
_jettag_c_get_8_1.doEnd();
out.write("}"); //$NON-NLS-1$
out.write(NL);
if(element.requiresNewWriter()) {
- RuntimeTagElement _jettag_c_get_10_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_10_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_10_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_10_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_10_1.setRuntimeParent(null);
- _jettag_c_get_10_1.setTagInfo(_TAGS.c_get_10_1);
+ _jettag_c_get_10_1.setTagInfo(_td_c_get_10_1);
_jettag_c_get_10_1.doStart(context, out);
_jettag_c_get_10_1.doEnd();
out.write("out = "); //$NON-NLS-1$
@@ -85,9 +83,9 @@ public class XMLEndGenerator implements JET2Template {
out.write(NL);
}
}
- RuntimeTagElement _jettag_c_get_13_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_13_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_13_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_13_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_13_1.setRuntimeParent(null);
- _jettag_c_get_13_1.setTagInfo(_TAGS.c_get_13_1);
+ _jettag_c_get_13_1.setTagInfo(_td_c_get_13_1);
_jettag_c_get_13_1.doStart(context, out);
_jettag_c_get_13_1.doEnd();
out.write( element.getTagVariable() );
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLStartGenerator.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLStartGenerator.java
index f7b821d..9b91c5e 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLStartGenerator.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/compiler/templates/XMLStartGenerator.java
@@ -16,8 +16,7 @@ public class XMLStartGenerator implements JET2Template {
private static final String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
- private static final class _TAGS {
- static final TagInfo c_get_6_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_6_1 = new TagInfo("c:get", //$NON-NLS-1$
6, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -25,7 +24,7 @@ public class XMLStartGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_7_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_7_1 = new TagInfo("c:get", //$NON-NLS-1$
7, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -33,7 +32,7 @@ public class XMLStartGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_8_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_8_1 = new TagInfo("c:get", //$NON-NLS-1$
8, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -41,7 +40,7 @@ public class XMLStartGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_9_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_9_1 = new TagInfo("c:get", //$NON-NLS-1$
9, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -49,7 +48,7 @@ public class XMLStartGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_12_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_12_1 = new TagInfo("c:get", //$NON-NLS-1$
12, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -57,7 +56,7 @@ public class XMLStartGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_14_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_14_1 = new TagInfo("c:get", //$NON-NLS-1$
14, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -65,7 +64,7 @@ public class XMLStartGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- static final TagInfo c_get_16_1 = new TagInfo("c:get", //$NON-NLS-1$
+ private static final TagInfo _td_c_get_16_1 = new TagInfo("c:get", //$NON-NLS-1$
16, 1,
new String[] {
"select", //$NON-NLS-1$
@@ -73,16 +72,15 @@ public class XMLStartGenerator implements JET2Template {
new String[] {
"$indent", //$NON-NLS-1$
} );
- }
public void generate(final JET2Context context, final JET2Writer __out) {
JET2Writer out = __out;
GenXMLElement element = (GenXMLElement) context.getVariable("element"); //$NON-NLS-1$
- RuntimeTagElement _jettag_c_get_6_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_6_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_6_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_6_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_6_1.setRuntimeParent(null);
- _jettag_c_get_6_1.setTagInfo(_TAGS.c_get_6_1);
+ _jettag_c_get_6_1.setTagInfo(_td_c_get_6_1);
_jettag_c_get_6_1.doStart(context, out);
_jettag_c_get_6_1.doEnd();
out.write("RuntimeTagElement "); //$NON-NLS-1$
@@ -97,9 +95,9 @@ public class XMLStartGenerator implements JET2Template {
out.write( element.getTagInfoVariable() );
out.write("); //$NON-NLS-1$ //$NON-NLS-2$"); //$NON-NLS-1$
out.write(NL);
- RuntimeTagElement _jettag_c_get_7_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_7_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_7_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_7_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_7_1.setRuntimeParent(null);
- _jettag_c_get_7_1.setTagInfo(_TAGS.c_get_7_1);
+ _jettag_c_get_7_1.setTagInfo(_td_c_get_7_1);
_jettag_c_get_7_1.doStart(context, out);
_jettag_c_get_7_1.doEnd();
out.write( element.getTagVariable() );
@@ -107,9 +105,9 @@ public class XMLStartGenerator implements JET2Template {
out.write( element.getParentTagVariable() );
out.write(");"); //$NON-NLS-1$
out.write(NL);
- RuntimeTagElement _jettag_c_get_8_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_8_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_8_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_8_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_8_1.setRuntimeParent(null);
- _jettag_c_get_8_1.setTagInfo(_TAGS.c_get_8_1);
+ _jettag_c_get_8_1.setTagInfo(_td_c_get_8_1);
_jettag_c_get_8_1.doStart(context, out);
_jettag_c_get_8_1.doEnd();
out.write( element.getTagVariable() );
@@ -117,9 +115,9 @@ public class XMLStartGenerator implements JET2Template {
out.write( element.getTagInfoVariable() );
out.write(");"); //$NON-NLS-1$
out.write(NL);
- RuntimeTagElement _jettag_c_get_9_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_9_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_9_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_9_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_9_1.setRuntimeParent(null);
- _jettag_c_get_9_1.setTagInfo(_TAGS.c_get_9_1);
+ _jettag_c_get_9_1.setTagInfo(_td_c_get_9_1);
_jettag_c_get_9_1.doStart(context, out);
_jettag_c_get_9_1.doEnd();
out.write( element.getTagVariable() );
@@ -127,9 +125,9 @@ public class XMLStartGenerator implements JET2Template {
out.write(NL);
if(element.hasBody()) {
if(element.requiresNewWriter()) {
- RuntimeTagElement _jettag_c_get_12_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_12_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_12_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_12_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_12_1.setRuntimeParent(null);
- _jettag_c_get_12_1.setTagInfo(_TAGS.c_get_12_1);
+ _jettag_c_get_12_1.setTagInfo(_td_c_get_12_1);
_jettag_c_get_12_1.doStart(context, out);
_jettag_c_get_12_1.doEnd();
out.write("JET2Writer "); //$NON-NLS-1$
@@ -137,9 +135,9 @@ public class XMLStartGenerator implements JET2Template {
out.write("_saved_out = out;"); //$NON-NLS-1$
out.write(NL);
}
- RuntimeTagElement _jettag_c_get_14_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_14_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_14_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_14_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_14_1.setRuntimeParent(null);
- _jettag_c_get_14_1.setTagInfo(_TAGS.c_get_14_1);
+ _jettag_c_get_14_1.setTagInfo(_td_c_get_14_1);
_jettag_c_get_14_1.doStart(context, out);
_jettag_c_get_14_1.doEnd();
out.write("while ("); //$NON-NLS-1$
@@ -147,9 +145,9 @@ public class XMLStartGenerator implements JET2Template {
out.write(".okToProcessBody()) {"); //$NON-NLS-1$
out.write(NL);
if(element.requiresNewWriter()) {
- RuntimeTagElement _jettag_c_get_16_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _TAGS.c_get_16_1); //$NON-NLS-1$ //$NON-NLS-2$
+ RuntimeTagElement _jettag_c_get_16_1 = context.getTagFactory().createRuntimeTag(_jetns_c, "get", "c:get", _td_c_get_16_1); //$NON-NLS-1$ //$NON-NLS-2$
_jettag_c_get_16_1.setRuntimeParent(null);
- _jettag_c_get_16_1.setTagInfo(_TAGS.c_get_16_1);
+ _jettag_c_get_16_1.setTagInfo(_td_c_get_16_1);
_jettag_c_get_16_1.doStart(context, out);
_jettag_c_get_16_1.doEnd();
out.write(" out = out.newNestedContentWriter();"); //$NON-NLS-1$
diff --git a/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.core.prefs
index 16c4e97..6e07d32 100644
--- a/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-#Tue Apr 03 15:15:39 EDT 2007
+#Tue May 22 14:41:58 EDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.ui.prefs
index a758fcc..4c1d5b1 100644
--- a/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.jet.tests.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Tue Apr 03 15:15:39 EDT 2007
+#Tue May 22 14:41:58 EDT 2007
eclipse.preferences.version=1
-internal.default.compliance=user
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * IBM Corporation - initial API and implementation\r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/tests/org.eclipse.jet.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jet.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index f992ce5..0000000
--- a/tests/org.eclipse.jet.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 03 14:56:39 EDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=user