X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteUiUtils.java;h=9d9395bb051950dbba4b6fde3f908b20a2ce420a;hb=f1b87af2e0de38f1f49ab8fe68f9988018914811;hp=a5205ee26e45c07f641aad460dfccfee6aec1a5e;hpb=c6b561fc1d45dd5abcbf86f99ae546bdc3b42b8d;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java index a5205ee..9d9395b 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java @@ -5,6 +5,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.Objects; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -45,7 +46,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.osgi.service.event.Event; /** UI utilities related to the APAF project. */ public class SuiteUiUtils { @@ -393,13 +393,14 @@ public class SuiteUiUtils { return lbl; } - public static boolean isCoworker(CmsView cmsView) { - boolean coworker = cmsView.doAs(() -> CurrentUser.isInRole(SuiteRole.coworker.dn())); - return coworker; - } +// public static boolean isCoworker(CmsView cmsView) { +// boolean coworker = cmsView.doAs(() -> CurrentUser.isInRole(SuiteRole.coworker.dn())); +// return coworker; +// } - public static boolean isTopic(Event event, CmsEvent cmsEvent) { - return event.getTopic().equals(cmsEvent.topic()); + public static boolean isTopic(String topic, CmsEvent cmsEvent) { + Objects.requireNonNull(topic); + return topic.equals(cmsEvent.topic()); } public static Button createLayerButton(Composite parent, String layer, Localized msg, CmsIcon icon,