Jazz Forum Welcome to the Jazz Community Forum Connect and collaborate with IBM Engineering experts and users

java api auto-resolve conflicts

Questions
Tags
Users
Badges
Gidi Gal
(96●20●58) edited
Apr 04 '19, 4:58 a.m.
When you accept change-set in RTC client with a conflict you get this dialog:

auto resolve conflicts dialog

Is it possible to present different behavior when using Java API ? I found that in order to use Java API to perform accept you need to use the API: com.ibm.team.filesystem.client.IOperationFactory.getWorkspaceUpdateOperation(WorkspaceUpdateDilemmaHandler dilemmaHandler).
I cannot find the switch which controls this dialog. Debugging the dialog reveals the following parts:
1) Its class name: com.ibm.team.filesystem.ui.changes.dialogs.ConflictsPromptDialog
2) It is being called from com.ibm.team.filesystem.ui.changes.dialogs.ConflictsPromptManager
3) ConflictsPromptManager is created by com.ibm.team.filesystem.ui.changes.views.ChangesViewPage.
4) ChangesViewPage is part of com.ibm.team.filesystem.ui.changes.views.LocalWorkspaceChangesView. This is the pending changes view.
Does this mean that there is no control from WorkspaceUpdateDilemmaHandler on the display of this dialog ?

0 votes

1 answer
1,942 views
0 votes

One answer

Permanent link
Shashikant Padur
JAZZ DEVELOPER (4.3k●2●7) Apr 04 '19, 5:21 a.m.

In your WorkspaceUpdateDilemmaHandler, you have to override isAutoResolveEnabled() method and return false.

0 votes

Comments
Gidi Gal
Apr 04 '19, 5:31 a.m.

I tried that, dialog is still displayed. RTC 6.0.6.1.

Shashikant Padur
JAZZ DEVELOPER Apr 05 '19, 12:43 a.m.

That should have worked. Can you post your code?

Gidi Gal
Apr 07 '19, 10:07 a.m.

Sample plugin posted into https://jazz.net/jazz/web/projects/Rational%20Team%20Concert#action=com.ibm.team.workitem.viewWorkItem&id=479737

Your answer

Register or log in to post your answer.

Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.

Ask a question
Guidelines
FAQ
Search context
Follow this question

By Email: 

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers
Answers and Comments
Question details
× 10,927
× 1,201

Question asked: Apr 04 '19, 4:55 a.m.

Question was seen: 1,942 times

Last updated: Apr 07 '19, 10:07 a.m.

Confirmation Cancel Confirm