From 85c7f77ccece25ac2606db2dc1c29a2c2a98cd86 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Thu, 31 Jan 2019 10:47:17 +0100 Subject: [PATCH] ref #7993: show better dialog when access denied and adapt RemoteCdmSource.toString --- .../etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java | 7 +------ .../taxeditor/remoting/source/CdmRemoteSourceBase.java | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java index d87748aa8..5d51d9e1e 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java +++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java @@ -121,12 +121,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { previousT = t; if (t != null && (t.getCause() instanceof RemoteAccessException || t instanceof NoHttpResponseException || t.getCause() instanceof CdmAuthenticationException || t.getMessage().contains("status code = 403"))){ - MessagingUtils.errorDialog("Access denied", - null, - MessagingUtils.ACCESS_DENIED, - statusAdapter.getStatus().getPlugin(), - t.getCause(), - false); + MessagingUtils.informationDialog("Access denied", MessagingUtils.ACCESS_DENIED); }else diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java index a96f254cc..b8190c122 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java @@ -134,11 +134,11 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { @Override public String toString() { - String result = CdmUtils.concat("/", baseUrl, contextPath); + String result = CdmUtils.concat("/", getName(),contextPath); if (StringUtils.isBlank(result)){ return super.toString(); }else{ - return result; + return result.replace("cdmserver/", ""); } } } -- 2.34.1