BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a59c4b0
)
ref #7993: show better dialog when access denied and adapt RemoteCdmSource.toString
author
Katja Luther
<k.luther@bgbm.org>
Thu, 31 Jan 2019 09:47:17 +0000
(10:47 +0100)
committer
Katja Luther
<k.luther@bgbm.org>
Thu, 31 Jan 2019 12:11:51 +0000
(13:11 +0100)
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java
patch
|
blob
|
history
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 d87748aa890304d6003817468bf49d2c52dae9b3..5d51d9e1ee9d5aaf3276a9f945a74ee80208843d 100644
(file)
--- 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"))){
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
}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 a96f254cc9209ab0ecbc9196e6203ab64dbefb88..b8190c1229b395ad4d0a783d4f8abcd141ab07a9 100644
(file)
--- 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() {
@Override
public String toString() {
- String result = CdmUtils.concat("/",
baseUrl,
contextPath);
+ String result = CdmUtils.concat("/",
getName(),
contextPath);
if (StringUtils.isBlank(result)){
return super.toString();
}else{
if (StringUtils.isBlank(result)){
return super.toString();
}else{
- return result;
+ return result
.replace("cdmserver/", "")
;
}
}
}
}
}
}