Skip to content
Snippets Groups Projects
Commit 150e5db0 authored by Vincent Aravantinos's avatar Vincent Aravantinos
Browse files

Fixed the issue. Made the behavior general: any model whose behavior on double...

Fixed the issue. Made the behavior general: any model whose behavior on double click is undefined will trigger the display of the properties tab. Can only be better than nothing it seems. If not, it will be easy to revert.
refs 1911
parent a8c899e2
No related branches found
No related tags found
No related merge requests found
...@@ -41,14 +41,18 @@ import org.eclipse.emf.common.notify.Adapter; ...@@ -41,14 +41,18 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EContentAdapter; import org.eclipse.emf.ecore.util.EContentAdapter;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editparts.AbstractConnectionEditPart; import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.gef.editpolicies.BendpointEditPolicy; import org.eclipse.gef.editpolicies.BendpointEditPolicy;
import org.eclipse.gef.requests.BendpointRequest; import org.eclipse.gef.requests.BendpointRequest;
import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.fortiss.tooling.base.model.base.ConnectionSegmentBase; import org.fortiss.tooling.base.model.base.ConnectionSegmentBase;
import org.fortiss.tooling.base.model.layout.Points; import org.fortiss.tooling.base.model.layout.Points;
import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
import org.fortiss.tooling.base.ui.editpart.command.bendpoint.CreateCommand; import org.fortiss.tooling.base.ui.editpart.command.bendpoint.CreateCommand;
import org.fortiss.tooling.base.ui.editpart.command.bendpoint.DeleteCommand; import org.fortiss.tooling.base.ui.editpart.command.bendpoint.DeleteCommand;
import org.fortiss.tooling.base.ui.editpart.command.bendpoint.MoveCommand; import org.fortiss.tooling.base.ui.editpart.command.bendpoint.MoveCommand;
...@@ -59,6 +63,7 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity; ...@@ -59,6 +63,7 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler; import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.service.IMarkerService; import org.fortiss.tooling.kernel.ui.service.IMarkerService;
import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
import org.fortiss.tooling.kernel.utils.LoggingUtils;
/** /**
* Base class for connection edit parts. It provides the figure, labels for the * Base class for connection edit parts. It provides the figure, labels for the
...@@ -68,7 +73,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; ...@@ -68,7 +73,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* @author hoelzl * @author hoelzl
* @author $Author$ * @author $Author$
* @version $Rev$ * @version $Rev$
* @ConQAT.Rating GREEN Hash: 0EDD0FD2EE6E1EE6F23D0A5618118720 * @ConQAT.Rating YELLOW Hash: 9D3E456FAADAE2A956385D7E24C06B58
*/ */
public abstract class ConnectionEditPartBase<T extends ConnectionSegmentBase> extends public abstract class ConnectionEditPartBase<T extends ConnectionSegmentBase> extends
AbstractConnectionEditPart { AbstractConnectionEditPart {
...@@ -393,4 +398,16 @@ public abstract class ConnectionEditPartBase<T extends ConnectionSegmentBase> ex ...@@ -393,4 +398,16 @@ public abstract class ConnectionEditPartBase<T extends ConnectionSegmentBase> ex
public IDiagramLayoutConfiguration getLayoutConfiguration() { public IDiagramLayoutConfiguration getLayoutConfiguration() {
return layoutConfiguration; return layoutConfiguration;
} }
/** {@inheritDoc} */
@Override
public void performRequest(Request req) {
try {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.showView("org.eclipse.ui.views.PropertySheet");
} catch(PartInitException e) {
LoggingUtils.info(ToolingBaseUIActivator.getDefault(),
"No property section to display.");
}
}
} }
...@@ -40,17 +40,22 @@ import org.eclipse.draw2d.Label; ...@@ -40,17 +40,22 @@ import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.XYLayout; import org.eclipse.draw2d.XYLayout;
import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.ConnectionEditPart; import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.Request;
import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Color;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.fortiss.tooling.base.model.element.IConnection; import org.fortiss.tooling.base.model.element.IConnection;
import org.fortiss.tooling.base.model.element.IConnector; import org.fortiss.tooling.base.model.element.IConnector;
import org.fortiss.tooling.base.model.element.IHierarchicElement; import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.base.model.layout.ILayoutedModelElement; import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
import org.fortiss.tooling.base.model.layout.Point; import org.fortiss.tooling.base.model.layout.Point;
import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
import org.fortiss.tooling.base.ui.editpart.figure.AntiAliasedEllipse; import org.fortiss.tooling.base.ui.editpart.figure.AntiAliasedEllipse;
import org.fortiss.tooling.base.ui.editpart.figure.TransparentLabel; import org.fortiss.tooling.base.ui.editpart.figure.TransparentLabel;
import org.fortiss.tooling.base.ui.editpart.policy.DirectConnectionAndReconnectionEditPolicy; import org.fortiss.tooling.base.ui.editpart.policy.DirectConnectionAndReconnectionEditPolicy;
import org.fortiss.tooling.base.ui.editpart.policy.RemoveEditPolicy; import org.fortiss.tooling.base.ui.editpart.policy.RemoveEditPolicy;
import org.fortiss.tooling.kernel.model.INamedCommentedElement; import org.fortiss.tooling.kernel.model.INamedCommentedElement;
import org.fortiss.tooling.kernel.utils.LoggingUtils;
/** /**
* Base class for connector edit parts. * Base class for connector edit parts.
...@@ -58,7 +63,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement; ...@@ -58,7 +63,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement;
* @author hoelzl * @author hoelzl
* @author $Author$ * @author $Author$
* @version $Rev$ * @version $Rev$
* @ConQAT.Rating GREEN Hash: 9D5CD102C927DE3D070C43F2BC499D1A * @ConQAT.Rating YELLOW Hash: 67112A4B6ABD306367A45DB6E990F5BF
*/ */
public abstract class ConnectorEditPartBase<T extends ILayoutedModelElement & IConnector & INamedCommentedElement> public abstract class ConnectorEditPartBase<T extends ILayoutedModelElement & IConnector & INamedCommentedElement>
extends PositionedEditPartBase<T> { extends PositionedEditPartBase<T> {
...@@ -246,4 +251,16 @@ public abstract class ConnectorEditPartBase<T extends ILayoutedModelElement & IC ...@@ -246,4 +251,16 @@ public abstract class ConnectorEditPartBase<T extends ILayoutedModelElement & IC
* connector in the current view (i.e. edit part). * connector in the current view (i.e. edit part).
*/ */
protected abstract boolean isTarget(); protected abstract boolean isTarget();
/** {@inheritDoc} */
@Override
public void performRequest(Request req) {
try {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.showView("org.eclipse.ui.views.PropertySheet");
} catch(PartInitException e) {
LoggingUtils.info(ToolingBaseUIActivator.getDefault(),
"No property section to display.");
}
}
} }
...@@ -21,11 +21,16 @@ import org.eclipse.emf.common.notify.Adapter; ...@@ -21,11 +21,16 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EContentAdapter; import org.eclipse.emf.ecore.util.EContentAdapter;
import org.eclipse.gef.Request;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart; import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.fortiss.tooling.base.ui.ToolingBaseUIActivator;
import org.fortiss.tooling.base.ui.layout.IDiagramLayoutConfiguration; import org.fortiss.tooling.base.ui.layout.IDiagramLayoutConfiguration;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler; import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
import org.fortiss.tooling.kernel.utils.LoggingUtils;
/** /**
* The base class for all graphical edit parts. Any change to the underlying * The base class for all graphical edit parts. Any change to the underlying
...@@ -37,7 +42,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; ...@@ -37,7 +42,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* @author hoelzl * @author hoelzl
* @author $Author$ * @author $Author$
* @version $Rev$ * @version $Rev$
* @ConQAT.Rating GREEN Hash: D644F1A17F6A5E0CE14E49EF15A5052B * @ConQAT.Rating YELLOW Hash: C423AC4A20917C8DA9A7E653191783C6
*/ */
public abstract class GraphicalEditPartBase<T extends EObject> extends AbstractGraphicalEditPart { public abstract class GraphicalEditPartBase<T extends EObject> extends AbstractGraphicalEditPart {
...@@ -120,4 +125,16 @@ public abstract class GraphicalEditPartBase<T extends EObject> extends AbstractG ...@@ -120,4 +125,16 @@ public abstract class GraphicalEditPartBase<T extends EObject> extends AbstractG
* while all other edit parts delegate this call to their parent edit part. * while all other edit parts delegate this call to their parent edit part.
*/ */
public abstract IDiagramLayoutConfiguration getLayoutConfiguration(); public abstract IDiagramLayoutConfiguration getLayoutConfiguration();
/** {@inheritDoc} */
@Override
public void performRequest(Request req) {
try {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.showView("org.eclipse.ui.views.PropertySheet");
} catch(PartInitException e) {
LoggingUtils.info(ToolingBaseUIActivator.getDefault(),
"No property section to display.");
}
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment