Merge "Bug 529253 - [Compare] Stereotype applications left behind by sub-unit refactoring merge"
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml b/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml
index 517bdb0..9700e20 100644
--- a/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml
+++ b/plugins/compare/org.eclipse.papyrus.compare.p2/pom.xml
@@ -12,6 +12,13 @@
<version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
+ <properties>
+ <update.site.name>Papyrus Compare</update.site.name>
+ <update.site.description>Installable Build</update.site.description>
+ <update.site.version>0.7.0.${buildQualifier}</update.site.version>
+ <target.eclipse.version>Oxygen</target.eclipse.version>
+ </properties>
+
<pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
@@ -40,11 +47,23 @@
<version>1.0.0</version>
<executions>
<execution>
+ <id>generate-facade</id>
<phase>package</phase>
<goals>
<goal>generate-repository-facade</goal>
</goals>
<configuration>
+ <!-- Contains the template for the generated HTML index page -->
+ <siteTemplateFolder>site/template/</siteTemplateFolder>
+
+ <!-- configuration options for the generated HTML index page -->
+ <symbols>
+ <update.site.name>${update.site.name}</update.site.name>
+ <update.site.description>${update.site.description}</update.site.description>
+ <update.site.version>${update.site.version}</update.site.version>
+ <target.eclipse.version>${target.eclipse.version}</target.eclipse.version>
+ </symbols>
+
<associateSites>
<associateSite>${emf-compare.p2.repo}</associateSite>
<associateSite>${egit.p2.repo}</associateSite>
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html
new file mode 100644
index 0000000..160dcea
--- /dev/null
+++ b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/index.html
@@ -0,0 +1,120 @@
+<html>
+<head>
+<title>${update.site.name} - ${update.site.description} Update Site: ${update.site.version}</title>
+<link rel="stylesheet" type="text/css" href="web/site.css">
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
+<table cellspacing="0" cellpadding="0" class="table">
+ <tr>
+ <td colspan="3" class="td_header"> </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">${update.site.name} - ${update.site.description} Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build: ${update.site.version}</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>${update.site.description}</b>
+ Update Site for ${update.site.name}.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To install from this site, start up Eclipse ${target.eclipse.version}, then do:
+ <ul>
+ <code><strong>Help > Install New Software... ></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code> button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>, agree to the license
+ terms, and install.</li>
+
+ <p class="bodyText">
+ You can also download Papyrus Compare as individual zips for
+ offline installation. See <a class="link" href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/">Papyrus Compare Downloads</a>.<br />
+ If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/release/">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Integration Builds</h4>
+
+ <p><a href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/integration/">Integration
+ builds</a>, published occasionally, are tested for new feature content and compatibility with dependencies,
+ but there may be some things which do not yet work.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="http://download.eclipse.org/modeling/mdt/papyrus/components/compare/updates/nightly/">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using an Integration build and need a
+ fix, you can update to the latest Nightly, or wait for the next Integration build.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</center>
+</html>
\ No newline at end of file
diff --git a/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css
new file mode 100644
index 0000000..393f757
--- /dev/null
+++ b/plugins/compare/org.eclipse.papyrus.compare.p2/site/template/web/site.css
@@ -0,0 +1,80 @@
+td.spacer {
+ padding-bottom: 10px;
+ padding-top: 10px;
+}
+
+.title {
+ font-family: sans-serif;
+ color: #1778be;
+}
+
+.table {
+ margin-top: 0px;
+ margin-left: 0px;
+ width: 920px;
+}
+
+.bodyText {
+ font-family: sans-serif;
+ font-size: 9pt;
+ color: #000000;
+ width: 100%
+}
+
+.sub-header {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 9pt;
+ color: white;
+}
+
+.log-text {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: lighter;
+ font-size: 8pt;
+ color: black;
+}
+
+.big-header {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 9pt;
+ color: white;
+ border-top: 10px solid white;
+}
+
+.light-row {
+ background: #FFFFFF
+}
+
+.dark-row {
+ background: #EEEEEE
+}
+
+.header {
+ background: #445562
+}
+
+#indent {
+ word-wrap: break-word;
+ width: 300px;
+ text-indent: 10px;
+}
+
+.link {
+ color: #187dc6;
+}
+
+/*
+.td_header {
+ background: url("https://www.eclipse.org/papyrus/papyrus-banner.png") 0 no-repeat;
+ height: 100px;
+}
+*/
+
+.column-header {
+ font-size:small;
+}
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml b/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
index f3905ed..806575a 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/doc/model/revisionTool.uml
@@ -829,8 +829,8 @@
<packagedElement xmi:type="uml:Package" xmi:id="_xQ6Hh4UnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.views.properties.runtime"/>
<packagedElement xmi:type="uml:Package" xmi:id="_xQ6HiYUnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.views.properties.storage"/>
<packagedElement xmi:type="uml:Package" xmi:id="_xQ6Hi4UnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.views.properties.util"/>
- <packagedElement xmi:type="uml:Package" xmi:id="_xRD4gYUnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.views.properties.widgets"/>
- <packagedElement xmi:type="uml:Package" xmi:id="_xRD4g4UnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.views.properties.widgets.layout"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_xRD4gYUnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.infra.properties.ui.widgets"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_xRD4g4UnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.infra.properties.ui.widgets"/>
<packagedElement xmi:type="uml:Package" xmi:id="_xRD4hYUnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.views.properties.xwt"/>
</packagedElement>
<packagedElement xmi:type="uml:Component" xmi:id="_xRNpjoUnEeSVSpmUeqlzmw" name="org.eclipse.papyrus.emf.facet.util.emf.core">
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
index 2260db9..4fca82a 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleAnswer.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
index 40c6ff7..97082ba 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleComment.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
index 2260db9..4fca82a 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleQuestion.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
index b99cc0c..af4fc4c 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReview.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns="http://www.eclipse.org/xwt/presentation">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
index ef37b27..20dcb62 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleReviewRepository.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
xmlns:x="http://www.eclipse.org/xwt"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
index 2260db9..4fca82a 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/MultipleTodo.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
index a317e59..fc3f27b 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleAnswer.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:x="http://www.eclipse.org/xwt" xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
index fb17a19..da3c8c4 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleComment.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns="http://www.eclipse.org/xwt/presentation"
xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
index 1e3696e..918caf0 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleQuestion.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns:x="http://www.eclipse.org/xwt"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:j="clr-namespace:java.lang"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
index 85b65f0..3891cda 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReview.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
index 47ccbbb..bf1a7ff 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleReviewRepository.xwt
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
index bc3663b..3028dfb 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/properties/ui/SingleTodo.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns:j="clr-namespace:java.lang"
xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.di b/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
index bf9abab..247ed5e 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/resource/Review.profile.di
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.uml.architecture.Profile"/>
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
index f64a4b0..8d6603a 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/advice/AdviceRemove.java
@@ -18,6 +18,7 @@
import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
import org.eclipse.papyrus.revision.tool.command.PreventRemoveCommand;
import org.eclipse.papyrus.revision.tool.ui.ReviewsEditor;
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
index 288b6dd..60c1f26 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/core/ReviewResourceManager.java
@@ -253,7 +253,7 @@
final Model reviewModel=getCurrentReviewModel();
NamedElement author=reviewModel.getPackagedElement(authorName);
if( author==null||!(author instanceof Actor)){
- RecordingCommand cmd= new RecordingCommand(getDomain(), "createReviewModel") {
+ final RecordingCommand cmd= new RecordingCommand(getDomain(), "createReviewModel") {
@Override
protected void doExecute() {
currentAuthor=UMLFactory.eINSTANCE.createActor();
@@ -267,7 +267,9 @@
currentAuthor.setValue(authorStereotype, I_VersioningStereotype.AUTHOR_COLOR_ATT, colorString);
}
};
- getDomain().getCommandStack().execute(cmd);
+ getDomain().getCommandStack().execute(cmd);
+
+
}
else{
currentAuthor=(Actor)author;
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
index fd2b9b1..dc58c0c 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/LaunchRevisionMode.java
@@ -13,30 +13,34 @@
*****************************************************************************/
package org.eclipse.papyrus.revision.tool.handlers;
+import java.util.Map;
+
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.papyrus.revision.tool.ui.ReviewsEditor;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.menus.UIElement;
/**
* This handler is used to launch the revision mode
*
*/
-public class LaunchRevisionMode extends RevisionAbstractHandler {
+public class LaunchRevisionMode extends RevisionAbstractHandler implements IElementUpdater {
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Command command = event.getCommand();
- boolean oldValue = HandlerUtil.toggleCommandState(command);
+
IWorkbenchPart part=PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.papyrus.revisiontool.commentview");
if( part instanceof ReviewsEditor){
- if(oldValue==false){
+ boolean isRunning = ((ReviewsEditor)part).modeRevisionIsRunning();
+ if(isRunning==false){
//now the revison mode is activated
-
((ReviewsEditor)part).startModeRevision();
}
else{
@@ -53,5 +57,18 @@
}
return true;
}
+ @Override
+ public void updateElement(UIElement uiElement, Map map) {
+ IWorkbenchPart part=PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.papyrus.revisiontool.commentview");
+ if( part instanceof ReviewsEditor){
+ boolean isRunning = ((ReviewsEditor)part).modeRevisionIsRunning();
+ uiElement.setChecked(isRunning);
+ }
+ else {
+ uiElement.setChecked(false);
+ }
+ }
}
+
+
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
index faff9fb..25feb72 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/ReviewsEditor.java
@@ -279,6 +279,7 @@
viewer.setInput(reviewResourceManager.getCurrentReviewModel());
reviewResourceManager.getDomain().addResourceSetListener(getResourceListener());
reviewResourceManager.startModeRevision();
+ reviewResourceManager.getCurrentAuthor();
}
/**
* stop the model revision and load review model in the editor
@@ -290,6 +291,12 @@
}
/**
+ * @return true if the mode revision is running.
+ */
+ public boolean modeRevisionIsRunning() {
+ return reviewResourceManager.modeRevisionRunning();
+ }
+ /**
* Retrieves the {@link IPropertySheetPage} that his Model Explorer uses.
*
* @return
