hide transport selection while linking a repository without pull (#262)

abapGit · Aug 15, 2023 · f47bf79 · f47bf79
1 parent ec12120
commit f47bf79
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizard.java b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizard.java
@@ -97,6 +97,10 @@ public void addPages() {
 	@Override
 	public boolean performFinish() {
 
+		//Validate the APACK page (As it could be the last page)
+		if (AbapGitWizard.this.cloneData.hasDependencies() && !this.pageApack.validateAll()) {
+			return false;
+		}
 		List<IAbapObject> cloneObjects = new LinkedList<>();
 
 		try {
@@ -264,6 +268,25 @@ public void handlePageChanging(final PageChangingEvent event) {
 				return;
 			}
 
+			//-> Any Page -> Folder Logic page 
+			//(If only linking a repository and no APACK dependencies, no need to show transport page and finish wizard )
+			if (event.getTargetPage() == AbapGitWizard.this.pageFolderlogic && !AbapGitWizard.this.pageBranchAndPackage.getLnpSequence() && !AbapGitWizard.this.cloneData.hasDependencies() ) {
+					AbapGitWizard.this.transportPage.setPageComplete(true);
+					AbapGitWizard.this.pageFolderlogic.setPageComplete(true);
+				}
+
+			// -> Folder Logic page -> Branch & Package page
+			if (event.getCurrentPage() == AbapGitWizard.this.pageFolderlogic
+					&& event.getTargetPage() == AbapGitWizard.this.pageBranchAndPackage) {
+				AbapGitWizard.this.transportPage.setPageComplete(false);
+			}
+
+			//-> Any Page -> APACK page 
+			//(If only linking a repository, no need to show transport page and finish wizard)
+			if (event.getTargetPage() == AbapGitWizard.this.pageApack && !AbapGitWizard.this.pageBranchAndPackage.getLnpSequence()) {
+				AbapGitWizard.this.transportPage.setPageComplete(true);
+			}
+
 			//-> Prepare transport page
 			if (event.getTargetPage() == AbapGitWizard.this.transportPage) {
 				try {

diff --git a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageApack.java b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageApack.java
@@ -363,6 +363,13 @@ private boolean validatePackageNotEmpty(IApackDependency apackDependency) {
 
 	@Override
 	public boolean canFlipToNextPage() {
+		AbapGitWizard wizard = (AbapGitWizard) getWizard();
+		AbapGitWizardPageBranchAndPackage branchAndPackagePage = (AbapGitWizardPageBranchAndPackage) wizard
+				.getPage(AbapGitWizardPageBranchAndPackage.class.getName());
+
+		if (!branchAndPackagePage.getLnpSequence()) {
+			return false;
+		}
 		return true;
 	}
 

diff --git a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageFolderLogic.java b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageFolderLogic.java
@@ -143,6 +143,13 @@ public void setVisible(boolean visible) {
 
 	@Override
 	public boolean canFlipToNextPage() {
+		AbapGitWizard wizard = (AbapGitWizard) getWizard();
+		AbapGitWizardPageBranchAndPackage branchAndPackagePage = (AbapGitWizardPageBranchAndPackage) wizard
+				.getPage(AbapGitWizardPageBranchAndPackage.class.getName());
+
+		if (!branchAndPackagePage.getLnpSequence() && !this.cloneData.hasDependencies()) {
+			return false;
+		}
 		return true;
 	}