Bug 580684: [Sirius][Logger] Use slf4j logger everywhere in Papyrus-Sirius
- added dependency for slf4j
- add NON-NLS tag everywhere
Signed-off-by: Dilan EESHVARAN <dilan.eeshvaran@cea.fr>
Signed-off-by: Vincent LORENZO <vincent.lorenzo@cea.fr>
Change-Id: I8b4a53e296df494cd4faf68dca6c6ea26fb0d36c
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/META-INF/MANIFEST.MF
index b84b627..ebd26c7 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
Bundle-Vendor: %providerName
Bundle-Version: 0.7.0.qualifier
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.8.0,4.0.0)",
+Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.27.0,3.0.0)",
org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
@@ -22,13 +22,13 @@
org.eclipse.papyrus.emf.facet.query.java.metamodel;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.architecture;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.1.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[4.2.0,5.0.0)",
org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.views.modelexplorer;bundle-version="[5.0.0,6.0.0)",
org.eclipse.sirius.diagram;bundle-version="[7.0.7,8.0.0)",
org.eclipse.ui;bundle-version="[3.201.0,4.0.0)"
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/src/org/eclipse/papyrus/sirius/editor/modelexplorer/Activator.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/src/org/eclipse/papyrus/sirius/editor/modelexplorer/Activator.java
index 27e5dd0..66bd464 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/src/org/eclipse/papyrus/sirius/editor/modelexplorer/Activator.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.modelexplorer/src/org/eclipse/papyrus/sirius/editor/modelexplorer/Activator.java
@@ -14,9 +14,10 @@
package org.eclipse.papyrus.sirius.editor.modelexplorer;
import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -30,7 +31,7 @@
private static Activator plugin;
// The log service
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
@@ -48,8 +49,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(plugin);
-
// Activation of the preferences of this plug-in to initialize this.
DefaultScope.INSTANCE.getNode(PLUGIN_ID);
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/META-INF/MANIFEST.MF
index 1dd5b8d..b317c47 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@
org.eclipse.emf.edit.ui;bundle-version="[2.21.0,3.0.0)",
org.eclipse.osgi;bundle-version="[3.18.0,4.0.0)",
org.eclipse.papyrus.emf.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[4.2.0,5.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.diagram;bundle-version="[7.0.7,8.0.0)",
org.eclipse.ui.views.properties.tabbed;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.125.0,4.0.0)"
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/src/org/eclipse/papyrus/sirius/editor/properties/Activator.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/src/org/eclipse/papyrus/sirius/editor/properties/Activator.java
index 733e290..fd21e19 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/src/org/eclipse/papyrus/sirius/editor/properties/Activator.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.properties/src/org/eclipse/papyrus/sirius/editor/properties/Activator.java
@@ -14,9 +14,10 @@
package org.eclipse.papyrus.sirius.editor.properties;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -29,7 +30,8 @@
// The shared instance
private static Activator plugin;
- public static LogHelper log;
+ /** The log. */
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor
@@ -41,7 +43,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
}
@Override
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/META-INF/MANIFEST.MF
index dab3747..5dc1b8c 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@
org.eclipse.papyrus.emf.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
@@ -20,6 +19,7 @@
org.eclipse.papyrus.sirius.editor.representation;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.editor.sirius;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.editor;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.1.0,5.0.0)",
org.eclipse.sirius.diagram;bundle-version="[7.0.7,8.0.0)",
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/AbstractCreateSiriusDiagramEditorCommand.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/AbstractCreateSiriusDiagramEditorCommand.java
index 9d588cd..0cc047a 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/AbstractCreateSiriusDiagramEditorCommand.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/AbstractCreateSiriusDiagramEditorCommand.java
@@ -90,7 +90,7 @@
final Resource res = semanticContext.eResource();
final URI semanticURI = res.getURI();
if (semanticURI.isPlatformPlugin()) {
- Activator.log.error(new UnsupportedOperationException("Diagram for element stored as platform plugin is not yet supported")); //$NON-NLS-1$
+ Activator.log.error("Unexpected Error",new UnsupportedOperationException("Diagram for element stored as platform plugin is not yet supported")); //$NON-NLS-1$ //$NON-NLS-2$
return null;
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusActivityDiagramEditorCommand.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusActivityDiagramEditorCommand.java
index 678b0a0..a173805 100644
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusActivityDiagramEditorCommand.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusActivityDiagramEditorCommand.java
@@ -138,7 +138,7 @@
}
return super.execute(docProto, diagramName, activity, activity, openAfterCreation, docProto.getImplementationID());
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
return super.execute(docProto, diagramName, graphicalContext, semanticContext, openAfterCreation, docProto.getImplementationID());
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusCommunicationDiagramEditorCommand.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusCommunicationDiagramEditorCommand.java
index 23e2c10..2564f8f 100644
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusCommunicationDiagramEditorCommand.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/CreatePapyrusSiriusCommunicationDiagramEditorCommand.java
@@ -126,7 +126,7 @@
}
return super.execute(docProto, diagramName, interaction, interaction, openAfterCreation, docProto.getImplementationID());
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
return super.execute(docProto, diagramName, graphicalContext, semanticContext, openAfterCreation, docProto.getImplementationID());
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/AbstractCreatePapyrusEditorViewCommand.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/AbstractCreatePapyrusEditorViewCommand.java
index cc59c5f..637be1a 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/AbstractCreatePapyrusEditorViewCommand.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/AbstractCreatePapyrusEditorViewCommand.java
@@ -16,7 +16,6 @@
import java.util.Collection;
import java.util.Collections;
-
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
@@ -224,7 +223,7 @@
manager.refreshTabs();
}
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/CreateSiriusDiagramEditorViewCommand.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/CreateSiriusDiagramEditorViewCommand.java
index 00c339a..5bd1b21 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/CreateSiriusDiagramEditorViewCommand.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/api/org/eclipse/papyrus/sirius/editor/representation/architecture/commands/CreateSiriusDiagramEditorViewCommand.java
@@ -86,7 +86,7 @@
try {
return (ISiriusSessionService) servReg.getService(ISiriusSessionService.SERVICE_ID);
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
return null;
}
@@ -118,27 +118,27 @@
// TODO try to create a dialect manager
// TODO : write that in the documentation
DSemanticDiagram diagram = (DSemanticDiagram) DialectManager.INSTANCE.createRepresentation(this.editorViewName, this.semanticContext, diagramDescription, session, new NullProgressMonitor());
-
+
DAnnotation annotation = DescriptionFactory.eINSTANCE.createDAnnotation();
-
+
annotation.setSource(SiriusDiagramConstants.PAPYRUS_SIRIUS_DIAGRAM_IMPLEMENTATION_DANNOTATION_SOURCE);
annotation.getDetails().put(SiriusDiagramConstants.PAPYRUS_SIRIUS_DIAGRAM_IMPLEMENTATION_DANNOTATION_KEY, this.prototype.getId());
diagram.getEAnnotations().add(annotation);
-
+
attachToResource(this.semanticContext, diagram);
-
+
if (diagram.eResource() != null) {
// we suppose all is ok
this.createdEditorView = diagram;
}
-
+
if(this.openAfterCreation && this.createdEditorView!=null) {
openEditor(this.createdEditorView);
}
-
+
}
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/src/org/eclipse/papyrus/sirius/editor/representation/architecture/Activator.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/src/org/eclipse/papyrus/sirius/editor/representation/architecture/Activator.java
index bd4011a..14bd94a 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/src/org/eclipse/papyrus/sirius/editor/representation/architecture/Activator.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.architecture/src/org/eclipse/papyrus/sirius/editor/representation/architecture/Activator.java
@@ -13,9 +13,10 @@
*****************************************************************************/
package org.eclipse.papyrus.sirius.editor.representation.architecture;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -28,7 +29,8 @@
// The shared instance
private static Activator plugin;
- public static LogHelper log;
+ /** The log. */
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor
@@ -40,7 +42,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
}
@Override
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.edit/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.edit/META-INF/MANIFEST.MF
index e7439e0..24df346 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation.edit/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.eclipse.papyrus.sirius.editor.representation.provider
-Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)",
+Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.27.0,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.17.0,3.0.0)",
org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[2.0.0,3.0.0)",
@@ -24,6 +24,7 @@
org.eclipse.papyrus.infra.types.edit;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.sirius.editor.representation;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.diagram.ui;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.diagram;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.ui;bundle-version="[7.0.7,8.0.0)",
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation/META-INF/MANIFEST.MF
index d256596..551180e 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.representation/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.representation/META-INF/MANIFEST.MF
@@ -20,6 +20,7 @@
org.eclipse.papyrus.infra.tools;bundle-version="[4.2.0,5.0.0)",
org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.diagram;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius;bundle-version="[7.0.7,8.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/META-INF/MANIFEST.MF
index 523b18d..da3ec75 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)",
org.eclipse.osgi;bundle-version="[3.18.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
org.eclipse.papyrus.sirius.editor.representation;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.diagram;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius;bundle-version="[7.0.7,8.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.125.0,4.0.0)"
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/src/org/eclipse/papyrus/sirius/editor/sirius/Activator.java b/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/src/org/eclipse/papyrus/sirius/editor/sirius/Activator.java
index f043b5d..afafdc3 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/src/org/eclipse/papyrus/sirius/editor/sirius/Activator.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor.sirius/src/org/eclipse/papyrus/sirius/editor/sirius/Activator.java
@@ -15,9 +15,11 @@
package org.eclipse.papyrus.sirius.editor.sirius;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
+
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -29,7 +31,8 @@
// The shared instance
private static Activator plugin;
- public static LogHelper log;
+ /** The log. */
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor
@@ -48,7 +51,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(getDefault());
}
/**
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.sirius.editor/META-INF/MANIFEST.MF
index 044e233..92a645f 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@
org.eclipse.papyrus.infra.architecture.representation;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.architecture;bundle-version="[3.2.0,4.0.0)",
org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)",
@@ -36,6 +35,7 @@
org.eclipse.papyrus.infra.widgets;bundle-version="[4.1.0,5.0.0)",
org.eclipse.papyrus.sirius.editor.representation;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.editor.sirius;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.tools;bundle-version="[5.1.0,6.0.0)",
org.eclipse.sirius.common.ui;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.common;bundle-version="[7.0.7,8.0.0)",
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/Activator.java b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/Activator.java
index b9da3ea..d9a40b8 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/Activator.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/Activator.java
@@ -14,13 +14,14 @@
*****************************************************************************/
package org.eclipse.papyrus.sirius.editor;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.papyrus.infra.emf.spi.resolver.IEObjectResolver;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.sirius.editor.internal.emf.SiriusEditPartEObjectResolver;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -32,7 +33,8 @@
// The shared instance
private static Activator plugin;
- public static LogHelper log;
+ /** The log. */
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* contribution to the OSGi Service used by {@link EMFHelper} to revolve Sirius EditPart into the represented semantic EObject
@@ -50,7 +52,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(getDefault());
this.eobjectResolverReg = context.registerService(IEObjectResolver.class, SiriusEditPartEObjectResolver::resolve, null);
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/NestedSiriusDiagramViewEditor.java b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/NestedSiriusDiagramViewEditor.java
index 7fec8c4..9691fe2 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/NestedSiriusDiagramViewEditor.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/NestedSiriusDiagramViewEditor.java
@@ -145,7 +145,7 @@
try {
saveAndDirtyService = servicesRegistry.getService(ISaveAndDirtyService.class);
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
saveAndDirtyService.registerIsaveablePart(this);
@@ -159,7 +159,7 @@
Assert.isNotNull(this.servicesRegistry, "The papyrus ServicesRegistry is null. The Diagram Editor creation failed."); //$NON-NLS-1$
initializeEditingDomain();
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
@@ -172,7 +172,7 @@
try {
return (ISiriusSessionService) this.servicesRegistry.getService(ISiriusSessionService.SERVICE_ID);
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
return null;
}
@@ -316,7 +316,7 @@
try {
NestedSiriusDiagramViewEditor.super.init(site, diagramViewEditorInput);
} catch (PartInitException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
});
@@ -513,7 +513,7 @@
getActionRegistry().getAction(InsertAction.ID));
keyHandler.put(KeyStroke.getPressed(SWT.DEL, 100, SWT.CTRL),
- getActionRegistry().getAction("deleteFromDiagramAction"));
+ getActionRegistry().getAction("deleteFromDiagramAction")); //$NON-NLS-1$
keyHandler.put(KeyStroke.getPressed(SWT.BS, 8, 0),
getActionRegistry().getAction(ActionFactory.DELETE.getId()));
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/SiriusDiagramEditorFactory.java b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/SiriusDiagramEditorFactory.java
index c865dba..12d5bd5 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/SiriusDiagramEditorFactory.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/editor/SiriusDiagramEditorFactory.java
@@ -171,7 +171,7 @@
try {
return registry.getActionBarContributor(actionBarId);
} catch (BackboneException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
return null;
}
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionPrinter.java b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionPrinter.java
index 512e4a3..b101b30 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionPrinter.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionPrinter.java
@@ -25,30 +25,30 @@
public static final void print(Session session, final String ID) {
- System.out.println(NLS.bind("------------- {0} ----------", ID));
- System.out.println("session =" + session);
+ System.out.println(NLS.bind("------------- {0} ----------", ID)); //$NON-NLS-1$
+ System.out.println("session =" + session); //$NON-NLS-1$
if (session != null) {
- System.out.println("\thashcode =" + session.hashCode());
+ System.out.println("\thashcode =" + session.hashCode()); //$NON-NLS-1$
} else {
- System.out.println("\tsession is null");
+ System.out.println("\tsession is null"); //$NON-NLS-1$
return;
}
if (session.getSessionResource() != null) {
- System.out.println("\tresource hascode = " + session.getSessionResource().hashCode());
+ System.out.println("\tresource hascode = " + session.getSessionResource().hashCode()); //$NON-NLS-1$
} else {
- System.out.println("\tsession resource is null");
+ System.out.println("\tsession resource is null"); //$NON-NLS-1$
return;
}
if (session.getSessionResource().getResourceSet() != null) {
- System.out.println("\tresourceSet hascode= " + session.getSessionResource().getResourceSet().hashCode());
+ System.out.println("\tresourceSet hascode= " + session.getSessionResource().getResourceSet().hashCode()); //$NON-NLS-1$
} else {
- System.out.println("\tsession resource set is null");
+ System.out.println("\tsession resource set is null"); //$NON-NLS-1$
return;
}
if (session.getTransactionalEditingDomain() != null) {
- System.out.println("\teditingDomain hashcode= " + session.getTransactionalEditingDomain().hashCode());
+ System.out.println("\teditingDomain hashcode= " + session.getTransactionalEditingDomain().hashCode()); //$NON-NLS-1$
} else {
- System.out.println("\tsession editing domain is null");
+ System.out.println("\tsession editing domain is null"); //$NON-NLS-1$
}
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionService.java b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionService.java
index 81e4d01..bfd5b90 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionService.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/sessions/SessionService.java
@@ -314,7 +314,7 @@
// if not we get this kind of exception : java.lang.IllegalStateException: Cannot modify resource set without a write transaction
GMFUnsafe.write(getEditingDomain(), new UpdateSiriusViewpointRunnable(this.createdSession, this.modelSet));
} catch (InterruptedException | RollbackException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/CreateSiriusDiagramViewTypeCommandHelper.java b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/CreateSiriusDiagramViewTypeCommandHelper.java
index f77bc7d..18e854f 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/CreateSiriusDiagramViewTypeCommandHelper.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/CreateSiriusDiagramViewTypeCommandHelper.java
@@ -103,11 +103,11 @@
return proto;
}
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | SecurityException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
} catch (InvocationTargetException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
return null;
diff --git a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/SiriusDiagramViewPrototype.java b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/SiriusDiagramViewPrototype.java
index 86a3fab..a22d2b8 100755
--- a/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/SiriusDiagramViewPrototype.java
+++ b/plugins/editor/org.eclipse.papyrus.sirius.editor/src/org/eclipse/papyrus/sirius/editor/internal/viewpoint/SiriusDiagramViewPrototype.java
@@ -114,14 +114,14 @@
try {
registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(owner);
} catch (ServiceException ex) {
- Activator.log.error(ex);
+ Activator.log.error("Unexpected Error",ex); //$NON-NLS-1$
return false;
}
ModelSet modelSet;
try {
modelSet = registry.getService(ModelSet.class);
} catch (ServiceException ex) {
- Activator.log.error(ex);
+ Activator.log.error("Unexpected Error",ex); //$NON-NLS-1$
return false;
}
}
diff --git a/plugins/org.eclipse.papyrus.sirius.log/.classpath b/plugins/org.eclipse.papyrus.sirius.log/.classpath
index abaa43d..b22fd21 100755
--- a/plugins/org.eclipse.papyrus.sirius.log/.classpath
+++ b/plugins/org.eclipse.papyrus.sirius.log/.classpath
@@ -1,8 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="api"/>
+ <classpathentry kind="src" output="bin" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-api-2.0.9.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-simple-2.0.9.jar"/>
+ <classpathentry kind="src" output="bin" path="api">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.papyrus.sirius.log/.project b/plugins/org.eclipse.papyrus.sirius.log/.project
index 37e22d9..670297c 100755
--- a/plugins/org.eclipse.papyrus.sirius.log/.project
+++ b/plugins/org.eclipse.papyrus.sirius.log/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/plugins/org.eclipse.papyrus.sirius.log/.settings/org.eclipse.m2e.core.prefs b/plugins/org.eclipse.papyrus.sirius.log/.settings/org.eclipse.m2e.core.prefs
new file mode 100755
index 0000000..f897a7f
--- /dev/null
+++ b/plugins/org.eclipse.papyrus.sirius.log/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.eclipse.papyrus.sirius.log/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.sirius.log/META-INF/MANIFEST.MF
index 210f3aa..64ddd70 100755
--- a/plugins/org.eclipse.papyrus.sirius.log/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.sirius.log/META-INF/MANIFEST.MF
@@ -1,9 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.sirius.log
+Bundle-SymbolicName: org.eclipse.papyrus.sirius.log;singleton:=true
Bundle-Version: 0.7.0.qualifier
+Export-Package: org.slf4j,
+ org.slf4j.simple
Bundle-Activator: org.eclipse.papyrus.sirius.log.internal.Activator
+Bundle-ClassPath: .,
+ lib/slf4j-api-2.0.9.jar,
+ lib/slf4j-simple-2.0.9.jar
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.201.0,4.0.0)"
diff --git a/plugins/org.eclipse.papyrus.sirius.log/api/org/eclipse/papyrus/sirius/log/LogHelper.java b/plugins/org.eclipse.papyrus.sirius.log/api/org/eclipse/papyrus/sirius/log/LogHelper.java
deleted file mode 100755
index 7827818..0000000
--- a/plugins/org.eclipse.papyrus.sirius.log/api/org/eclipse/papyrus/sirius/log/LogHelper.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2016, 2021 Atos Origin, CEA, Christian W. Damus, and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Atos Origin - initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- * Christian W. Damus - bugs 465416, 485220
- * Vincent LORENZO (CEA) - duplicated from Papyrus
- *******************************************************************************/
-package org.eclipse.papyrus.sirius.log;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * A Log Helper.
- *
- * @author tszadel
- *
- */
-public class LogHelper {
-
- /** The plugin Id. */
- private String pluginId;
-
- /** The plugin related to that helper. */
- private Bundle bundle;
-
- private boolean tracing;
- private Map<String, Boolean> traceOptions;
-
- /**
- * Default Constructor.
- * The associated plugin can be set later.
- * If no plugin is set, use java log.
- */
- public LogHelper() {
- }
-
- /**
- * Constructor.
- *
- * @param activator
- * The activator.
- */
- public LogHelper(Plugin activator) {
- setPlugin(activator);
- }
-
- /**
- * Constructor.
- *
- * @param bundle
- * The bundle.
- * @since 1.2
- */
- public LogHelper(Bundle bundle) {
- setBundle(bundle);
- }
-
- /**
- * Set the associated plugin.
- * This plugin log will be used as log.
- *
- * @param activator
- */
- public void setPlugin(Plugin activator) {
- setBundle(activator.getBundle());
- }
-
- /**
- * Set the associated {@code bundle}.
- * This {@code bundle}'s log will be used as log.
- *
- * @param bundle
- * the bundle
- * @since 1.2
- */
- public void setBundle(Bundle bundle) {
- this.pluginId = bundle.getSymbolicName();
- this.bundle = bundle;
-
- this.tracing = Boolean.getBoolean(Platform.getDebugOption(String.format("%s/debug", pluginId))); //$NON-NLS-1$
- if (tracing) {
- this.traceOptions = new ConcurrentHashMap<>(32, 0.75f, 4);
- }
- }
-
- /**
- * Log an informative message into the Eclipse log file
- *
- * @param message
- * the message to log
- */
- public void info(String message) {
- log(message, IStatus.INFO);
- }
-
- /**
- * Log a debug message into the Eclipse log file
- *
- * @param message
- * the message to log
- */
- public void debug(String message) {
- if (isDebugEnabled()) {
- log("[DEBUG] " + message, IStatus.INFO); //$NON-NLS-1$
- }
- }
-
- /**
- * Test if the platform is in debug mode.
- *
- * @return True if the platform is in debug mode.
- */
- public boolean isDebugEnabled() {
- if (bundle != null) {
- return Platform.inDebugMode();
- }
-
- return false;
- }
-
- /**
- * Queries whether the specified tracing {@code option} is enabled by the user.
- *
- * @param option
- * a tracing option, without the <tt>{@literal <bundle-id>/debug/}</tt> path prefix
- *
- * @return whether the tracing {@code option} is enabled
- *
- * @see #trace(String, String)
- */
- public boolean isTraceEnabled(String option) {
- if (tracing) {
- final String key = String.format("%s/debug/%s", pluginId, option); //$NON-NLS-1$
- Boolean result;
-
- synchronized (traceOptions) {
- result = traceOptions.get(key);
- if (result == null) {
- result = Boolean.valueOf(Platform.getDebugOption(key));
- traceOptions.put(key, result);
- }
- }
-
- return result.booleanValue();
- }
-
- return false;
- }
-
- /**
- * Prints the specified trace {@code message}, if the {@code option} is enabled by the user.
- *
- * @param option
- * the tracing option, without the <tt>{@literal <bundle-id>/debug/}</tt> path prefix
- * @param message
- * the message to print
- *
- * @see #isTraceEnabled(String)
- */
- public void trace(String option, String message) {
- if (isTraceEnabled(option)) {
- System.out.printf("[TRACE:%s] %s%n", option, message); //$NON-NLS-1$
- }
- }
-
- /**
- * Log a message with given level into the Eclipse log file
- *
- * @param message
- * the message to log
- * @param level
- * the message priority
- */
- private void log(String message, int level) {
- log(new Status(level, pluginId, message));
- }
-
- /**
- *
- * @param status
- */
- public void log(IStatus status) {
-
- if (bundle == null) {
- // TODO Do log with java ?
- } else {
- Platform.getLog(bundle).log(status);
- }
- }
-
- /**
- * Log a warning message.
- *
- * @param e
- * the exception to log
- */
- public void warn(String message) {
- log(message, IStatus.WARNING);
- }
-
-
- /**
- * Log an exception into the Eclipse log file
- *
- * @param e
- * the exception to log
- */
- public void error(Throwable e) {
- error("Unexpected Error", e); //$NON-NLS-1$
- }
-
- /**
- * Log an exception into the Eclipse log file
- *
- * @param message
- * the message
- * @param e
- * the exception to log
- */
- public void error(String message, Throwable e) {
-
- Throwable t = e;
- if (e instanceof InvocationTargetException) {
- t = ((InvocationTargetException) e).getTargetException();
- }
-
- IStatus status;
- if (t instanceof CoreException) {
- status = ((CoreException) t).getStatus();
- } else {
- status = new Status(IStatus.ERROR, pluginId, message, e);
- }
-
- log(status);
- }
-
- /**
- * Obtains the stack-trace description of the caller of the calling method (that is, the method that
- * called the method using this helper method). Useful for logging warning messages etc.
- *
- * @return the caller of my caller, or a placeholder in case the JVM cannot provide the necessary
- * stack information (which is a documented possibility)
- */
- public String getCallerMethod() {
- StackTraceElement[] stack = new Exception().fillInStackTrace().getStackTrace();
- return ((stack == null) || (stack.length < 3)) ? "<unknown caller>" : stack[2].toString(); //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.papyrus.sirius.log/build.properties b/plugins/org.eclipse.papyrus.sirius.log/build.properties
index f3625c6..2867e2c 100755
--- a/plugins/org.eclipse.papyrus.sirius.log/build.properties
+++ b/plugins/org.eclipse.papyrus.sirius.log/build.properties
@@ -4,5 +4,7 @@
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
- about.html
+ about.html,\
+ lib/slf4j-api-2.0.9.jar,\
+ lib/slf4j-simple-2.0.9.jar
src.includes = about.html
diff --git a/plugins/org.eclipse.papyrus.sirius.log/lib/.gitignore b/plugins/org.eclipse.papyrus.sirius.log/lib/.gitignore
new file mode 100644
index 0000000..f23b948
--- /dev/null
+++ b/plugins/org.eclipse.papyrus.sirius.log/lib/.gitignore
@@ -0,0 +1 @@
+*.jar
\ No newline at end of file
diff --git a/plugins/org.eclipse.papyrus.sirius.log/pom.xml b/plugins/org.eclipse.papyrus.sirius.log/pom.xml
index 14e9992..ff1f78c 100755
--- a/plugins/org.eclipse.papyrus.sirius.log/pom.xml
+++ b/plugins/org.eclipse.papyrus.sirius.log/pom.xml
@@ -13,4 +13,43 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.6.1</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF
index 3986882..cc787b6 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls.edit/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@
org.eclipse.emf.ecore;bundle-version="[2.27.0,3.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.17.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.properties.advanced.controls;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.model;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.properties;bundle-version="[7.0.7,8.0.0)",
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
index f15c05a..80bddde 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.advanced.controls/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.27.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.model;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.properties;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[7.0.7,8.0.0)"
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.common/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.common/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.common/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.common/META-INF/MANIFEST.MF
index ed371f0..af08dd7 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.common/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.common/META-INF/MANIFEST.MF
@@ -16,8 +16,8 @@
org.eclipse.emf.edit.ui;bundle-version="[2.21.0,3.0.0)",
org.eclipse.eef.properties.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.common;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.common.interpreter;bundle-version="[7.0.7,8.0.0)",
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.common/src/org/eclipse/papyrus/sirius/properties/common/Activator.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.common/src/org/eclipse/papyrus/sirius/properties/common/Activator.java
index 6cf633b..959b745 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.common/src/org/eclipse/papyrus/sirius/properties/common/Activator.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.common/src/org/eclipse/papyrus/sirius/properties/common/Activator.java
@@ -13,9 +13,10 @@
*******************************************************************************/
package org.eclipse.papyrus.sirius.properties.common;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle.
@@ -33,7 +34,8 @@
/**
* Helper to log errors/warnings.
*/
- private static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
+
/**
* The shared instance.
@@ -56,7 +58,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(getDefault());
}
/*
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionHelpExpressionPropertySection.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionHelpExpressionPropertySection.java
index 4e72bee..4db0ce2 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionHelpExpressionPropertySection.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionHelpExpressionPropertySection.java
@@ -69,7 +69,7 @@
/*
* We set the color as it's a InterpretedExpression
*/
- text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+ text.setBackground(SiriusEditor.getColorRegistry().get("yellow")); //$NON-NLS-1$
TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
}
@@ -89,6 +89,6 @@
@Override
protected String getPropertyDescription() {
- return "";
+ return ""; //$NON-NLS-1$
}
}
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionLabelExpressionPropertySection.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionLabelExpressionPropertySection.java
index 3df5841..ebe03bb 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionLabelExpressionPropertySection.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.editor.properties.advanced.controls/src/org/eclipse/papyrus/sirius/properties/editor/properties/advanced/controls/stereotypeapplication/StereotypeApplicationDescriptionLabelExpressionPropertySection.java
@@ -69,7 +69,7 @@
/*
* We set the color as it's a InterpretedExpression
*/
- text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+ text.setBackground(SiriusEditor.getColorRegistry().get("yellow")); //$NON-NLS-1$
TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
}
@@ -89,6 +89,6 @@
@Override
protected String getPropertyDescription() {
- return "";
+ return ""; //$NON-NLS-1$
}
}
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.eef.advanced.controls/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.services/.classpath b/plugins/properties/org.eclipse.papyrus.sirius.properties.services/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.services/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.services/META-INF/MANIFEST.MF
index 2e7ca1b..f059aa7 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.services/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.services/META-INF/MANIFEST.MF
@@ -12,10 +12,10 @@
org.eclipse.emf.edit.ui;bundle-version="[2.21.0,3.0.0)",
org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.properties.ui;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.tools;bundle-version="[4.2.0,5.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.papyrus.sirius.properties.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.views.modelexplorer;bundle-version="[5.0.0,6.0.0)",
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.services/src/org/eclipse/papyrus/sirius/properties/services/Activator.java b/plugins/properties/org.eclipse.papyrus.sirius.properties.services/src/org/eclipse/papyrus/sirius/properties/services/Activator.java
index 2e99a33..5ad5afd 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.services/src/org/eclipse/papyrus/sirius/properties/services/Activator.java
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.services/src/org/eclipse/papyrus/sirius/properties/services/Activator.java
@@ -13,12 +13,14 @@
*****************************************************************************/
package org.eclipse.papyrus.sirius.properties.services;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.papyrus.sirius.properties.services.internal.EEFPropertySheetPageProvider;
import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* The activator class controls the plug-in life cycle.
@@ -37,8 +39,7 @@
/**
* Helper to log errors/warnings.
- */
- private static LogHelper log;
+ */ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor.
@@ -51,7 +52,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
// 1. get the bundle context
BundleContext bc = Activator.getDefault().getBundle().getBundleContext();
// 2. find the property page service
diff --git a/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
index 5c324bf..8921243 100644
--- a/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
+++ b/plugins/properties/org.eclipse.papyrus.sirius.properties.ui.advanced.controls/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
org.eclipse.papyrus.sirius.properties.eef.advanced.controls;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.common.interpreter;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.properties;bundle-version="[7.0.7,8.0.0)",
- org.eclipse.sirius.properties.core;bundle-version="[7.0.7,8.0.0)",
+ org.eclipse.sirius.properties.core;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[7.0.7,8.0.0)"
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/.classpath b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/META-INF/MANIFEST.MF
index c3dd6f2..a798383 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/src/org/eclipse/papyrus/sirius/uml/diagram/activity/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/src/org/eclipse/papyrus/sirius/uml/diagram/activity/Activator.java
index a826c38..2da8ec9 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/src/org/eclipse/papyrus/sirius/uml/diagram/activity/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.activity/src/org/eclipse/papyrus/sirius/uml/diagram/activity/Activator.java
@@ -15,13 +15,13 @@
import java.util.HashSet;
import java.util.Set;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -39,7 +39,8 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
+
/**
* The constructor
@@ -59,7 +60,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_activity.odesign")); //$NON-NLS-1$
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.architecture/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.architecture/META-INF/MANIFEST.MF
index c082a16..fb0e33c 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.architecture/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.architecture/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@
org.eclipse.papyrus.sirius.editor.modelexplorer;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.editor.representation.architecture;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.editor.representation;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.diagram.activity;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/META-INF/MANIFEST.MF
index 0336a73..1f327a6 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@
Require-Bundle: com.google.guava;bundle-version="[32.1.3,32.1.4)",
org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[4.2.0,5.0.0)",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.profile;bundle-version="[4.2.0,5.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.1.0,5.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/Activator.java
index 34788f7..f706bd3 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/Activator.java
@@ -15,13 +15,13 @@
import java.util.HashSet;
import java.util.Set;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -37,7 +37,7 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor
@@ -57,7 +57,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_class.odesign")); //$NON-NLS-1$
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/internal/ui/dialog/AssociationSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/internal/ui/dialog/AssociationSelectionDialog.java
index 9ae3715..e8131d9 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/internal/ui/dialog/AssociationSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/internal/ui/dialog/AssociationSelectionDialog.java
@@ -85,7 +85,7 @@
try {
return this.serviceRegistry.getService(LabelProviderService.class).getLabelProvider();
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
return null;
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/services/ClassDiagramServices.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/services/ClassDiagramServices.java
index 13b9e12..3beb52d 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/services/ClassDiagramServices.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/services/ClassDiagramServices.java
@@ -101,13 +101,13 @@
public static final ClassDiagramServices INSTANCE = new ClassDiagramServices();
/** Dialog CANCEL button label */
- private static final String CANCEL_LABEL = "Cancel";
+ private static final String CANCEL_LABEL = "Cancel"; //$NON-NLS-1$
/** Dialog OK button label */
- private static final String OK_LABEL = "OK";
+ private static final String OK_LABEL = "OK"; //$NON-NLS-1$
/** Annotation generic source name */
- private static final String ANNOTATION_GENERIC_SOURCE = "org.eclipse.papyrus";
+ private static final String ANNOTATION_GENERIC_SOURCE = "org.eclipse.papyrus"; //$NON-NLS-1$
/** Annotation InstanceEnd source name */
private static final String ANNOTATION_INSTANCE_END_SOURCE = InstanceSpecificationLinkUtils.INSTANCE_END;
@@ -123,13 +123,13 @@
private static final int INSTANCE_SPECIFICATION_LINK__TARGET_INDEX = 1;
/** Annotation detail key */
- private static final String ANNOTATION_DETAIL_KEY = "nature";
+ private static final String ANNOTATION_DETAIL_KEY = "nature"; //$NON-NLS-1$
/** Annotation detail value */
- private static final String ANNOTATION_DETAIL_VALUE = "UML_Nature";
+ private static final String ANNOTATION_DETAIL_VALUE = "UML_Nature"; //$NON-NLS-1$
/** underscore separator */
- private static final String UNDERSCORE = "_";
+ private static final String UNDERSCORE = "_"; //$NON-NLS-1$
/**
* index used to find the source of the {@link GeneralizationSet}
@@ -2447,10 +2447,10 @@
*/
public String getTypeTarget(EObject context) {
if (context instanceof Class || context instanceof Interface) {
- return "nestedClassifier";
+ return "nestedClassifier"; //$NON-NLS-1$
}
- return "packagedElement";
+ return "packagedElement"; //$NON-NLS-1$
}
/**
@@ -2464,9 +2464,9 @@
*/
public String getTypeTarget(EObject context, EObject newContainerView) {
if (newContainerView instanceof Class || newContainerView instanceof Interface) {
- return "nestedClassifier";
+ return "nestedClassifier"; //$NON-NLS-1$
}
- return "packagedElement";
+ return "packagedElement"; //$NON-NLS-1$
}
/**
@@ -2481,8 +2481,8 @@
*/
public String getConstraintLabel(Element elem) {
StringBuilder constLabel = new StringBuilder();
- String body = "";
- String lang = "";
+ String body = ""; //$NON-NLS-1$
+ String lang = ""; //$NON-NLS-1$
if (elem instanceof Constraint) {
Constraint constraint = ((Constraint) elem);
ValueSpecification valueSpec = constraint.getSpecification();
@@ -2559,7 +2559,7 @@
try {
registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(eobject);
} catch (ServiceException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
return registry;
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/META-INF/MANIFEST.MF
index a8c2d84..a682614 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/META-INF/MANIFEST.MF
@@ -18,10 +18,8 @@
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.8.0,2.0.0)",
org.eclipse.papyrus.infra.architecture;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.1.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[4.2.0,5.0.0)",
org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[3.0.0,4.0.0)",
@@ -31,20 +29,18 @@
org.eclipse.papyrus.infra.services.edit;bundle-version="[4.1.0,5.0.0)",
org.eclipse.papyrus.infra.types.core;bundle-version="[5.1.0,6.0.0)",
org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.papyrus.sirius.editor.sirius;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.editor;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[2.0.0,3.0.0)",
org.eclipse.sirius.common.ui;bundle-version="[7.0.7,8.0.0)",
- org.eclipse.sirius.common.ui;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.common;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.diagram.ui;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.diagram;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.ecore.extender;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.ext.base;bundle-version="[7.0.7,8.0.0)",
- org.eclipse.sirius.ext.base;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius;bundle-version="[7.0.7,8.0.0)",
org.eclipse.ui.ide;bundle-version="[3.19.0,4.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.125.0,4.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/Activator.java
index e425f46..13c72e5 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/Activator.java
@@ -14,11 +14,11 @@
package org.eclipse.papyrus.sirius.uml.diagram.common;
import java.util.Set;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -33,7 +33,8 @@
private static Set<Viewpoint> viewpoints;
- public static LogHelper log;
+ /** The log. */
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor
@@ -50,7 +51,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
}
/*
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/core/services/AbstractDiagramServices.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/core/services/AbstractDiagramServices.java
index 0d862af..d893f2a 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/core/services/AbstractDiagramServices.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.common/src/org/eclipse/papyrus/sirius/uml/diagram/common/core/services/AbstractDiagramServices.java
@@ -506,9 +506,9 @@
HideFilterHelper.INSTANCE.reveal(element);
}
} catch (final MetaClassNotFoundException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
} catch (final FeatureNotFoundException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/.classpath b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/.classpath
old mode 100644
new mode 100755
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/META-INF/MANIFEST.MF
index 3c8801c..ec4e797 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/src/org/eclipse/papyrus/sirius/uml/diagram/communication/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/src/org/eclipse/papyrus/sirius/uml/diagram/communication/Activator.java
index bb79587..6062093 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/src/org/eclipse/papyrus/sirius/uml/diagram/communication/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.communication/src/org/eclipse/papyrus/sirius/uml/diagram/communication/Activator.java
@@ -15,13 +15,13 @@
import java.util.HashSet;
import java.util.Set;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -39,7 +39,7 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor
@@ -59,7 +59,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_communication.odesign")); //$NON-NLS-1$
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/META-INF/MANIFEST.MF
index 0041aef..05d3ff6 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/Activator.java
index 4ceb081..84460a9 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.component/src/org/eclipse/papyrus/sirius/uml/diagram/component/Activator.java
@@ -16,12 +16,13 @@
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle.
@@ -39,7 +40,7 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger(Activator.class);
/**
* The constructor
@@ -56,10 +57,10 @@
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_component.odesign")); //$NON-NLS-1$
}
@@ -69,6 +70,7 @@
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
if (viewpoints != null) {
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/META-INF/MANIFEST.MF
index a473a8f..9c3e4a3 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
Automatic-Module-Name: org.eclipse.papyrus.sirius.uml.diagram.compositestructure
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/src/org/eclipse/papyrus/sirius/uml/diagram/compositestructure/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/src/org/eclipse/papyrus/sirius/uml/diagram/compositestructure/Activator.java
index b6a9abf..686ce90 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/src/org/eclipse/papyrus/sirius/uml/diagram/compositestructure/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.compositestructure/src/org/eclipse/papyrus/sirius/uml/diagram/compositestructure/Activator.java
@@ -16,12 +16,13 @@
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -39,7 +40,7 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger(Activator.class);
/**
* The constructor
@@ -56,10 +57,10 @@
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_compositestructure.odesign")); //$NON-NLS-1$
}
@@ -69,6 +70,7 @@
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
if (viewpoints != null) {
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/META-INF/MANIFEST.MF
index 3a66db8..385698e 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
org.eclipse.gmf.runtime.gef.ui;bundle-version="[1.8.0,2.0.0)",
org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/src/org/eclipse/papyrus/sirius/uml/diagram/deployment/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/src/org/eclipse/papyrus/sirius/uml/diagram/deployment/Activator.java
index 02b143f..7d6b2b1 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/src/org/eclipse/papyrus/sirius/uml/diagram/deployment/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.deployment/src/org/eclipse/papyrus/sirius/uml/diagram/deployment/Activator.java
@@ -16,12 +16,13 @@
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -39,7 +40,7 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger(Activator.class);
/**
* The constructor
@@ -60,7 +61,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_deployment.odesign")); //$NON-NLS-1$
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/META-INF/MANIFEST.MF
index 5ea7d65..3d8ef54 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/src/org/eclipse/papyrus/sirius/uml/diagram/pkg/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/src/org/eclipse/papyrus/sirius/uml/diagram/pkg/Activator.java
index 4cd088d..b43a694 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/src/org/eclipse/papyrus/sirius/uml/diagram/pkg/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.pkg/src/org/eclipse/papyrus/sirius/uml/diagram/pkg/Activator.java
@@ -16,12 +16,13 @@
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -39,7 +40,7 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger(Activator.class);
/**
* The constructor
@@ -60,7 +61,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_package.odesign")); //$NON-NLS-1$
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/META-INF/MANIFEST.MF
index dc6827b..ae1048a 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -11,10 +11,10 @@
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[4.2.0,5.0.0)",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.widgets;bundle-version="[4.1.0,5.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/src/org/eclipse/papyrus/sirius/uml/diagram/profile/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/src/org/eclipse/papyrus/sirius/uml/diagram/profile/Activator.java
index e695e84..8bae8b5 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/src/org/eclipse/papyrus/sirius/uml/diagram/profile/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.profile/src/org/eclipse/papyrus/sirius/uml/diagram/profile/Activator.java
@@ -16,12 +16,13 @@
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -39,7 +40,7 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger(Activator.class);
/**
* The constructor
@@ -56,10 +57,10 @@
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_profile.odesign")); //$NON-NLS-1$
}
@@ -69,6 +70,7 @@
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
if (viewpoints != null) {
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/META-INF/MANIFEST.MF
index 7757acf..bcd257c 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[4.3.0,5.0.0)",
org.eclipse.papyrus.sirius.editor;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.sirius.common.ui;bundle-version="[7.0.7,8.0.0)",
org.eclipse.sirius.common;bundle-version="[7.0.7,8.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/Activator.java
index d75a4e5..152a159 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/Activator.java
@@ -59,7 +59,7 @@
public void start(final BundleContext context) throws Exception {
super.start(context);
viewpoints = new HashSet<Viewpoint>();
- viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_sequence.odesign"));
+ viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_sequence.odesign")); //$NON-NLS-1$
}
/**
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/provider/RefreshSequenceExtensionProvider.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/provider/RefreshSequenceExtensionProvider.java
index 35f5d23..ab966de 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/provider/RefreshSequenceExtensionProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/provider/RefreshSequenceExtensionProvider.java
@@ -39,10 +39,10 @@
*/
public class RefreshSequenceExtensionProvider implements IRefreshExtensionProvider {
- private final static String observationPointFilterName = "Hide Observation Point";
- private final static String observationPointFilterAnnotationName = "Observation Point Filter Deactivation";
- private final static String diagramID = "SequenceDiagram";
- private final static String diagramEditorID = "org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditorID";
+ private final static String observationPointFilterName = "Hide Observation Point"; //$NON-NLS-1$
+ private final static String observationPointFilterAnnotationName = "Observation Point Filter Deactivation"; //$NON-NLS-1$
+ private final static String diagramID = "SequenceDiagram"; //$NON-NLS-1$
+ private final static String diagramEditorID = "org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditorID"; //$NON-NLS-1$
/**
* Constructor.
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/CombinedAndOperandService.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/CombinedAndOperandService.java
index 86c4b13..b288ac4 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/CombinedAndOperandService.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/CombinedAndOperandService.java
@@ -77,10 +77,10 @@
if (interactionFragment instanceof OccurrenceSpecification) {
EList<EAnnotation> eAnnotations = interactionFragment.getEAnnotations();
for (EAnnotation annotation : eAnnotations) {
- if (annotation.getSource().equals(combinedFragment.getName() + "_start")) {
+ if (annotation.getSource().equals(combinedFragment.getName() + "_start")) { //$NON-NLS-1$
startOC = (OccurrenceSpecification) interactionFragment;
}
- if (annotation.getSource().equals(combinedFragment.getName() + "_end")) {
+ if (annotation.getSource().equals(combinedFragment.getName() + "_end")) { //$NON-NLS-1$
endOC = (OccurrenceSpecification) interactionFragment;
}
}
@@ -102,7 +102,7 @@
for (InteractionFragment fragmentOperand : fragmentsOperand) {
List<EAnnotation> annotationsOperand = fragmentOperand.getEAnnotations();
for (EAnnotation annotatationOp : annotationsOperand) {
- if (annotatationOp.getSource().equals(interactionOperand.getName() + "_start")) {
+ if (annotatationOp.getSource().equals(interactionOperand.getName() + "_start")) { //$NON-NLS-1$
operandStart = (OccurrenceSpecification) fragmentOperand;
break;
}
@@ -128,11 +128,11 @@
public void createEAnnotations(EObject context) {
if (context instanceof EModelElement) {
EAnnotation annotStart = EcoreFactory.eINSTANCE.createEAnnotation();
- annotStart.setSource(((NamedElement) context).getName() + "_start");
+ annotStart.setSource(((NamedElement) context).getName() + "_start"); //$NON-NLS-1$
((EModelElement) context).getEAnnotations().add(annotStart);
EAnnotation annotEnd = EcoreFactory.eINSTANCE.createEAnnotation();
- annotEnd.setSource(((NamedElement) context).getName() + "_end");
+ annotEnd.setSource(((NamedElement) context).getName() + "_end"); //$NON-NLS-1$
((EModelElement) context).getEAnnotations().add(annotEnd);
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ConstraintService.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ConstraintService.java
index ddf9270..1b0fde6 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ConstraintService.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ConstraintService.java
@@ -97,20 +97,20 @@
languages = ((OpaqueExpression) specification).getLanguages();
bodies = ((OpaqueExpression) specification).getBodies();
}
- String langage = "";
+ String langage = ""; //$NON-NLS-1$
if (languages != null && !languages.isEmpty()) {
langage = languages.get(0);
}
- String body = "";
+ String body = ""; //$NON-NLS-1$
if (bodies != null && !bodies.isEmpty()) {
body = bodies.get(0);
}
- String result = name + "\n" + "{{" + langage + "}" + body + "}";
+ String result = name + "\n" + "{{" + langage + "}" + body + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
return result;
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/FragmentsService.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/FragmentsService.java
index aa72419..3eeff43 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/FragmentsService.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/FragmentsService.java
@@ -84,7 +84,7 @@
EList<EAnnotation> eAnnotations = ((CombinedFragment) o).getEAnnotations();
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((CombinedFragment) o).getName() + "_end")) {
+ if (annot.getSource().equals(((CombinedFragment) o).getName() + "_end")) { //$NON-NLS-1$
return annot;
}
}
@@ -94,7 +94,7 @@
EList<EAnnotation> eAnnotations = ((InteractionOperand) o).getEAnnotations();
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((InteractionOperand) o).getName() + "_end")) {
+ if (annot.getSource().equals(((InteractionOperand) o).getName() + "_end")) { //$NON-NLS-1$
return annot;
}
}
@@ -121,7 +121,7 @@
EList<EAnnotation> eAnnotations = ((CombinedFragment) o).getEAnnotations();
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((CombinedFragment) o).getName() + "_start")) {
+ if (annot.getSource().equals(((CombinedFragment) o).getName() + "_start")) { //$NON-NLS-1$
return annot;
}
}
@@ -131,7 +131,7 @@
EList<EAnnotation> eAnnotations = ((InteractionOperand) o).getEAnnotations();
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((InteractionOperand) o).getName() + "_start")) {
+ if (annot.getSource().equals(((InteractionOperand) o).getName() + "_start")) { //$NON-NLS-1$
return annot;
}
}
@@ -187,7 +187,7 @@
EList<EAnnotation> eAnnotations = ((InteractionOperand) object).getEAnnotations();
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((InteractionOperand) object).getName() + "_start")) {
+ if (annot.getSource().equals(((InteractionOperand) object).getName() + "_start")) { //$NON-NLS-1$
results.add(annot);
}
}
@@ -200,7 +200,7 @@
}
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((InteractionOperand) object).getName() + "_end")) {
+ if (annot.getSource().equals(((InteractionOperand) object).getName() + "_end")) { //$NON-NLS-1$
results.add(annot);
}
}
@@ -220,7 +220,7 @@
EList<EAnnotation> eAnnotations = interactionFragment.getEAnnotations();
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((CombinedFragment) interactionFragment).getName() + "_start")) {
+ if (annot.getSource().equals(((CombinedFragment) interactionFragment).getName() + "_start")) { //$NON-NLS-1$
results.add(annot);
}
}
@@ -233,7 +233,7 @@
EList<EAnnotation> eAnnotations = interactionFragment.getEAnnotations();
if (eAnnotations != null && !eAnnotations.isEmpty()) {
for (EAnnotation annot : eAnnotations) {
- if (annot.getSource().equals(((CombinedFragment) interactionFragment).getName() + "_end")) {
+ if (annot.getSource().equals(((CombinedFragment) interactionFragment).getName() + "_end")) { //$NON-NLS-1$
results.add(annot);
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/MessageService.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/MessageService.java
index 45f1201..7aadbb6 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/MessageService.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/MessageService.java
@@ -340,11 +340,11 @@
MessageOccurrenceSpecification occurenceMessageSend = UMLFactory.eINSTANCE.createMessageOccurrenceSpecification();
interaction.getFragments().add(occurenceMessageSend);
LifelineService.getInstance().getLifeline(sourceVariable).getCoveredBys().add(occurenceMessageSend);
- occurenceMessageSend.setName(computeDefaultName(occurenceMessageSend) + "SendEvent");
+ occurenceMessageSend.setName(computeDefaultName(occurenceMessageSend) + "SendEvent"); //$NON-NLS-1$
DestructionOccurrenceSpecification occurenceMessageReceive = UMLFactory.eINSTANCE.createDestructionOccurrenceSpecification();
interaction.getFragments().add(occurenceMessageReceive);
- occurenceMessageReceive.setName(computeDefaultName(occurenceMessageReceive) + "ReceiveEvent");
+ occurenceMessageReceive.setName(computeDefaultName(occurenceMessageReceive) + "ReceiveEvent"); //$NON-NLS-1$
targetVariable.getCoveredBys().add(occurenceMessageReceive);
deleteMessage.setMessageSort(MessageSort.DELETE_MESSAGE_LITERAL);
@@ -526,10 +526,10 @@
MessageOccurrenceSpecification occurenceMessageSend = UMLFactory.eINSTANCE.createMessageOccurrenceSpecification();
interaction.getFragments().add(occurenceMessageSend);
LifelineService.getInstance().getLifeline(sourceV).getCoveredBys().add(occurenceMessageSend);
- occurenceMessageSend.setName(computeDefaultName(occurenceMessageSend) + "SendEvent");
+ occurenceMessageSend.setName(computeDefaultName(occurenceMessageSend) + "SendEvent"); //$NON-NLS-1$
MessageOccurrenceSpecification occurenceMessageReceive = UMLFactory.eINSTANCE.createMessageOccurrenceSpecification();
interaction.getFragments().add(occurenceMessageReceive);
- occurenceMessageReceive.setName(computeDefaultName(occurenceMessageReceive) + "ReceiveEvent");
+ occurenceMessageReceive.setName(computeDefaultName(occurenceMessageReceive) + "ReceiveEvent"); //$NON-NLS-1$
targetV.getCoveredBys().add(occurenceMessageReceive);
createMessage.setMessageSort(MessageSort.CREATE_MESSAGE_LITERAL);
@@ -980,7 +980,7 @@
String name = ((Message) object).getName();
if (eContainer instanceof Interaction) {
// TODO, il faut trouver une autre solution pour trouver le message d'invokation que par le nom. Car celui ci pourrait etre chang� par l'utilisateur apres coup.
- String invokationName = name.replace("_reply", "");
+ String invokationName = name.replace("_reply", ""); //$NON-NLS-1$ //$NON-NLS-2$
return ((Interaction) eContainer).getMessage(invokationName);
}
}
@@ -1128,9 +1128,9 @@
// Create reply message
final Message replyMessage = factory.createMessage();
- String replyName = "";
+ String replyName = ""; //$NON-NLS-1$
if (message == null) {
- replyName = "Message_" + getMessages(interaction).size();
+ replyName = "Message_" + getMessages(interaction).size(); //$NON-NLS-1$
} else {
replyName = message.getName();
}
@@ -1171,14 +1171,14 @@
* the execution
*/
private void replaceByMessageOccurrence(ExecutionOccurrenceSpecification execOcc, List<EObject> enclosingFragments, MessageOccurrenceSpecification event, ExecutionSpecification execution) {
- if (execOcc.getName().endsWith("start")) {
+ if (execOcc.getName().endsWith("start")) { //$NON-NLS-1$
int indexOfSource = enclosingFragments.indexOf(execOcc);
enclosingFragments.remove(execOcc);
enclosingFragments.add(indexOfSource, event);
execution.setStart(event);
execOcc.setCovered(null);
}
- if (execOcc.getName().endsWith("finish")) {
+ if (execOcc.getName().endsWith("finish")) { //$NON-NLS-1$
int indexOfSource = enclosingFragments.indexOf(execOcc);
enclosingFragments.remove(execOcc);
enclosingFragments.add(indexOfSource, event);
@@ -1624,7 +1624,7 @@
if (sourceView instanceof DNodeSpec && targetView instanceof DNodeSpec) {
String nameSource = ((DNodeSpec) sourceView).getActualMapping().getName();
String nameTarget = ((DNodeSpec) targetView).getActualMapping().getName();
- return nameSource.equalsIgnoreCase("Observation") && nameTarget.equals("Observation");
+ return nameSource.equalsIgnoreCase("Observation") && nameTarget.equals("Observation"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -1646,8 +1646,8 @@
if (sourceView instanceof DNodeSpec && targetView instanceof DNodeSpec) {
String nameSource = ((DNodeSpec) sourceView).getActualMapping().getName();
String nameTarget = ((DNodeSpec) targetView).getActualMapping().getName();
- boolean isGateSource = nameSource.equalsIgnoreCase("Gate") || nameSource.equalsIgnoreCase("GateBorder");
- boolean isGateTarget = nameTarget.equalsIgnoreCase("Gate") || nameTarget.equalsIgnoreCase("GateBorder");
+ boolean isGateSource = nameSource.equalsIgnoreCase("Gate") || nameSource.equalsIgnoreCase("GateBorder"); //$NON-NLS-1$ //$NON-NLS-2$
+ boolean isGateTarget = nameTarget.equalsIgnoreCase("Gate") || nameTarget.equalsIgnoreCase("GateBorder"); //$NON-NLS-1$ //$NON-NLS-2$
return isGateSource || isGateTarget;
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ReorderService.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ReorderService.java
index 3d1bf66..54c14ad 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ReorderService.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.sequence/src/org/eclipse/papyrus/sirius/uml/diagram/sequence/services/ReorderService.java
@@ -442,10 +442,10 @@
EAnnotation endOc = null;
for (EObject interactionFragment : fragments) {
if (interactionFragment instanceof EAnnotation) {
- if (((EAnnotation) interactionFragment).getSource().equals(combinedFragment.getName() + "_start")) {
+ if (((EAnnotation) interactionFragment).getSource().equals(combinedFragment.getName() + "_start")) { //$NON-NLS-1$
startOc = (EAnnotation) interactionFragment;
}
- if (((EAnnotation) interactionFragment).getSource().equals(combinedFragment.getName() + "_end")) {
+ if (((EAnnotation) interactionFragment).getSource().equals(combinedFragment.getName() + "_end")) { //$NON-NLS-1$
endOc = (EAnnotation) interactionFragment;
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/META-INF/MANIFEST.MF
index a9da4d8..2f09407 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.1.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.3.0,5.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/Activator.java
index 60243c7..7465f82 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/Activator.java
@@ -65,7 +65,7 @@
super.start(context);
plugin = this;
viewpoints = new HashSet<Viewpoint>();
- viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_statemachine.odesign"));
+ viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_statemachine.odesign")); //$NON-NLS-1$
}
/**
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineRefreshExtensionProvider.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineRefreshExtensionProvider.java
index 327d255..9b44e1a 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineRefreshExtensionProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineRefreshExtensionProvider.java
@@ -50,7 +50,7 @@
DiagramDescription description = viewPoint.getDescription();
String name = description.getName();
- return name.equals("StateMachineDiagram");
+ return name.equals("StateMachineDiagram"); //$NON-NLS-1$
}
/**
@@ -115,7 +115,7 @@
EList<DDiagramElement> diagramElements = di.getDiagramElements();
for (DDiagramElement dDiagramElement : diagramElements) {
if (dDiagramElement instanceof DNodeContainer) {
- if (((DNodeContainer) dDiagramElement).getActualMapping().getName().equals("SMD_State")) {
+ if (((DNodeContainer) dDiagramElement).getActualMapping().getName().equals("SMD_State")) { //$NON-NLS-1$
if (((DNodeContainer) dDiagramElement).getElements().size() == 0) {
((DNodeContainer) dDiagramElement).setChildrenPresentation(ContainerLayout.FREE_FORM);
} else {
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineServices.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineServices.java
index 8fe90ac..f9e1571 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineServices.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/StateMachineServices.java
@@ -386,7 +386,7 @@
return context;
}
if (((DNodeContainer) context).getTarget() instanceof Region) {
- if (((DNodeContainer) context).getActualMapping().getName().contains("Horizontal") || ((DNodeContainer) context).getActualMapping().getName().contains("Vertical")) {
+ if (((DNodeContainer) context).getActualMapping().getName().contains("Horizontal") || ((DNodeContainer) context).getActualMapping().getName().contains("Vertical")) { //$NON-NLS-1$ //$NON-NLS-2$
return context;
}
return getStateViewParent(context.eContainer());
@@ -426,13 +426,13 @@
*/
public EObject setChildRepresentation(EObject context, String value) {
if (context instanceof DNodeContainer) {
- if (value.equals("H")) {
+ if (value.equals("H")) { //$NON-NLS-1$
((DNodeContainer) context).setChildrenPresentation(ContainerLayout.HORIZONTAL_STACK);
}
- if (value.equals("V")) {
+ if (value.equals("V")) { //$NON-NLS-1$
((DNodeContainer) context).setChildrenPresentation(ContainerLayout.VERTICAL_STACK);
}
- if (value.equals("F")) {
+ if (value.equals("F")) { //$NON-NLS-1$
((DNodeContainer) context).setChildrenPresentation(ContainerLayout.FREE_FORM);
}
}
@@ -546,7 +546,7 @@
* @return the drop location
*/
public String getDropLocation(EObject object, EObject containerView) {
- String result = "";
+ String result = ""; //$NON-NLS-1$
if (containerView instanceof DNodeContainer) {
View view = SiriusGMFHelper.getGmfView((DNodeContainer) containerView);
Node gmfnode = (Node) view;
@@ -624,9 +624,9 @@
View view = SiriusGMFHelper.getGmfView((DNodeContainer) containerView);
Node gmfnode = (Node) view;
Rectangle bounds = getFreeformViewport(gmfnode);
- return ((bounds.height + 1) / 10) + "";
+ return ((bounds.height + 1) / 10) + ""; //$NON-NLS-1$
}
- return "-1";
+ return "-1"; //$NON-NLS-1$
}
/**
@@ -645,10 +645,10 @@
View view = SiriusGMFHelper.getGmfView((DNodeContainer) containerView);
Node gmfnode = (Node) view;
Rectangle bounds = getFreeformViewport(gmfnode);
- return ((bounds.width + 1) / 10) + "";
+ return ((bounds.width + 1) / 10) + ""; //$NON-NLS-1$
}
- return "-1";
+ return "-1"; //$NON-NLS-1$
}
@@ -704,7 +704,7 @@
DDiagram parentDiagram = ((DNodeContainer) containerView).getParentDiagram();
EList<DDiagramElement> diagramElements = parentDiagram.getDiagramElements();
for (DDiagramElement dDiagramElement : diagramElements) {
- if ((dDiagramElement instanceof DNodeContainer) && ((DNodeContainer) dDiagramElement).getActualMapping().getName().equals("SMD_RegionCompartment")) {
+ if ((dDiagramElement instanceof DNodeContainer) && ((DNodeContainer) dDiagramElement).getActualMapping().getName().equals("SMD_RegionCompartment")) { //$NON-NLS-1$
continue;
}
if (ElementToRefresh.toReposition.containsKey(dDiagramElement)) {
@@ -856,18 +856,18 @@
languages = ((OpaqueExpression) specification).getLanguages();
bodies = ((OpaqueExpression) specification).getBodies();
}
- String langage = "";
+ String langage = ""; //$NON-NLS-1$
if (languages != null && !languages.isEmpty()) {
langage = languages.get(0);
}
- String body = "";
+ String body = ""; //$NON-NLS-1$
if (bodies != null && !bodies.isEmpty()) {
body = bodies.get(0);
}
- String result = name + "\n" + "{{" + langage + "}" + body + "}";
+ String result = name + "\n" + "{{" + langage + "}" + body + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
return result;
}
- return "";
+ return ""; //$NON-NLS-1$
}
@@ -910,7 +910,7 @@
if (specification instanceof OpaqueExpression) {
bodies = ((OpaqueExpression) specification).getBodies();
}
- String body = "";
+ String body = ""; //$NON-NLS-1$
if (bodies != null && !bodies.isEmpty()) {
body = bodies.get(0);
}
@@ -919,7 +919,7 @@
return result;
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -1136,7 +1136,7 @@
return ((NamedElement) object).getName();
}
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -1163,7 +1163,7 @@
return String.format("[%s]", value); //$NON-NLS-1$
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
@@ -1180,12 +1180,12 @@
StringBuilder result = new StringBuilder();
View view = SiriusGMFHelper.getGmfView((DDiagramElement) containerView);
String textForTrigger = getTextForTrigger(view, trans);
- if (textForTrigger != null && !"".equals(textForTrigger)) {
+ if (textForTrigger != null && !"".equals(textForTrigger)) { //$NON-NLS-1$
result.append(textForTrigger);
}
result.append(getTextForGuard(trans));
String textForEffect = getTextForEffect(view, trans);
- if (textForEffect != null && !"".equals(textForEffect)) {
+ if (textForEffect != null && !"".equals(textForEffect)) { //$NON-NLS-1$
result.append("/"); //$NON-NLS-1$
if (lineBreakBeforeEffect(view)) {
result.append("\n"); //$NON-NLS-1$
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/custom/StateMachineRegionPolicy.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/custom/StateMachineRegionPolicy.java
index 4d4d998..514081e 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/custom/StateMachineRegionPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.statemachine/src/org/eclipse/papyrus/sirius/uml/diagram/statemachine/custom/StateMachineRegionPolicy.java
@@ -69,7 +69,7 @@
IFigure sizeOnDropFeedback = null;
/** The drop location. */
- String dropLocation = "";
+ String dropLocation = ""; //$NON-NLS-1$
/**
* Erase target feedback.
@@ -100,7 +100,7 @@
protected Command getReparentCommand(ChangeBoundsRequest changeBoundsRequest) {
View container = getHost().getAdapter(View.class);
EObject context = container == null ? null : ViewUtil.resolveSemanticElement(container);
- CompositeCommand cc = new CompositeCommand("move (re-parent) state");
+ CompositeCommand cc = new CompositeCommand("move (re-parent) state"); //$NON-NLS-1$
Iterator<?> it = changeBoundsRequest.getEditParts().iterator();
while (it.hasNext()) {
Object next = it.next();
@@ -158,7 +158,7 @@
CreateUnspecifiedTypeRequest unspecReq = (CreateUnspecifiedTypeRequest) request;
for (Iterator<?> iter = unspecReq.getElementTypes().iterator(); iter.hasNext();) {
IElementType elementType = (IElementType) iter.next();
- if (((IHintedType) elementType).getSemanticHint().equals(((IHintedType) getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Region_Shape")).getSemanticHint())) {
+ if (((IHintedType) elementType).getSemanticHint().equals(((IHintedType) getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Region_Shape")).getSemanticHint())) { //$NON-NLS-1$
// starting point is the existing region compartment on
// which mouse was moving
View existingRegionCompartmentView = (View) getHost().getModel();
@@ -176,7 +176,7 @@
} else if (request instanceof CreateViewRequest) {
CreateViewRequest create = (CreateViewRequest) request;
for (CreateViewRequest.ViewDescriptor descriptor : create.getViewDescriptors()) {
- if (((IHintedType) getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Region_Shape")).getSemanticHint().equals(descriptor.getSemanticHint())) {
+ if (((IHintedType) getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Region_Shape")).getSemanticHint().equals(descriptor.getSemanticHint())) { //$NON-NLS-1$
// Creating a region view as a sibling of the region owning this compartment
IAdaptable compartment = new SemanticAdapter(null, ((View) getHost().getModel()).eContainer());
@@ -284,8 +284,8 @@
List<?> elementTypes = createUnspecifiedTypeRequest.getElementTypes();
// Treat the case where only one element type is listed
// Only take EntryPoint or ExitPoint element type into account
- if ((elementTypes.size() == 1) && (((IElementType) (elementTypes.get(0)) == getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape"))
- || ((IElementType) (elementTypes.get(0)) == getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape")))) {
+ if ((elementTypes.size() == 1) && (((IElementType) (elementTypes.get(0)) == getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape")) //$NON-NLS-1$
+ || ((IElementType) (elementTypes.get(0)) == getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape")))) { //$NON-NLS-1$
// If the target is a compartment replace by its grand parent edit part
if ((getHost() instanceof ShapeCompartmentEditPart)) {
return getHost().getParent().getParent().getParent();
@@ -361,23 +361,23 @@
* A default empty property string which serves when creating a region
* without initial graphical context.
*/
- public static final String NONE = "";
+ public static final String NONE = ""; //$NON-NLS-1$
/**
* The code for a region in the TOP part of a given area.
*/
- public static final String TOP = "T";
+ public static final String TOP = "T"; //$NON-NLS-1$
/**
* The code for a region in the RIGHT part of a given area.
*/
- public static final String RIGHT = "R";
+ public static final String RIGHT = "R"; //$NON-NLS-1$
/**
* The code for a region in the BOTTOM part of a given area.
*/
- public static final String BOTTOM = "B";
+ public static final String BOTTOM = "B"; //$NON-NLS-1$
/**
* The code for a region in the LEFT part of a given area.
*/
- public static final String LEFT = "L";
+ public static final String LEFT = "L"; //$NON-NLS-1$
/**
* Computes the zone at location within bounds using absolute coordinates.
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/META-INF/MANIFEST.MF
index a71f653..08e66e3 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@
org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
org.eclipse.papyrus.extensionpoints.editors;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.3.0,5.0.0)",
org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[3.1.0,4.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/Activator.java
index 3858312..fc47b6e 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/Activator.java
@@ -13,9 +13,10 @@
*****************************************************************************/
package org.eclipse.papyrus.sirius.uml.diagram.textedit;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Class Activator.
@@ -36,7 +37,7 @@
private static Activator plugin;
/** The log. */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
/**
* The constructor.
@@ -60,7 +61,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
}
/**
@@ -69,7 +69,7 @@
* @param context
* @throws Exception
*/
-
+
/*
* (non-Javadoc)
*
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextDEdgeNameEditPart.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextDEdgeNameEditPart.java
index 86123b9..f655d7a 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextDEdgeNameEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextDEdgeNameEditPart.java
@@ -18,11 +18,11 @@
import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.textedit.Activator;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeNameEditPart;
import org.eclipse.swt.custom.BusyIndicator;
@@ -66,7 +66,7 @@
if (resolveSemanticElement instanceof DEdgeSpec) {
EObject target = ((DEdgeSpec) resolveSemanticElement).getTarget();
final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + target.eClass().getInstanceClassName());
- if (languagePreferred != null && !languagePreferred.equals("")) {
+ if (languagePreferred != null && !languagePreferred.equals("")) { //$NON-NLS-1$
configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, target, this);
} else {
configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, target, this);
@@ -108,7 +108,7 @@
}
});
} catch (InterruptedException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNode3EditPart.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNode3EditPart.java
index 7ed664d..cd8e4ee 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNode3EditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNode3EditPart.java
@@ -33,11 +33,11 @@
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.textedit.Activator;
import org.eclipse.sirius.diagram.DDiagramElement;
import org.eclipse.sirius.diagram.description.tool.DirectEditLabel;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeSpec;
@@ -105,7 +105,7 @@
if (resolveSemanticElement instanceof DNodeSpec) {
EObject target = ((DNodeSpec) resolveSemanticElement).getTarget();
final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + target.eClass().getInstanceClassName());
- if (languagePreferred != null && !languagePreferred.equals("")) {
+ if (languagePreferred != null && !languagePreferred.equals("")) { //$NON-NLS-1$
configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, target, this);
} else {
super.performDirectEditRequest(request);
@@ -145,7 +145,7 @@
}
});
} catch (InterruptedException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerName2EditPart.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerName2EditPart.java
index cfa1f61..4cd5fbb 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerName2EditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerName2EditPart.java
@@ -19,11 +19,11 @@
import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.textedit.Activator;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeContainerSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerName2EditPart;
@@ -65,7 +65,7 @@
if (resolveSemanticElement instanceof DNodeContainerSpec) {
EObject target = ((DNodeContainer) resolveSemanticElement).getTarget();
final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + target.eClass().getInstanceClassName());
- if (languagePreferred != null && !languagePreferred.equals("")) {
+ if (languagePreferred != null && !languagePreferred.equals("")) { //$NON-NLS-1$
configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, target, this);
} else {
configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, target, this);
@@ -103,7 +103,7 @@
}
});
} catch (InterruptedException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerNameEditPart.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerNameEditPart.java
index 5a48469..78553a6 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerNameEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeContainerNameEditPart.java
@@ -19,11 +19,11 @@
import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.textedit.Activator;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeContainerSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerNameEditPart;
import org.eclipse.swt.custom.BusyIndicator;
@@ -64,7 +64,7 @@
if (resolveSemanticElement instanceof DNodeContainerSpec) {
EObject target = ((DNodeContainerSpec) resolveSemanticElement).getTarget();
final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + target.eClass().getInstanceClassName());
- if (languagePreferred != null && !languagePreferred.equals("")) {
+ if (languagePreferred != null && !languagePreferred.equals("")) { //$NON-NLS-1$
configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, target, this);
} else {
configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, target, this);
@@ -103,7 +103,7 @@
}
});
} catch (InterruptedException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeListElementEditPart.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeListElementEditPart.java
index 68c074f..a0fb24a 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeListElementEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeListElementEditPart.java
@@ -19,11 +19,11 @@
import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.textedit.Activator;
import org.eclipse.sirius.diagram.DNodeListElement;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeListElementEditPart;
import org.eclipse.swt.custom.BusyIndicator;
@@ -63,7 +63,7 @@
if (resolveSemanticElement instanceof DNodeListElement) {
EObject target = ((DNodeListElement) resolveSemanticElement).getTarget();
final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + target.eClass().getInstanceClassName());
- if (languagePreferred != null && !languagePreferred.equals("")) {
+ if (languagePreferred != null && !languagePreferred.equals("")) { //$NON-NLS-1$
configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, target, this);
} else {
configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, target, this);
@@ -102,7 +102,7 @@
}
});
} catch (InterruptedException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeNameEditPart.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeNameEditPart.java
index 53900ab..e10341c 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeNameEditPart.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.textedit/src/org/eclipse/papyrus/sirius/uml/diagram/textedit/editpart/XtextSiriusDNodeNameEditPart.java
@@ -19,11 +19,11 @@
import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IDirectEditorConfiguration;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.textedit.Activator;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeNameEditPart;
import org.eclipse.swt.custom.BusyIndicator;
@@ -67,7 +67,7 @@
if(resolveSemanticElement instanceof DNodeSpec) {
EObject target = ((DNodeSpec) resolveSemanticElement).getTarget();
final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + target.eClass().getInstanceClassName());
- if (languagePreferred != null && !languagePreferred.equals("")) {
+ if (languagePreferred != null && !languagePreferred.equals("")) { //$NON-NLS-1$
configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, target, this);
} else {
configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, target, this);
@@ -108,7 +108,7 @@
}
});
} catch (InterruptedException e) {
- Activator.log.error(e);
+ Activator.log.error("Unexpected Error",e); //$NON-NLS-1$
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/META-INF/MANIFEST.MF
index 1a2b896..819e45e 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Automatic-Module-Name: org.eclipse.papyrus.sirius.uml.diagram.usecase
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.sirius.uml.diagram.common;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.domain.services;bundle-version="[0.15.0,1.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[5.2.0,6.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/src/org/eclipse/papyrus/sirius/uml/diagram/usecase/Activator.java b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/src/org/eclipse/papyrus/sirius/uml/diagram/usecase/Activator.java
index 25edf6a..8fdb0a5 100644
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/src/org/eclipse/papyrus/sirius/uml/diagram/usecase/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.usecase/src/org/eclipse/papyrus/sirius/uml/diagram/usecase/Activator.java
@@ -13,15 +13,17 @@
*****************************************************************************/
package org.eclipse.papyrus.sirius.uml.diagram.usecase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The activator class controls the plug-in life cycle
@@ -39,7 +41,8 @@
private static Set<Viewpoint> viewpoints;
/** Logging helper */
- public static LogHelper log;
+ public static Logger log = LoggerFactory.getLogger( Activator.class );
+
/**
* The constructor
@@ -59,7 +62,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- log = new LogHelper(this);
viewpoints = new HashSet<Viewpoint>();
viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/papyrus_usecase.odesign")); //$NON-NLS-1$
}
diff --git a/plugins/uml/org.eclipse.papyrus.sirius.uml/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.sirius.uml/META-INF/MANIFEST.MF
index 5922021..c56c24a 100755
--- a/plugins/uml/org.eclipse.papyrus.sirius.uml/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.sirius.uml/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@
org.eclipse.papyrus.infra.architecture;bundle-version="[3.2.0,4.0.0)",
org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.1.0,4.0.0)",
org.eclipse.papyrus.sirius.editor.modelexplorer;bundle-version="[0.7.0,1.0.0)",
+ org.eclipse.papyrus.sirius.log;bundle-version="[0.7.0,1.0.0)",
org.eclipse.papyrus.uml.architecture;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.uml.modelexplorer;bundle-version="[3.1.0,4.0.0)",
