From e8d31e8321bb18489b37a53a32db833f8efb5ddf Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 5 May 2021 11:14:46 +0200 Subject: [PATCH] Introduce content layer. --- .../src/org/argeo/entity/EntityType.java | 2 + .../src/org/argeo/entity/entity.cnd | 6 + core/org.argeo.suite.ui/OSGI-INF/leadPane.xml | 2 +- .../suite/ui/widgets/TreeOrSearchArea.java | 74 +++++++++++++ .../config/documentsLayer.properties | 6 - .../config/entryArea.properties | 1 - .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../OSGI-INF/contentEntryArea.xml | 8 ++ .../OSGI-INF/contentLayer.xml} | 6 +- .../OSGI-INF/documentsFolder.xml | 2 +- .../OSGI-INF/fsEntryArea.xml} | 6 +- .../OSGI-INF/l10n/bundle.properties | 0 .../bnd.bnd | 6 +- .../build.properties | 2 +- .../config/contentEntryArea.properties | 1 + .../config/contentLayer.properties | 6 + .../config/documentsFolder.properties | 0 .../config/fsEntryArea.properties | 1 + .../pom.xml | 2 +- .../argeo/library/ui/ContentEntryArea.java | 103 ++++++++++++++++++ .../library}/ui/DocumentsContextMenu.java | 18 +-- .../library}/ui/DocumentsFileComposite.java | 2 +- .../library}/ui/DocumentsFolderComposite.java | 2 +- .../ui/DocumentsFolderUiProvider.java | 2 +- .../library}/ui/DocumentsTreeUiProvider.java | 2 +- .../argeo/library}/ui/DocumentsUiService.java | 2 +- library/pom.xml | 2 +- 30 files changed, 231 insertions(+), 35 deletions(-) create mode 100644 core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java delete mode 100644 library/org.argeo.documents.ui/config/documentsLayer.properties delete mode 100644 library/org.argeo.documents.ui/config/entryArea.properties rename library/{org.argeo.documents.ui => org.argeo.library.ui}/.classpath (100%) rename library/{org.argeo.documents.ui => org.argeo.library.ui}/.gitignore (100%) rename library/{org.argeo.documents.ui => org.argeo.library.ui}/.project (95%) rename library/{org.argeo.documents.ui => org.argeo.library.ui}/META-INF/.gitignore (100%) create mode 100644 library/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml rename library/{org.argeo.documents.ui/OSGI-INF/documentsLayer.xml => org.argeo.library.ui/OSGI-INF/contentLayer.xml} (62%) rename library/{org.argeo.documents.ui => org.argeo.library.ui}/OSGI-INF/documentsFolder.xml (86%) rename library/{org.argeo.documents.ui/OSGI-INF/entryArea.xml => org.argeo.library.ui/OSGI-INF/fsEntryArea.xml} (68%) rename library/{org.argeo.documents.ui => org.argeo.library.ui}/OSGI-INF/l10n/bundle.properties (100%) rename library/{org.argeo.documents.ui => org.argeo.library.ui}/bnd.bnd (52%) rename library/{org.argeo.documents.ui => org.argeo.library.ui}/build.properties (76%) create mode 100644 library/org.argeo.library.ui/config/contentEntryArea.properties create mode 100644 library/org.argeo.library.ui/config/contentLayer.properties rename library/{org.argeo.documents.ui => org.argeo.library.ui}/config/documentsFolder.properties (100%) create mode 100644 library/org.argeo.library.ui/config/fsEntryArea.properties rename library/{org.argeo.documents.ui => org.argeo.library.ui}/pom.xml (95%) create mode 100644 library/org.argeo.library.ui/src/org/argeo/library/ui/ContentEntryArea.java rename library/{org.argeo.documents.ui/src/org/argeo/documents => org.argeo.library.ui/src/org/argeo/library}/ui/DocumentsContextMenu.java (90%) rename library/{org.argeo.documents.ui/src/org/argeo/documents => org.argeo.library.ui/src/org/argeo/library}/ui/DocumentsFileComposite.java (99%) rename library/{org.argeo.documents.ui/src/org/argeo/documents => org.argeo.library.ui/src/org/argeo/library}/ui/DocumentsFolderComposite.java (99%) rename library/{org.argeo.documents.ui/src/org/argeo/documents => org.argeo.library.ui/src/org/argeo/library}/ui/DocumentsFolderUiProvider.java (97%) rename library/{org.argeo.documents.ui/src/org/argeo/documents => org.argeo.library.ui/src/org/argeo/library}/ui/DocumentsTreeUiProvider.java (98%) rename library/{org.argeo.documents.ui/src/org/argeo/documents => org.argeo.library.ui/src/org/argeo/library}/ui/DocumentsUiService.java (99%) diff --git a/core/org.argeo.entity.api/src/org/argeo/entity/EntityType.java b/core/org.argeo.entity.api/src/org/argeo/entity/EntityType.java index ecd6330..84fa16f 100644 --- a/core/org.argeo.entity.api/src/org/argeo/entity/EntityType.java +++ b/core/org.argeo.entity.api/src/org/argeo/entity/EntityType.java @@ -4,6 +4,8 @@ package org.argeo.entity; public enum EntityType implements JcrName { // entity entity, local, relatedTo, + // structure + space, // typology typologies, terms, term, // form diff --git a/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd index b64a275..cd3f327 100644 --- a/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd +++ b/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd @@ -35,6 +35,12 @@ mixin //+ * (entity:reference) //+ * (entity:composite) +// +// STRUCTURE +// +[entity:space] +mixin + // // TYPOLOGY // diff --git a/core/org.argeo.suite.ui/OSGI-INF/leadPane.xml b/core/org.argeo.suite.ui/OSGI-INF/leadPane.xml index 1aeec0a..c43d933 100644 --- a/core/org.argeo.suite.ui/OSGI-INF/leadPane.xml +++ b/core/org.argeo.suite.ui/OSGI-INF/leadPane.xml @@ -6,7 +6,7 @@ argeo.suite.ui.dashboardLayer -argeo.documents.ui.documentsLayer +argeo.library.ui.contentLayer argeo.people.ui.peopleLayer argeo.geo.ui.mapLayer diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java new file mode 100644 index 0000000..3434ed5 --- /dev/null +++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java @@ -0,0 +1,74 @@ +package org.argeo.suite.ui.widgets; + +import org.argeo.cms.ui.util.CmsUiUtils; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StackLayout; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Text; + +/** + * Displays a tree by default, which becomes a list if the search text field is + * used. + */ +public class TreeOrSearchArea extends Composite { + private static final long serialVersionUID = -1302546480076719532L; + + private Text searchT; + private StackLayout bodyLayout; + + private TreeViewer treeViewer; + private TreeViewer searchResultsViewer; + + public TreeOrSearchArea(Composite parent, int style) { + super(parent, style); + createUi(this); + } + + protected void createUi(Composite parent) { + parent.setLayout(new GridLayout()); + Composite searchC = new Composite(parent, SWT.NONE); + searchC.setLayout(new GridLayout()); + searchC.setLayoutData(CmsUiUtils.fillWidth()); + createSearchUi(searchC); + + Composite bodyC = new Composite(parent, SWT.NONE); + bodyC.setLayoutData(CmsUiUtils.fillAll()); + bodyLayout = new StackLayout(); + bodyC.setLayout(bodyLayout); + Composite treeC = new Composite(bodyC, SWT.NONE); + createTreeUi(treeC); + Composite searchResultsC = new Composite(bodyC, SWT.NONE); + createSearchResultsUi(searchResultsC); + + bodyLayout.topControl = treeC; + } + + protected void createSearchUi(Composite parent) { + parent.setLayout(CmsUiUtils.noSpaceGridLayout()); + searchT = new Text(parent, SWT.MULTI | SWT.BORDER); + searchT.setLayoutData(CmsUiUtils.fillWidth()); + } + + protected void createTreeUi(Composite parent) { + parent.setLayout(CmsUiUtils.noSpaceGridLayout()); + treeViewer = new TreeViewer(parent); + treeViewer.getTree().setLayoutData(CmsUiUtils.fillAll()); + } + + protected void createSearchResultsUi(Composite parent) { + parent.setLayout(CmsUiUtils.noSpaceGridLayout()); + searchResultsViewer = new TreeViewer(parent); + searchResultsViewer.getTree().setLayoutData(CmsUiUtils.fillAll()); + } + + public TreeViewer getTreeViewer() { + return treeViewer; + } + + public TreeViewer getSearchResultsViewer() { + return searchResultsViewer; + } + +} diff --git a/library/org.argeo.documents.ui/config/documentsLayer.properties b/library/org.argeo.documents.ui/config/documentsLayer.properties deleted file mode 100644 index 78382a6..0000000 --- a/library/org.argeo.documents.ui/config/documentsLayer.properties +++ /dev/null @@ -1,6 +0,0 @@ -service.pid=argeo.documents.ui.documentsLayer - -title=%content -icon=documents - -entity.type=nt:folder diff --git a/library/org.argeo.documents.ui/config/entryArea.properties b/library/org.argeo.documents.ui/config/entryArea.properties deleted file mode 100644 index 43b08f0..0000000 --- a/library/org.argeo.documents.ui/config/entryArea.properties +++ /dev/null @@ -1 +0,0 @@ -service.pid=argeo.documents.ui.entryArea diff --git a/library/org.argeo.documents.ui/.classpath b/library/org.argeo.library.ui/.classpath similarity index 100% rename from library/org.argeo.documents.ui/.classpath rename to library/org.argeo.library.ui/.classpath diff --git a/library/org.argeo.documents.ui/.gitignore b/library/org.argeo.library.ui/.gitignore similarity index 100% rename from library/org.argeo.documents.ui/.gitignore rename to library/org.argeo.library.ui/.gitignore diff --git a/library/org.argeo.documents.ui/.project b/library/org.argeo.library.ui/.project similarity index 95% rename from library/org.argeo.documents.ui/.project rename to library/org.argeo.library.ui/.project index c046a7d..6aa2010 100644 --- a/library/org.argeo.documents.ui/.project +++ b/library/org.argeo.library.ui/.project @@ -1,6 +1,6 @@ - org.argeo.documents.ui + org.argeo.library.ui diff --git a/library/org.argeo.documents.ui/META-INF/.gitignore b/library/org.argeo.library.ui/META-INF/.gitignore similarity index 100% rename from library/org.argeo.documents.ui/META-INF/.gitignore rename to library/org.argeo.library.ui/META-INF/.gitignore diff --git a/library/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml b/library/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml new file mode 100644 index 0000000..0b5646e --- /dev/null +++ b/library/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/library/org.argeo.documents.ui/OSGI-INF/documentsLayer.xml b/library/org.argeo.library.ui/OSGI-INF/contentLayer.xml similarity index 62% rename from library/org.argeo.documents.ui/OSGI-INF/documentsLayer.xml rename to library/org.argeo.library.ui/OSGI-INF/contentLayer.xml index 3833237..0dae1af 100644 --- a/library/org.argeo.documents.ui/OSGI-INF/documentsLayer.xml +++ b/library/org.argeo.library.ui/OSGI-INF/contentLayer.xml @@ -1,9 +1,9 @@ - + - - + + diff --git a/library/org.argeo.documents.ui/OSGI-INF/documentsFolder.xml b/library/org.argeo.library.ui/OSGI-INF/documentsFolder.xml similarity index 86% rename from library/org.argeo.documents.ui/OSGI-INF/documentsFolder.xml rename to library/org.argeo.library.ui/OSGI-INF/documentsFolder.xml index a7c2e4b..d7d71f0 100644 --- a/library/org.argeo.documents.ui/OSGI-INF/documentsFolder.xml +++ b/library/org.argeo.library.ui/OSGI-INF/documentsFolder.xml @@ -1,6 +1,6 @@ - + diff --git a/library/org.argeo.documents.ui/OSGI-INF/entryArea.xml b/library/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml similarity index 68% rename from library/org.argeo.documents.ui/OSGI-INF/entryArea.xml rename to library/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml index 50fcfe3..540f4ff 100644 --- a/library/org.argeo.documents.ui/OSGI-INF/entryArea.xml +++ b/library/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml @@ -1,10 +1,10 @@ - - + + - + diff --git a/library/org.argeo.documents.ui/OSGI-INF/l10n/bundle.properties b/library/org.argeo.library.ui/OSGI-INF/l10n/bundle.properties similarity index 100% rename from library/org.argeo.documents.ui/OSGI-INF/l10n/bundle.properties rename to library/org.argeo.library.ui/OSGI-INF/l10n/bundle.properties diff --git a/library/org.argeo.documents.ui/bnd.bnd b/library/org.argeo.library.ui/bnd.bnd similarity index 52% rename from library/org.argeo.documents.ui/bnd.bnd rename to library/org.argeo.library.ui/bnd.bnd index 9a3a99c..71f4618 100644 --- a/library/org.argeo.documents.ui/bnd.bnd +++ b/library/org.argeo.library.ui/bnd.bnd @@ -1,10 +1,12 @@ Service-Component:\ -OSGI-INF/entryArea.xml,\ -OSGI-INF/documentsLayer.xml,\ +OSGI-INF/contentEntryArea.xml,\ +OSGI-INF/fsEntryArea.xml,\ +OSGI-INF/contentLayer.xml,\ OSGI-INF/documentsFolder.xml Import-Package:\ org.eclipse.swt,\ +javax.jcr.nodetype,\ org.argeo.api,\ org.argeo.suite.ui,\ * \ No newline at end of file diff --git a/library/org.argeo.documents.ui/build.properties b/library/org.argeo.library.ui/build.properties similarity index 76% rename from library/org.argeo.documents.ui/build.properties rename to library/org.argeo.library.ui/build.properties index 0a508e2..0859c52 100644 --- a/library/org.argeo.documents.ui/build.properties +++ b/library/org.argeo.library.ui/build.properties @@ -2,6 +2,6 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ OSGI-INF/,\ - OSGI-INF/documentsLayer.xml,\ + OSGI-INF/contentLayer.xml,\ OSGI-INF/documentsFolder.xml source.. = src/ diff --git a/library/org.argeo.library.ui/config/contentEntryArea.properties b/library/org.argeo.library.ui/config/contentEntryArea.properties new file mode 100644 index 0000000..855fe97 --- /dev/null +++ b/library/org.argeo.library.ui/config/contentEntryArea.properties @@ -0,0 +1 @@ +service.pid=argeo.library.ui.contentEntryArea diff --git a/library/org.argeo.library.ui/config/contentLayer.properties b/library/org.argeo.library.ui/config/contentLayer.properties new file mode 100644 index 0000000..ad7b10e --- /dev/null +++ b/library/org.argeo.library.ui/config/contentLayer.properties @@ -0,0 +1,6 @@ +service.pid=argeo.library.ui.contentLayer + +title=%content +icon=documents + +entity.type=nt:folder,entity:space diff --git a/library/org.argeo.documents.ui/config/documentsFolder.properties b/library/org.argeo.library.ui/config/documentsFolder.properties similarity index 100% rename from library/org.argeo.documents.ui/config/documentsFolder.properties rename to library/org.argeo.library.ui/config/documentsFolder.properties diff --git a/library/org.argeo.library.ui/config/fsEntryArea.properties b/library/org.argeo.library.ui/config/fsEntryArea.properties new file mode 100644 index 0000000..0bceaf0 --- /dev/null +++ b/library/org.argeo.library.ui/config/fsEntryArea.properties @@ -0,0 +1 @@ +service.pid=argeo.library.ui.fsEntryArea diff --git a/library/org.argeo.documents.ui/pom.xml b/library/org.argeo.library.ui/pom.xml similarity index 95% rename from library/org.argeo.documents.ui/pom.xml rename to library/org.argeo.library.ui/pom.xml index 2c59ff3..048dd4a 100644 --- a/library/org.argeo.documents.ui/pom.xml +++ b/library/org.argeo.library.ui/pom.xml @@ -7,7 +7,7 @@ 2.3.1-SNAPSHOT .. - org.argeo.documents.ui + org.argeo.library.ui Documents UI jar diff --git a/library/org.argeo.library.ui/src/org/argeo/library/ui/ContentEntryArea.java b/library/org.argeo.library.ui/src/org/argeo/library/ui/ContentEntryArea.java new file mode 100644 index 0000000..4c8b041 --- /dev/null +++ b/library/org.argeo.library.ui/src/org/argeo/library/ui/ContentEntryArea.java @@ -0,0 +1,103 @@ +package org.argeo.library.ui; + +import java.util.SortedMap; +import java.util.TreeMap; + +import javax.jcr.Node; +import javax.jcr.NodeIterator; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.jcr.nodetype.NodeType; +import javax.jcr.query.Query; + +import org.argeo.cms.ui.CmsUiProvider; +import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.entity.EntityType; +import org.argeo.jcr.Jcr; +import org.argeo.jcr.JcrException; +import org.argeo.suite.ui.widgets.TreeOrSearchArea; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; + +public class ContentEntryArea implements CmsUiProvider { + + @Override + public Control createUi(Composite parent, Node context) throws RepositoryException { + parent.setLayout(new GridLayout()); + Ui ui = new Ui(parent, SWT.NONE); + ui.setLayoutData(CmsUiUtils.fillAll()); + + ui.getTreeViewer().setContentProvider(new SpacesContentProvider()); + ui.getTreeViewer().setInput(context.getSession()); + return ui; + } + + protected boolean isLeaf(Node node) { + return Jcr.isNodeType(node, EntityType.entity.get()) || Jcr.isNodeType(node, NodeType.NT_FILE); + } + + class Ui extends TreeOrSearchArea { + + public Ui(Composite parent, int style) { + super(parent, style); + } + + } + + class SpacesContentProvider implements ITreeContentProvider { + + @Override + public Object[] getElements(Object inputElement) { + Session session = (Session) inputElement; + try { + Query query = session.getWorkspace().getQueryManager() + .createQuery("SELECT * FROM [" + EntityType.space.get() + "]", Query.JCR_SQL2); + NodeIterator spacesIt = query.execute().getNodes(); + SortedMap map = new TreeMap<>(); + while (spacesIt.hasNext()) { + Node space = spacesIt.nextNode(); + String path = space.getPath(); + map.put(path, space); + } + return map.values().toArray(); + } catch (RepositoryException e) { + throw new JcrException(e); + } + } + + @Override + public Object[] getChildren(Object parentElement) { + Node parent = (Node) parentElement; + if (isLeaf(parent)) + return null; + return Jcr.getNodes(parent).toArray(); + } + + @Override + public Object getParent(Object element) { + Node node = (Node) element; + return Jcr.getParent(node); + } + + @Override + public boolean hasChildren(Object element) { + Node node = (Node) element; + return !isLeaf(node); + } + + @Override + public void dispose() { + } + + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + + } + +} diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsContextMenu.java b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsContextMenu.java similarity index 90% rename from library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsContextMenu.java rename to library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsContextMenu.java index 3757dc7..03de251 100644 --- a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsContextMenu.java +++ b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsContextMenu.java @@ -1,12 +1,12 @@ -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; -import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_DELETE; -import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_DOWNLOAD_FOLDER; -import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_RENAME; -import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_SHARE_FOLDER; -import static org.argeo.documents.ui.DocumentsUiService.ACTION_ID_UPLOAD_FILE; +package org.argeo.library.ui; + +import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_BOOKMARK_FOLDER; +import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_CREATE_FOLDER; +import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_DELETE; +import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_DOWNLOAD_FOLDER; +import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_RENAME; +import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_SHARE_FOLDER; +import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_UPLOAD_FILE; import java.nio.file.Files; import java.nio.file.Path; diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFileComposite.java b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java similarity index 99% rename from library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFileComposite.java rename to library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java index 84c56a3..10cf3bd 100644 --- a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFileComposite.java +++ b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFileComposite.java @@ -1,4 +1,4 @@ -package org.argeo.documents.ui; +package org.argeo.library.ui; import java.io.IOException; import java.nio.file.Files; diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderComposite.java b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java similarity index 99% rename from library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderComposite.java rename to library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java index 289a0cd..a686074 100644 --- a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderComposite.java +++ b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java @@ -1,4 +1,4 @@ -package org.argeo.documents.ui; +package org.argeo.library.ui; import java.io.IOException; import java.io.InputStream; diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderUiProvider.java b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java similarity index 97% rename from library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderUiProvider.java rename to library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java index e525a9e..bdc194b 100644 --- a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsFolderUiProvider.java +++ b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java @@ -1,4 +1,4 @@ -package org.argeo.documents.ui; +package org.argeo.library.ui; import java.nio.file.Path; import java.nio.file.spi.FileSystemProvider; diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsTreeUiProvider.java b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java similarity index 98% rename from library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsTreeUiProvider.java rename to library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java index 13c26e5..4660515 100644 --- a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsTreeUiProvider.java +++ b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java @@ -1,4 +1,4 @@ -package org.argeo.documents.ui; +package org.argeo.library.ui; import java.nio.file.Files; import java.nio.file.Path; diff --git a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsUiService.java b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java similarity index 99% rename from library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsUiService.java rename to library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java index a0fa782..ad13d28 100644 --- a/library/org.argeo.documents.ui/src/org/argeo/documents/ui/DocumentsUiService.java +++ b/library/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsUiService.java @@ -1,4 +1,4 @@ -package org.argeo.documents.ui; +package org.argeo.library.ui; import static org.argeo.cms.ui.dialogs.CmsMessageDialog.openConfirm; import static org.argeo.cms.ui.dialogs.CmsMessageDialog.openError; diff --git a/library/pom.xml b/library/pom.xml index ea3ef63..ea051de 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -11,6 +11,6 @@ Argeo Library Components pom - org.argeo.documents.ui + org.argeo.library.ui -- 2.30.2