Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-01-31 19:56:33 +0000
committerjames2002-01-31 19:56:33 +0000
commit8d1249c1d604e7765f0da34c638509eeb0a472da (patch)
tree94817ed984813bc4fc0f8cc130e607db648a76e2
parent34fa0cff522f723777f0258b2d5901e2c838159d (diff)
downloadeclipse.platform.team-8d1249c1d604e7765f0da34c638509eeb0a472da.tar.gz
eclipse.platform.team-8d1249c1d604e7765f0da34c638509eeb0a472da.tar.xz
eclipse.platform.team-8d1249c1d604e7765f0da34c638509eeb0a472da.zip
8714: Location validation should be an option
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java32
3 files changed, 43 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index b15119621..b20dd8f25 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -121,7 +121,7 @@ SharingWizard.autoConnectTitle=Connect Project to Repository
SharingWizard.couldNotImport=Could Not Import
SharingWizard.couldNotImportLong=Your resources could not be imported into the repository because a module with that name already exists.
SharingWizard.description=Configure a Project to Use CVS
-SharingWizard.importTitle=Import Project into Repository
+SharingWizard.importTitle=Share Project with Repository
SharingWizard.title=Configure a Project to Use CVS
SharingWizard.enterInformation=Enter Repository Location Information
SharingWizard.enterModuleName=Enter Module Name
@@ -260,6 +260,8 @@ ResourcePropertiesPage.error=Error
SharingWizard.validationFailedText={0}. Set project sharing anyway?
SharingWizard.validationFailedTitle=Unable to Validate
+SharingWizardFinishPage.message=The wizard has all the information necessary to share your project with the CVS repository. When you click \"Finish\", the wizard will import your project into the repository and open the Synchronize view to allow you to release your resources.
+
ShowHistoryAction.showHistory=Show in Resource History
ShowHistoryAction.noHistory=No History Available
ShowHistoryAction.noHistoryLong=No resource history available for selected resources.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
index 7f7d873a2..724e900c9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
@@ -60,6 +60,9 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
// The page that prompts the user for module name.
private ModuleSelectionPage modulePage;
+ // The page that tells the user what's going to happen.
+ private SharingWizardFinishPage finishPage;
+
public SharingWizard() {
setNeedsProgressMonitor(true);
}
@@ -78,6 +81,8 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
addPage(createLocationPage);
modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), null);
addPage(modulePage);
+ finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("Ready to Share Project"), null);
+ addPage(finishPage);
}
}
public boolean canFinish() {
@@ -111,6 +116,9 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
if (page == createLocationPage) {
return modulePage;
}
+ if (page == modulePage) {
+ return finishPage;
+ }
return null;
}
/*
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
new file mode 100644
index 000000000..07fdeb249
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardFinishPage.java
@@ -0,0 +1,32 @@
+package org.eclipse.team.internal.ccvs.ui.wizards;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2002.
+ * All Rights Reserved.
+ */
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.team.internal.ccvs.ui.Policy;
+
+public class SharingWizardFinishPage extends CVSWizardPage {
+ public SharingWizardFinishPage(String pageName, String title, ImageDescriptor titleImage) {
+ super(pageName, title, titleImage);
+ }
+
+ /*
+ * @see IDialogPage#createControl(Composite)
+ */
+ public void createControl(Composite parent) {
+ Composite composite = createComposite(parent, 1);
+ Label label = new Label(composite, SWT.LEFT | SWT.WRAP);
+ label.setText(Policy.bind("SharingWizardFinishPage.message"));
+ GridData data = new GridData();
+ data.widthHint = 350;
+ label.setLayoutData(data);
+ setControl(composite);
+ }
+}

Back to the top