Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2014-02-14 12:08:13 +0000
committerVincent Lorenzo2014-02-14 12:08:13 +0000
commit270a58d0d71d7eded7deae196fbd5134f646cf93 (patch)
treeb6a6b78abdce87574c65000a8de6e0df3f9bea63
parentc553888a3bac8d0b16914489a75182333fd99b61 (diff)
parentb0b8ee5723af195d9cf7e24d759fe864a2475aff (diff)
downloadorg.eclipse.papyrus-270a58d0d71d7eded7deae196fbd5134f646cf93.tar.gz
org.eclipse.papyrus-270a58d0d71d7eded7deae196fbd5134f646cf93.tar.xz
org.eclipse.papyrus-270a58d0d71d7eded7deae196fbd5134f646cf93.zip
Merge branch 'master' of ssh://vlorenzo@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
index 4fd07f68e65..5973347c169 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2011 Atos.
+ * Copyright (c) 2011, 2014 Atos, CEA, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@
*
* Contributors:
* Mathieu Velten (Atos) - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 357250
*
*****************************************************************************/
package org.eclipse.papyrus.commands;
@@ -72,11 +73,11 @@ public class CheckedOperationHistory implements IOperationHistory {
}
static {
- IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.commands", "operationApprover");
+ IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "operationApprover"); //$NON-NLS-1$
List<ApproverPriorityPair> approverPriorityPairs = new LinkedList<ApproverPriorityPair>();
for(IConfigurationElement elem : configElements) {
- if("operationApprover".equals(elem.getName())) {
+ if("operationApprover".equals(elem.getName())) { //$NON-NLS-1$
try {
ApproverPriorityPair approverPriorityPair = new ApproverPriorityPair();
approverPriorityPair.approver = (IOperationApprover2)elem.createExecutableExtension("class");
@@ -84,8 +85,7 @@ public class CheckedOperationHistory implements IOperationHistory {
approverPriorityPairs.add(approverPriorityPair);
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Activator.log.error("Uncaught exception in instantiation of operation approver.", e); //$NON-NLS-1$
}
}
}

Back to the top