Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2010-04-28 17:23:10 -0400
committeratikhomirov2010-04-28 17:23:10 -0400
commit7f87ba53979977ddda5a5ffc72f9e7ca4090a5b5 (patch)
tree21d98bb4d66b86347fc68309a24d16250d8de6bf
parentb70541bdd20979864f42bcd0cb8fa4810f0a0312 (diff)
downloadorg.eclipse.gmf-tooling-7f87ba53979977ddda5a5ffc72f9e7ca4090a5b5.tar.gz
org.eclipse.gmf-tooling-7f87ba53979977ddda5a5ffc72f9e7ca4090a5b5.tar.xz
org.eclipse.gmf-tooling-7f87ba53979977ddda5a5ffc72f9e7ca4090a5b5.zip
[188329] Java 5 code
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt
index 0027bb023..261c4828e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt
@@ -59,7 +59,8 @@
«ENDDEFINE»
«DEFINE getSemanticChildrenListMethod FOR gmfgen::GenContainerBase-»
- «EXPAND xpt::Common::generatedMemberComment»
+«EXPAND xpt::Common::generatedMemberComment»
+«EXPAND CodeStyle::SuppressWarnings('"rawtypes"')»
protected java.util.List getSemanticChildrenList() {
«IF hasSemanticChildren(self) /*REVISIT: is there real need for this check - Generator seems to consult needsCanonicalEP, which in turns ensures there are semantic children?*/-»
org.eclipse.gmf.runtime.notation.View viewObject = (org.eclipse.gmf.runtime.notation.View) getHost().getModel();
@@ -77,7 +78,7 @@ protected java.util.List getSemanticChildrenList() {
«DEFINE isOrphanedMethod FOR gmfgen::GenContainerBase-»
«EXPAND xpt::Common::generatedMemberComment»
-protected boolean isOrphaned(java.util.Collection semanticChildren, final org.eclipse.gmf.runtime.notation.View view) {
+protected boolean isOrphaned(«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.emf.ecore.EObject')» semanticChildren, final org.eclipse.gmf.runtime.notation.View view) {
«EXPAND _checkShortcutProperty-»
return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());
}
@@ -225,7 +226,9 @@ private boolean isMyDiagramElement(org.eclipse.gmf.runtime.notation.View view) {
executeCommand(new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(boundsCommand.reduce()));
}
«ENDIF-»
- «createdViewsVar».addAll((«EXPAND CodeStyle::G('java.util.List', 'org.eclipse.core.runtime.IAdaptable')») request.getNewObject());
+ «EXPAND CodeStyle::SuppressWarnings('"unchecked"')»
+ «EXPAND CodeStyle::G('java.util.List', 'org.eclipse.core.runtime.IAdaptable')» nl = («EXPAND CodeStyle::G('java.util.List', 'org.eclipse.core.runtime.IAdaptable')») request.getNewObject();
+ «createdViewsVar».addAll(nl);
}
if (changed || «createdViewsVar».size() > 0) {
postProcessRefreshSemantic(createdViews);

Back to the top