Google Git
Sign in
eclipse/dltk/org.eclipse.dltk.examples/47f658da518ea8e3f00a16cd2220637ae9e1668a^!/.
commit
47f658da518ea8e3f00a16cd2220637ae9e1668a
[log]
author
apanchenk <apanchenk>
Thu May 13 08:00:36 2010 +0000
committer
apanchenk <apanchenk>
Thu May 13 08:00:36 2010 +0000
tree
31b3dff398884f85d36a579a3310202cc9987efd
parent
199497dae60cc776337da24ae49354f02c5b2ab5 [diff]
regenerated

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/.classpath b/javascript/tools/org.eclipse.dltk.javascript.core.editor/.classpath
index 64c5e31..304e861 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/.classpath
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF b/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF
index 3d8d57e..dc9bffb 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/META-INF/MANIFEST.MF

@@ -4,11 +4,11 @@
 Bundle-SymbolicName: org.eclipse.dltk.javascript.core.editor;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.dltk.javascript.internal.model.references.presentation.ReferencesEditorPlugin$Implementation
+Bundle-Activator: org.eclipse.dltk.javascript.typeinfo.model.presentation.ReferencesEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.dltk.javascript.internal.model.references.presentation
+Export-Package: org.eclipse.dltk.javascript.typeinfo.model.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
  org.eclipse.dltk.javascript.core.edit;visibility:=reexport,

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/icons/full/obj16/TypeInfoModelModelFile.gif b/javascript/tools/org.eclipse.dltk.javascript.core.editor/icons/full/obj16/TypeInfoModelModelFile.gif
new file mode 100644
index 0000000..3097cf4
--- /dev/null
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/icons/full/obj16/TypeInfoModelModelFile.gif
Binary files differ

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/icons/full/wizban/NewTypeInfoModel.gif b/javascript/tools/org.eclipse.dltk.javascript.core.editor/icons/full/wizban/NewTypeInfoModel.gif
new file mode 100644
index 0000000..f9e80f0
--- /dev/null
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/icons/full/wizban/NewTypeInfoModel.gif
Binary files differ

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.properties b/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.properties
index 36f84a0..383747d 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.properties
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.properties

@@ -8,7 +8,7 @@
 # Contributors:
 #     xored software, Inc. - initial API and Implementation (Alex Panchenko)
 #
-# $Id: plugin.properties,v 1.3 2010/02/27 13:00:41 apanchenk Exp $
+# $Id: plugin.properties,v 1.4 2010/05/13 08:00:37 apanchenk Exp $
 
 pluginName = References Editor
 providerName = www.eclipse.org
@@ -61,3 +61,9 @@
 _UI_FileConflict_label = File Conflict
 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
 
+_UI_TypeInfoModelEditor_menu = &TypeInfoModel Editor
+_UI_TypeInfoModelModelWizard_label = TypeInfoModel Model
+_UI_TypeInfoModelModelWizard_description = Create a new TypeInfoModel model
+_UI_TypeInfoModelEditor_label = TypeInfoModel Model Editor
+_UI_TypeInfoModelEditorFilenameDefaultBase = My
+_UI_TypeInfoModelEditorFilenameExtensions = typeinfomodel

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.xml b/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.xml
index 515112c..ca73cb8 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.xml
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/plugin.xml

@@ -12,7 +12,7 @@
  Contributors:
      xored software, Inc. - initial API and Implementation (Alex Panchenko)
 
- $Id: plugin.xml,v 1.2 2010/02/27 12:38:23 apanchenk Exp $
+ $Id: plugin.xml,v 1.3 2010/05/13 08:00:37 apanchenk Exp $
 -->
 
 <plugin>
@@ -24,7 +24,7 @@
       <wizard
             id="org.eclipse.dltk.javascript.internal.model.references.presentation.ReferenceModelModelWizardID"
             name="%_UI_ReferenceModelModelWizard_label"
-            class="org.eclipse.dltk.javascript.internal.model.references.presentation.ReferenceModelModelWizard"
+            class="org.eclipse.dltk.javascript.typeinfo.model.presentation.TypeInfoModelModelWizard"
             category="org.eclipse.dltk.javascript.tools"
             icon="icons/full/obj16/ReferenceModelModelFile.gif">
          <description>%_UI_ReferenceModelModelWizard_description</description>
@@ -37,9 +37,9 @@
             id="org.eclipse.dltk.javascript.internal.model.references.presentation.ReferenceModelEditorID"
             name="%_UI_ReferenceModelEditor_label"
             icon="icons/full/obj16/ReferenceModelModelFile.gif"
-            extensions="referencemodel"
-            class="org.eclipse.dltk.javascript.internal.model.references.presentation.ReferenceModelEditor"
-            contributorClass="org.eclipse.dltk.javascript.internal.model.references.presentation.ReferenceModelActionBarContributor">
+            extensions="typeinfomodel"
+            class="org.eclipse.dltk.javascript.typeinfo.model.presentation.TypeInfoModelEditor"
+            contributorClass="org.eclipse.dltk.javascript.typeinfo.model.presentation.TypeInfoModelActionBarContributor">
       </editor>
    </extension>
 

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferencesEditorPlugin.java b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/ReferencesEditorPlugin.java
similarity index 93%
rename from javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferencesEditorPlugin.java
rename to javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/ReferencesEditorPlugin.java
index 73962dc..7efdcef 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferencesEditorPlugin.java
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/ReferencesEditorPlugin.java

@@ -9,9 +9,9 @@
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
  *
- * $Id: ReferencesEditorPlugin.java,v 1.1 2010/02/27 12:12:18 apanchenk Exp $
+ * $Id: ReferencesEditorPlugin.java,v 1.1 2010/05/13 08:00:36 apanchenk Exp $
  */
-package org.eclipse.dltk.javascript.internal.model.references.presentation;
+package org.eclipse.dltk.javascript.typeinfo.model.presentation;
 
 import org.eclipse.emf.common.EMFPlugin;
 

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelActionBarContributor.java b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelActionBarContributor.java
similarity index 95%
rename from javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelActionBarContributor.java
rename to javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelActionBarContributor.java
index 27686b3..249a7de 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelActionBarContributor.java
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelActionBarContributor.java

@@ -9,9 +9,9 @@
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
  *
- * $Id: ReferenceModelActionBarContributor.java,v 1.1 2010/02/27 12:12:18 apanchenk Exp $
+ * $Id: TypeInfoModelActionBarContributor.java,v 1.1 2010/05/13 08:00:36 apanchenk Exp $
  */
-package org.eclipse.dltk.javascript.internal.model.references.presentation;
+package org.eclipse.dltk.javascript.typeinfo.model.presentation;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -51,12 +51,12 @@
 import org.eclipse.ui.PartInitException;
 
 /**
- * This is the action bar contributor for the ReferenceModel model editor.
+ * This is the action bar contributor for the TypeInfoModel model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ReferenceModelActionBarContributor
+public class TypeInfoModelActionBarContributor
 	extends EditingDomainActionBarContributor
 	implements ISelectionChangedListener {
 	/**
@@ -161,7 +161,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ReferenceModelActionBarContributor() {
+	public TypeInfoModelActionBarContributor() {
 		super(ADDITIONS_LAST_STYLE);
 		loadResourceAction = new LoadResourceAction();
 		validateAction = new ValidateAction();
@@ -176,8 +176,8 @@
 	 */
 	@Override
 	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("referencemodel-settings")); //$NON-NLS-1$
-		toolBarManager.add(new Separator("referencemodel-additions")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("typeinfomodel-settings")); //$NON-NLS-1$
+		toolBarManager.add(new Separator("typeinfomodel-additions")); //$NON-NLS-1$
 	}
 
 	/**
@@ -191,7 +191,7 @@
 	public void contributeToMenu(IMenuManager menuManager) {
 		super.contributeToMenu(menuManager);
 
-		IMenuManager submenuManager = new MenuManager(ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelEditor_menu"), "org.eclipse.dltk.javascript.internal.model.referencesMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+		IMenuManager submenuManager = new MenuManager(ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelEditor_menu"), "org.eclipse.dltk.javascript.typeinfo.modelMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
 		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
 		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
 		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelEditor.java b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelEditor.java
similarity index 97%
rename from javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelEditor.java
rename to javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelEditor.java
index 0b2b5ad..44426fb 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelEditor.java
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelEditor.java

@@ -9,13 +9,14 @@
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
  *
- * $Id: ReferenceModelEditor.java,v 1.3 2010/02/27 13:02:39 apanchenk Exp $
+ * $Id: TypeInfoModelEditor.java,v 1.1 2010/05/13 08:00:36 apanchenk Exp $
  */
-package org.eclipse.dltk.javascript.internal.model.references.presentation;
+package org.eclipse.dltk.javascript.typeinfo.model.presentation;
 
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -34,55 +35,22 @@
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.ResourcesPlugin;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.dltk.javascript.internal.model.references.provider.ReferenceModelItemProviderAdapterFactory;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
+
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -92,16 +60,23 @@
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
+
 import org.eclipse.swt.SWT;
+
 import org.eclipse.swt.custom.CTabFolder;
+
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.Transfer;
+
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
+
 import org.eclipse.swt.graphics.Point;
+
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Tree;
+
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
@@ -109,26 +84,88 @@
 import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
 import org.eclipse.ui.dialogs.SaveAsDialog;
+
 import org.eclipse.ui.ide.IGotoMarker;
+
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.MultiPageEditorPart;
+
 import org.eclipse.ui.views.contentoutline.ContentOutline;
 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
 import org.eclipse.ui.views.properties.IPropertySheetPage;
 import org.eclipse.ui.views.properties.PropertySheet;
 import org.eclipse.ui.views.properties.PropertySheetPage;
 
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.ui.MarkerHelper;
+
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+
+import org.eclipse.dltk.javascript.typeinfo.model.provider.TypeInfoModelItemProviderAdapterFactory;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
 
 /**
- * This is an example of a ReferenceModel model editor.
+ * This is an example of a TypeInfoModel model editor.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ReferenceModelEditor
+public class TypeInfoModelEditor
 	extends MultiPageEditorPart
 	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
 	/**
@@ -240,18 +277,18 @@
 			public void partActivated(IWorkbenchPart p) {
 				if (p instanceof ContentOutline) {
 					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
-						getActionBarContributor().setActiveEditor(ReferenceModelEditor.this);
+						getActionBarContributor().setActiveEditor(TypeInfoModelEditor.this);
 
 						setCurrentViewer(contentOutlineViewer);
 					}
 				}
 				else if (p instanceof PropertySheet) {
 					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
-						getActionBarContributor().setActiveEditor(ReferenceModelEditor.this);
+						getActionBarContributor().setActiveEditor(TypeInfoModelEditor.this);
 						handleActivate();
 					}
 				}
-				else if (p == ReferenceModelEditor.this) {
+				else if (p == TypeInfoModelEditor.this) {
 					handleActivate();
 				}
 			}
@@ -414,7 +451,7 @@
 								 public void run() {
 									 removedResources.addAll(visitor.getRemovedResources());
 									 if (!isDirty()) {
-										 getSite().getPage().closeEditor(ReferenceModelEditor.this, false);
+										 getSite().getPage().closeEditor(TypeInfoModelEditor.this, false);
 									 }
 								 }
 							 });
@@ -425,7 +462,7 @@
 							(new Runnable() {
 								 public void run() {
 									 changedResources.addAll(visitor.getChangedResources());
-									 if (getSite().getPage().getActiveEditor() == ReferenceModelEditor.this) {
+									 if (getSite().getPage().getActiveEditor() == TypeInfoModelEditor.this) {
 										 handleActivate();
 									 }
 								 }
@@ -457,7 +494,7 @@
 
 		if (!removedResources.isEmpty()) {
 			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(ReferenceModelEditor.this, false);
+				getSite().getPage().closeEditor(TypeInfoModelEditor.this, false);
 			}
 			else {
 				removedResources.clear();
@@ -587,7 +624,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ReferenceModelEditor() {
+	public TypeInfoModelEditor() {
 		super();
 		initializeEditingDomain();
 	}
@@ -604,7 +641,7 @@
 		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
 
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ReferenceModelItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new TypeInfoModelItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 
 		// Create the command stack that will notify this editor as commands are executed.
@@ -1098,8 +1135,8 @@
 				new ExtendedPropertySheetPage(editingDomain) {
 					@Override
 					public void setSelectionToViewer(List<?> selection) {
-						ReferenceModelEditor.this.setSelectionToViewer(selection);
-						ReferenceModelEditor.this.setFocus();
+						TypeInfoModelEditor.this.setSelectionToViewer(selection);
+						TypeInfoModelEditor.this.setFocus();
 					}
 
 					@Override

diff --git a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelModelWizard.java b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelModelWizard.java
similarity index 86%
rename from javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelModelWizard.java
rename to javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelModelWizard.java
index 4a1457a..463e6bb 100644
--- a/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/internal/model/references/presentation/ReferenceModelModelWizard.java
+++ b/javascript/tools/org.eclipse.dltk.javascript.core.editor/src/org/eclipse/dltk/javascript/typeinfo/model/presentation/TypeInfoModelModelWizard.java

@@ -9,9 +9,9 @@
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
  *
- * $Id: ReferenceModelModelWizard.java,v 1.2 2010/02/27 13:38:51 apanchenk Exp $
+ * $Id: TypeInfoModelModelWizard.java,v 1.1 2010/05/13 08:00:36 apanchenk Exp $
  */
