Adapt to changes in Argeo Commons

diff --git a/org.argeo.entity.ui/pom.xml b/org.argeo.entity.ui/pom.xml
index 10c591842eca281d3b67d87e88ee2c6ccbf16274..563c8c515e99cf7c09b73ce8713e8ea6d404febb 100644 (file)
--- 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>
                <!-- 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>
                        <version>${version.argeo-commons}</version>

+                       <scope>provided</scope>

                </dependency>
 
                <!-- Eclipse E4 -->
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/org.argeo.geo.ui/pom.xml b/org.argeo.geo.ui/pom.xml
index cfe3a0e6320ffac541c953ade3c21429384aafbb..18a51a1e79d844b27827024c87b478ee7e3751e3 100644 (file)
--- a/org.argeo.geo.ui/pom.xml
+++ b/org.argeo.geo.ui/pom.xml
@@ -17,6 +17,14 @@
                        <version>2.3-SNAPSHOT</version>
                </dependency>
 
                        <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>
                <!-- Eclipse E4 -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>


@@ -25,13 +33,5 @@
                        <type>pom</type>
                        <scope>provided</scope>
                </dependency>
                        <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>
        </dependencies>
 </project>

diff --git a/org.argeo.library.ui/pom.xml b/org.argeo.library.ui/pom.xml
index 672634ad7d11b8af7bce5042c17069eaef68906a..0e95c3d9b5529f05aca6f1b7b63d90a97af5d4e1 100644 (file)
--- a/org.argeo.library.ui/pom.xml
+++ b/org.argeo.library.ui/pom.xml
@@ -17,6 +17,14 @@
                        <version>2.3-SNAPSHOT</version>
                </dependency>
 
                        <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>
                <!-- Eclipse E4 -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>


@@ -25,13 +33,6 @@
                        <type>pom</type>
                        <scope>provided</scope>
                </dependency>
                        <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>
 
        </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 ad13d28863130992148881fa7174afae7a261008..5d04b175c088bc487c6d9407a2376b2b1f198d33 100644 (file)
--- 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.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;
 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>();
                        }
                        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) {
                        // 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 d211fc75d0c2d288f2488f38d105fbcc313b915e..72e870563e5a296678769ea2df9d77b00fcd63f2 100644 (file)
--- a/org.argeo.people.ui/pom.xml
+++ b/org.argeo.people.ui/pom.xml
@@ -17,6 +17,14 @@
                        <version>2.3-SNAPSHOT</version>
                </dependency>
 
                        <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>
                <!-- Eclipse E4 -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>


@@ -25,13 +33,6 @@
                        <type>pom</type>
                        <scope>provided</scope>
                </dependency>
                        <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>
 
        </dependencies>
 </project>

diff --git a/org.argeo.publishing.ui/pom.xml b/org.argeo.publishing.ui/pom.xml
index f26aeb4391f2e230affba435e1d04bc1a8013a15..84c2155ba4c93f590c10950a1b4ef14f936e639c 100644 (file)
--- a/org.argeo.publishing.ui/pom.xml
+++ b/org.argeo.publishing.ui/pom.xml
@@ -17,6 +17,14 @@
                        <version>2.3-SNAPSHOT</version>
                </dependency>
 
                        <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>
                <!-- Eclipse E4 -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>


@@ -25,13 +33,6 @@
                        <type>pom</type>
                        <scope>provided</scope>
                </dependency>
                        <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>
 
        </dependencies>
 </project>

diff --git a/org.argeo.suite.ui/pom.xml b/org.argeo.suite.ui/pom.xml
index b5d1b2ae792abf6ead6b81167f0fd032bbb57cb0..5d3f932517bc7c9f62e823944fde57d3200cb433 100644 (file)
--- 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>
                <!-- 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>
                        <version>${version.argeo-commons}</version>
                </dependency>

+               <!-- Specific -->

                <dependency>
                        <groupId>org.argeo.commons</groupId>
                <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>
                        <version>${version.argeo-commons}</version>
                        <scope>provided</scope>
                </dependency>