Improve selective pull dialog with action description & support delet…

…ion (#271)
abapGit · Jul 4, 2024 · 908af20 · 908af20
1 parent be2608c
commit 908af20
Show file tree

Hide file tree

Showing 26 changed files with 801 additions and 390 deletions.
diff --git a/org.abapgit.adt.backend/model/agitpullmodifiedobjects.ecore b/org.abapgit.adt.backend/model/agitpullmodifiedobjects.ecore
@@ -72,7 +72,7 @@
       <details key="name" value="overwriteObjects"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="abapgitobjects" upperBound="-1"
-        eType="#//AbapGitObject" containment="true" resolveProxies="false">
+        eType="#//OverwriteObject" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="namespace" value="##targetNamespace"/>
@@ -86,13 +86,30 @@
       <details key="name" value="packageWarningObjects"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="abapgitobjects" upperBound="-1"
-        eType="#//AbapGitObject" containment="true" resolveProxies="false">
+        eType="#//OverwriteObject" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="namespace" value="##targetNamespace"/>
         <details key="name" value="abapgitobjects"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbapGitObject" eSuperTypes="../../com.sap.adt.tools.core.base/model/adtcore.ecore#//AdtObjectReference"/>
+  <eClassifiers xsi:type="ecore:EClass" name="OverwriteObject" eSuperTypes="../../com.sap.adt.tools.core.base/model/adtcore.ecore#//AdtObjectReference">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="kind" value="elementOnly"/>
+      <details key="name" value="overwriteObject"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="action" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actionDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/org.abapgit.adt.backend/model/agitpullmodifiedobjects.genmodel b/org.abapgit.adt.backend/model/agitpullmodifiedobjects.genmodel
@@ -24,6 +24,9 @@
     <genClasses ecoreClass="agitpullmodifiedobjects.ecore#//PackageWarningObjects">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference agitpullmodifiedobjects.ecore#//PackageWarningObjects/abapgitobjects"/>
     </genClasses>
-    <genClasses ecoreClass="agitpullmodifiedobjects.ecore#//AbapGitObject"/>
+    <genClasses ecoreClass="agitpullmodifiedobjects.ecore#//OverwriteObject">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute agitpullmodifiedobjects.ecore#//OverwriteObject/action"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute agitpullmodifiedobjects.ecore#//OverwriteObject/actionDescription"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/org.abapgit.adt.backend/src/org/abapgit/adt/backend/internal/RepositoryService.java b/org.abapgit.adt.backend/src/org/abapgit/adt/backend/internal/RepositoryService.java
@@ -22,6 +22,7 @@
 import com.sap.adt.communication.resources.AdtRestResourceFactory;
 import com.sap.adt.communication.resources.IRestResource;
 import com.sap.adt.communication.resources.UriBuilder;
+import com.sap.adt.compatibility.exceptions.OutDatedClientException;
 import com.sap.adt.compatibility.filter.AdtCompatibleRestResourceFilterFactory;
 import com.sap.adt.compatibility.filter.IAdtCompatibleRestResourceFilter;
 import com.sap.adt.tools.core.model.atom.IAtomLink;
@@ -265,7 +266,7 @@ public URI getURIFromAtomLink(IRepository repository, String relation) {
 
 	@Override
 	public IAbapGitPullModifiedObjects getModifiedObjects(IProgressMonitor monitor, IRepository currRepository,
-			String user, String password) {
+			String user, String password) throws OutDatedClientException {
 		URI uriToModifiedObjects = getURIFromAtomLink(currRepository, IRepositoryService.RELATION_MODIFIED_OBJECTS);
 
 		IHeaders headers = null;