Skip to content

Commit 908af20

Browse files
Improve selective pull dialog with action description & support deletion (#271)
1 parent be2608c commit 908af20

26 files changed

+801
-390
lines changed

org.abapgit.adt.backend/model/agitpullmodifiedobjects.ecore

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<details key="name" value="overwriteObjects"/>
7373
</eAnnotations>
7474
<eStructuralFeatures xsi:type="ecore:EReference" name="abapgitobjects" upperBound="-1"
75-
eType="#//AbapGitObject" containment="true" resolveProxies="false">
75+
eType="#//OverwriteObject" containment="true" resolveProxies="false">
7676
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
7777
<details key="kind" value="element"/>
7878
<details key="namespace" value="##targetNamespace"/>
@@ -86,13 +86,30 @@
8686
<details key="name" value="packageWarningObjects"/>
8787
</eAnnotations>
8888
<eStructuralFeatures xsi:type="ecore:EReference" name="abapgitobjects" upperBound="-1"
89-
eType="#//AbapGitObject" containment="true" resolveProxies="false">
89+
eType="#//OverwriteObject" containment="true" resolveProxies="false">
9090
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
9191
<details key="kind" value="element"/>
9292
<details key="namespace" value="##targetNamespace"/>
9393
<details key="name" value="abapgitobjects"/>
9494
</eAnnotations>
9595
</eStructuralFeatures>
9696
</eClassifiers>
97-
<eClassifiers xsi:type="ecore:EClass" name="AbapGitObject" eSuperTypes="../../com.sap.adt.tools.core.base/model/adtcore.ecore#//AdtObjectReference"/>
97+
<eClassifiers xsi:type="ecore:EClass" name="OverwriteObject" eSuperTypes="../../com.sap.adt.tools.core.base/model/adtcore.ecore#//AdtObjectReference">
98+
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
99+
<details key="kind" value="elementOnly"/>
100+
<details key="name" value="overwriteObject"/>
101+
</eAnnotations>
102+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="action" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
103+
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
104+
<details key="kind" value="attribute"/>
105+
<details key="namespace" value="##targetNamespace"/>
106+
</eAnnotations>
107+
</eStructuralFeatures>
108+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="actionDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
109+
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
110+
<details key="kind" value="attribute"/>
111+
<details key="namespace" value="##targetNamespace"/>
112+
</eAnnotations>
113+
</eStructuralFeatures>
114+
</eClassifiers>
98115
</ecore:EPackage>

org.abapgit.adt.backend/model/agitpullmodifiedobjects.genmodel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<genClasses ecoreClass="agitpullmodifiedobjects.ecore#//PackageWarningObjects">
2525
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference agitpullmodifiedobjects.ecore#//PackageWarningObjects/abapgitobjects"/>
2626
</genClasses>
27-
<genClasses ecoreClass="agitpullmodifiedobjects.ecore#//AbapGitObject"/>
27+
<genClasses ecoreClass="agitpullmodifiedobjects.ecore#//OverwriteObject">
28+
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute agitpullmodifiedobjects.ecore#//OverwriteObject/action"/>
29+
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute agitpullmodifiedobjects.ecore#//OverwriteObject/actionDescription"/>
30+
</genClasses>
2831
</genPackages>
2932
</genmodel:GenModel>

org.abapgit.adt.backend/src/org/abapgit/adt/backend/internal/RepositoryService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.sap.adt.communication.resources.AdtRestResourceFactory;
2323
import com.sap.adt.communication.resources.IRestResource;
2424
import com.sap.adt.communication.resources.UriBuilder;
25+
import com.sap.adt.compatibility.exceptions.OutDatedClientException;
2526
import com.sap.adt.compatibility.filter.AdtCompatibleRestResourceFilterFactory;
2627
import com.sap.adt.compatibility.filter.IAdtCompatibleRestResourceFilter;
2728
import com.sap.adt.tools.core.model.atom.IAtomLink;
@@ -265,7 +266,7 @@ public URI getURIFromAtomLink(IRepository repository, String relation) {
265266

266267
@Override
267268
public IAbapGitPullModifiedObjects getModifiedObjects(IProgressMonitor monitor, IRepository currRepository,
268-
String user, String password) {
269+
String user, String password) throws OutDatedClientException {
269270
URI uriToModifiedObjects = getURIFromAtomLink(currRepository, IRepositoryService.RELATION_MODIFIED_OBJECTS);
270271

271272
IHeaders headers = null;

0 commit comments

Comments
 (0)