From 1b14c471f53d439ade788f3e3ef136ccaa9bf1be Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 23 Oct 2020 11:54:07 +0200
Subject: [PATCH] Move composites to main Documents UI package.

---
 .../documents/{composites => ui}/DocumentsContextMenu.java     | 3 +--
 .../documents/{composites => ui}/DocumentsFileComposite.java   | 3 +--
 .../documents/{composites => ui}/DocumentsFolderComposite.java | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename library/org.argeo.documents.ui/src/org/argeo/documents/{composites => ui}/DocumentsContextMenu.java (98%)
 rename library/org.argeo.documents.ui/src/org/argeo/documents/{composites => ui}/DocumentsFileComposite.java (98%)
 rename library/org.argeo.documents.ui/src/org/argeo/documents/{composites => ui}/DocumentsFolderComposite.java (99%)

diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsContextMenu.java b/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsContextMenu.java
similarity index 98%
rename from library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsContextMenu.java
rename to library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsContextMenu.java
index 63172c8..3757dc7 100644
--- a/library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsContextMenu.java
+++ b/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsContextMenu.java
@@ -1,4 +1,4 @@
-package org.argeo.documents.composites;
+package org.argeo.documents.ui;
 
 import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_BOOKMARK_FOLDER;
 import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_CREATE_FOLDER;
@@ -11,7 +11,6 @@ import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_UPLOAD_FILE;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.argeo.documents.ui.DocumentsUiService;
 import org.argeo.suite.ui.widgets.AbstractConnectContextMenu;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.graphics.Point;
diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsFileComposite.java b/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFileComposite.java
similarity index 98%
rename from library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsFileComposite.java
rename to library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFileComposite.java
index 307eed7..e0eaf1e 100644
--- a/library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsFileComposite.java
+++ b/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFileComposite.java
@@ -1,4 +1,4 @@
-package org.argeo.documents.composites;
+package org.argeo.documents.ui;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -11,7 +11,6 @@ import javax.jcr.RepositoryException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.util.CmsUiUtils;
-import org.argeo.documents.ui.DocumentsUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.fs.FsUiUtils;
 import org.argeo.eclipse.ui.specific.UiContext;
diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsFolderComposite.java b/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderComposite.java
similarity index 99%
rename from library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsFolderComposite.java
rename to library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderComposite.java
index a8b6930..289a0cd 100644
--- a/library/org.argeo.documents.ui/src/org/argeo/documents/composites/DocumentsFolderComposite.java
+++ b/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderComposite.java
@@ -1,4 +1,4 @@
-package org.argeo.documents.composites;
+package org.argeo.documents.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -18,7 +18,6 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.fs.FileDrop;
 import org.argeo.cms.ui.fs.FsStyles;
 import org.argeo.cms.ui.util.CmsUiUtils;
-import org.argeo.documents.ui.DocumentsUiService;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.fs.FileIconNameLabelProvider;
-- 
2.30.2