Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2012-10-16 11:38:00 +0000
committercletavernie2012-10-16 11:38:00 +0000
commit53a29f532c8621aab9f25e12b42b9e75310b72d2 (patch)
tree9340daa433e1cb59a19bbe3cb4a2323dd04a65f6 /incoming
parent1ca8e7fd9c7bcb67c92793034cbe8616b61c83a1 (diff)
downloadorg.eclipse.papyrus-53a29f532c8621aab9f25e12b42b9e75310b72d2.tar.gz
org.eclipse.papyrus-53a29f532c8621aab9f25e12b42b9e75310b72d2.tar.xz
org.eclipse.papyrus-53a29f532c8621aab9f25e12b42b9e75310b72d2.zip
New service registry: Fix project metadata and apply Papyrus formatter
Diffstat (limited to 'incoming')
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.classpath2
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF2
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/about.html106
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/build.properties4
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/plugin.properties2
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.classpath2
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF10
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/about.html106
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/build.properties4
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/plugin.properties2
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF4
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/about.html106
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/build.properties7
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/plugin.properties2
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationException.java22
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationMultiException.java62
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationNotFoundException.java22
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DescriptorsCache.java176
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/ServiceDescriptor.java2
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/annotations/Service.java17
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/AliasServiceEntry.java9
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/LazyStartupEntry.java1
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/PojoServiceEntry.java11
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java11
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceFactoryEntry.java13
-rw-r--r--incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/StartStartupEntry.java2
26 files changed, 512 insertions, 195 deletions
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.classpath b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.classpath
index ed2bc1287f0..45f024e850e 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.classpath
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF
index 951aaf31517..18de1e47674 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptors.provider,
org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.provider
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.serviceregistry;visibility:=reexport,
+ org.eclipse.papyrus.infra.core.serviceregistry;bundle-version="0.10.0";visibility:=reexport,
org.eclipse.emf.edit;visibility:=reexport,
org.eclipse.uml2.common.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/about.html b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/about.html
new file mode 100644
index 00000000000..34ab520eed4
--- /dev/null
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/about.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+ on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html> \ No newline at end of file
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/build.properties b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/build.properties
index 061672eb20e..9811208ae02 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/build.properties
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/build.properties
@@ -4,7 +4,9 @@ bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html
jars.compile.order = .
source.. = src/
output.. = bin/
+src.includes = about.html
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/plugin.properties b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/plugin.properties
index b3c2f7f6b20..618abc0fc31 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/plugin.properties
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.edit/plugin.properties
@@ -8,7 +8,7 @@
# Contributors:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
##################################################################################
-pluginName=Papyrus Service Registry
+pluginName=Papyrus Service Registry (Incubation)
providerName=Eclipse Modeling Project
_UI_CreateChild_text = {0}
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.classpath b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.classpath
index ed2bc1287f0..45f024e850e 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.classpath
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF
index 7da9cc74730..a95ce6cc267 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.core.serviceregistry.editor;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.presentation.ServicedescriptorswithidEditorPlugin$Implementation
Bundle-Vendor: %providerName
@@ -10,9 +10,9 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.presentation
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.core.serviceregistry.edit;visibility:=reexport,
+ org.eclipse.core.resources,
+ org.eclipse.papyrus.infra.core.serviceregistry.edit;bundle-version="0.10.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
+ org.eclipse.emf.edit.ui,
+ org.eclipse.ui.ide
Bundle-ActivationPolicy: lazy
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/about.html b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/about.html
new file mode 100644
index 00000000000..34ab520eed4
--- /dev/null
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/about.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+ on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html> \ No newline at end of file
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/build.properties b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/build.properties
index 0f81e49d110..b9ca46651c7 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/build.properties
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/build.properties
@@ -4,7 +4,9 @@ bin.includes = .,\
icons/,\
META-INF/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ about.html
jars.compile.order = .
source.. = src/
output.. = bin
+src.includes = about.html
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/plugin.properties b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/plugin.properties
index a5e9be5690d..710afc54211 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/plugin.properties
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry.editor/plugin.properties
@@ -8,7 +8,7 @@
# Contributors:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
##################################################################################
-pluginName=Papyrus Service Registry
+pluginName=Papyrus Service Registry (Incubation)
providerName=Eclipse Modeling Project
_UI_ServicedescriptorswithidEditor_menu = &Servicedescriptorswithid Editor
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF
index 33da65242c3..585457ed85e 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.10.0.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
org.junit,
org.eclipse.emf.common,
org.eclipse.emf.ecore
@@ -18,3 +18,5 @@ Export-Package: org.eclipse.papyrus.infra.core.serviceregistry,
org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid,
org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.impl,
org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.util
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/about.html b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/about.html
new file mode 100644
index 00000000000..34ab520eed4
--- /dev/null
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/about.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 14, 2010</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+ (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+ <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+ on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.</li>
+ <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.</li>
+ <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html> \ No newline at end of file
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/build.properties b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/build.properties
index 53c8b373787..ae6766fb27c 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/build.properties
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/build.properties
@@ -1,4 +1,9 @@
source.. = src/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ about.html,\
+ plugin.properties,\
+ models/,\
+ schema/
+src.includes = about.html
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/plugin.properties b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/plugin.properties
index 376bf25e8b5..dd53c3514dc 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/plugin.properties
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
##################################################################################
-pluginName=Papyrus Service Registry
+pluginName=Papyrus Service Registry (Incubation)
providerName=Eclipse Modeling Project
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationException.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationException.java
index 827d18ac722..cdd3e54ec6c 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationException.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationException.java
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.infra.core.serviceregistry;
* Root exception of exceptions thrown while reading descriptor declarations.
*
* @author cedric dumoulin
- *
+ *
*/
public class DeclarationException extends Exception {
@@ -30,14 +30,14 @@ public class DeclarationException extends Exception {
/**
* Constructor.
- *
+ *
*/
public DeclarationException() {
}
/**
* Constructor.
- *
+ *
* @param message
*/
public DeclarationException(String message) {
@@ -46,7 +46,7 @@ public class DeclarationException extends Exception {
/**
* Constructor.
- *
+ *
* @param cause
*/
public DeclarationException(Throwable cause) {
@@ -55,7 +55,7 @@ public class DeclarationException extends Exception {
/**
* Constructor.
- *
+ *
* @param message
* @param cause
*/
@@ -63,16 +63,4 @@ public class DeclarationException extends Exception {
super(message, cause);
}
- /**
- * Constructor.
- *
- * @param message
- * @param cause
- * @param enableSuppression
- * @param writableStackTrace
- */
- public DeclarationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- }
-
}
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationMultiException.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationMultiException.java
index 3d46bdec3f4..a399adffc88 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationMultiException.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationMultiException.java
@@ -22,7 +22,7 @@ import java.util.List;
* An exception used to gather multi exceptions encountered during declarations reading.
*
* @author cedric dumoulin
- *
+ *
*/
public class DeclarationMultiException extends DeclarationException {
@@ -30,11 +30,12 @@ public class DeclarationMultiException extends DeclarationException {
*
*/
private static final long serialVersionUID = 1L;
-
+
private List<Throwable> errors;
+
/**
* Constructor.
- *
+ *
*/
public DeclarationMultiException() {
// TODO Auto-generated constructor stub
@@ -42,7 +43,7 @@ public class DeclarationMultiException extends DeclarationException {
/**
* Constructor.
- *
+ *
* @param message
*/
public DeclarationMultiException(String message) {
@@ -52,7 +53,7 @@ public class DeclarationMultiException extends DeclarationException {
/**
* Constructor.
- *
+ *
* @param cause
*/
public DeclarationMultiException(Throwable cause) {
@@ -62,7 +63,7 @@ public class DeclarationMultiException extends DeclarationException {
/**
* Constructor.
- *
+ *
* @param message
* @param cause
*/
@@ -72,24 +73,12 @@ public class DeclarationMultiException extends DeclarationException {
}
/**
- * Constructor.
- *
- * @param message
- * @param cause
- * @param enableSuppression
- * @param writableStackTrace
- */
- public DeclarationMultiException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- // TODO Auto-generated constructor stub
- }
-
- /**
*
* Constructor.
- *
+ *
* @param string
- * @param warnings The warnings used to initialize this object. No clone is per
+ * @param warnings
+ * The warnings used to initialize this object. No clone is per
*/
public DeclarationMultiException(String string, List<Throwable> warnings) {
this.errors = warnings;
@@ -100,43 +89,44 @@ public class DeclarationMultiException extends DeclarationException {
*
* @param throwable
*/
- public void addThrowable( Throwable throwable ) {
- if( errors == null) {
+ public void addThrowable(Throwable throwable) {
+ if(errors == null) {
errors = new ArrayList<Throwable>();
}
errors.add(throwable);
}
-
+
/**
*
* @return
*/
public boolean isEmpty() {
- if(errors == null)
+ if(errors == null) {
return true;
-
+ }
+
return errors.isEmpty();
}
-
+
/**
*
* @see java.lang.Throwable#toString()
- *
+ *
* @return
*/
@Override
public String toString() {
- if( errors == null || errors.size()==0) {
- return super.toString();
+ if(errors == null || errors.size() == 0) {
+ return super.toString();
}
-
+
StringBuffer buff = new StringBuffer(super.toString());
- for( Throwable error : errors) {
- buff.append("\n").append( error.getMessage() );
+ for(Throwable error : errors) {
+ buff.append("\n").append(error.getMessage());
}
-
+
return buff.toString();
-
-
+
+
}
}
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationNotFoundException.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationNotFoundException.java
index a016aa7684f..703e60fa144 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationNotFoundException.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DeclarationNotFoundException.java
@@ -17,7 +17,7 @@ package org.eclipse.papyrus.infra.core.serviceregistry;
/**
* @author cedric dumoulin
- *
+ *
*/
public class DeclarationNotFoundException extends DeclarationException {
@@ -28,7 +28,7 @@ public class DeclarationNotFoundException extends DeclarationException {
/**
* Constructor.
- *
+ *
*/
public DeclarationNotFoundException() {
super();
@@ -36,19 +36,7 @@ public class DeclarationNotFoundException extends DeclarationException {
/**
* Constructor.
- *
- * @param message
- * @param cause
- * @param enableSuppression
- * @param writableStackTrace
- */
- public DeclarationNotFoundException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- }
-
- /**
- * Constructor.
- *
+ *
* @param message
* @param cause
*/
@@ -58,7 +46,7 @@ public class DeclarationNotFoundException extends DeclarationException {
/**
* Constructor.
- *
+ *
* @param message
*/
public DeclarationNotFoundException(String message) {
@@ -67,7 +55,7 @@ public class DeclarationNotFoundException extends DeclarationException {
/**
* Constructor.
- *
+ *
* @param cause
*/
public DeclarationNotFoundException(Throwable cause) {
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DescriptorsCache.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DescriptorsCache.java
index 230965f660d..751010a0b18 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DescriptorsCache.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/DescriptorsCache.java
@@ -16,8 +16,6 @@ package org.eclipse.papyrus.infra.core.serviceregistry;
import java.util.List;
-import javax.swing.event.AncestorEvent;
-
import org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptors.AbstractServiceDesc;
import org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptors.AliasDesc;
import org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptors.Descriptors;
@@ -36,11 +34,11 @@ import org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.S
/**
- * A cache used to query the {@link IServiceDescriptorsWithIdProvider}. The cache return resolved descriptors,
+ * A cache used to query the {@link IServiceDescriptorsWithIdProvider}. The cache return resolved descriptors,
* in the form of instance of the ServiceDescriptors model.
*
* @author cedric dumoulin
- *
+ *
*/
public class DescriptorsCache {
@@ -48,93 +46,95 @@ public class DescriptorsCache {
* The cache of descriptors.
*/
protected Descriptors descriptorsCache;
-
+
/**
* The provider used to query declarations.
*/
protected ServiceDescriptorsWithIdProviderCollection declaredDescriptorProvider;
-
-
+
+
/**
*
* Constructor.
- *
+ *
*/
public DescriptorsCache() {
declaredDescriptorProvider = new ServiceDescriptorsWithIdProviderCollection();
descriptorsCache = ServicedescriptorsFactory.eINSTANCE.createDescriptors();
}
-
+
/**
* Add all the provided {@link IServiceDescriptorsWithIdProvider} to the list of providers to use.
+ *
* @param declaredDescriptorProviders
*/
- public void addAll(IServiceDescriptorsWithIdProvider ... declaredDescriptorProviders) {
+ public void addAll(IServiceDescriptorsWithIdProvider... declaredDescriptorProviders) {
declaredDescriptorProvider.addAll(declaredDescriptorProviders);
descriptorsCache = ServicedescriptorsFactory.eINSTANCE.createDescriptors();
-
+
}
/**
* Get the descriptor for the specified registry.
* The descriptor is built from the declarations found in {@link #declaredDescriptorProvider}.
- * The descriptor is cached. This mean that subsequent calls for the same name will return the same
- * result.
- * <br/>
+ * The descriptor is cached. This mean that subsequent calls for the same name will return the same
+ * result. <br/>
* If the registry is not found, throws an exception.
*
- * @param registryName The name of the registry for which the descriptor is required.
+ * @param registryName
+ * The name of the registry for which the descriptor is required.
*
* @return The registry descriptor
- * @throws DeclarationException If an error occur while reading declarations.
+ * @throws DeclarationException
+ * If an error occur while reading declarations.
*
*/
public RegistryDesc getRegistryDesc(String registryName) throws DeclarationException {
-
+
// Try from cache
RegistryDesc desc = descriptorsCache.getRegistryDesc(registryName);
-
- if( desc!=null) {
+
+ if(desc != null) {
return desc;
}
-
+
// Load from providers
// this can throw exception
RegistryIdDesc idDesc = declaredDescriptorProvider.getRegistryIdDesc(registryName);
-
+
// Create a RegistryDesc from a RegistryIdDesc, and set minimal data
desc = ServicedescriptorsFactory.eINSTANCE.createRegistryDesc();
desc.setName(idDesc.getName());
desc.setIsUnique(idDesc.isUnique());
desc.setDescription(idDesc.getDescription());
-
+
// Add it to the cache, so it can be found by other requests
descriptorsCache.getRegistries().add(desc);
-
+
// Set the references
// serviceSet
- for( String serviceSetId : idDesc.getSets()) {
- desc.getServiceSets().add( getServiceSetDesc(serviceSetId) );
+ for(String serviceSetId : idDesc.getSets()) {
+ desc.getServiceSets().add(getServiceSetDesc(serviceSetId));
}
-
+
// extends
- for( String extendsId : idDesc.getExtends()) {
- desc.getExtends().add( getRegistryDesc(extendsId) );
+ for(String extendsId : idDesc.getExtends()) {
+ desc.getExtends().add(getRegistryDesc(extendsId));
}
-
+
// parents
- for( String extendsId : idDesc.getParents()) {
- desc.getParents().add( getRegistryDesc(extendsId) );
+ for(String extendsId : idDesc.getParents()) {
+ desc.getParents().add(getRegistryDesc(extendsId));
}
-
-
+
+
// Resolve inheritances
// need to compute services available for this registry
// Available services are those from all sets, and from extends.
- computeRegistryServices( desc );
-
+ computeRegistryServices(desc);
+
return desc;
}
@@ -142,10 +142,9 @@ public class DescriptorsCache {
/**
* Get the {@link ServiceSetDesc} for the specified name.
* The descriptor is built from the declarations found in {@link #declaredDescriptorProvider}.
- * The descriptor is cached. This mean that subsequent calls for the same name will return the same
- * result.
- * <br/>
- * If the descriptor is not found, throws an exception.
+ * The descriptor is cached. This mean that subsequent calls for the same name will return the same
+ * result. <br/>
+ * If the descriptor is not found, throws an exception.
*
* @param serviceSetId
* @return
@@ -154,38 +153,38 @@ public class DescriptorsCache {
public ServiceSetDesc getServiceSetDesc(String serviceSetId) throws DeclarationException {
// Try from cache
ServiceSetDesc desc = descriptorsCache.getServiceSetDesc(serviceSetId);
-
- if( desc!=null) {
+
+ if(desc != null) {
return desc;
}
-
+
// Load from providers
// this can throw exception
ServiceSetIdDesc idDesc = declaredDescriptorProvider.getServiceSet(serviceSetId);
-
+
// Create a RegistryDesc from a RegistryIdDesc, and set minimal data
desc = ServicedescriptorsFactory.eINSTANCE.createServiceSetDesc();
desc.setName(idDesc.getName());
desc.setDescription(idDesc.getDescription());
-
+
// Add it to the cache, so it can be found by other requests
descriptorsCache.getServiceSets().add(desc);
-
+
// Set the references
// serviceSet
- for( AbstractServiceIdDesc serviceIdDesc : idDesc.getServiceDescriptors()) {
- desc.getOwnedServices().add( transformAbstractServiceIdDescToRef(serviceIdDesc) );
+ for(AbstractServiceIdDesc serviceIdDesc : idDesc.getServiceDescriptors()) {
+ desc.getOwnedServices().add(transformAbstractServiceIdDescToRef(serviceIdDesc));
}
-
+
// extends
- for( String extendsId : idDesc.getExtends()) {
- desc.getExtends().add( getServiceSetDesc(extendsId) );
+ for(String extendsId : idDesc.getExtends()) {
+ desc.getExtends().add(getServiceSetDesc(extendsId));
}
// Resolve inheritances
// need to compute services available for this set
// Available services are those from all extends.
- computeServiceSetServices( desc );
+ computeServiceSetServices(desc);
return desc;
}
@@ -197,38 +196,35 @@ public class DescriptorsCache {
* @return
*/
private AbstractServiceDesc transformAbstractServiceIdDescToRef(AbstractServiceIdDesc serviceIdDesc) {
- if( serviceIdDesc instanceof ServiceFactoryIdDesc) {
+ if(serviceIdDesc instanceof ServiceFactoryIdDesc) {
return transformServiceFactoryIdDescToRef((ServiceFactoryIdDesc)serviceIdDesc);
- }
- else if ( serviceIdDesc instanceof ServiceIdDesc) {
+ } else if(serviceIdDesc instanceof ServiceIdDesc) {
return transformServiceIdDescToRef((ServiceIdDesc)serviceIdDesc);
- }
- else if ( serviceIdDesc instanceof AliasIdDesc) {
+ } else if(serviceIdDesc instanceof AliasIdDesc) {
return transformAliasIdDescToRef((AliasIdDesc)serviceIdDesc);
- }
- else {
+ } else {
// Should never happen
- throw new UnsupportedOperationException("Don't no how to transform '" + serviceIdDesc +"' to AbstractServiceDesc.");
+ throw new UnsupportedOperationException("Don't no how to transform '" + serviceIdDesc + "' to AbstractServiceDesc.");
}
}
/**
*
* @param serviceIdDesc
- * @return
+ * @return
*/
private AbstractServiceDesc transformServiceIdDescToRef(ServiceIdDesc serviceIdDesc) {
-
+
ServiceDesc desc = ServicedescriptorsFactory.eINSTANCE.createServiceDesc();
desc.setBundleID(serviceIdDesc.getBundleID());
desc.setClassname(serviceIdDesc.getClassname());
desc.setDescription(serviceIdDesc.getDescription());
desc.setName(serviceIdDesc.getName());
desc.setPriority(serviceIdDesc.getPriority());
- desc.setStartKind( transformStartKind(serviceIdDesc.getStartKind()));
+ desc.setStartKind(transformStartKind(serviceIdDesc.getStartKind()));
// dependsOn
desc.getDependsOnIds().addAll(serviceIdDesc.getDependsOn());
-
+
return desc;
}
@@ -239,7 +235,7 @@ public class DescriptorsCache {
*/
private StartupKind transformStartKind(org.eclipse.papyrus.infra.core.serviceregistry.servicedescriptorswithid.StartupKind startKind) {
- switch( startKind) {
+ switch(startKind) {
case STARTUP:
return StartupKind.STARTUP;
case LAZY:
@@ -252,7 +248,7 @@ public class DescriptorsCache {
/**
*
* @param serviceIdDesc
- * @return
+ * @return
*/
private AbstractServiceDesc transformAliasIdDescToRef(AliasIdDesc serviceIdDesc) {
AliasDesc desc = ServicedescriptorsFactory.eINSTANCE.createAliasDesc();
@@ -262,7 +258,7 @@ public class DescriptorsCache {
desc.setPriority(serviceIdDesc.getPriority());
// dependsOn
desc.getDependsOnIds().addAll(serviceIdDesc.getDependsOn());
-
+
return desc;
}
@@ -270,7 +266,7 @@ public class DescriptorsCache {
/**
*
* @param serviceIdDesc
- * @return
+ * @return
*/
private AbstractServiceDesc transformServiceFactoryIdDescToRef(ServiceFactoryIdDesc serviceIdDesc) {
ServiceFactoryDesc desc = ServicedescriptorsFactory.eINSTANCE.createServiceFactoryDesc();
@@ -279,76 +275,78 @@ public class DescriptorsCache {
desc.setDescription(serviceIdDesc.getDescription());
desc.setName(serviceIdDesc.getName());
desc.setPriority(serviceIdDesc.getPriority());
- desc.setStartKind( transformStartKind(serviceIdDesc.getStartKind()));
+ desc.setStartKind(transformStartKind(serviceIdDesc.getStartKind()));
// dependsOn
desc.getDependsOnIds().addAll(serviceIdDesc.getDependsOn());
-
+
return desc;
}
/**
- * Compute the services available from this registry. This implies
+ * Compute the services available from this registry. This implies
* resolving inheritances from extends.
- * @param registryDesc The descriptor for which services should be computed.
+ *
+ * @param registryDesc
+ * The descriptor for which services should be computed.
*
*
*/
private void computeRegistryServices(RegistryDesc registryDesc) {
-
+
// Reset the services
List<AbstractServiceDesc> services = registryDesc.getServices();
services.clear();
-
+
// do the union of all services from sets
// Do not check for double names (this is done in the Registry).
- for( ServiceSetDesc setDesc : registryDesc.getServiceSets()) {
-
+ for(ServiceSetDesc setDesc : registryDesc.getServiceSets()) {
+
services.addAll(setDesc.getServices());
}
-
+
// Add services from extends
// Add a services from a parent only if there is not a service with the same name
// in the child
- for( RegistryDesc extendsDesc : registryDesc.getExtends()) {
+ for(RegistryDesc extendsDesc : registryDesc.getExtends()) {
// Walk each service of the parent
- for( AbstractServiceDesc serviceDesc : extendsDesc.getServices()) {
+ for(AbstractServiceDesc serviceDesc : extendsDesc.getServices()) {
// Check if the service is already in the child
- if( ! registryDesc.servicesContains(serviceDesc.getName())) {
- services.add(serviceDesc);
+ if(!registryDesc.servicesContains(serviceDesc.getName())) {
+ services.add(serviceDesc);
}
}
}
-
+
}
/**
- * Compute the services available from the specified {@link ServiceSetDesc}. This reset and compute
+ * Compute the services available from the specified {@link ServiceSetDesc}. This reset and compute
* the {@link ServiceSetDesc#getServices()} property.
*
* @param serviceSetDesc
*/
private void computeServiceSetServices(ServiceSetDesc serviceSetDesc) {
-
+
// Reset the services
List<AbstractServiceDesc> services = serviceSetDesc.getServices();
services.clear();
-
+
// Add its own services
services.addAll(serviceSetDesc.getOwnedServices());
-
+
// Add services from extends
// Add a services from an extends only if there is not a service with the same name
// in the child
- for( ServiceSetDesc extendsDesc : serviceSetDesc.getExtends()) {
+ for(ServiceSetDesc extendsDesc : serviceSetDesc.getExtends()) {
// Walk each service of the parent
- for( AbstractServiceDesc serviceDesc : extendsDesc.getServices()) {
+ for(AbstractServiceDesc serviceDesc : extendsDesc.getServices()) {
// Check if the service is already in the child
- if( ! serviceSetDesc.servicesContains(serviceDesc.getName())) {
- services.add(serviceDesc);
+ if(!serviceSetDesc.servicesContains(serviceDesc.getName())) {
+ services.add(serviceDesc);
}
}
}
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/ServiceDescriptor.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/ServiceDescriptor.java
index b06fc580e56..e2b01627dcd 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/ServiceDescriptor.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/ServiceDescriptor.java
@@ -20,7 +20,7 @@ public class ServiceDescriptor {
*/
public enum ServiceTypeKind {
service, serviceFactory, pojo, alias
- };
+ }
/** Classname of the service. USed to start the service */
private String serviceClassname;
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/annotations/Service.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/annotations/Service.java
index 2b0206a3b25..34b6d6a80c8 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/annotations/Service.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/annotations/Service.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Target;
/**
* @author cedric dumoulin
- *
+ *
*/
// Annotation accessible at runtime
@Retention(RetentionPolicy.RUNTIME)
@@ -34,24 +34,29 @@ public @interface Service {
* Constant used to specify that the id is not set by the user.
*/
static String ID_NOT_SET = "";
+
/**
* Possible type of startup.
*/
- public enum StartupKind {lazy, startup};
-
- /*
+ public enum StartupKind {
+ lazy, startup
+ }
+
+ /*
* Service Id
*/
String id() default ID_NOT_SET;
-
+
/**
* Kind of startup requested for the service.
+ *
* @return
*/
StartupKind startupKind() default StartupKind.lazy;
-
+
/**
* Service priority level. Default is 0.
+ *
* @return
*/
int priority() default 0;
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/AliasServiceEntry.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/AliasServiceEntry.java
index 3c7fdae989e..b90fe1d74fe 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/AliasServiceEntry.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/AliasServiceEntry.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.infra.core.serviceregistry.ServicesRegistry;
public class AliasServiceEntry extends ServiceTypeEntry {
/** The real service entry. */
-// private ServiceTypeEntry referencedService;
+ // private ServiceTypeEntry referencedService;
/** The instance of the real service. */
private Object serviceInstance;
@@ -38,6 +38,7 @@ public class AliasServiceEntry extends ServiceTypeEntry {
* @throws ServiceException
* If service can't be started.
*/
+ @Override
public Object getServiceInstance() throws ServiceException {
checkState(ServiceState.started);
@@ -50,9 +51,10 @@ public class AliasServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void createService() throws ServiceException {
checkState(ServiceState.registered);
-
+
setState(ServiceState.created);
}
@@ -64,6 +66,7 @@ public class AliasServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void initService(ServicesRegistry servicesRegistry) throws ServiceException {
checkState(ServiceState.created);
try {
@@ -84,6 +87,7 @@ public class AliasServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void startService() throws ServiceException {
setState(ServiceState.started);
}
@@ -92,6 +96,7 @@ public class AliasServiceEntry extends ServiceTypeEntry {
* Dispose the alias.
* The referenced service is not disposed
*/
+ @Override
public void disposeService() throws ServiceException {
serviceInstance = null;
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/LazyStartupEntry.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/LazyStartupEntry.java
index 442e1f7a07d..b29bdf0a0bd 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/LazyStartupEntry.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/LazyStartupEntry.java
@@ -3,7 +3,6 @@
*/
package org.eclipse.papyrus.infra.core.serviceregistry.internal;
-import org.eclipse.papyrus.infra.core.serviceregistry.IService;
import org.eclipse.papyrus.infra.core.serviceregistry.ServiceException;
import org.eclipse.papyrus.infra.core.serviceregistry.ServiceState;
import org.eclipse.papyrus.infra.core.serviceregistry.ServicesRegistry;
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/PojoServiceEntry.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/PojoServiceEntry.java
index e9ce661fcdd..e9942a35907 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/PojoServiceEntry.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/PojoServiceEntry.java
@@ -51,10 +51,12 @@ public class PojoServiceEntry extends ServiceTypeEntry {
* @throws ServiceException
* If service can't be started.
*/
+ @Override
public Object getServiceInstance() throws ServiceException {
- if(serviceInstance == null)
+ if(serviceInstance == null) {
throw new BadStateException("Service is not created.", state, serviceDescriptor);
+ }
return serviceInstance;
}
@@ -64,6 +66,7 @@ public class PojoServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void createService() throws ServiceException {
checkState(ServiceState.registered);
// Exit if already created.
@@ -91,6 +94,7 @@ public class PojoServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void initService(ServicesRegistry servicesRegistry) throws ServiceException {
setState(ServiceState.initialized);
}
@@ -100,6 +104,7 @@ public class PojoServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void startService() throws ServiceException {
setState(ServiceState.started);
}
@@ -107,9 +112,11 @@ public class PojoServiceEntry extends ServiceTypeEntry {
/**
* Do nothing.
*/
+ @Override
public void disposeService() throws ServiceException {
- if(serviceInstance == null)
+ if(serviceInstance == null) {
return;
+ }
serviceInstance = null;
setState(ServiceState.disposed);
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java
index 6582c17d608..c19a671052a 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java
@@ -56,10 +56,12 @@ public class ServiceEntry extends ServiceTypeEntry {
* @throws ServiceException
* If service can't be started.
*/
+ @Override
public Object getServiceInstance() throws ServiceException {
- if(serviceInstance == null)
+ if(serviceInstance == null) {
throw new BadStateException("Service is not created.", state, serviceDescriptor);
+ }
return serviceInstance;
@@ -80,6 +82,7 @@ public class ServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void createService() throws ServiceException {
checkState(ServiceState.registered);
// Exit if already created.
@@ -107,6 +110,7 @@ public class ServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void initService(ServicesRegistry servicesRegistry) throws ServiceException {
checkState(ServiceState.created);
try {
@@ -127,6 +131,7 @@ public class ServiceEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void startService() throws ServiceException {
checkState(ServiceState.initialized);
@@ -148,9 +153,11 @@ public class ServiceEntry extends ServiceTypeEntry {
/**
* Dispose the service.
*/
+ @Override
public void disposeService() throws ServiceException {
- if(serviceInstance == null)
+ if(serviceInstance == null) {
return;
+ }
serviceInstance.disposeService();
serviceInstance = null;
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceFactoryEntry.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceFactoryEntry.java
index e7386924ac4..c3b1458e691 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceFactoryEntry.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceFactoryEntry.java
@@ -34,7 +34,6 @@ public class ServiceFactoryEntry extends ServiceTypeEntry {
public ServiceFactoryEntry(ServiceDescriptor serviceDescriptor) {
super(serviceDescriptor);
setState(ServiceState.registered);
-
}
/**
@@ -59,12 +58,11 @@ public class ServiceFactoryEntry extends ServiceTypeEntry {
* @throws ServiceException
* If service can't be started.
*/
+ @Override
public Object getServiceInstance() throws ServiceException {
if(factoryInstance == null) {
- throw new BadStateException("Service is not available (state="
- + state.toString()
- + "). ", state, serviceDescriptor);
+ throw new BadStateException("Service is not available (state=" + state.toString() + "). ", state, serviceDescriptor);
}
// Get the service instance if needed.
@@ -94,6 +92,7 @@ public class ServiceFactoryEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void createService() throws ServiceException {
checkState(ServiceState.registered);
// Exit if already created.
@@ -121,6 +120,7 @@ public class ServiceFactoryEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void initService(ServicesRegistry servicesRegistry) throws ServiceException {
checkState(ServiceState.created);
try {
@@ -141,6 +141,7 @@ public class ServiceFactoryEntry extends ServiceTypeEntry {
*
* @throws ServiceException
*/
+ @Override
public void startService() throws ServiceException {
checkState(ServiceState.initialized);
@@ -162,9 +163,11 @@ public class ServiceFactoryEntry extends ServiceTypeEntry {
/**
* Dispose the service.
*/
+ @Override
public void disposeService() throws ServiceException {
- if(factoryInstance == null)
+ if(factoryInstance == null) {
return;
+ }
factoryInstance.disposeService();
factoryInstance = null;
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/StartStartupEntry.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/StartStartupEntry.java
index 931119a8449..2bbc0bfa4eb 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/StartStartupEntry.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/StartStartupEntry.java
@@ -3,7 +3,6 @@
*/
package org.eclipse.papyrus.infra.core.serviceregistry.internal;
-import org.eclipse.papyrus.infra.core.serviceregistry.IService;
import org.eclipse.papyrus.infra.core.serviceregistry.ServiceException;
import org.eclipse.papyrus.infra.core.serviceregistry.ServicesRegistry;
@@ -23,7 +22,6 @@ public class StartStartupEntry extends ServiceStartupEntry {
* @param registry
*/
public StartStartupEntry(ServiceTypeEntry serviceEntry) {
-
super(serviceEntry);
}

Back to the top