REOPENED - bug 216972: Need to be able to preview the data from the Upload Dialog
https://bugs.eclipse.org/bugs/show_bug.cgi?id=216972
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/AskUserUploaderWizard.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/AskUserUploaderWizard.java
index 4654ee2..ef1f3a9 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/AskUserUploaderWizard.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/AskUserUploaderWizard.java
@@ -19,21 +19,23 @@
public class AskUserUploaderWizard extends Wizard implements INewWizard {
private final AskUserUploader uploader;
private TermsOfUseWizardPage termsPage;
+ private UploadPreviewPage previewPage;
public AskUserUploaderWizard(AskUserUploader uploader) {
super();
this.uploader = uploader;
setNeedsProgressMonitor(false);
setHelpAvailable(false);
-
}
public void addPages() {
addPage(new SelectActionWizardPage(uploader));
+
termsPage = new TermsOfUseWizardPage(uploader);
addPage(termsPage);
- addPage(new UploadPreviewPage(uploader));
- //addPage(new FilterPage(uploader));
+
+ previewPage = new UploadPreviewPage(uploader);
+ addPage(previewPage);
}
@Override
@@ -59,4 +61,8 @@
public void showTermsPage() {
getContainer().showPage(termsPage);
}
+
+ public void showPreviewPage() {
+ getContainer().showPage(previewPage);
+ }
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java
index 7a819d3..5c34808 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java
@@ -49,7 +49,13 @@
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout());
- createFormText(composite, "<form><p>The Eclipse Usage Data Collector (UDC) has been collecting data on how you have been using the workbench. It would now like to upload the data to a server at the Eclipse Foundation.</p></form>");
+ FormText greeting = createFormText(composite, "<form><p>The Eclipse Usage Data Collector (UDC) has been collecting data on how you have been using the workbench. It would now like to upload the data to a server at the Eclipse Foundation.</p><p>You can preview the data before it is uploaded on the <a href=\"preview\">Preview page</a>.</p></form>");
+ greeting.addHyperlinkListener(new HyperlinkAdapter() {
+ @Override
+ public void linkActivated(HyperlinkEvent event) {
+ ((AskUserUploaderWizard)getWizard()).showPreviewPage();
+ }
+ });
createSpacer(composite);
createUploadNowRadio(composite);
@@ -63,7 +69,7 @@
createNeverUploadRadio(composite);
createSpacer(composite);
-
+
FormText text = createFormText(composite, getTermsText());
text.addHyperlinkListener(new HyperlinkAdapter() {
@Override
@@ -71,7 +77,7 @@
((AskUserUploaderWizard)getWizard()).showTermsPage();
}
});
-
+
setControl(composite);
}
