Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Zeitoun2017-04-20 15:09:11 +0000
committerXavier Zeitoun2017-04-21 10:56:48 +0000
commit31b1d95d6cd95789035af2cd0dabdd8205c03aef (patch)
tree647859f127638af12074bfe3ac6f5ccba09e553d
parent4127daf9fa1e1913bbd99318389ef6543a564c5c (diff)
downloadorg.eclipse.papyrus-collaborativemodeling-31b1d95d6cd95789035af2cd0dabdd8205c03aef.tar.gz
org.eclipse.papyrus-collaborativemodeling-31b1d95d6cd95789035af2cd0dabdd8205c03aef.tar.xz
org.eclipse.papyrus-collaborativemodeling-31b1d95d6cd95789035af2cd0dabdd8205c03aef.zip
[Releng] Migration to Oxygen Patch 0
* CDONewModelStorageProvider : SelecDiagramCategoryPage swiched to SelectArchitectureContextPage (api change from Papyrus) * Stopwatch api changed (new version of guava used) * on RefuseReviewHandler : changed the argument to retrieve the IElementService provider * Releng : launch configuraiton et target platform updated Test are launched but do not succeed Change-Id: I563acead884fca0e34ca5c11682c431765894514 Signed-off-by: Xavier Zeitoun <xavier.zeitoun@cea.fr>
-rwxr-xr-xplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java11
-rwxr-xr-xplugins/cdo/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch2
-rwxr-xr-xplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java26
-rwxr-xr-xplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java2
-rwxr-xr-xreleng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target9
-rwxr-xr-xreleng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd7
6 files changed, 26 insertions, 31 deletions
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java b/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
index efd4ae32..16ef0aef 100755
--- a/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/util/tests/JobWaiterTest.java
@@ -38,8 +38,7 @@ import com.google.common.collect.Lists;
*/
public class JobWaiterTest {
- private Stopwatch watch = new Stopwatch();
-
+ private Stopwatch watch = Stopwatch.createUnstarted();
private List<TestJob> jobsToClean = Lists.newArrayListWithExpectedSize(1);
@Test
@@ -51,7 +50,7 @@ public class JobWaiterTest {
watch.stop();
assertThat(done, is(true));
- assertThat(watch.elapsedTime(TimeUnit.SECONDS), lessThanOrEqualTo(3L));
+ assertThat(watch.elapsed(TimeUnit.SECONDS), lessThanOrEqualTo(3L));
}
@Test
@@ -65,7 +64,7 @@ public class JobWaiterTest {
watch.stop();
assertThat(done, is(true));
- assertThat(watch.elapsedTime(TimeUnit.SECONDS), lessThanOrEqualTo(3L));
+ assertThat(watch.elapsed(TimeUnit.SECONDS), lessThanOrEqualTo(3L));
}
@Test
@@ -77,7 +76,7 @@ public class JobWaiterTest {
watch.stop();
assertThat(done, is(false));
- assertThat(watch.elapsedTime(TimeUnit.SECONDS), lessThan(5L));
+ assertThat(watch.elapsed(TimeUnit.SECONDS), lessThan(5L));
}
@Test
@@ -91,7 +90,7 @@ public class JobWaiterTest {
watch.stop();
assertThat(done, is(false));
- assertThat(watch.elapsedTime(TimeUnit.SECONDS), lessThan(5L));
+ assertThat(watch.elapsed(TimeUnit.SECONDS), lessThan(5L));
}
//
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch b/plugins/cdo/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
index d6d55b73..d112125f 100755
--- a/plugins/cdo/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.tests/Papyrus All CDO Tests.launch
@@ -40,7 +40,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.cdo.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms80m -Xmx2048m -XX:MaxPermSize=256M&#10;-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms80m -Xmx2048m &#13;&#10;-Dorg.eclipse.swt.internal.carbon.smallFonts"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java b/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
index f9e2a3c3..1c984ac1 100755
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
@@ -33,7 +33,7 @@ import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
import org.eclipse.papyrus.cdo.internal.ui.editors.PapyrusCDOEditorInput;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
import org.eclipse.papyrus.uml.diagram.wizards.providers.AbstractNewModelStorageProvider;
import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
@@ -51,7 +51,7 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
private CreateModelWizard wizard;
- private SelectDiagramCategoryPage newDiagramCategoryPage;
+ private SelectArchitectureContextPage newDiagramCategoryPage;
private NewModelPage newModelPage;
@@ -86,8 +86,7 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
if (checkout != null) {
bus.post(checkout);
}
-
- newDiagramCategoryPage = createNewDiagramCategoryPage(selection);
+ newDiagramCategoryPage = createNewArchitectureContextPage(selection);
}
/**
@@ -134,23 +133,10 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
}
@Override
- public SelectDiagramCategoryPage getDiagramCategoryPage() {
+ public SelectArchitectureContextPage getArchitectureContextPage() {
return newDiagramCategoryPage;
}
- @Override
- public IStatus validateDiagramCategories(String... newCategories) {
- if (newModelPage != null && newModelPage.getNewResourceName() != null) {
- String firstCategory = newCategories.length > 0 ? newCategories[0] : null;
- if (newCategories.length > 0) {
- // 316943 - [Wizard] Wrong suffix for file name when creating a
- // profile model
- return newModelPage.diagramExtensionChanged(wizard.getDiagramFileExtension(firstCategory));
- }
- }
-
- return super.validateDiagramCategories(newCategories);
- }
/**
* Creates the new model page, if required.
@@ -191,12 +177,12 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
return new PapyrusCDOEditorInput(uri, uri.trimFileExtension().lastSegment());
}
- private SelectDiagramCategoryPage createNewDiagramCategoryPage(IStructuredSelection selection) {
+ private SelectArchitectureContextPage createNewArchitectureContextPage(IStructuredSelection selection) {
if (wizard.isCreateProjectWizard() || wizard.isCreateMultipleModelsWizard() || !wizard.isPapyrusRootWizard()) {
return null;
}
- return new SelectDiagramCategoryPage();
+ return new SelectArchitectureContextPage();
}
diff --git a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
index 1e30e1fe..bd691615 100755
--- a/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
+++ b/plugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/handlers/RefuseReviewHandler.java
@@ -182,7 +182,7 @@ public class RefuseReviewHandler extends RevisionAbstractHandler {
protected void executeSeCommand(EObject eOject, ReviewResourceManager r, EStructuralFeature feature, Object set,Element element) {
SetRequest request= new SetRequest(((Match)eOject).getLeft(), feature, set);
request.setEditingDomain(r.getDomain());
- IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request);
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(eOject);
if(provider != null) {
// Retrieve delete command from the Element Edit service
ICommand cmd = provider.getEditCommand(request);
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index 0e870931..72d1f020 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1488905956">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1492705545">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -76,7 +76,12 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="0.0.0"/>
<unit id="org.apache.commons.io.source" version="0.0.0"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <unit id="org.apache.batik.css" version="1.6.0.v201011041432"/>
+ <unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>
+ <unit id="org.apache.batik.xml" version="1.6.0.v201011041432"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
index 0d77d771..f6a8f8a3 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
@@ -96,9 +96,14 @@ location ocl "http://download.eclipse.org/modeling/mdt/ocl/updates/interim/6.3.0
//manualUpdate
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository" {
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
org.apache.commons.io lazy
org.apache.commons.io.source lazy
+ com.google.guava [21.0.0,22.0.1]
+ com.google.guava.source [21.0.0,22.0.1]
+ org.apache.batik.css [1.6.0,1.6.1)
+ org.apache.batik.util [1.6.0,1.6.1)
+ org.apache.batik.xml [1.6.0,1.6.1)
}
//updateFrom("XWT",0)

Back to the top