Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaadia DHOUIB2015-10-16 12:31:57 +0000
committerSaadia DHOUIB2015-10-16 12:31:57 +0000
commitac769b54423ebb71a2af0eb2254b2940a9fe38f3 (patch)
tree5960fa65532c96945d3a0ee585934f764d40f0b4
parent8c1f8d0146ff9bd5527b8c8584edc7a37fe34240 (diff)
downloadorg.eclipse.papyrus-ac769b54423ebb71a2af0eb2254b2940a9fe38f3.tar.gz
org.eclipse.papyrus-ac769b54423ebb71a2af0eb2254b2940a9fe38f3.tar.xz
org.eclipse.papyrus-ac769b54423ebb71a2af0eb2254b2940a9fe38f3.zip
Moving TraceFunctions to oep.infra.services.tracebreakpoints.ui
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/plugin.xml7
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceFunctions.java1
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml8
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceFunctions.java125
5 files changed, 11 insertions, 133 deletions
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF
index 78478fafe30..e86f842f721 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core.log,
org.eclipse.papyrus.infra.gmfdiag.commands,
org.eclipse.papyrus.infra.services.decoration,
- org.eclipse.papyrus.infra.services.markerlistener
+ org.eclipse.papyrus.infra.services.markerlistener,
+ org.eclipse.papyrus.infra.widgets
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %pluginProvider
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/plugin.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/plugin.xml
index 5805b48e184..8e5b5878fc8 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/plugin.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/plugin.xml
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
+<extension
+ point="org.eclipse.papyrus.infra.services.decoration.decorationSpecificFunctions">
+ <client
+ class="org.eclipse.papyrus.infra.services.tracebreakpoints.TraceFunctions"
+ decorationType="org.eclipse.papyrus.tporbpmarker">
+ </client>
+ </extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceFunctions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceFunctions.java
index dbecb00f1dc..0ee6977ef71 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceFunctions.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceFunctions.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.services.decoration.IDecorationSpecificFunction
import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;
import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;
import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TracepointConstants;
public class TraceFunctions implements IDecorationSpecificFunctions {
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml
index ae7b2ee4f80..93a68724a94 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml
@@ -5,13 +5,7 @@
<extension-point id="traceMechanism" name="traceMechanism" schema="schema/traceMechanism.exsd"/>
- <extension
- point="org.eclipse.papyrus.infra.services.decoration.decorationSpecificFunctions">
- <client
- class="org.eclipse.papyrus.infra.services.tracebreakpoints.TraceFunctions"
- decorationType="org.eclipse.papyrus.tporbpmarker">
- </client>
- </extension>
+
<extension
id="org.eclipse.papyrus.tporbpmarker"
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceFunctions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceFunctions.java
deleted file mode 100644
index b03f5cf73ed..00000000000
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceFunctions.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * 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:
- * Ansgar Radermacher (CEA LIST) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.tracebreakpoints;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.services.decoration.IDecorationSpecificFunctions;
-import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition;
-import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration;
-import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
-
-
-public class TraceFunctions implements IDecorationSpecificFunctions {
-
- public static final String activeBreakpoint16 = "icons/etool16/brkp_16x16.gif"; //$NON-NLS-1$
-
- public static final String inActiveBreakpoint16 = "icons/etool16/brkpd_16x16.gif"; //$NON-NLS-1$
-
- public static final String activeTracepoint16 = "icons/etool16/trcp_16x16.gif"; //$NON-NLS-1$
-
- public static final String inActiveTracepoint16 = "icons/etool16/trcpd_16x16.gif"; //$NON-NLS-1$
-
- public static final String activeBreakpoint9 = "icons/etool16/brkp_9x9.gif"; //$NON-NLS-1$
-
- public static final String inActiveBreakpoint9 = "icons/etool16/brkpd_9x9.gif"; //$NON-NLS-1$
-
- public static final String activeTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$
-
- public static final String inActiveTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$
-
- /**
- * Return the image descriptor associated with a trace or breakpoint marker
- */
- @Override
- public ImageDescriptor getImageDescriptorForGE(IPapyrusMarker marker) {
-
-
- org.eclipse.papyrus.infra.widgets.Activator widgetsActivator =
- org.eclipse.papyrus.infra.widgets.Activator.getDefault();
- ImageDescriptor overlay = null;
- boolean isActive = marker.getAttribute(TracepointConstants.isActive, false);
- boolean isTracepoint = marker.getAttribute(TracepointConstants.isTracepoint, false);
- if (isTracepoint) {
- overlay = isActive ?
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, activeTracepoint16) :
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, inActiveTracepoint16);
- }
- else {
- overlay = isActive ?
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, activeBreakpoint16) :
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, inActiveBreakpoint16);
- }
-
- return overlay;
- }
-
- /**
- * Return the image descriptor associated with a trace or breakpoint marker
- */
- @Override
- public ImageDescriptor getImageDescriptorForME(IPapyrusMarker marker) {
- org.eclipse.papyrus.infra.widgets.Activator widgetsActivator =
- org.eclipse.papyrus.infra.widgets.Activator.getDefault();
- ImageDescriptor overlay = null;
- boolean isActive = marker.getAttribute(TracepointConstants.isActive, false);
- boolean isTracepoint = marker.getAttribute(TracepointConstants.isTracepoint, false);
- if (isTracepoint) {
- overlay = isActive ?
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, activeTracepoint11) :
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, inActiveTracepoint11);
- }
- else {
- overlay = isActive ?
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, activeBreakpoint9) :
- widgetsActivator.getImageDescriptor(Activator.PLUGIN_ID, inActiveBreakpoint9);
- }
-
- return overlay;
- }
-
- @Override
- public PreferedPosition getPreferedPosition(IPapyrusMarker marker) {
- return PreferedPosition.SOUTH_EAST;
- }
-
- @Override
- public String getMessage(IPapyrusMarker marker) {
- boolean isActive = marker.getAttribute(TracepointConstants.isActive, false);
- boolean isTracepoint = marker.getAttribute(TracepointConstants.isTracepoint, false);
- return (isActive ? "active" : "inactive") + " " + //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
- (isTracepoint ? "trace point" : "break point"); //$NON-NLS-1$//$NON-NLS-2$
- }
-
- public int getPriority(IMarker marker) {
- return 0; // all markers have same priority (and we should not have multiple markers on the same model element).
- }
-
- @Override
- public IPapyrusDecoration markerPropagation(EList<IPapyrusDecoration> childDecorations) {
- return null;
- }
-
- @Override
- public MarkChildren supportsMarkerPropagation() {
- return MarkChildren.NO;
- }
-
- @Override
- public int getPriority(IPapyrusMarker marker) {
- // TODO Auto-generated method stub
- return 0;
- }
-}

Back to the top