Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2009-02-11 13:56:34 -0500
committerashatalin2009-02-11 13:56:34 -0500
commit098d4aec0f4eeff952209fdfc55ff2cb635aa983 (patch)
tree9bbd840b9c19bfb49cf91ec02fa0b7511b4410fd
parent4bd679f470de047ac9465845c1fa7bde1ecb65ac (diff)
downloadorg.eclipse.gmf-tooling-098d4aec0f4eeff952209fdfc55ff2cb635aa983.tar.gz
org.eclipse.gmf-tooling-098d4aec0f4eeff952209fdfc55ff2cb635aa983.tar.xz
org.eclipse.gmf-tooling-098d4aec0f4eeff952209fdfc55ff2cb635aa983.zip
[264373] - EMF content provider for project explorer is brokenv20090211-1530
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/CodegenEmitters.java4
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java5
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/editor/DomainModelElementTester.xpt50
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/navigator/extensions.xpt14
4 files changed, 2 insertions, 71 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/CodegenEmitters.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/CodegenEmitters.java
index 075e27232..fd9bbba0c 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/CodegenEmitters.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/CodegenEmitters.java
@@ -473,10 +473,6 @@ public class CodegenEmitters {
return getPrimaryEmitter("xpt::editor::MatchingStrategy"); //$NON-NLS-1$
}
- public TextEmitter getDomainModelElementTesterEmitter() {
- return getPrimaryEmitter("xpt::editor::DomainModelElementTester"); //$NON-NLS-1$
- }
-
public TextEmitter getURIEditorInputTesterEmitter() {
return getPrimaryEmitter("xpt::editor::UriEditorInputTester"); //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java
index 57a07f40a..9c5ee7a0f 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java
@@ -256,7 +256,6 @@ public class Generator extends GeneratorBase implements Runnable {
generateDomainNavigatorContentProvider();
generateDomainNavigatorLabelProvider();
generateDomainNavigatorItem();
- generateDomainModelElementTester();
generateURIEditorInputTester();
}
}
@@ -769,10 +768,6 @@ public class Generator extends GeneratorBase implements Runnable {
doGenerateJavaClass(myEmitters.getDomainNavigatorItemEmitter(), myEditorGen.getNavigator().getDomainNavigatorItemQualifiedClassName(), myEditorGen.getNavigator());
}
- private void generateDomainModelElementTester() throws InterruptedException {
- doGenerateJavaClass(myEmitters.getDomainModelElementTesterEmitter(), myEditorGen.getNavigator().getDomainModelElementTesterQualifiedClassName(), myEditorGen.getNavigator());
- }
-
private void generateURIEditorInputTester() throws InterruptedException {
doGenerateJavaClass(myEmitters.getURIEditorInputTesterEmitter(), myEditorGen.getNavigator().getUriInputTesterQualifiedClassName(), myEditorGen.getNavigator());
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/editor/DomainModelElementTester.xpt b/plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/editor/DomainModelElementTester.xpt
deleted file mode 100644
index ee08817d7..000000000
--- a/plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/editor/DomainModelElementTester.xpt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Alexander Shatalin (Borland) - initial API and implementation
- */
-
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-«EXTENSION xpt::GenModelUtils»
-
-«DEFINE DomainModelElementTester FOR gmfgen::GenNavigator-»
- «EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
- «EXPAND xpt::Common::generatedClassComment»
-public class «domainModelElementTesterClassName» extends org.eclipse.core.expressions.PropertyTester {
-
- «EXPAND test-»
-
- «EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE test FOR gmfgen::GenNavigator-»
- «EXPAND xpt::Common::generatedMemberComment»
-public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
- if (false == receiver instanceof org.eclipse.emf.ecore.EObject) {
- return false;
- }
- org.eclipse.emf.ecore.EObject eObject = (org.eclipse.emf.ecore.EObject) receiver;
- org.eclipse.emf.ecore.EClass eClass = eObject.eClass();
- «EXPAND checkGenClass FOREACH editorGen.domainGenModel.genPackages.genClasses-»
- return false;
-}
-«ENDDEFINE»
-
-«DEFINE checkGenClass FOR genmodel::GenClass-»
-if (eClass == «EXPAND MetaModel::MetaClass») {
- return true;
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/navigator/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/navigator/extensions.xpt
index 283d17861..b82d0a660 100644
--- a/plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/navigator/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates.migrated/xpt/navigator/extensions.xpt
@@ -20,10 +20,6 @@
«EXPAND editorInputPropertyTester('Shortcut', 'org.eclipse.gmf.runtime.notation.View', editorGen.diagram.getShortcutPropertyTesterQualifiedClassName())-»
«ENDIF-»
-«IF generateDomainModelNavigator and null <> editorGen.domainGenModel-»
-
- «EXPAND editorInputPropertyTester('DomainModelElement', 'org.eclipse.emf.ecore.EObject', getDomainModelElementTesterQualifiedClassName())-»
-«ENDIF-»
«EXPAND registerBindings-»
@@ -90,17 +86,11 @@
<instanceof value="org.eclipse.core.resources.IFile"/>
<test property="org.eclipse.core.resources.extension" value="«editorGen.domainFileExtension»"/>
</and>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject"/>
- <test property="«editorGen.plugin.iD».isDomainModelElement"/>
- </and>
+ <instanceof value="«getDomainNavigatorItemQualifiedClassName()»"/>
</or>
</triggerPoints>
<possibleChildren>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject"/>
- <test property="«editorGen.plugin.iD».isDomainModelElement"/>
- </and>
+ <instanceof value="«getDomainNavigatorItemQualifiedClassName()»"/>
</possibleChildren>
</navigatorContent>
«ENDIF-»

Back to the top