From 0e465414ea4fc79aa4961461efdc0201e1bee154 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Thu, 29 Oct 2015 10:14:51 +0000 Subject: [PATCH] Clean internal package structure git-svn-id: https://svn.argeo.org/commons/trunk@8530 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.eclipse.ui.workbench/plugin.xml | 34 +++++++++---------- .../ui/workbench/commands/AddFolderNode.java | 4 +-- .../ui/workbench/commands/AddPrivileges.java | 6 ++-- .../workbench/commands/CreateWorkspace.java | 2 +- .../ui/workbench/commands/DeleteNodes.java | 4 +-- .../ui/workbench/commands/DumpNode.java | 2 +- .../ui/workbench/commands/EditNode.java | 2 +- .../ui/workbench/commands/GetNodeSize.java | 4 +-- .../workbench/commands/ImportFileSystem.java | 6 ++-- .../commands/NodeConfigurableDump.java | 2 +- .../ui/workbench/commands/OpenEditor.java | 4 +-- .../ui/workbench/commands/Refresh.java | 2 +- .../commands/RemoveRemoteRepository.java | 2 +- .../ui/workbench/commands/RenameNode.java | 2 +- .../FullVersioningTreeContentProvider.java | 2 +- .../jcr}/GenericNodeDoubleClickListener.java | 10 +++--- .../jcr}/JcrBrowserUtils.java | 10 +++--- .../jcr}/NodeContentProvider.java | 6 ++-- .../jcr}/NodeLabelProvider.java | 12 +++---- .../jcr}/PropertiesContentProvider.java | 2 +- .../jcr}/PropertyLabelProvider.java | 2 +- .../jcr}/SingleNodeAsTreeContentProvider.java | 2 +- .../jcr}/VersionLabelProvider.java | 2 +- .../jcr}/model/MaintainedRepositoryElem.java | 2 +- .../jcr}/model/RemoteRepositoryElem.java | 2 +- .../jcr}/model/RepositoriesElem.java | 2 +- .../jcr}/model/RepositoryElem.java | 2 +- .../jcr}/model/SingleJcrNodeElem.java | 2 +- .../jcr}/model/WorkspaceElem.java | 2 +- .../jcr}/parts/AbstractJcrQueryEditor.java | 2 +- .../jcr}/parts/AddPrivilegeWizard.java | 4 +-- .../jcr}/parts/ChildNodesPage.java | 6 ++-- .../jcr}/parts/ChooseNameDialog.java | 2 +- .../jcr}/parts/EmptyNodePage.java | 2 +- .../jcr}/parts/GenericNodeEditorInput.java | 2 +- .../jcr}/parts/GenericNodePage.java | 2 +- .../jcr}/parts/GenericPropertyPage.java | 4 +-- .../jcr}/parts/ImportFileSystemWizard.java | 2 +- .../jcr}/parts/JcrQueryEditorInput.java | 2 +- .../jcr}/parts/NodeEditorInput.java | 2 +- .../jcr}/parts/NodePrivilegesPage.java | 25 +++++++++++++- .../jcr}/parts/NodeVersionHistoryPage.java | 8 ++--- .../jcr}/parts/StringNodeEditorInput.java | 2 +- .../users}/UsersImages.java | 2 +- .../users}/UsersUtils.java | 2 +- .../ui/workbench/jcr/DefaultNodeEditor.java | 10 +++--- .../workbench/jcr/GenericJcrQueryEditor.java | 2 +- .../ui/workbench/jcr/JcrBrowserView.java | 12 +++---- .../ui/workbench/users/PickUpUserDialog.java | 2 +- .../eclipse/ui/workbench/users/UserLP.java | 4 +-- 50 files changed, 129 insertions(+), 106 deletions(-) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/FullVersioningTreeContentProvider.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/GenericNodeDoubleClickListener.java (92%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/JcrBrowserUtils.java (88%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/NodeContentProvider.java (96%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/NodeLabelProvider.java (91%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/PropertiesContentProvider.java (97%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/PropertyLabelProvider.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/SingleNodeAsTreeContentProvider.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/VersionLabelProvider.java (96%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/model/MaintainedRepositoryElem.java (91%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/model/RemoteRepositoryElem.java (97%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/model/RepositoriesElem.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/model/RepositoryElem.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/model/SingleJcrNodeElem.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/model/WorkspaceElem.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/AbstractJcrQueryEditor.java (99%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/AddPrivilegeWizard.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/ChildNodesPage.java (95%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/ChooseNameDialog.java (97%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/EmptyNodePage.java (96%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/GenericNodeEditorInput.java (97%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/GenericNodePage.java (99%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/GenericPropertyPage.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/ImportFileSystemWizard.java (99%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/JcrQueryEditorInput.java (96%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/NodeEditorInput.java (96%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/NodePrivilegesPage.java (88%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/NodeVersionHistoryPage.java (97%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{jcr/internal => internal/jcr}/parts/StringNodeEditorInput.java (98%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{users/internal => internal/users}/UsersImages.java (95%) rename org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/{users/internal => internal/users}/UsersUtils.java (98%) diff --git a/org.argeo.eclipse.ui.workbench/plugin.xml b/org.argeo.eclipse.ui.workbench/plugin.xml index c6d82a97a..b450f5555 100644 --- a/org.argeo.eclipse.ui.workbench/plugin.xml +++ b/org.argeo.eclipse.ui.workbench/plugin.xml @@ -233,10 +233,10 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"> + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem"> @@ -254,10 +254,10 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"> + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem"> @@ -275,7 +275,7 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem"> @@ -292,9 +292,9 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" /> + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" /> @@ -309,9 +309,9 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" /> + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" /> @@ -326,9 +326,9 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem" /> + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem" /> @@ -341,7 +341,7 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem" /> @@ -354,9 +354,9 @@ + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" /> + value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" /> @@ -368,7 +368,7 @@ style="push"> - + @@ -380,7 +380,7 @@ style="push"> - + @@ -393,7 +393,7 @@ - + diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java index c396b7215..aa866956a 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java @@ -23,9 +23,9 @@ import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.eclipse.ui.dialogs.SingleValue; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java index 4e0a04546..cc7d94ee6 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java @@ -22,9 +22,9 @@ import org.argeo.ArgeoException; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.AddPrivilegeWizard; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.AddPrivilegeWizard; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java index 9c59a369c..4b6057dbc 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java @@ -20,8 +20,8 @@ import java.util.Arrays; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.eclipse.ui.dialogs.SingleValue; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoryElem; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java index 445537959..d8c0f0cef 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java @@ -23,9 +23,9 @@ import javax.jcr.RepositoryException; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java index 4943ccbf3..2823988c9 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java @@ -32,7 +32,7 @@ import javax.jcr.Session; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.workbench.CommandUtils; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; import org.argeo.jcr.JcrUtils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java index 12a582291..d97074714 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java @@ -22,7 +22,7 @@ import javax.jcr.Property; import javax.jcr.nodetype.NodeType; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.NodeEditorInput; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodeEditorInput; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java index 9ffb944b0..c8cad976d 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java @@ -23,8 +23,8 @@ import javax.jcr.Node; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; import org.argeo.jcr.JcrUtils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java index 7b3be8965..922f0257e 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java @@ -20,10 +20,10 @@ import javax.jcr.Node; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.ImportFileSystemWizard; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.ImportFileSystemWizard; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java index 34f18d0b3..cd6c0dc98 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java @@ -34,7 +34,7 @@ import javax.jcr.RepositoryException; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; import org.argeo.jcr.JcrUtils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java index fe31bc4ef..bf2f824e8 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java @@ -19,10 +19,10 @@ import javax.jcr.Node; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.JcrQueryEditorInput; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodeEditorInput; import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor; import org.argeo.eclipse.ui.workbench.jcr.GenericJcrQueryEditor; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.JcrQueryEditorInput; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.NodeEditorInput; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java index 72e3457f0..ffb398ac2 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java @@ -19,8 +19,8 @@ import java.util.Iterator; import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.JcrBrowserUtils; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; -import org.argeo.eclipse.ui.workbench.jcr.internal.JcrBrowserUtils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java index 83938a8e6..8f6f58f41 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java @@ -15,8 +15,8 @@ */ package org.argeo.eclipse.ui.workbench.commands; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RemoteRepositoryElem; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java index aaab72749..1d246078b 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java @@ -24,8 +24,8 @@ import javax.jcr.Session; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.dialogs.SingleValue; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; import org.argeo.jcr.JcrUtils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/FullVersioningTreeContentProvider.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/FullVersioningTreeContentProvider.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java index 0371a230d..b4132ed85 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/FullVersioningTreeContentProvider.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import java.util.ArrayList; import java.util.List; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/GenericNodeDoubleClickListener.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java similarity index 92% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/GenericNodeDoubleClickListener.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java index a70d9a52c..469713ae0 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/GenericNodeDoubleClickListener.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -21,11 +21,11 @@ import javax.jcr.nodetype.NodeType; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericNodeEditorInput; import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoryElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.GenericNodeEditorInput; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/JcrBrowserUtils.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java similarity index 88% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/JcrBrowserUtils.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java index 8649023e4..4261d9f40 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/JcrBrowserUtils.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.TreeParent; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoriesElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoryElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; /** Centralizes useful methods to manage the JCR Browser */ public class JcrBrowserUtils { diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/NodeContentProvider.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java similarity index 96% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/NodeContentProvider.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java index 943841514..e9bb70678 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/NodeContentProvider.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import java.util.ArrayList; import java.util.Arrays; @@ -30,8 +30,8 @@ import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.RepositoryRegister; import org.argeo.jcr.UserJcrUtils; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoriesElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; import org.argeo.util.security.Keyring; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/NodeLabelProvider.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java similarity index 91% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/NodeLabelProvider.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java index 7e377d516..0686c2342 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/NodeLabelProvider.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -22,12 +22,12 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem; import org.argeo.eclipse.ui.workbench.jcr.JcrImages; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RemoteRepositoryElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoriesElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoryElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem; import org.argeo.jcr.ArgeoTypes; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.swt.graphics.Image; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/PropertiesContentProvider.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java similarity index 97% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/PropertiesContentProvider.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java index c9c5a6ee4..58571eba8 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/PropertiesContentProvider.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import java.util.Set; import java.util.TreeSet; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/PropertyLabelProvider.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/PropertyLabelProvider.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java index 5781afe36..1964b7b74 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/PropertyLabelProvider.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/SingleNodeAsTreeContentProvider.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/SingleNodeAsTreeContentProvider.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java index 01cba7228..1dcd28720 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/SingleNodeAsTreeContentProvider.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import java.util.ArrayList; import java.util.Arrays; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/VersionLabelProvider.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java similarity index 96% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/VersionLabelProvider.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java index d79f568ab..f7e110ae8 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/VersionLabelProvider.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal; +package org.argeo.eclipse.ui.workbench.internal.jcr; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/MaintainedRepositoryElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java similarity index 91% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/MaintainedRepositoryElem.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java index ce6aed3ed..845c23111 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/MaintainedRepositoryElem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.workbench.jcr.internal.model; +package org.argeo.eclipse.ui.workbench.internal.jcr.model; import javax.jcr.Repository; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RemoteRepositoryElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java similarity index 97% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RemoteRepositoryElem.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java index 3e94f8885..f243a2dd0 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RemoteRepositoryElem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.model; +package org.argeo.eclipse.ui.workbench.internal.jcr.model; import java.util.Arrays; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoriesElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoriesElem.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java index d5e84af04..984d01b5f 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoriesElem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.model; +package org.argeo.eclipse.ui.workbench.internal.jcr.model; import java.util.Map; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoryElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoryElem.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java index a468eab5e..5adf6f546 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/RepositoryElem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.model; +package org.argeo.eclipse.ui.workbench.internal.jcr.model; import javax.jcr.Repository; import javax.jcr.RepositoryException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/SingleJcrNodeElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/SingleJcrNodeElem.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java index 06d0fa251..dfc0b3d29 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/SingleJcrNodeElem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.model; +package org.argeo.eclipse.ui.workbench.internal.jcr.model; import javax.jcr.Node; import javax.jcr.NodeIterator; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/WorkspaceElem.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/WorkspaceElem.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java index 54351ffd4..c20fb98d7 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/model/WorkspaceElem.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.model; +package org.argeo.eclipse.ui.workbench.internal.jcr.model; import javax.jcr.Node; import javax.jcr.NodeIterator; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AbstractJcrQueryEditor.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java similarity index 99% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AbstractJcrQueryEditor.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java index 161eb491c..81914e37b 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AbstractJcrQueryEditor.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import java.util.ArrayList; import java.util.List; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AddPrivilegeWizard.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AddPrivilegeWizard.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java index 52cf08715..3432abb89 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/AddPrivilegeWizard.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import java.util.Collections; import java.util.HashMap; @@ -25,8 +25,8 @@ import javax.jcr.security.Privilege; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.EclipseUiUtils; +import org.argeo.eclipse.ui.workbench.internal.users.UsersUtils; import org.argeo.eclipse.ui.workbench.users.PickUpUserDialog; -import org.argeo.eclipse.ui.workbench.users.internal.UsersUtils; import org.argeo.jcr.JcrUtils; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.window.Window; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ChildNodesPage.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java similarity index 95% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ChildNodesPage.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java index 1a0b31dcf..8a7d49665 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ChildNodesPage.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import javax.jcr.Node; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; +import org.argeo.eclipse.ui.workbench.internal.jcr.NodeLabelProvider; +import org.argeo.eclipse.ui.workbench.internal.jcr.SingleNodeAsTreeContentProvider; import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor; -import org.argeo.eclipse.ui.workbench.jcr.internal.NodeLabelProvider; -import org.argeo.eclipse.ui.workbench.jcr.internal.SingleNodeAsTreeContentProvider; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ChooseNameDialog.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java similarity index 97% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ChooseNameDialog.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java index 02518d5dc..0c6bcb88e 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ChooseNameDialog.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/EmptyNodePage.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java similarity index 96% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/EmptyNodePage.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java index 45823f770..a79f779a0 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/EmptyNodePage.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericNodeEditorInput.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java similarity index 97% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericNodeEditorInput.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java index bc9cc3034..6e12cb81f 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericNodeEditorInput.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import javax.jcr.Node; import javax.jcr.RepositoryException; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericNodePage.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java similarity index 99% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericNodePage.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java index 8aaeb33d8..2b19a95d0 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericNodePage.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericPropertyPage.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericPropertyPage.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java index 0de0af824..8d43ad40c 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/GenericPropertyPage.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ import javax.jcr.Value; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.workbench.WorkbenchConstants; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.PropertyLabelProvider; +import org.argeo.eclipse.ui.workbench.internal.jcr.PropertyLabelProvider; import org.eclipse.jface.layout.TreeColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ITreeContentProvider; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ImportFileSystemWizard.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java similarity index 99% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ImportFileSystemWizard.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java index 871b73ad6..1ccec0fb6 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/ImportFileSystemWizard.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import java.io.File; import java.io.FileInputStream; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/JcrQueryEditorInput.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java similarity index 96% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/JcrQueryEditorInput.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java index baa7e62c9..e533dd7ce 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/JcrQueryEditorInput.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import javax.jcr.query.Query; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeEditorInput.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java similarity index 96% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeEditorInput.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java index bdd4afa7a..c562fe971 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeEditorInput.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodePrivilegesPage.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java similarity index 88% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodePrivilegesPage.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java index 799dedcad..3dbae1da9 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodePrivilegesPage.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import java.util.ArrayList; import java.util.List; @@ -22,6 +22,11 @@ import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import javax.jcr.Value; +import javax.jcr.security.AccessControlEntry; +import javax.jcr.security.AccessControlList; +import javax.jcr.security.AccessControlManager; +import javax.jcr.security.AccessControlPolicy; +import javax.jcr.security.AccessControlPolicyIterator; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; @@ -206,6 +211,24 @@ public class NodePrivilegesPage extends FormPage { } } + AccessControlManager acm = context.getSession() + .getAccessControlManager(); + AccessControlPolicyIterator acpi = acm + .getApplicablePolicies(context.getPath()); + + List acps = new ArrayList(); + try { + while (true) { + Object obj = acpi.next(); + acps.add((AccessControlPolicy) obj); + } + } catch (Exception e) { + // No more elements + } + + AccessControlList acl = ((AccessControlList) acps.get(0)); + AccessControlEntry[] entries = acl.getAccessControlEntries(); + return privs.toArray(); } catch (Exception e) { throw new ArgeoException("Cannot retrieve authorization for " diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeVersionHistoryPage.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java similarity index 97% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeVersionHistoryPage.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java index fa79a24db..e760ad82e 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/NodeVersionHistoryPage.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -39,9 +39,9 @@ import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.argeo.jcr.JcrUtils; import org.argeo.jcr.PropertyDiff; import org.argeo.jcr.VersionDiff; -import org.argeo.eclipse.ui.workbench.jcr.internal.FullVersioningTreeContentProvider; -import org.argeo.eclipse.ui.workbench.jcr.internal.GenericNodeDoubleClickListener; -import org.argeo.eclipse.ui.workbench.jcr.internal.VersionLabelProvider; +import org.argeo.eclipse.ui.workbench.internal.jcr.FullVersioningTreeContentProvider; +import org.argeo.eclipse.ui.workbench.internal.jcr.GenericNodeDoubleClickListener; +import org.argeo.eclipse.ui.workbench.internal.jcr.VersionLabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/StringNodeEditorInput.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/StringNodeEditorInput.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java index 67b40a398..e93b7ea73 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/internal/parts/StringNodeEditorInput.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.jcr.internal.parts; +package org.argeo.eclipse.ui.workbench.internal.jcr.parts; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/internal/UsersImages.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java similarity index 95% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/internal/UsersImages.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java index 099756fda..22f8b488a 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/internal/UsersImages.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.eclipse.ui.workbench.users.internal; +package org.argeo.eclipse.ui.workbench.internal.users; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; import org.eclipse.swt.graphics.Image; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/internal/UsersUtils.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java similarity index 98% rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/internal/UsersUtils.java rename to org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java index 7470ea121..8ad28fc25 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/internal/UsersUtils.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java @@ -1,4 +1,4 @@ -package org.argeo.eclipse.ui.workbench.users.internal; +package org.argeo.eclipse.ui.workbench.internal.users; import java.security.AccessController; import java.util.List; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java index 91a2cadec..2b60048dc 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java @@ -26,11 +26,11 @@ import javax.jcr.security.Privilege; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.ChildNodesPage; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.GenericNodeEditorInput; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.GenericPropertyPage; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.NodePrivilegesPage; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.NodeVersionHistoryPage; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.ChildNodesPage; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericNodeEditorInput; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericPropertyPage; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodePrivilegesPage; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodeVersionHistoryPage; import org.argeo.jcr.JcrUtils; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.ui.IEditorInput; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java index 73b8be61b..48ef15c1f 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java @@ -16,7 +16,7 @@ package org.argeo.eclipse.ui.workbench.jcr; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.parts.AbstractJcrQueryEditor; +import org.argeo.eclipse.ui.workbench.internal.jcr.parts.AbstractJcrQueryEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java index dff153d97..3474f6ba1 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java @@ -33,12 +33,12 @@ import org.argeo.eclipse.ui.TreeParent; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer; import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin; -import org.argeo.eclipse.ui.workbench.jcr.internal.GenericNodeDoubleClickListener; -import org.argeo.eclipse.ui.workbench.jcr.internal.JcrBrowserUtils; -import org.argeo.eclipse.ui.workbench.jcr.internal.NodeContentProvider; -import org.argeo.eclipse.ui.workbench.jcr.internal.NodeLabelProvider; -import org.argeo.eclipse.ui.workbench.jcr.internal.PropertiesContentProvider; -import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem; +import org.argeo.eclipse.ui.workbench.internal.jcr.GenericNodeDoubleClickListener; +import org.argeo.eclipse.ui.workbench.internal.jcr.JcrBrowserUtils; +import org.argeo.eclipse.ui.workbench.internal.jcr.NodeContentProvider; +import org.argeo.eclipse.ui.workbench.internal.jcr.NodeLabelProvider; +import org.argeo.eclipse.ui.workbench.internal.jcr.PropertiesContentProvider; +import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem; import org.argeo.jcr.RepositoryRegister; import org.argeo.util.security.Keyring; import org.eclipse.jface.action.MenuManager; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java index 23d9c5a72..7caec2b97 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java @@ -22,7 +22,7 @@ import org.argeo.ArgeoException; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; -import org.argeo.eclipse.ui.workbench.users.internal.UsersUtils; +import org.argeo.eclipse.ui.workbench.internal.users.UsersUtils; import org.argeo.osgi.useradmin.LdifName; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.viewers.DoubleClickEvent; diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java index 0b74e7e91..157beff2c 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java @@ -4,8 +4,8 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.workbench.users.internal.UsersImages; -import org.argeo.eclipse.ui.workbench.users.internal.UsersUtils; +import org.argeo.eclipse.ui.workbench.internal.users.UsersImages; +import org.argeo.eclipse.ui.workbench.internal.users.UsersUtils; import org.argeo.osgi.useradmin.LdifName; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.ColumnLabelProvider; -- 2.30.2