Skip to content
Snippets Groups Projects
Commit 71618008 authored by Andreas Wandinger's avatar Andreas Wandinger
Browse files

A minor cleanup. 

refs 610
parent c65c5500
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ElementEditPartBase.java
+ 15
− 21
View file @ 71618008
...@@ -59,14 +59,13 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; ...@@ -59,14 +59,13 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* @author hoelzl * @author hoelzl
* @author $Author$ * @author $Author$
* @version $Rev$ * @version $Rev$
* @ConQAT.Rating GREEN Hash: 51E7754E9905C1269ABA7D8B4FD50753 * @ConQAT.Rating GREEN Hash: 450841556180E967B0BF5BC0756859E7
*/ */
public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INamedCommentedElement> public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INamedCommentedElement> extends
extends PositionedEditPartBase<T> { PositionedEditPartBase<T> {
/** The default font for titles. */ /** The default font for titles. */
public static Font DEFAULT_TITLE_FONT = FontUtils.derive( public static Font DEFAULT_TITLE_FONT = FontUtils.derive(JFaceResources.getDefaultFont(), 0, SWT.BOLD);
JFaceResources.getDefaultFont(), 0, SWT.BOLD);
/** Constructor. */ /** Constructor. */
protected ElementEditPartBase(T modelObject) { protected ElementEditPartBase(T modelObject) {
...@@ -79,11 +78,9 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam ...@@ -79,11 +78,9 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam
Label nameLabel = new TransparentLabel(); Label nameLabel = new TransparentLabel();
nameLabel.setForegroundColor(getForegroundColor()); nameLabel.setForegroundColor(getForegroundColor());
nameLabel.setFont(DEFAULT_TITLE_FONT); nameLabel.setFont(DEFAULT_TITLE_FONT);
nameLabel.setTextAlignment(PositionConstants.LEFT nameLabel.setTextAlignment(PositionConstants.LEFT | PositionConstants.TOP);
| PositionConstants.TOP);
nameLabel.setTextPlacement(PositionConstants.EAST); nameLabel.setTextPlacement(PositionConstants.EAST);
nameLabel.setIcon(IModelElementHandlerService.INSTANCE nameLabel.setIcon(IModelElementHandlerService.INSTANCE.getModelElementHandler(getModel()).getIcon());
.getModelElementHandler(getModel()).getIcon());
return nameLabel; return nameLabel;
} }
...@@ -111,7 +108,7 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam ...@@ -111,7 +108,7 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam
labelBounds.y += (labelBounds.height - textBounds.height) / 2; labelBounds.y += (labelBounds.height - textBounds.height) / 2;
labelBounds.x += 2 * DefaultLayoutConstants.DEFAULT_SHAPE_INSETS; labelBounds.x += 2 * DefaultLayoutConstants.DEFAULT_SHAPE_INSETS;
labelBounds.width -= 4 * DefaultLayoutConstants.DEFAULT_SHAPE_INSETS; labelBounds.width -= 4 * DefaultLayoutConstants.DEFAULT_SHAPE_INSETS;
labelBounds.height = textBounds.height; labelBounds.height = (int)(textBounds.height * 1.5);
return labelBounds; return labelBounds;
} }
...@@ -125,20 +122,17 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam ...@@ -125,20 +122,17 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam
@Override @Override
protected void createEditPolicies() { protected void createEditPolicies() {
installEditPolicy(EditPolicy.COMPONENT_ROLE, new RemoveEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new RemoveEditPolicy());
installEditPolicy(EditPolicy.LAYOUT_ROLE, installEditPolicy(EditPolicy.LAYOUT_ROLE, new ElementLayoutEditPolicy<T>(this));
new ElementLayoutEditPolicy<T>(this)); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DirectConnectionAndReconnectionEditPolicy());
installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
new DirectConnectionAndReconnectionEditPolicy());
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public void performRequest(Request req) { public void performRequest(Request req) {
if (req.getType() == RequestConstants.REQ_OPEN) { if(req.getType() == RequestConstants.REQ_OPEN) {
EObject eo = getModel(); EObject eo = getModel();
IModelElementHandler<EObject> handler = IModelElementHandlerService.INSTANCE IModelElementHandler<EObject> handler = IModelElementHandlerService.INSTANCE.getModelElementHandler(eo);
.getModelElementHandler(eo); if(handler != null) {
if (handler != null) {
eo = handler.handleOpenModelElementRequest(eo); eo = handler.handleOpenModelElementRequest(eo);
} }
IModelEditorBindingService.INSTANCE.openInEditor(eo); IModelEditorBindingService.INSTANCE.openInEditor(eo);
...@@ -152,7 +146,7 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam ...@@ -152,7 +146,7 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam
protected void refreshVisuals() { protected void refreshVisuals() {
super.refreshVisuals(); super.refreshVisuals();
for (EditPart child : (List<EditPart>) getChildren()) { for(EditPart child : (List<EditPart>)getChildren()) {
child.refresh(); child.refresh();
} }
} }
...@@ -164,10 +158,10 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam ...@@ -164,10 +158,10 @@ public abstract class ElementEditPartBase<T extends ILayoutedModelElement & INam
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({"rawtypes"})
@Override @Override
public Object getAdapter(Class adapter) { public Object getAdapter(Class adapter) {
if (adapter == SnapToHelper.class && getLayoutConfiguration().useGrid()) { if(adapter == SnapToHelper.class && getLayoutConfiguration().useGrid()) {
return snapToGridAdapter(this); return snapToGridAdapter(this);
} }
return super.getAdapter(adapter); return super.getAdapter(adapter);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment