summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcheuoua2007-05-19 21:38:47 (EDT)
committerjcheuoua2007-05-19 21:38:47 (EDT)
commit5f4f38b975a026b406741cba5963073e5b9bc74f (patch)
treee1f080f4cb8e650b45584c39ece96fee086468fc
parentab9b82c292b40e32349a7aabb04d74aa608137f3 (diff)
downloadorg.eclipse.jet-5f4f38b975a026b406741cba5963073e5b9bc74f.zip
org.eclipse.jet-5f4f38b975a026b406741cba5963073e5b9bc74f.tar.gz
org.eclipse.jet-5f4f38b975a026b406741cba5963073e5b9bc74f.tar.bz2
Refactoring (set all packages as internal. they are not intended to be used via API)
-rw-r--r--plugins/org.eclipse.jet.editor/plugin.properties2
-rw-r--r--plugins/org.eclipse.jet.editor/plugin.xml15
-rw-r--r--plugins/org.eclipse.jet.editor/schema/defaultContentColorerDelegates.exsd6
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java128
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/Activator.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/Activator.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETEditor.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditorHelper.java3
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETSourceViewer.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETSourceViewer.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETTextEditor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETTextEditor.java)20
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETTextPreviewViewer.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETTextPreviewViewer.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/actions/SetContentColorerAction.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/actions/SetContentColorerAction.java)6
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETAnnotationHover.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETAnnotationHover.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETAnnotationModel.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETAnnotationModel.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETProblemAnnotation.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETProblemAnnotation.java)12
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/autoedit/JETTemplateAutoEditStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/autoedit/JETTemplateAutoEditStrategy.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/DoubleClickStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/DoubleClickStrategy.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/IJETColorConstants.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/IJETColorConstants.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETDocumentProvider.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETDocumentProvider.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETEditorPreferenceConstants.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETEditorPreferenceConstants.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETReconcilingStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETReconcilingStrategy.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETSourceViewerConfiguration.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETSourceViewerConfiguration.java)6
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETTokenStyleManager.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETTokenStyleManager.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETWhitespaceDetector.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETWhitespaceDetector.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/NonRuleBasedDamagerRepairer.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/NonRuleBasedDamagerRepairer.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/IJETDefaultTextColorerDelegate.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/IJETDefaultTextColorerDelegate.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/java/JavaContentPartitionConfigurationDelegate.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/java/JavaContentPartitionConfigurationDelegate.java)6
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/xml/XMLContentPartitionConfigurationDelegate.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/xml/XMLContentPartitionConfigurationDelegate.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/AbstractJETAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/AbstractJETAssistProcessor.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/AbstractXMLTagsBasedAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/AbstractXMLTagsBasedAssistProcessor.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETCustomTagAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETCustomTagAssistProcessor.java)5
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETDirectiveAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETDirectiveAssistProcessor.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaDeclarationAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaDeclarationAssistProcessor.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaExpressionAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaExpressionAssistProcessor.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaScriptletAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaScriptletAssistProcessor.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETTagAssistProcessor.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETTagAssistProcessor.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETCustomTagFormattingStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETCustomTagFormattingStrategy.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETDirectiveFormattingStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETDirectiveFormattingStrategy.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaDeclarationFormattingStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaDeclarationFormattingStrategy.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaExpressionFormattingStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaExpressionFormattingStrategy.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaScriptletFormattingStrategy.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaScriptletFormattingStrategy.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/gen/JETEditorJET2JavaGenerator.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/gen/JETEditorJET2JavaGenerator.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/i18n/TextEditorMessages.properties (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/i18n/TextEditorMessages.properties)0
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlineContentProvider.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlineContentProvider.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlineLabelProvider.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlineLabelProvider.java)6
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlinePage.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlinePage.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/ITokenScannerProvider.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/ITokenScannerProvider.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/JETDocumentPartitionScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/JETDocumentPartitionScanner.java)28
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/PartitionScannerBasedDamagerRepairer.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/PartitionScannerBasedDamagerRepairer.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTElementScannerRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTElementScannerRule.java)6
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETCommentRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETCommentRule.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETCustomTagRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETCustomTagRule.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETDirectiveRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETDirectiveRule.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaDeclarationRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaDeclarationRule.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaExpressionRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaExpressionRule.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaScriptletRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaScriptletRule.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETBracketRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETBracketRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETCommentRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETCommentRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETCustomTagRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETCustomTagRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETDirectiveRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETDirectiveRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaDeclarationRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaDeclarationRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaExpressionRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaExpressionRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaScriptletRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaScriptletRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/WordListDetectorRule.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/WordListDetectorRule.java)2
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETCommentScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETCommentScanner.java)6
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETCustomTagScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETCustomTagScanner.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETDefaultContentScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETDefaultContentScanner.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETDirectiveScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETDirectiveScanner.java)10
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaCodeScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaCodeScanner.java)4
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaDeclarationScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaDeclarationScanner.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaExpressionScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaExpressionScanner.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaScriptletScanner.java (renamed from plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaScriptletScanner.java)8
-rw-r--r--plugins/org.eclipse.jet.editor/templates/jet2java.jet94
72 files changed, 391 insertions, 164 deletions
diff --git a/plugins/org.eclipse.jet.editor/plugin.properties b/plugins/org.eclipse.jet.editor/plugin.properties
index a7418d1..db212a1 100644
--- a/plugins/org.eclipse.jet.editor/plugin.properties
+++ b/plugins/org.eclipse.jet.editor/plugin.properties
@@ -1 +1,3 @@
+pluginName = JET Editor
+providerName = Eclipse EMFT
_UI_SetContentColorerAction.label=Set Non-JET Text Content Colorer ... \ No newline at end of file
diff --git a/plugins/org.eclipse.jet.editor/plugin.xml b/plugins/org.eclipse.jet.editor/plugin.xml
index da412af..e9fd574 100644
--- a/plugins/org.eclipse.jet.editor/plugin.xml
+++ b/plugins/org.eclipse.jet.editor/plugin.xml
@@ -6,21 +6,22 @@
<extension
point="org.eclipse.ui.editors">
<editor
- name="EMFT - Java Emitter Templates Editor"
+ class="org.eclipse.jet.internal.editor.JETTextEditor"
+ contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+ default="true"
extensions="jet"
icon="icons/full/obj16/JETTemplateFile.gif"
- contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
- class="org.eclipse.jet.editor.JETTextEditor"
- id="org.eclipse.jet.editor.JETEditor">
+ id="org.eclipse.jet.editor.JETEditor"
+ name="EMFT - Java Emitter Templates Editor">
</editor>
</extension>
<extension
point="org.eclipse.jet.editor.defaultContentColorerDelegates">
<defaultContentColorerDelegate
- delegateClass="org.eclipse.jet.editor.configuration.delegates.java.JavaContentPartitionConfigurationDelegate">
+ delegateClass="org.eclipse.jet.internal.editor.configuration.delegates.java.JavaContentPartitionConfigurationDelegate">
</defaultContentColorerDelegate>
<defaultContentColorerDelegate
- delegateClass="org.eclipse.jet.editor.configuration.delegates.xml.XMLContentPartitionConfigurationDelegate">
+ delegateClass="org.eclipse.jet.internal.editor.configuration.delegates.xml.XMLContentPartitionConfigurationDelegate">
</defaultContentColorerDelegate>
</extension>
<extension
@@ -30,7 +31,7 @@
targetID="org.eclipse.jet.editor.JETEditor">
<action
actionID="setDelegateColorerActionID"
- class="org.eclipse.jet.editor.actions.SetContentColorerAction"
+ class="org.eclipse.jet.internal.editor.actions.SetContentColorerAction"
id="org.eclipse.jet.editor.setDelegateColorerActionID"
label="%_UI_SetContentColorerAction.label"
style="push">
diff --git a/plugins/org.eclipse.jet.editor/schema/defaultContentColorerDelegates.exsd b/plugins/org.eclipse.jet.editor/schema/defaultContentColorerDelegates.exsd
index 5c74163..4f13c0f 100644
--- a/plugins/org.eclipse.jet.editor/schema/defaultContentColorerDelegates.exsd
+++ b/plugins/org.eclipse.jet.editor/schema/defaultContentColorerDelegates.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jet.editor">
+<schema targetNamespace="org.eclipse.jet.internal.editor">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.jet.editor" id="defaultContentColorerDelegates" name="Default Content Colorer Delegates"/>
+ <meta.schema plugin="org.eclipse.jet.internal.editor" id="defaultContentColorerDelegates" name="Default Content Colorer Delegates"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -50,7 +50,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jet.editor.configuration.delegates.IJETDefaultTextColorerDelegate"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.internal.editor.configuration.delegates.IJETDefaultTextColorerDelegate"/>
</appInfo>
</annotation>
</attribute>
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
new file mode 100644
index 0000000..ec774cd
--- /dev/null
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/compiler/templates/JET2JavaGenerator.java
@@ -0,0 +1,128 @@
+package org.eclipse.jet.internal.compiler.templates;
+
+import org.eclipse.jet.JET2Context;
+import org.eclipse.jet.JET2Template;
+import org.eclipse.jet.JET2Writer;
+import org.eclipse.jet.taglib.RuntimeTagElement;
+import org.eclipse.jet.taglib.TagInfo;
+import org.eclipse.jet.internal.compiler.*;
+import org.eclipse.jet.compiler.*;
+import org.eclipse.jet.transform.TransformContextExtender;
+import org.eclipse.jet.taglib.TagLibraryReference;
+import java.util.*;
+import org.eclipse.jface.text.Position;
+
+public class JET2JavaGenerator implements JET2Template {
+ public static final String _jetns_java = "org.eclipse.jet.javaTags"; //$NON-NLS-1$
+ public static final String _jetns_ws = "org.eclipse.jet.workspaceTags"; //$NON-NLS-1$
+ public static final String _jetns_c = "org.eclipse.jet.controlTags"; //$NON-NLS-1$
+ public static final String _jetns_f = "org.eclipse.jet.formatTags"; //$NON-NLS-1$
+
+ private XMLElement[] getAllXMLTags(JET2CompilationUnit cu) {
+ final List result = new ArrayList();
+ cu.accept(new DefaultJET2ASTVisitor() {
+ public void visit(XMLBodyElement element) {
+ result.add(element);
+ }
+
+ public void visit(XMLEmptyElement element) {
+ result.add(element);
+ }
+ });
+ return (XMLElement[])result.toArray(new XMLElement[result.size()]);
+ }
+
+ private JET2Declaration[] getAllJavaDeclarations(JET2CompilationUnit cu) {
+ final List result = new ArrayList();
+ cu.accept(new DefaultJET2ASTVisitor() {
+ public void visit(JET2Declaration declaration) {
+ result.add(declaration);
+ }
+ });
+ return (JET2Declaration[])result.toArray(new JET2Declaration[result.size()]);
+ }
+
+ private void adjustGeneratedBodyPositions(Map mappingPositions, int generatedBodyOffsetStart) {
+ for (Iterator iterator = mappingPositions.keySet().iterator(); iterator.hasNext();) {
+ Object element = iterator.next();
+ if (!(element instanceof JET2Declaration)) {
+ Position position = (Position) mappingPositions.get(element);
+ position.offset += generatedBodyOffsetStart;
+ }
+ }
+ }
+
+
+ public JET2JavaGenerator() {
+ super();
+ }
+
+ public void generate(final JET2Context context, JET2Writer out) {
+ final TagInfo _jettd_c_include_89_4 = new TagInfo("c:include", //$NON-NLS-1$
+ 89, 4,
+ new String[] {
+ "template", //$NON-NLS-1$
+ },
+ new String[] {
+ "templates/tagDataDeclarations.jet", //$NON-NLS-1$
+ } );
+ out.write( "\n" ); //$NON-NLS-1$
+ out.write( "\n" ); //$NON-NLS-1$
+ out.write( "\n" ); //$NON-NLS-1$
+ out.write( "\n" ); //$NON-NLS-1$
+ out.write( "\n" ); //$NON-NLS-1$
+ out.write( "\n" ); //$NON-NLS-1$
+ out.write( "\n" ); //$NON-NLS-1$
+ out.write( "\n" ); //$NON-NLS-1$
+
+ JET2CompilationUnit cu = (JET2CompilationUnit) context.getVariable("cu");
+ JET2Declaration allMemberDeclarations[] = getAllJavaDeclarations(cu);
+ XMLElement allXMLElements[] = getAllXMLTags(cu);
+ TagLibraryReference tlRefs[] = cu.getTagLibraryReferences();
+ Map generatedBodyMappingPositions = new HashMap();
+ Map mappingPositions = (Map) context.getVariable("org.eclipse.jet.storeJavaMappingPositions");
+ org.eclipse.jet.internal.editor.JETEditorHelper.JETEditorMethodBodyCreator generatedBody = new org.eclipse.jet.internal.editor.JETEditorHelper.JETEditorMethodBodyCreator(
+ TransformContextExtender.getInstance(context).getLoader(), generatedBodyMappingPositions);
+ cu.accept(generatedBody);
+ out.write( "\npackage " ); //$NON-NLS-1$
+ out.write( cu.getOutputJavaPackage() );
+ out.write( ";\n\nimport org.eclipse.jet.JET2Context;\nimport org.eclipse.jet.JET2Template;\nimport org.eclipse.jet.JET2Writer;\n" ); //$NON-NLS-1$
+ if( allXMLElements.length > 0) { out.write( "\nimport org.eclipse.jet.taglib.RuntimeTagElement;\nimport org.eclipse.jet.taglib.TagInfo;\n" ); //$NON-NLS-1$
+ } out.write( "\n" ); //$NON-NLS-1$
+ for(Iterator i=cu.getImports().iterator();i.hasNext();) {
+ String importName = (String)i.next(); out.write( "\nimport " ); //$NON-NLS-1$
+ out.write(importName);
+ out.write( ";\n" ); //$NON-NLS-1$
+ } out.write( "\n\npublic class " ); //$NON-NLS-1$
+ out.write( cu.getOutputJavaClassName() );
+ out.write( " implements JET2Template {\n" ); //$NON-NLS-1$
+ if( allXMLElements.length > 0) { out.write( "\n" ); //$NON-NLS-1$
+ for(int i = 0; i < tlRefs.length; i++ ) { out.write( "\n public static final String _jetns_" ); //$NON-NLS-1$
+ out.write( tlRefs[i].getPrefix() );
+ out.write( " = \"" ); //$NON-NLS-1$
+ out.write( tlRefs[i].getTagLibraryId() );
+ out.write( "\"; //$NON-NLS-1$\n" ); //$NON-NLS-1$
+ } out.write( "\n" ); //$NON-NLS-1$
+ } out.write( "\n" ); //$NON-NLS-1$
+ for(int i = 0; i < allMemberDeclarations.length; i++) { out.write( "\n\n" ); //$NON-NLS-1$
+ out.write( allMemberDeclarations[i].getJavaContent() );
+ out.write( "\n" ); //$NON-NLS-1$
+ } out.write( "\n\n\tpublic " ); //$NON-NLS-1$
+ out.write( cu.getOutputJavaClassName() );
+ out.write( "() {\n\t\tsuper();\n\t}\n\n\tpublic void generate(final JET2Context context, JET2Writer out) {\n" ); //$NON-NLS-1$
+ for(int i = 0; i < allXMLElements.length; i++) {
+ context.setVariable("element", allXMLElements[i]); //$NON-NLS-1$
+ out.write( "\n\t\t\t" ); //$NON-NLS-1$
+ RuntimeTagElement _jettag_c_include_89_4 = context.getTagFactory().createRuntimeTag(_jetns_c, "include", "c:include", _jettd_c_include_89_4); //$NON-NLS-1$ //$NON-NLS-2$
+ _jettag_c_include_89_4.setRuntimeParent(null);
+ _jettag_c_include_89_4.setTagInfo(_jettd_c_include_89_4);
+ _jettag_c_include_89_4.doStart(context, out);
+ _jettag_c_include_89_4.doEnd();
+ out.write( "\n" ); //$NON-NLS-1$
+ } out.write( "\n" ); //$NON-NLS-1$
+ out.write( generatedBody.getBuffer() );
+ out.write( "\n\t}\n\n}\n" ); //$NON-NLS-1$
+
+ }
+
+}
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/Activator.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/Activator.java
index 87de916..da0412d 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/Activator.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor;
+package org.eclipse.jet.internal.editor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -10,7 +10,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jet.editor";
+ public static final String PLUGIN_ID = "org.eclipse.jet.internal.editor";
// The shared instance
private static Activator plugin;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETEditor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditor.java
index 9617cbe..f44c389 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETEditor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditor.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor;
+package org.eclipse.jet.internal.editor;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -16,7 +16,7 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
public class JETEditor extends FormEditor implements ITextEditorExtension, IMenuListener, IGotoMarker {
- public static final String ID = "org.eclipse.jet.editor";
+ public static final String ID = "org.eclipse.jet.internal.editor";
public static final String copyright = "(c) 2006 Joel Cheuoua & Contributors";
protected IStatusLineManager contentOutlineStatusLineManager;
protected TreeViewer contentOutlineViewer;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditorHelper.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditorHelper.java
index 2f5773a..8204c41 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditorHelper.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETEditorHelper.java
@@ -33,10 +33,9 @@ import org.eclipse.jet.compiler.JET2Declaration;
import org.eclipse.jet.compiler.JET2Expression;
import org.eclipse.jet.compiler.JET2Scriptlet;
import org.eclipse.jet.compiler.Problem;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.gen.JETEditorJET2JavaGenerator;
import org.eclipse.jet.internal.compiler.MethodBodyCreator;
import org.eclipse.jet.internal.compiler.templates.CodeGenTemplateLoader;
+import org.eclipse.jet.internal.editor.gen.JETEditorJET2JavaGenerator;
import org.eclipse.jet.internal.parser.ParseProblemSeverity;
import org.eclipse.jet.transform.TransformContextExtender;
import org.eclipse.jface.text.BadLocationException;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETSourceViewer.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETSourceViewer.java
index 851ccbb..58be6ef 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETSourceViewer.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETSourceViewer.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor;
+package org.eclipse.jet.internal.editor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETTextEditor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETTextEditor.java
index 35ef46e..646315d 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETTextEditor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETTextEditor.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor;
+package org.eclipse.jet.internal.editor;
import java.io.ByteArrayInputStream;
import java.lang.reflect.Constructor;
@@ -32,13 +32,13 @@ import org.eclipse.jet.compiler.TextElement;
import org.eclipse.jet.compiler.XMLBodyElement;
import org.eclipse.jet.compiler.XMLBodyElementEnd;
import org.eclipse.jet.compiler.XMLEmptyElement;
-import org.eclipse.jet.editor.configuration.JETDocumentProvider;
-import org.eclipse.jet.editor.configuration.JETEditorPreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETSourceViewerConfiguration;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
-import org.eclipse.jet.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
-import org.eclipse.jet.editor.outline.JETOutlinePage;
-import org.eclipse.jet.editor.partition.JETDocumentPartitionScanner;
+import org.eclipse.jet.internal.editor.configuration.JETDocumentProvider;
+import org.eclipse.jet.internal.editor.configuration.JETEditorPreferenceConstants;
+import org.eclipse.jet.internal.editor.configuration.JETSourceViewerConfiguration;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
+import org.eclipse.jet.internal.editor.outline.JETOutlinePage;
+import org.eclipse.jet.internal.editor.partition.JETDocumentPartitionScanner;
import org.eclipse.jet.taglib.TagLibrary;
import org.eclipse.jet.taglib.TagLibraryManager;
import org.eclipse.jet.taglib.TagLibraryReference;
@@ -151,7 +151,7 @@ public class JETTextEditor extends TextEditor {
private void initDefaultContentColorerDelegetes() {
defaultContentColorerDelegates = new ArrayList();
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement elements[] = registry.getConfigurationElementsFor("org.eclipse.jet.editor",
+ IConfigurationElement elements[] = registry.getConfigurationElementsFor("org.eclipse.jet.internal.editor",
"defaultContentColorerDelegates");
for (int i = 0; i < elements.length; i++) {
IConfigurationElement element = elements[i];
@@ -324,7 +324,7 @@ public class JETTextEditor extends TextEditor {
protected void createActions() {
super.createActions();
- ResourceBundle resourceBundle = ResourceBundle.getBundle("org.eclipse.jet.editor.i18n.TextEditorMessages");
+ ResourceBundle resourceBundle = ResourceBundle.getBundle("org.eclipse.jet.internal.editor.i18n.TextEditorMessages");
Action action = new ContentAssistAction(resourceBundle, "ContentAssistProposal.", this);
action.setActionDefinitionId("org.eclipse.ui.edit.text.contentAssist.proposals");
setAction("ContentAssistProposal", action);
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETTextPreviewViewer.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETTextPreviewViewer.java
index 85ac0fc..c056d4d 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/JETTextPreviewViewer.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/JETTextPreviewViewer.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor;
+package org.eclipse.jet.internal.editor;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/actions/SetContentColorerAction.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/actions/SetContentColorerAction.java
index 1b28873..5a1cbd4 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/actions/SetContentColorerAction.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/actions/SetContentColorerAction.java
@@ -1,7 +1,7 @@
-package org.eclipse.jet.editor.actions;
+package org.eclipse.jet.internal.editor.actions;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredContentProvider;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETAnnotationHover.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETAnnotationHover.java
index 663fd29..7c01be6 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETAnnotationHover.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETAnnotationHover.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.annotations;
+package org.eclipse.jet.internal.editor.annotations;
import java.util.*;
import org.eclipse.jface.text.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETAnnotationModel.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETAnnotationModel.java
index 96e2fc0..228eb83 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETAnnotationModel.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETAnnotationModel.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.annotations;
+package org.eclipse.jet.internal.editor.annotations;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETProblemAnnotation.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETProblemAnnotation.java
index 549499c..4a2c4ba 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/annotations/JETProblemAnnotation.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/annotations/JETProblemAnnotation.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.annotations;
+package org.eclipse.jet.internal.editor.annotations;
import org.eclipse.jet.compiler.Problem;
import org.eclipse.jet.internal.parser.ParseProblemSeverity;
@@ -6,17 +6,17 @@ import org.eclipse.jface.text.source.Annotation;
public class JETProblemAnnotation extends Annotation {
- public static final String ERROR_ANNOTATION_TYPE = "org.eclipse.jet.editor.error";
+ public static final String ERROR_ANNOTATION_TYPE = "org.eclipse.jet.internal.editor.error";
- public static final String WARNING_ANNOTATION_TYPE = "org.eclipse.jet.editor.warning";
+ public static final String WARNING_ANNOTATION_TYPE = "org.eclipse.jet.internal.editor.warning";
- public static final String INFO_ANNOTATION_TYPE = "org.eclipse.jet.editor.info";
+ public static final String INFO_ANNOTATION_TYPE = "org.eclipse.jet.internal.editor.info";
public JETProblemAnnotation(Problem problem) {
if (problem.getSeverity() == ParseProblemSeverity.ERROR)
- setType("org.eclipse.jet.editor.error");
+ setType("org.eclipse.jet.internal.editor.error");
else if (problem.getSeverity() == ParseProblemSeverity.WARNING)
- setType("org.eclipse.jet.editor.warning");
+ setType("org.eclipse.jet.internal.editor.warning");
setText(problem.getMessage());
}
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/autoedit/JETTemplateAutoEditStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/autoedit/JETTemplateAutoEditStrategy.java
index 01b07f4..cf53e35 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/autoedit/JETTemplateAutoEditStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/autoedit/JETTemplateAutoEditStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.autoedit;
+package org.eclipse.jet.internal.editor.autoedit;
import org.eclipse.jface.text.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/DoubleClickStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/DoubleClickStrategy.java
index 10fd0e9..18bb666 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/DoubleClickStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/DoubleClickStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import org.eclipse.jface.text.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/IJETColorConstants.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/IJETColorConstants.java
index c93b1a0..ceff69e 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/IJETColorConstants.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/IJETColorConstants.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import org.eclipse.swt.graphics.RGB;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETDocumentProvider.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETDocumentProvider.java
index 327396b..d98880c 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETDocumentProvider.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETDocumentProvider.java
@@ -1,10 +1,10 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.annotations.JETAnnotationModel;
-import org.eclipse.jet.editor.partition.JETDocumentPartitionScanner;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.annotations.JETAnnotationModel;
+import org.eclipse.jet.internal.editor.partition.JETDocumentPartitionScanner;
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentPartitioner;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETEditorPreferenceConstants.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETEditorPreferenceConstants.java
index 56489b1..f02faa9 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETEditorPreferenceConstants.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETEditorPreferenceConstants.java
@@ -8,7 +8,7 @@
* Contributors:
* Joel Cheuoua - initial API and implementation
*******************************************************************************/
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -18,7 +18,7 @@ import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
/**
* Preference Constants used for the IRL Editor
* @author lmirguet
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
*/
public class JETEditorPreferenceConstants {
public static final String JET_CUSTOM_TAG_FG_COLOR = "jet_custom_tag_foreground";
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETReconcilingStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETReconcilingStrategy.java
index e7e9d5a..c0beb71 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETReconcilingStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETReconcilingStrategy.java
@@ -1,14 +1,14 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import java.util.Iterator;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jet.compiler.JET2CompilationUnit;
import org.eclipse.jet.compiler.Problem;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.annotations.JETAnnotationModel;
-import org.eclipse.jet.editor.annotations.JETProblemAnnotation;
import org.eclipse.jet.internal.editor.JETEditorHelper;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.annotations.JETAnnotationModel;
+import org.eclipse.jet.internal.editor.annotations.JETProblemAnnotation;
import org.eclipse.jface.text.*;
import org.eclipse.jface.text.reconciler.*;
import org.eclipse.jface.text.source.Annotation;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETSourceViewerConfiguration.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETSourceViewerConfiguration.java
index 7af9980..e751e00 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETSourceViewerConfiguration.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.annotations.JETAnnotationHover;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.annotations.JETAnnotationHover;
import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextDoubleClickStrategy;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETTokenStyleManager.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETTokenStyleManager.java
index 638c566..d404490 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETTokenStyleManager.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETTokenStyleManager.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETWhitespaceDetector.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETWhitespaceDetector.java
index dba8371..c3a2f79 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/JETWhitespaceDetector.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/JETWhitespaceDetector.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import org.eclipse.jface.text.rules.IWhitespaceDetector;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/NonRuleBasedDamagerRepairer.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/NonRuleBasedDamagerRepairer.java
index a494ca2..ed3f136 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/NonRuleBasedDamagerRepairer.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/NonRuleBasedDamagerRepairer.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.configuration;
+package org.eclipse.jet.internal.editor.configuration;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.text.BadLocationException;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/IJETDefaultTextColorerDelegate.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/IJETDefaultTextColorerDelegate.java
index 849cc1b..2ac871d 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/IJETDefaultTextColorerDelegate.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/IJETDefaultTextColorerDelegate.java
@@ -1,6 +1,6 @@
-package org.eclipse.jet.editor.configuration.delegates;
+package org.eclipse.jet.internal.editor.configuration.delegates;
-import org.eclipse.jet.editor.partition.ITokenScannerProvider;
+import org.eclipse.jet.internal.editor.partition.ITokenScannerProvider;
import org.eclipse.jface.text.rules.IPredicateRule;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/java/JavaContentPartitionConfigurationDelegate.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/java/JavaContentPartitionConfigurationDelegate.java
index 8291231..62b974f 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/java/JavaContentPartitionConfigurationDelegate.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/java/JavaContentPartitionConfigurationDelegate.java
@@ -1,12 +1,12 @@
-package org.eclipse.jet.editor.configuration.delegates.java;
+package org.eclipse.jet.internal.editor.configuration.delegates.java;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jdt.ui.ISharedImages;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.rules.*;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/xml/XMLContentPartitionConfigurationDelegate.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/xml/XMLContentPartitionConfigurationDelegate.java
index bdb0e23..63c2291 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/configuration/delegates/xml/XMLContentPartitionConfigurationDelegate.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/configuration/delegates/xml/XMLContentPartitionConfigurationDelegate.java
@@ -1,9 +1,9 @@
-package org.eclipse.jet.editor.configuration.delegates.xml;
+package org.eclipse.jet.internal.editor.configuration.delegates.xml;
import org.eclipse.jdt.ui.text.IColorManager;
-import org.eclipse.jet.editor.Activator;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
+import org.eclipse.jet.internal.editor.Activator;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.rules.ICharacterScanner;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/AbstractJETAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/AbstractJETAssistProcessor.java
index f79aee8..c7968c3 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/AbstractJETAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/AbstractJETAssistProcessor.java
@@ -1,6 +1,6 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
public abstract class AbstractJETAssistProcessor implements IContentAssistProcessor {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/AbstractXMLTagsBasedAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/AbstractXMLTagsBasedAssistProcessor.java
index b861461..32e9001 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/AbstractXMLTagsBasedAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/AbstractXMLTagsBasedAssistProcessor.java
@@ -1,8 +1,9 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
import java.util.*;
-import org.eclipse.jet.editor.JETTextEditor;
+
import org.eclipse.jet.internal.editor.JETDocumentReader;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.CompletionProposal;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -50,8 +51,9 @@ public abstract class AbstractXMLTagsBasedAssistProcessor extends AbstractJETAss
TreeSet set = (TreeSet) (TreeSet) innerMap.get(key);
if (set == null && key.length() == 0)
return getRootTags();
- else
+ else if (set != null)
return (String[]) set.toArray(new String[set.size()]);
+ return new String[0];
}
private boolean prefixMatches(String prefix, String word) {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETCustomTagAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETCustomTagAssistProcessor.java
index f63ae54..461afba 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETCustomTagAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETCustomTagAssistProcessor.java
@@ -1,7 +1,8 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
import java.util.*;
-import org.eclipse.jet.editor.JETTextEditor;
+
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jet.taglib.*;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.IContextInformation;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETDirectiveAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETDirectiveAssistProcessor.java
index e439464..64830f1 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETDirectiveAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETDirectiveAssistProcessor.java
@@ -1,6 +1,6 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaDeclarationAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaDeclarationAssistProcessor.java
index 0811aa1..68e09d4 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaDeclarationAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaDeclarationAssistProcessor.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
import org.eclipse.jet.compiler.JET2Declaration;
-import org.eclipse.jet.editor.JETTextEditor;
import org.eclipse.jet.internal.editor.JETEditorHelper;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaExpressionAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaExpressionAssistProcessor.java
index 36641c0..37d7087 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaExpressionAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaExpressionAssistProcessor.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
import org.eclipse.jet.compiler.JET2Expression;
-import org.eclipse.jet.editor.JETTextEditor;
import org.eclipse.jet.internal.editor.JETEditorHelper;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.*;
import org.eclipse.jface.text.contentassist.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaScriptletAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaScriptletAssistProcessor.java
index 465572a..dbc7652 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETJavaScriptletAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETJavaScriptletAssistProcessor.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
import org.eclipse.jet.compiler.JET2Scriptlet;
-import org.eclipse.jet.editor.JETTextEditor;
import org.eclipse.jet.internal.editor.JETEditorHelper;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.*;
import org.eclipse.jface.text.contentassist.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETTagAssistProcessor.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETTagAssistProcessor.java
index d242a7d..238427c 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/contentassist/JETTagAssistProcessor.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/contentassist/JETTagAssistProcessor.java
@@ -1,6 +1,6 @@
-package org.eclipse.jet.editor.contentassist;
+package org.eclipse.jet.internal.editor.contentassist;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformation;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETCustomTagFormattingStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETCustomTagFormattingStrategy.java
index b9b7178..c4d1c1c 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETCustomTagFormattingStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETCustomTagFormattingStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.formatter;
+package org.eclipse.jet.internal.editor.formatter;
import org.eclipse.jface.text.formatter.IFormattingContext;
import org.eclipse.jface.text.formatter.IFormattingStrategy;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETDirectiveFormattingStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETDirectiveFormattingStrategy.java
index 990a8d3..156a12a 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETDirectiveFormattingStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETDirectiveFormattingStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.formatter;
+package org.eclipse.jet.internal.editor.formatter;
import org.eclipse.jface.text.formatter.IFormattingContext;
import org.eclipse.jface.text.formatter.IFormattingStrategy;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaDeclarationFormattingStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaDeclarationFormattingStrategy.java
index 62d8a24..09d10cf 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaDeclarationFormattingStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaDeclarationFormattingStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.formatter;
+package org.eclipse.jet.internal.editor.formatter;
import org.eclipse.jface.text.formatter.IFormattingContext;
import org.eclipse.jface.text.formatter.IFormattingStrategy;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaExpressionFormattingStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaExpressionFormattingStrategy.java
index cab496e..d79e0d4 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaExpressionFormattingStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaExpressionFormattingStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.formatter;
+package org.eclipse.jet.internal.editor.formatter;
import org.eclipse.jface.text.formatter.IFormattingContext;
import org.eclipse.jface.text.formatter.IFormattingStrategy;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaScriptletFormattingStrategy.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaScriptletFormattingStrategy.java
index 3103c4b..a7d72dc 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/formatter/JETJavaScriptletFormattingStrategy.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/formatter/JETJavaScriptletFormattingStrategy.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.formatter;
+package org.eclipse.jet.internal.editor.formatter;
import org.eclipse.jface.text.formatter.IFormattingContext;
import org.eclipse.jface.text.formatter.IFormattingStrategy;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/gen/JETEditorJET2JavaGenerator.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/gen/JETEditorJET2JavaGenerator.java
index 9199205..75bd649 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/gen/JETEditorJET2JavaGenerator.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/gen/JETEditorJET2JavaGenerator.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.gen;
+package org.eclipse.jet.internal.editor.gen;
import java.util.*;
import org.eclipse.jet.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/i18n/TextEditorMessages.properties b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/i18n/TextEditorMessages.properties
index 7deaa82..7deaa82 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/i18n/TextEditorMessages.properties
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/i18n/TextEditorMessages.properties
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlineContentProvider.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlineContentProvider.java
index af625d9..0971605 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlineContentProvider.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlineContentProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.outline;
+package org.eclipse.jet.internal.editor.outline;
import java.util.ArrayList;
import java.util.Arrays;
@@ -9,7 +9,7 @@ import org.eclipse.jet.compiler.JET2ASTElement;
import org.eclipse.jet.compiler.JET2CompilationUnit;
import org.eclipse.jet.compiler.TextElement;
import org.eclipse.jet.compiler.XMLBodyElement;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlineLabelProvider.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlineLabelProvider.java
index 8bfb91d..b67d41b 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlineLabelProvider.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlineLabelProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.outline;
+package org.eclipse.jet.internal.editor.outline;
import java.util.Iterator;
import java.util.Map;
@@ -14,9 +14,9 @@ import org.eclipse.jet.compiler.JET2Expression;
import org.eclipse.jet.compiler.JET2Scriptlet;
import org.eclipse.jet.compiler.TextElement;
import org.eclipse.jet.compiler.XMLElement;
-import org.eclipse.jet.editor.Activator;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.Activator;
import org.eclipse.jet.internal.editor.JETEditorHelper;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jet.taglib.TagLibraryReference;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlinePage.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlinePage.java
index b27c66e..02a7194 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/outline/JETOutlinePage.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/outline/JETOutlinePage.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.outline;
+package org.eclipse.jet.internal.editor.outline;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jet.compiler.JET2CompilationUnit;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.viewers.IPostSelectionProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.TreeViewer;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/ITokenScannerProvider.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/ITokenScannerProvider.java
index 33a1b3b..7970c93 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/ITokenScannerProvider.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/ITokenScannerProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.partition;
+package org.eclipse.jet.internal.editor.partition;
import org.eclipse.jface.text.rules.ITokenScanner;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/JETDocumentPartitionScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/JETDocumentPartitionScanner.java
index fe27452..1061687 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/JETDocumentPartitionScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/JETDocumentPartitionScanner.java
@@ -1,14 +1,14 @@
-package org.eclipse.jet.editor.partition;
+package org.eclipse.jet.internal.editor.partition;
import java.util.*;
import org.eclipse.jdt.internal.ui.text.java.JavaAutoIndentStrategy;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.autoedit.JETTemplateAutoEditStrategy;
-import org.eclipse.jet.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
-import org.eclipse.jet.editor.contentassist.*;
-import org.eclipse.jet.editor.formatter.*;
-import org.eclipse.jet.editor.rules.*;
-import org.eclipse.jet.editor.scanners.*;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.autoedit.JETTemplateAutoEditStrategy;
+import org.eclipse.jet.internal.editor.configuration.delegates.IJETDefaultTextColorerDelegate;
+import org.eclipse.jet.internal.editor.contentassist.*;
+import org.eclipse.jet.internal.editor.formatter.*;
+import org.eclipse.jet.internal.editor.rules.*;
+import org.eclipse.jet.internal.editor.scanners.*;
import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.ContentAssistant;
@@ -226,7 +226,7 @@ public class JETDocumentPartitionScanner extends RuleBasedPartitionScanner {
}
protected ITokenScanner getCommentScanner() {
- org.eclipse.jet.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
+ org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
org.eclipse.jface.preference.IPreferenceStore preferenceStore = editor.getEditorPreferenceStore();
if (commentScanner == null)
commentScanner = new JETCommentScanner(tokenStyleManager, preferenceStore);
@@ -234,7 +234,7 @@ public class JETDocumentPartitionScanner extends RuleBasedPartitionScanner {
}
protected ITokenScanner getCustomTagScanner() {
- org.eclipse.jet.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
+ org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
org.eclipse.jface.preference.IPreferenceStore preferenceStore = editor.getEditorPreferenceStore();
if (tagScanner == null)
tagScanner = new JETCustomTagScanner(tokenStyleManager, preferenceStore);
@@ -242,7 +242,7 @@ public class JETDocumentPartitionScanner extends RuleBasedPartitionScanner {
}
protected ITokenScanner getJavaScriptletScanner() {
- org.eclipse.jet.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
+ org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
org.eclipse.jface.preference.IPreferenceStore preferenceStore = editor.getEditorPreferenceStore();
if (scriptletScanner == null)
scriptletScanner = new JETJavaScriptletScanner(tokenStyleManager, preferenceStore);
@@ -250,7 +250,7 @@ public class JETDocumentPartitionScanner extends RuleBasedPartitionScanner {
}
protected ITokenScanner getJavaExpressionScanner() {
- org.eclipse.jet.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
+ org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
org.eclipse.jface.preference.IPreferenceStore preferenceStore = editor.getEditorPreferenceStore();
if (expressionScanner == null)
expressionScanner = new JETJavaExpressionScanner(tokenStyleManager, preferenceStore);
@@ -258,7 +258,7 @@ public class JETDocumentPartitionScanner extends RuleBasedPartitionScanner {
}
protected ITokenScanner getJavaDeclarationScanner() {
- org.eclipse.jet.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
+ org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
org.eclipse.jface.preference.IPreferenceStore preferenceStore = editor.getEditorPreferenceStore();
if (declarationScanner == null)
declarationScanner = new JETJavaDeclarationScanner(tokenStyleManager, preferenceStore);
@@ -266,7 +266,7 @@ public class JETDocumentPartitionScanner extends RuleBasedPartitionScanner {
}
protected ITokenScanner getDirectiveScanner() {
- org.eclipse.jet.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
+ org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager tokenStyleManager = editor.getTokenStyleManager();
org.eclipse.jface.preference.IPreferenceStore preferenceStore = editor.getEditorPreferenceStore();
if (directiveScanner == null)
directiveScanner = new JETDirectiveScanner(tokenStyleManager, preferenceStore);
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/PartitionScannerBasedDamagerRepairer.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/PartitionScannerBasedDamagerRepairer.java
index 2b3d29e..36fd8ae 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/partition/PartitionScannerBasedDamagerRepairer.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/partition/PartitionScannerBasedDamagerRepairer.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.partition;
+package org.eclipse.jet.internal.editor.partition;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.text.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTElementScannerRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTElementScannerRule.java
index 63ec4f7..462005a 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTElementScannerRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTElementScannerRule.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jet.compiler.JET2ASTElement;
-import org.eclipse.jet.editor.JETTextEditor;
-import org.eclipse.jet.editor.partition.JETDocumentPartitionScanner;
+import org.eclipse.jet.internal.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.partition.JETDocumentPartitionScanner;
import org.eclipse.jface.text.rules.*;
public abstract class ASTElementScannerRule implements IPredicateRule {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETCommentRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETCommentRule.java
index 18be930..b709de7 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETCommentRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETCommentRule.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jet.compiler.Comment;
import org.eclipse.jet.compiler.JET2ASTElement;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.rules.IToken;
public class ASTJETCommentRule extends ASTElementScannerRule {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETCustomTagRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETCustomTagRule.java
index cfa5d79..85b3965 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETCustomTagRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETCustomTagRule.java
@@ -1,7 +1,7 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jet.compiler.*;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.rules.IToken;
public class ASTJETCustomTagRule extends ASTElementScannerRule {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETDirectiveRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETDirectiveRule.java
index 4b66251..601bd0a 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETDirectiveRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETDirectiveRule.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jet.compiler.JET2ASTElement;
import org.eclipse.jet.compiler.JET2Directive;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.rules.IToken;
public class ASTJETDirectiveRule extends ASTElementScannerRule {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaDeclarationRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaDeclarationRule.java
index fdaf12d..f2f785c 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaDeclarationRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaDeclarationRule.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jet.compiler.JET2ASTElement;
import org.eclipse.jet.compiler.JET2Declaration;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.rules.IToken;
public class ASTJETJavaDeclarationRule extends ASTElementScannerRule {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaExpressionRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaExpressionRule.java
index 07353fd..bdca1a7 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaExpressionRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaExpressionRule.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jet.compiler.JET2ASTElement;
import org.eclipse.jet.compiler.JET2Expression;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.rules.IToken;
public class ASTJETJavaExpressionRule extends ASTElementScannerRule {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaScriptletRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaScriptletRule.java
index 619b918..cff5acf 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/ASTJETJavaScriptletRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/ASTJETJavaScriptletRule.java
@@ -1,8 +1,8 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jet.compiler.JET2ASTElement;
import org.eclipse.jet.compiler.JET2Scriptlet;
-import org.eclipse.jet.editor.JETTextEditor;
+import org.eclipse.jet.internal.editor.JETTextEditor;
import org.eclipse.jface.text.rules.IToken;
public class ASTJETJavaScriptletRule extends ASTElementScannerRule {
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETBracketRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETBracketRule.java
index 0ccaf0f..b8ebbad 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETBracketRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETBracketRule.java
@@ -9,7 +9,7 @@
* Joel Cheuoua - initial API and implementation
*******************************************************************************/
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IToken;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETCommentRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETCommentRule.java
index 6133aad..e259b14 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETCommentRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETCommentRule.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jface.text.rules.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETCustomTagRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETCustomTagRule.java
index c926667..889ffca 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETCustomTagRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETCustomTagRule.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import java.util.HashSet;
import java.util.Set;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETDirectiveRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETDirectiveRule.java
index b9e184b..1ab6c87 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETDirectiveRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETDirectiveRule.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jface.text.rules.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaDeclarationRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaDeclarationRule.java
index 3c53b13..42dec6a 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaDeclarationRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaDeclarationRule.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jface.text.rules.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaExpressionRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaExpressionRule.java
index b0c83af..0243dca 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaExpressionRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaExpressionRule.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jface.text.rules.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaScriptletRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaScriptletRule.java
index 0ca798e..4ffddba 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/JETJavaScriptletRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/JETJavaScriptletRule.java
@@ -1,4 +1,4 @@
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import org.eclipse.jface.text.rules.*;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/WordListDetectorRule.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/WordListDetectorRule.java
index cb00e5d..d06ed7b 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/rules/WordListDetectorRule.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/rules/WordListDetectorRule.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.eclipse.jet.editor.rules;
+package org.eclipse.jet.internal.editor.rules;
import java.util.Collection;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETCommentScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETCommentScanner.java
index 8cf75c9..104c330 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETCommentScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETCommentScanner.java
@@ -1,7 +1,7 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
-import org.eclipse.jet.editor.configuration.JETEditorPreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.configuration.JETEditorPreferenceConstants;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.rules.RuleBasedScanner;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETCustomTagScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETCustomTagScanner.java
index 468c0ce..17f47c2 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETCustomTagScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETCustomTagScanner.java
@@ -1,12 +1,12 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETEditorPreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
-import org.eclipse.jet.editor.rules.WordListDetectorRule;
+import org.eclipse.jet.internal.editor.configuration.JETEditorPreferenceConstants;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.rules.WordListDetectorRule;
import org.eclipse.jet.taglib.TagLibrary;
import org.eclipse.jet.taglib.TagLibraryManager;
import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETDefaultContentScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETDefaultContentScanner.java
index c46b9df..a3efb8c 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETDefaultContentScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETDefaultContentScanner.java
@@ -1,6 +1,6 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.rules.RuleBasedScanner;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETDirectiveScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETDirectiveScanner.java
index a962126..964c8ce 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETDirectiveScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETDirectiveScanner.java
@@ -1,10 +1,10 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETEditorPreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
-import org.eclipse.jet.editor.rules.JETBracketRule;
-import org.eclipse.jet.editor.rules.WordListDetectorRule;
+import org.eclipse.jet.internal.editor.configuration.JETEditorPreferenceConstants;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.rules.JETBracketRule;
+import org.eclipse.jet.internal.editor.rules.WordListDetectorRule;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.rules.IRule;
import org.eclipse.jface.text.rules.IToken;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaCodeScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaCodeScanner.java
index 8c205fd..d56a402 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaCodeScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaCodeScanner.java
@@ -1,10 +1,10 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IRule;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaDeclarationScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaDeclarationScanner.java
index 2c3f408..351d4e5 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaDeclarationScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaDeclarationScanner.java
@@ -1,12 +1,12 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETEditorPreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
-import org.eclipse.jet.editor.rules.JETBracketRule;
+import org.eclipse.jet.internal.editor.configuration.JETEditorPreferenceConstants;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.rules.JETBracketRule;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.rules.IToken;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaExpressionScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaExpressionScanner.java
index 440838d..d43ecd7 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaExpressionScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaExpressionScanner.java
@@ -1,12 +1,12 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETEditorPreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
-import org.eclipse.jet.editor.rules.JETBracketRule;
+import org.eclipse.jet.internal.editor.configuration.JETEditorPreferenceConstants;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.rules.JETBracketRule;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.rules.IToken;
diff --git a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaScriptletScanner.java b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaScriptletScanner.java
index fcec5eb..59142ac 100644
--- a/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/editor/scanners/JETJavaScriptletScanner.java
+++ b/plugins/org.eclipse.jet.editor/src/org/eclipse/jet/internal/editor/scanners/JETJavaScriptletScanner.java
@@ -1,12 +1,12 @@
-package org.eclipse.jet.editor.scanners;
+package org.eclipse.jet.internal.editor.scanners;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETEditorPreferenceConstants;
-import org.eclipse.jet.editor.configuration.JETTokenStyleManager;
-import org.eclipse.jet.editor.rules.JETBracketRule;
+import org.eclipse.jet.internal.editor.configuration.JETEditorPreferenceConstants;
+import org.eclipse.jet.internal.editor.configuration.JETTokenStyleManager;
+import org.eclipse.jet.internal.editor.rules.JETBracketRule;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.rules.IToken;
diff --git a/plugins/org.eclipse.jet.editor/templates/jet2java.jet b/plugins/org.eclipse.jet.editor/templates/jet2java.jet
new file mode 100644
index 0000000..b69d331
--- /dev/null
+++ b/plugins/org.eclipse.jet.editor/templates/jet2java.jet
@@ -0,0 +1,94 @@
+<%@jet package="org.eclipse.jet.internal.compiler.templates"
+ class="JET2JavaGenerator"
+ %>
+<%@jet imports="org.eclipse.jet.internal.compiler.*"%>
+<%@jet imports="org.eclipse.jet.compiler.*"%>
+<%@jet imports="org.eclipse.jet.transform.TransformContextExtender"%>
+<%@jet imports="org.eclipse.jet.taglib.TagLibraryReference"%>
+<%@jet imports="java.util.*"%>
+<%@jet imports="org.eclipse.jface.text.Position"%>
+<%!
+ private XMLElement[] getAllXMLTags(JET2CompilationUnit cu) {
+ final List result = new ArrayList();
+ cu.accept(new DefaultJET2ASTVisitor() {
+ public void visit(XMLBodyElement element) {
+ result.add(element);
+ }
+
+ public void visit(XMLEmptyElement element) {
+ result.add(element);
+ }
+ });
+ return (XMLElement[])result.toArray(new XMLElement[result.size()]);
+ }
+
+ private JET2Declaration[] getAllJavaDeclarations(JET2CompilationUnit cu) {
+ final List result = new ArrayList();
+ cu.accept(new DefaultJET2ASTVisitor() {
+ public void visit(JET2Declaration declaration) {
+ result.add(declaration);
+ }
+ });
+ return (JET2Declaration[])result.toArray(new JET2Declaration[result.size()]);
+ }
+
+ private void adjustGeneratedBodyPositions(Map mappingPositions, int generatedBodyOffsetStart) {
+ for (Iterator iterator = mappingPositions.keySet().iterator(); iterator.hasNext();) {
+ Object element = iterator.next();
+ if (!(element instanceof JET2Declaration)) {
+ Position position = (Position) mappingPositions.get(element);
+ position.offset += generatedBodyOffsetStart;
+ }
+ }
+ }
+%>
+<%
+ JET2CompilationUnit cu = (JET2CompilationUnit) context.getVariable("cu");
+ JET2Declaration allMemberDeclarations[] = getAllJavaDeclarations(cu);
+ XMLElement allXMLElements[] = getAllXMLTags(cu);
+ TagLibraryReference tlRefs[] = cu.getTagLibraryReferences();
+ Map generatedBodyMappingPositions = new HashMap();
+ Map mappingPositions = (Map) context.getVariable("org.eclipse.jet.storeJavaMappingPositions");
+ org.eclipse.jet.internal.editor.JETEditorHelper.JETEditorMethodBodyCreator generatedBody = new org.eclipse.jet.internal.editor.JETEditorHelper.JETEditorMethodBodyCreator(
+ TransformContextExtender.getInstance(context).getLoader(), generatedBodyMappingPositions);
+ cu.accept(generatedBody);
+%>
+package <%= cu.getOutputJavaPackage() %>;
+
+import org.eclipse.jet.JET2Context;
+import org.eclipse.jet.JET2Template;
+import org.eclipse.jet.JET2Writer;
+<% if( allXMLElements.length > 0) { %>
+import org.eclipse.jet.taglib.RuntimeTagElement;
+import org.eclipse.jet.taglib.TagInfo;
+<% } %>
+<% for(Iterator i=cu.getImports().iterator();i.hasNext();) {
+ String importName = (String)i.next();%>
+import <%=importName%>;
+<% } %>
+
+public class <%= cu.getOutputJavaClassName() %> implements JET2Template {
+<% if( allXMLElements.length > 0) { %>
+<% for(int i = 0; i < tlRefs.length; i++ ) { %>
+ public static final String _jetns_<%= tlRefs[i].getPrefix() %> = "<%= tlRefs[i].getTagLibraryId() %>"; //$NON-NLS-1$
+<% } %>
+<% } %>
+<% for(int i = 0; i < allMemberDeclarations.length; i++) { %>
+
+<%= allMemberDeclarations[i].getJavaContent() %>
+<% } %>
+
+ public <%= cu.getOutputJavaClassName() %>() {
+ super();
+ }
+
+ public void generate(final JET2Context context, JET2Writer out) {
+<% for(int i = 0; i < allXMLElements.length; i++) {
+ context.setVariable("element", allXMLElements[i]); //$NON-NLS-1$
+%>
+ <c:include template="templates/tagDataDeclarations.jet"/>
+<% } %>
+<%= generatedBody.getBuffer() %>
+ }
+
+}