Merge branch 'master' into permission-vertical

Change-Id: Ibb2d345e6e9c8b073d68514331e13a732677e4e4
This commit is contained in:
Axel Uhl
2018-09-14 10:24:14 +02:00
60 changed files with 1543 additions and 242 deletions
@@ -93,4 +93,6 @@ public interface StringMessages extends Messages {
String explainReplicationServletPort();
String ok();
String setUpStorageService();
}
@@ -47,7 +47,15 @@ public class URLFieldWithFileUpload extends Composite implements HasValue<String
private boolean valueChangeHandlerInitialized = false;
private final FormPanel uploadFormPanel;
private final HorizontalPanel uploadPanel;
public URLFieldWithFileUpload(final StringMessages stringMessages) {
this(stringMessages, true);
}
public URLFieldWithFileUpload(final StringMessages stringMessages, boolean initiallyEnableUpload) {
final VerticalPanel mainPanel = new VerticalPanel();
final HorizontalPanel imageUrlPanel = new HorizontalPanel();
mainPanel.add(new Label(stringMessages.pleaseOnlyUploadContentYouHaveAllUsageRightsFor()));
@@ -83,11 +91,13 @@ public class URLFieldWithFileUpload extends Composite implements HasValue<String
imageUrlPanel.add(removePanel);
// the upload panel
FormPanel uploadFormPanel = new FormPanel();
uploadFormPanel = new FormPanel();
mainPanel.add(uploadFormPanel);
HorizontalPanel uploadPanel = new HorizontalPanel();
uploadPanel = new HorizontalPanel();
uploadPanel.setSpacing(3);
uploadFormPanel.add(uploadPanel);
if(initiallyEnableUpload) {
uploadFormPanel.add(uploadPanel);
}
uploadFormPanel.setAction("/sailingserver/fileupload");
uploadFormPanel.setEncoding(FormPanel.ENCODING_MULTIPART);
uploadFormPanel.setMethod(FormPanel.METHOD_POST);
@@ -198,4 +208,12 @@ public class URLFieldWithFileUpload extends Composite implements HasValue<String
private JSONValue parseAfterReplacingSurroundingPreElement(String jsonString) {
return JSONParser.parseStrict(jsonString.replaceFirst("<pre[^>]*>(.*)</pre>", "$1"));
}
public void setUploadEnabled(boolean uploadEnabled) {
if (uploadEnabled) {
uploadFormPanel.add(uploadPanel);
} else {
uploadFormPanel.remove(uploadPanel);
}
}
}