From: Mathieu Baudier Date: Sat, 25 Jan 2020 13:10:30 +0000 (+0100) Subject: Remove unused dependencies. X-Git-Tag: argeo-commons-2.1.85~25 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=4b0f656244f364957088bc4dbcfb0c0f692fdc69 Remove unused dependencies. --- diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java index a38879424..fb7106b4f 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java @@ -34,7 +34,6 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import javax.transaction.UserTransaction; -import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.e4.users.providers.CommonNameLP; import org.argeo.cms.e4.users.providers.MailLP; @@ -92,7 +91,7 @@ import org.osgi.service.useradmin.UserAdmin; import org.osgi.service.useradmin.UserAdminEvent; /** Display/edit main properties of a given group */ -public class GroupEditor extends AbstractRoleEditor implements ArgeoNames { +public class GroupEditor extends AbstractRoleEditor { // final static String ID = "GroupEditor.mainPage"; @Inject diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java index 7d36a9507..e9a4a25f1 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupsView.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.e4.users.providers.CommonNameLP; @@ -71,7 +70,7 @@ import org.osgi.service.useradmin.UserAdminEvent; import org.osgi.service.useradmin.UserAdminListener; /** List all groups with filter */ -public class GroupsView implements ArgeoNames { +public class GroupsView { private final static Log log = LogFactory.getLog(GroupsView.class); // public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".groupsView"; @@ -228,8 +227,8 @@ public class GroupsView implements ArgeoNames { .append(NodeConstants.TOKENS_BASEDN).append(")))"); else builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=") - .append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*") - .append(NodeConstants.TOKENS_BASEDN).append(")))"); + .append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*") + .append(NodeConstants.TOKENS_BASEDN).append(")))"); } roles = userAdminWrapper.getUserAdmin().getRoles(builder.toString()); diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java index 4ac96464b..f7d6706fc 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserEditor.java @@ -28,7 +28,6 @@ import java.util.List; import javax.inject.Inject; -import org.argeo.cms.ArgeoNames; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.e4.users.providers.CommonNameLP; import org.argeo.cms.e4.users.providers.DomainNameLP; @@ -82,7 +81,7 @@ import org.osgi.service.useradmin.UserAdmin; import org.osgi.service.useradmin.UserAdminEvent; /** Display/edit the properties of a given user */ -public class UserEditor extends AbstractRoleEditor implements ArgeoNames { +public class UserEditor extends AbstractRoleEditor { // final static String ID = "UserEditor.mainPage"; @Inject diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java index fb57a6201..377605f5d 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UsersView.java @@ -22,7 +22,6 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; -import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.e4.users.providers.CommonNameLP; @@ -56,7 +55,7 @@ import org.osgi.service.useradmin.UserAdminEvent; import org.osgi.service.useradmin.UserAdminListener; /** List all users with filter - based on Ldif userAdmin */ -public class UsersView implements ArgeoNames { +public class UsersView { // private final static Log log = LogFactory.getLog(UsersView.class); // public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".usersView"; diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java index 7a8c8bb6f..d2e35c3a4 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java @@ -20,7 +20,6 @@ import java.util.Map; import javax.inject.Inject; -import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.e4.users.UserAdminWrapper; import org.argeo.eclipse.ui.EclipseUiUtils; @@ -103,7 +102,7 @@ public class NewGroup { } } - private class MainGroupInfoWizardPage extends WizardPage implements FocusListener, ArgeoNames { + private class MainGroupInfoWizardPage extends WizardPage implements FocusListener { private static final long serialVersionUID = -3150193365151601807L; public MainGroupInfoWizardPage() { diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java index e12e6c882..f2ddf9eee 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java @@ -24,7 +24,6 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; -import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.e4.users.UiAdminUtils; import org.argeo.cms.e4.users.UserAdminWrapper; @@ -131,7 +130,7 @@ public class NewUser { } } - private class MainUserInfoWizardPage extends WizardPage implements ModifyListener, ArgeoNames { + private class MainUserInfoWizardPage extends WizardPage implements ModifyListener { private static final long serialVersionUID = -3150193365151601807L; public MainUserInfoWizardPage() { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java index 4873433e1..d6de0464e 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/forms/FormPageViewer.java @@ -17,7 +17,6 @@ import javax.jcr.ValueFormatException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsNames; import org.argeo.cms.text.Img; import org.argeo.cms.text.MarkupValidatorCopy; import org.argeo.cms.ui.CmsEditable; @@ -422,7 +421,7 @@ public class FormPageViewer extends AbstractPageViewer { return body; } - protected class FormFileUploadReceiver extends FileUploadReceiver implements CmsNames { + protected class FormFileUploadReceiver extends FileUploadReceiver { private Node context; private Section section; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java index 47eb191f9..0b76a6f01 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/JcrFileUploadReceiver.java @@ -12,21 +12,18 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.io.FilenameUtils; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsNames; import org.argeo.cms.ui.CmsImageManager; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.fileupload.FileDetails; import org.eclipse.rap.fileupload.FileUploadReceiver; -public class JcrFileUploadReceiver extends FileUploadReceiver implements - CmsNames { +public class JcrFileUploadReceiver extends FileUploadReceiver { private final Node parentNode; private final String nodeName; private final CmsImageManager imageManager; /** If nodeName is null, use the uploaded file name */ - public JcrFileUploadReceiver(Node parentNode, String nodeName, - CmsImageManager imageManager) { + public JcrFileUploadReceiver(Node parentNode, String nodeName, CmsImageManager imageManager) { super(); this.parentNode = parentNode; this.nodeName = nodeName; @@ -34,11 +31,9 @@ public class JcrFileUploadReceiver extends FileUploadReceiver implements } @Override - public void receive(InputStream stream, FileDetails details) - throws IOException { + public void receive(InputStream stream, FileDetails details) throws IOException { try { - String fileName = nodeName != null ? nodeName : details - .getFileName(); + String fileName = nodeName != null ? nodeName : details.getFileName(); String contentType = details.getContentType(); if (isImage(details.getFileName(), contentType)) { imageManager.uploadImage(parentNode, fileName, stream); @@ -71,8 +66,7 @@ public class JcrFileUploadReceiver extends FileUploadReceiver implements protected Boolean isImage(String fileName, String contentType) { String ext = FilenameUtils.getExtension(fileName); - return ext != null - && (ext.equals("png") || ext.equalsIgnoreCase("jpg")); + return ext != null && (ext.equals("png") || ext.equalsIgnoreCase("jpg")); } protected void processNewFile(Node node) { diff --git a/org.argeo.cms.ui/src/org/argeo/cms/viewers/Section.java b/org.argeo.cms.ui/src/org/argeo/cms/viewers/Section.java index af7fd877f..e59b57de6 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/viewers/Section.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/viewers/Section.java @@ -8,37 +8,32 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.cms.CmsException; -import org.argeo.cms.CmsNames; import org.argeo.cms.util.CmsUtils; import org.argeo.cms.widgets.JcrComposite; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -public class Section extends JcrComposite implements CmsNames { +public class Section extends JcrComposite { private static final long serialVersionUID = -5933796173755739207L; private final Section parentSection; private Composite sectionHeader; private final Integer relativeDepth; - public Section(Composite parent, int style, Node node) - throws RepositoryException { + public Section(Composite parent, int style, Node node) throws RepositoryException { this(parent, findSection(parent), style, node); } - public Section(Section section, int style, Node node) - throws RepositoryException { + public Section(Section section, int style, Node node) throws RepositoryException { this(section, section, style, node); } - protected Section(Composite parent, Section parentSection, int style, - Node node) throws RepositoryException { + protected Section(Composite parent, Section parentSection, int style, Node node) throws RepositoryException { super(parent, style, node); this.parentSection = parentSection; if (parentSection != null) { - relativeDepth = getNode().getDepth() - - parentSection.getNode().getDepth(); + relativeDepth = getNode().getDepth() - parentSection.getNode().getDepth(); } else { relativeDepth = 0; } @@ -55,8 +50,7 @@ public class Section extends JcrComposite implements CmsNames { return Collections.unmodifiableMap(result); } - private void collectDirectSubSections(Composite composite, - LinkedHashMap subSections) + private void collectDirectSubSections(Composite composite, LinkedHashMap subSections) throws RepositoryException { if (composite == sectionHeader || composite instanceof EditablePart) return; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java index 210318995..da4d949a4 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/StyledControl.java @@ -13,8 +13,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; /** Editable text part displaying styled text. */ -public abstract class StyledControl extends JcrComposite implements - CmsConstants, CmsNames { +public abstract class StyledControl extends JcrComposite implements CmsConstants { private static final long serialVersionUID = -6372283442330912755L; private Control control; @@ -31,13 +30,11 @@ public abstract class StyledControl extends JcrComposite implements setLayout(CmsUtils.noSpaceGridLayout()); } - public StyledControl(Composite parent, int style, Item item) - throws RepositoryException { + public StyledControl(Composite parent, int style, Item item) throws RepositoryException { super(parent, style, item); } - public StyledControl(Composite parent, int style, Item item, - boolean cacheImmediately) throws RepositoryException { + public StyledControl(Composite parent, int style, Item item, boolean cacheImmediately) throws RepositoryException { super(parent, style, item, cacheImmediately); } diff --git a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java index 112562c3f..c1ca4c4b8 100644 --- a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java +++ b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java @@ -25,7 +25,6 @@ import javax.jcr.PropertyType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.cnd.CndImporter; -import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.jackrabbit.unit.AbstractJackrabbitTestCase; import org.argeo.node.tabular.TabularColumn; @@ -37,13 +36,11 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase { private final static Log log = LogFactory.getLog(JcrTabularTest.class); public void testWriteReadCsv() throws Exception { - session().setNamespacePrefix("argeo", ArgeoNames.ARGEO_NAMESPACE); - InputStreamReader reader = new InputStreamReader(getClass() - .getResourceAsStream("/org/argeo/node/node.cnd")); + // session().setNamespacePrefix("argeo", ArgeoNames.ARGEO_NAMESPACE); + InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/node/node.cnd")); CndImporter.registerNodeTypes(reader, session()); reader.close(); - reader = new InputStreamReader(getClass() - .getResourceAsStream("/org/argeo/cms/cms.cnd")); + reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/cms/cms.cnd")); CndImporter.registerNodeTypes(reader, session()); reader.close(); @@ -56,10 +53,8 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase { for (int i = 0; i < columnCount; i++) { header.add(new TabularColumn("col" + i, PropertyType.STRING)); } - Node tableNode = session().getRootNode().addNode("table", - ArgeoTypes.ARGEO_TABLE); - TabularWriter writer = new JcrTabularWriter(tableNode, header, - ArgeoTypes.ARGEO_CSV); + Node tableNode = session().getRootNode().addNode("table", ArgeoTypes.ARGEO_TABLE); + TabularWriter writer = new JcrTabularWriter(tableNode, header, ArgeoTypes.ARGEO_CSV); for (int i = 0; i < rowCount; i++) { List objs = new ArrayList(); for (int j = 0; j < columnCount; j++) { @@ -71,8 +66,7 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase { session().save(); if (log.isDebugEnabled()) - log.debug("Wrote tabular content " + rowCount + " rows, " - + columnCount + " columns"); + log.debug("Wrote tabular content " + rowCount + " rows, " + columnCount + " columns"); // read TabularRowIterator rowIt = new JcrTabularRowIterator(tableNode); Long count = 0l; @@ -83,7 +77,6 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase { } assertEquals(rowCount, count); if (log.isDebugEnabled()) - log.debug("Read tabular content " + rowCount + " rows, " - + columnCount + " columns"); + log.debug("Read tabular content " + rowCount + " rows, " + columnCount + " columns"); } }