-package org.eclipse.dltk.javascript.internal.model.references.presentation;
+package org.eclipse.dltk.javascript.typeinfo.model.presentation;
 
 
 import java.util.ArrayList;
@@ -32,9 +32,9 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.dltk.javascript.internal.model.references.ReferenceModelFactory;
-import org.eclipse.dltk.javascript.internal.model.references.ReferenceModelPackage;
-import org.eclipse.dltk.javascript.internal.model.references.provider.ReferencesEditPlugin;
+import org.eclipse.dltk.javascript.typeinfo.model.TypeInfoModelFactory;
+import org.eclipse.dltk.javascript.typeinfo.model.TypeInfoModelPackage;
+import org.eclipse.dltk.javascript.typeinfo.model.provider.ReferencesEditPlugin;
 import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
@@ -76,7 +76,7 @@
  * <!-- end-user-doc -->
  * @generated
  */
-public class ReferenceModelModelWizard extends Wizard implements INewWizard {
+public class TypeInfoModelModelWizard extends Wizard implements INewWizard {
 	/**
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
@@ -84,7 +84,7 @@
 	 * @generated
 	 */
 	public static final List<String> FILE_EXTENSIONS =
-		Collections.unmodifiableList(Arrays.asList(ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
+		Collections.unmodifiableList(Arrays.asList(ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * A formatted list of supported file extensions, suitable for display.
@@ -93,7 +93,7 @@
 	 * @generated
 	 */
 	public static final String FORMATTED_FILE_EXTENSIONS =
-		ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
 	/**
 	 * This caches an instance of the model package.
@@ -101,7 +101,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ReferenceModelPackage referenceModelPackage = ReferenceModelPackage.eINSTANCE;
+	protected TypeInfoModelPackage typeInfoModelPackage = TypeInfoModelPackage.eINSTANCE;
 
 	/**
 	 * This caches an instance of the model factory.
@@ -109,7 +109,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ReferenceModelFactory referenceModelFactory = referenceModelPackage.getReferenceModelFactory();
+	protected TypeInfoModelFactory typeInfoModelFactory = typeInfoModelPackage.getTypeInfoModelFactory();
 
 	/**
 	 * This is the file creation page.
@@ -117,7 +117,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ReferenceModelModelWizardNewFileCreationPage newFileCreationPage;
+	protected TypeInfoModelModelWizardNewFileCreationPage newFileCreationPage;
 
 	/**
 	 * This is the initial object creation page.
@@ -125,7 +125,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ReferenceModelModelWizardInitialObjectCreationPage initialObjectCreationPage;
+	protected TypeInfoModelModelWizardInitialObjectCreationPage initialObjectCreationPage;
 
 	/**
 	 * Remember the selection during initialization for populating the default container.
@@ -161,7 +161,7 @@
 		this.workbench = workbench;
 		this.selection = selection;
 		setWindowTitle(ReferencesEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ReferencesEditorPlugin.INSTANCE.getImage("full/wizban/NewReferenceModel"))); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ReferencesEditorPlugin.INSTANCE.getImage("full/wizban/NewTypeInfoModel"))); //$NON-NLS-1$
 	}
 
 	/**
@@ -173,7 +173,7 @@
 	protected Collection<String> getInitialObjectNames() {
 		if (initialObjectNames == null) {
 			initialObjectNames = new ArrayList<String>();
-			initialObjectNames.add(ReferenceModelPackage.Literals.TYPE.getName());
+			initialObjectNames.add(TypeInfoModelPackage.Literals.TYPE.getName());
 			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
 		}
 		return initialObjectNames;
@@ -186,8 +186,8 @@
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
-		EClass eClass = (EClass)referenceModelPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
-		EObject rootObject = referenceModelFactory.create(eClass);
+		EClass eClass = (EClass)typeInfoModelPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = typeInfoModelFactory.create(eClass);
 		return rootObject;
 	}
 
@@ -288,14 +288,14 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public class ReferenceModelModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+	public class TypeInfoModelModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
 		/**
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public ReferenceModelModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+		public TypeInfoModelModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
 			super(pageId, selection);
 		}
 
@@ -335,7 +335,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public class ReferenceModelModelWizardInitialObjectCreationPage extends WizardPage {
+	public class TypeInfoModelModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -363,7 +363,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public ReferenceModelModelWizardInitialObjectCreationPage(String pageId) {
+		public TypeInfoModelModelWizardInitialObjectCreationPage(String pageId) {
 			super(pageId);
 		}
 
@@ -373,7 +373,8 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE); {
+			Composite composite = new Composite(parent, SWT.NONE);
+			{
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
@@ -548,10 +549,10 @@
 	public void addPages() {
 		// Create a page, set the title, and the initial model file name.
 		//
-		newFileCreationPage = new ReferenceModelModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
-		newFileCreationPage.setTitle(ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelModelWizard_label")); //$NON-NLS-1$
-		newFileCreationPage.setDescription(ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelModelWizard_description")); //$NON-NLS-1$
-		newFileCreationPage.setFileName(ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+		newFileCreationPage = new TypeInfoModelModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
+		newFileCreationPage.setTitle(ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelModelWizard_label")); //$NON-NLS-1$
+		newFileCreationPage.setDescription(ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelModelWizard_description")); //$NON-NLS-1$
+		newFileCreationPage.setFileName(ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
 		addPage(newFileCreationPage);
 
 		// Try and get the resource selection to determine a current directory for the file dialog.
@@ -577,7 +578,7 @@
 
 					// Make up a unique new name here.
 					//
-					String defaultModelBaseFilename = ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelEditorFilenameDefaultBase"); //$NON-NLS-1$
+					String defaultModelBaseFilename = ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelEditorFilenameDefaultBase"); //$NON-NLS-1$
 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
 					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
@@ -587,8 +588,8 @@
 				}
 			}
 		}
-		initialObjectCreationPage = new ReferenceModelModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
-		initialObjectCreationPage.setTitle(ReferencesEditorPlugin.INSTANCE.getString("_UI_ReferenceModelModelWizard_label")); //$NON-NLS-1$
+		initialObjectCreationPage = new TypeInfoModelModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
+		initialObjectCreationPage.setTitle(ReferencesEditorPlugin.INSTANCE.getString("_UI_TypeInfoModelModelWizard_label")); //$NON-NLS-1$
 		initialObjectCreationPage.setDescription(ReferencesEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
 		addPage(initialObjectCreationPage);
 	}