From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 10 Dec 2021 04:52:48 +0000 (+0100)
Subject: Adapt to changes in Argeo Commons
X-Git-Tag: argeo-suite-2.3.3~39
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=39f4b81ef1b30af7640654ec9eede6bea2ce4adf

Adapt to changes in Argeo Commons
---

diff --git a/org.argeo.entity.ui/pom.xml b/org.argeo.entity.ui/pom.xml
index 10c5918..563c8c5 100644
--- a/org.argeo.entity.ui/pom.xml
+++ b/org.argeo.entity.ui/pom.xml
@@ -27,8 +27,9 @@
 		<!-- Specific -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- Eclipse E4 -->
diff --git a/org.argeo.geo.ui/pom.xml b/org.argeo.geo.ui/pom.xml
index cfe3a0e..18a51a1 100644
--- a/org.argeo.geo.ui/pom.xml
+++ b/org.argeo.geo.ui/pom.xml
@@ -17,6 +17,14 @@
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Specific -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.swt.specific.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Eclipse E4 -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -25,13 +33,5 @@
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
-		<!-- Specific -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/org.argeo.library.ui/pom.xml b/org.argeo.library.ui/pom.xml
index 672634a..0e95c3d 100644
--- a/org.argeo.library.ui/pom.xml
+++ b/org.argeo.library.ui/pom.xml
@@ -17,6 +17,14 @@
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Specific -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.swt.specific.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Eclipse E4 -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -25,13 +33,6 @@
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
-		<!-- Specific -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
-		</dependency>
 
 	</dependencies>
 </project>
diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java
index ad13d28..5d04b17 100644
--- a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java
+++ b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java
@@ -29,7 +29,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.dialogs.CmsFeedback;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.specific.OpenFile;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
@@ -89,8 +88,8 @@ public class DocumentsUiService {
 			}
 			String uri = Paths.get(tmpFile.getAbsolutePath()).toUri().toString();
 			Map<String, String> params = new HashMap<String, String>();
-			params.put(OpenFile.PARAM_FILE_NAME, name);
-			params.put(OpenFile.PARAM_FILE_URI, uri);
+//			params.put(OpenFile.PARAM_FILE_NAME, name);
+//			params.put(OpenFile.PARAM_FILE_URI, uri);
 			// FIXME open file without a command
 			// CommandUtils.callCommand(OpenFile.ID, params);
 		} catch (IOException e1) {
diff --git a/org.argeo.people.ui/pom.xml b/org.argeo.people.ui/pom.xml
index d211fc7..72e8705 100644
--- a/org.argeo.people.ui/pom.xml
+++ b/org.argeo.people.ui/pom.xml
@@ -17,6 +17,14 @@
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Specific -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.swt.specific.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Eclipse E4 -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -25,13 +33,6 @@
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
-		<!-- Specific -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
-		</dependency>
 
 	</dependencies>
 </project>
diff --git a/org.argeo.publishing.ui/pom.xml b/org.argeo.publishing.ui/pom.xml
index f26aeb4..84c2155 100644
--- a/org.argeo.publishing.ui/pom.xml
+++ b/org.argeo.publishing.ui/pom.xml
@@ -17,6 +17,14 @@
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Specific -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.swt.specific.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Eclipse E4 -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -25,13 +33,6 @@
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
-		<!-- Specific -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
-			<scope>provided</scope>
-		</dependency>
 
 	</dependencies>
 </project>
diff --git a/org.argeo.suite.ui/pom.xml b/org.argeo.suite.ui/pom.xml
index b5d1b2a..5d3f932 100644
--- a/org.argeo.suite.ui/pom.xml
+++ b/org.argeo.suite.ui/pom.xml
@@ -25,12 +25,13 @@
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<artifactId>org.argeo.cms.ui</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+		<!-- Specific -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
 		</dependency>