From: Mathieu Baudier Date: Sat, 26 Oct 2019 10:45:33 +0000 (+0200) Subject: Adapt Argeo Commons RCP. X-Git-Tag: argeo-commons-2.1.82~13 X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=565466f2477b64e11278afc2fbbb039c6db25c61 Adapt Argeo Commons RCP. --- diff --git a/rcp/dep/pom.xml b/rcp/dep/pom.xml index 2fd5b2485..ee63ea82f 100644 --- a/rcp/dep/pom.xml +++ b/rcp/dep/pom.xml @@ -63,6 +63,11 @@ org.junit test + + org.argeo.tp.sdk + org.hamcrest + test + diff --git a/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java new file mode 100644 index 000000000..0c5d34699 --- /dev/null +++ b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java @@ -0,0 +1,15 @@ +package org.argeo.eclipse.ui.specific; + +import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Shell; + +public class CmsFileDialog extends FileDialog { + public CmsFileDialog(Shell parent, int style) { + super(parent, style); + } + + public CmsFileDialog(Shell parent) { + super(parent); + } + +} diff --git a/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java new file mode 100644 index 000000000..638859a85 --- /dev/null +++ b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java @@ -0,0 +1,32 @@ +package org.argeo.eclipse.ui.specific; + +import org.eclipse.rap.rwt.widgets.FileUpload; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Composite; + +public class CmsFileUpload extends FileUpload { + public CmsFileUpload(Composite parent, int style) { + super(parent, style); + } + + @Override + public void setText(String text) { + super.setText(text); + } + + @Override + public String getFileName() { + return super.getFileName(); + } + + @Override + public String[] getFileNames() { + return super.getFileNames(); + } + + @Override + public void addSelectionListener(SelectionListener listener) { + super.addSelectionListener(listener); + } + +} diff --git a/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java index 5b16d99be..524447ed0 100644 --- a/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java +++ b/rcp/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java @@ -1,5 +1,6 @@ package org.argeo.eclipse.ui.specific; +import java.io.IOException; import java.io.InputStream; import java.util.Arrays; @@ -40,7 +41,7 @@ public class FileDropAdapter { } /** Executed in UI thread */ - protected void processUpload(InputStream in, String fileName, String contentType) { + protected void processUpload(InputStream in, String fileName, String contentType) throws IOException { } diff --git a/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java b/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java index e9555166b..cbf1449e0 100644 --- a/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java +++ b/rcp/org.argeo.eclipse.ui.rcp/src/org/eclipse/rap/rwt/widgets/FileUpload.java @@ -17,12 +17,21 @@ public class FileUpload extends Composite { public void submit(String url) { } - - public void setImage( Image image ) { - - } - - public void setText(String text){ - - } + + public void setImage(Image image) { + + } + + public void setText(String text) { + + } + + public String getFileName() { + return null; + } + + public String[] getFileNames() { + return null; + } + }