summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskovalsky2012-05-22 15:39:17 (EDT)
committer mgolubev2012-05-22 15:39:17 (EDT)
commit3df501e20c0144cac72f50ad357a0d8d9bea4d9f (patch)
tree06712633e983873fde19755d3f6b9e7658c33c3c
parent58f48b047b9b201a8091160756e2e2f8254b7fe5 (diff)
downloadorg.eclipse.gmf-tooling-3df501e20c0144cac72f50ad357a0d8d9bea4d9f.zip
org.eclipse.gmf-tooling-3df501e20c0144cac72f50ad357a0d8d9bea4d9f.tar.gz
org.eclipse.gmf-tooling-3df501e20c0144cac72f50ad357a0d8d9bea4d9f.tar.bz2
[379484] - Adjustments after [380320]: all fields should be private,
+avoid accessing protected super.figure directly
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
index cabd689..c15c5cf 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
@@ -36,7 +36,7 @@
private String defaultText;
«EXPAND xpt::Common::generatedMemberComment»
- org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate labelDelegate;
+ private org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate labelDelegate;
«ENDDEFINE»
«DEFINE methods(needsRefreshBounds : Boolean, readOnly : Boolean, useElementIcon : Boolean, viewmap : gmfgen::Viewmap,
@@ -211,8 +211,8 @@
if (label instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel){
labelDelegate = new org.eclipse.gmf.runtime.diagram.ui.label.WrappingLabelDelegate((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel)label);
} «IF isVerticalLabel(self)-»
- else if (figure instanceof «getVerticalLabelFQN()») {
- labelDelegate = new «getVerticalLabelDelegateFQN()»((«getVerticalLabelFQN()»)figure);
+ else if (label instanceof «getVerticalLabelFQN()») {
+ labelDelegate = new «getVerticalLabelDelegateFQN()»((«getVerticalLabelFQN()»)label);
} «ENDIF-»
else {
labelDelegate = new «getSimpleLabelDelegateFQN()»((org.eclipse.draw2d.Label)label);