diff options
Diffstat (limited to 'sandbox')
25 files changed, 25 insertions, 25 deletions
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/Activator.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/Activator.class Binary files differdeleted file mode 100644 index d1f6ca908a2..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/Activator.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.class Binary files differdeleted file mode 100644 index 58e1d343171..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.class Binary files differdeleted file mode 100644 index 99d5d0c9ae6..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.class Binary files differdeleted file mode 100644 index fbc2ea025c0..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.class Binary files differdeleted file mode 100644 index 9eab3449b57..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.class Binary files differdeleted file mode 100644 index 8e6c1411e66..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$1.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$1.class Binary files differdeleted file mode 100644 index 50fc07028fd..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$1.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$2.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$2.class Binary files differdeleted file mode 100644 index 736ceec6408..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$2.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$3.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$3.class Binary files differdeleted file mode 100644 index 4c8d6925567..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$3.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$4.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$4.class Binary files differdeleted file mode 100644 index 381e8b9d320..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$4.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$5.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$5.class Binary files differdeleted file mode 100644 index 98401f6b8c5..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$5.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.class Binary files differdeleted file mode 100644 index 4cd5a2f6dce..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.class Binary files differdeleted file mode 100644 index a90502bbeeb..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$1.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$1.class Binary files differdeleted file mode 100644 index 4c84ecf3eeb..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$1.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$OpenDiagramCommand.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$OpenDiagramCommand.class Binary files differdeleted file mode 100644 index d8da36cc932..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$OpenDiagramCommand.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.class Binary files differdeleted file mode 100644 index 2d53323bebd..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/DebugMarkerMappingToPseudoSelector.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/DebugMarkerMappingToPseudoSelector.class Binary files differdeleted file mode 100644 index 808065b9e74..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/DebugMarkerMappingToPseudoSelector.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/IPresentation.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/IPresentation.class Binary files differdeleted file mode 100644 index 9ca365ab927..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/IPresentation.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.class Binary files differdeleted file mode 100644 index b5fd9f400b0..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$1.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$1.class Binary files differdeleted file mode 100644 index ad11bfbb1be..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$1.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$2.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$2.class Binary files differdeleted file mode 100644 index d50be211b29..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$2.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$3.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$3.class Binary files differdeleted file mode 100644 index 9c0d1f00162..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$3.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.class Binary files differdeleted file mode 100644 index 527110579a0..00000000000 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.class +++ /dev/null diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java index 9121de60682..52932d26c05 100644 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java +++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java @@ -50,7 +50,6 @@ import org.eclipse.papyrus.infra.services.markerlistener.PapyrusMarkerAdapter; import org.eclipse.papyrus.moka.MokaConstants;
import org.eclipse.papyrus.moka.debug.MokaBreakpoint;
import org.eclipse.papyrus.moka.launch.EditorUtils;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;
/**
@@ -63,17 +62,17 @@ public class AnimationUtils { * The static instance for this class
*/
protected static AnimationUtils eInstance = null ;
-
+
/**
* An EObject -> 'Suspended' marker map
*/
protected static Map<EObject, IPapyrusMarker> eObjectToSuspendedMarker = new HashMap<EObject, IPapyrusMarker>() ;
-
+
/**
* An EObject -> 'Animation' marker map
*/
protected static Map<EObject, IPapyrusMarker> eObjectToAnimationMarker = new HashMap<EObject, IPapyrusMarker>() ;
-
+
/**
* An EObject -> List<Diagram> map
*/
@@ -89,7 +88,7 @@ public class AnimationUtils { eObjectToSuspendedMarker = new HashMap<EObject, IPapyrusMarker>() ;
eObjectToDiagrams = new HashMap<EObject, List<Diagram> >() ;
}
-
+
/**
* Returns an instance of AnimationUtils. Guarantees that AnimationUtils is instantiated only once.
*
@@ -112,7 +111,7 @@ public class AnimationUtils { if (matchingDiagrams != null) {
return matchingDiagrams ;
}
-
+
Resource resource = modelElement.eResource() ;
ResourceSet resourceSet = resource.getResourceSet() ;
@@ -135,12 +134,12 @@ public class AnimationUtils { }
}
}
-
+
eObjectToDiagrams.put(modelElement, matchingDiagrams) ;
-
+
return matchingDiagrams ;
}
-
+
/**
* In the case where the list of diagrams for the given modelElement has already been retrieved,
* resets this list
@@ -164,18 +163,15 @@ public class AnimationUtils { ServicesRegistry servicesRegistry = (ServicesRegistry)part.getAdapter(ServicesRegistry.class);
try {
final IPageManager pageMngr = ServiceUtils.getInstance().getIPageManager(servicesRegistry) ;
- try {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- if (pageMngr.isOpen(diagram))
- pageMngr.selectPage(diagram) ;
- else {
- TransactionalEditingDomain domain = (TransactionalEditingDomain)EMFHelper.resolveEditingDomain(diagram) ;
- OpenDiagramCommand updateCommand = new OpenDiagramCommand(diagram, pageMngr, domain);
- domain.getCommandStack().execute(updateCommand) ;
- }
- }
- });
+ try {
+ if (pageMngr.isOpen(diagram)) {
+ pageMngr.selectPage(diagram) ;
+ }
+ else {
+ TransactionalEditingDomain domain = (TransactionalEditingDomain)EMFHelper.resolveEditingDomain(diagram) ;
+ OpenDiagramCommand updateCommand = new OpenDiagramCommand(diagram, pageMngr, domain);
+ domain.getCommandStack().execute(updateCommand) ;
+ }
} catch (Exception e) {
Activator.log.error(e) ;
}
@@ -233,7 +229,7 @@ public class AnimationUtils { }
eObjectToSuspendedMarker.clear() ;
}
-
+
/**
* Adds an "Animation" marker to the given semantic element
*
@@ -307,7 +303,11 @@ public class AnimationUtils { }
return semanticElement ;
}
-
+
+ public boolean isAnimationMarkerApplied(EObject element) {
+ return eObjectToAnimationMarker.get(element) != null ;
+ }
+
/**
* A command for opening a diagram
*
@@ -340,7 +340,7 @@ public class AnimationUtils { @Override
protected void doExecute() {
this.pageMngr.openPage(diagram) ;
- //this.pageMngr.selectPage(diagram) ;
+ this.pageMngr.selectPage(diagram) ;
}
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.java b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.java index da45600286c..392e0a79975 100644 --- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.java +++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.java @@ -172,7 +172,7 @@ public class MokaDebugModelPresentation implements IDebugModelPresentation, IDeb /* (non-Javadoc)
* @see org.eclipse.debug.ui.IDebugEditorPresentation#removeAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IThread)
*/
- public void removeAnnotations(IEditorPart editorPart, IThread thread) {
+ public void removeAnnotations(IEditorPart editorPart, IThread thread) {
AnimationUtils.getInstance().removeSuspendedMarker(thread) ;
}
|