From 6a5e23b28836bc0b3723948f6966553ad488b069 Mon Sep 17 00:00:00 2001
From: shubhamWaghmare-sap
 <57699330+shubhamWaghmare-sap@users.noreply.github.com>
Date: Mon, 27 Sep 2021 22:13:13 +0530
Subject: [PATCH] enable selective pull (#217)

Selective Pull was disabled as backend call ran into error while PULL, as it involves sub-package creation which requires a transport request to be passed on and since transport request is not available at the time of calculating modified objects.
The issue was fixed and selective pull is now enabled.
---
 .../adt/ui/internal/i18n/messages.properties       |  2 +-
 .../adt/ui/internal/util/AbapGitService.java       | 14 +++++---------
 .../AbapGitWizardPageObjectsSelectionForPull.java  |  3 ++-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/i18n/messages.properties b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/i18n/messages.properties
index c838d27..f75bbf2 100644
--- a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/i18n/messages.properties
+++ b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/i18n/messages.properties
@@ -45,7 +45,7 @@ AbapGitWizard_task_pulling_repository=Pulling from repository...
 AbapGitWizard_title=Link abapGit Repository
 AbapGitWizardPull_title=Pull from abapGit Repository
 AbapGitWizardPullSelectedObjects_OverwriteObjectsMessage=The following objects have been modified (or deleted) locally. Select the objects which should be overwritten (or recreated).
-AbapGitWizardPullSelectedObjects_PackageWarningObjectsMessage=The following objects have been created in other packages. Select the objects which should be overwritten. CAUTION: Selected objects will be overwritten in other packages. 
+AbapGitWizardPullSelectedObjects_PackageWarningObjectsMessage=Caution: The following objects have been created in other packages. Select the objects which should be overwritten. 
 AbapGitWizardPageApack_checkbox_pull_all_dependencies=Pull all dependent repositories
 AbapGitWizardPageApack_description=Verify all dependencies and specify local packages for them
 AbapGitWizardPageApack_label_dependencies=Dependencies:
diff --git a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/util/AbapGitService.java b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/util/AbapGitService.java
index d04fe25..2609a2a 100644
--- a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/util/AbapGitService.java
+++ b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/util/AbapGitService.java
@@ -72,16 +72,12 @@ public boolean isFolderLogicSupportedWhileLink(IRepositories repositories) {
 	//TODO: Remove after 2105 back end release supporting selective pull reaches all customers
 	@Override
 	public boolean isSelectivePullSupported(IRepository repository) {
-		/*
-		 * Disable the selective pull temporarily because of the incident https://support.wdf.sap.corp/sap/support/message/2170159859.
-		 * Selective pull backend call runs into error while PULL as it somehow involves package creation which requires a transport request to be passed on.
-		 */
 
-//		for (IAtomLink link : repository.getLinks()) {
-//			if (link.getRel().equalsIgnoreCase(IRepositoryService.RELATION_MODIFIED_OBJECTS)) {
-//				return true;
-//			}
-//		}
+		for (IAtomLink link : repository.getLinks()) {
+			if (link.getRel().equalsIgnoreCase(IRepositoryService.RELATION_MODIFIED_OBJECTS)) {
+				return true;
+			}
+		}
 		return false;
 	}
 
diff --git a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageObjectsSelectionForPull.java b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageObjectsSelectionForPull.java
index c45668b..732ec05 100644
--- a/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageObjectsSelectionForPull.java
+++ b/org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageObjectsSelectionForPull.java
@@ -128,7 +128,7 @@ public String getText(Object element) {
 
 		});
 
-		createTreeViewerColumn("Type", 50).setLabelProvider(new ColumnLabelProvider() { //$NON-NLS-1$
+		createTreeViewerColumn("Type", 20).setLabelProvider(new ColumnLabelProvider() { //$NON-NLS-1$
 			@Override
 			public String getText(Object element) {
 				if (element instanceof IAbapGitObject) {
@@ -145,6 +145,7 @@ private TreeViewerColumn createTreeViewerColumn(String title, int bound) {
 		viewerColumn.getColumn().setText(title);
 		this.treeColumnLayout.setColumnData(viewerColumn.getColumn(), new ColumnWeightData(20, bound, true));
 		return viewerColumn;
+
 	}
 
 	@Override