org.tigris.subversion.svnclientadapter.ISVNConflictResolver Java Examples
The following examples show how to use
org.tigris.subversion.svnclientadapter.ISVNConflictResolver.
You can vote up the ones you like or vote down the ones you don't like,
and go to the original project or source file by following the links above each example. You may check out the related API usage on the sidebar.
Example #1
| Source File: UpdateToHeadPreferencePage.java From APICloud-Studio with GNU General Public License v3.0 | 6 votes |
|
@Override
public boolean performOk() {
store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_IGNORE_EXTERNALS, ignoreExternalsButton.getSelection());
store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_ALLOW_UNVERSIONED_OBSTRUCTIONS, forceButton.getSelection());
if (textConflictMarkButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TEXT_FILES, ISVNConflictResolver.Choice.postpone);
else store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TEXT_FILES, ISVNConflictResolver.Choice.chooseMerged);
if (binaryConflictIncomingButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_BINARY_FILES, ISVNConflictResolver.Choice.chooseTheirsFull);
else if (binaryConflictUserButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_BINARY_FILES, ISVNConflictResolver.Choice.chooseMineFull);
else if (binaryConflictMarkButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_BINARY_FILES, ISVNConflictResolver.Choice.postpone);
else store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_BINARY_FILES, ISVNConflictResolver.Choice.chooseMerged);
if (propertyConflictMarkButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_PROPERTIES, ISVNConflictResolver.Choice.postpone);
else store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_PROPERTIES, ISVNConflictResolver.Choice.chooseMerged);
if (treeConflictMarkButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TREE_CONFLICTS, ISVNConflictResolver.Choice.postpone);
else if (treeConflictResolveButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TREE_CONFLICTS, ISVNConflictResolver.Choice.chooseMerged);
else if (treeConflictUserButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TREE_CONFLICTS, ISVNConflictResolver.Choice.chooseMine);
else if (treeConflictPromptButton.getSelection()) store.setValue(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TREE_CONFLICTS, SVNConflictResolver.PROMPT);
return super.performOk();
}
Example #2
| Source File: SVNConflictResolver.java From APICloud-Studio with GNU General Public License v3.0 | 6 votes |
|
public static String getResolutionDescription(String resolution) {
if (resolution == null || resolution.trim().length() == 0 || resolution.equals("0")) return "Unresolved"; //$NON-NLS-1$ //$NON-NLS-2$
if (resolution.equals("Y")) return "Resolution unknown"; //$NON-NLS-1$ //$NON-NLS-2$
int res = Integer.parseInt(resolution);
switch (res) {
case ISVNConflictResolver.Choice.chooseBase:
return "Base version used"; //$NON-NLS-1$
case ISVNConflictResolver.Choice.chooseTheirsFull:
return "Incoming version used"; //$NON-NLS-1$
case ISVNConflictResolver.Choice.chooseMineFull:
return "Local version used"; //$NON-NLS-1$
case ISVNConflictResolver.Choice.chooseTheirs:
return "Incoming version used for conflicted hunks"; //$NON-NLS-1$
case ISVNConflictResolver.Choice.chooseMine:
return "Local version used for conflicted hunks"; //$NON-NLS-1$
case ISVNConflictResolver.Choice.chooseMerged:
return "Merged version used"; //$NON-NLS-1$
default:
return "Unresolved"; //$NON-NLS-1$
}
}
Example #3
| Source File: ConflictHandlingWizardPage.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
public ConflictResolution getConflictResolution() {
int resolution = ISVNConflictResolver.Choice.postpone;
if (markConflictedButton.getSelection()) resolution = ISVNConflictResolver.Choice.postpone;
else if (chooseIncomingVersionButton != null && chooseIncomingVersionButton.getSelection()) {
if (conflictDescriptor.getReason() == SVNConflictDescriptor.Reason.deleted || conflictDescriptor.getReason() == SVNConflictDescriptor.Reason.moved_away) {
resolution = ISVNConflictResolver.Choice.chooseMerged;
}
else {
resolution = ISVNConflictResolver.Choice.chooseTheirsFull;
}
}
else if (chooseIncomingVersionForConflictsButton != null && chooseIncomingVersionForConflictsButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseTheirs;
else if (chooseUserVersionButton != null && chooseUserVersionButton.getSelection()) {
if (conflictDescriptor.getReason() == SVNConflictDescriptor.Reason.deleted || conflictDescriptor.getReason() == SVNConflictDescriptor.Reason.moved_away) {
resolution = ISVNConflictResolver.Choice.chooseMine;
}
else {
resolution = ISVNConflictResolver.Choice.chooseMineFull;
}
}
else if (chooseUserVersionForConflictsButton != null && chooseUserVersionForConflictsButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseMine;
else if (chooseBaseVersionButton != null && chooseBaseVersionButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseBase;
if (!conflictDescriptor.isBinary()) {
if (fileEditorButton != null && fileEditorButton.getSelection()) resolution = ConflictResolution.FILE_EDITOR;
}
if (conflictEditorButton != null && conflictEditorButton.getSelection()) resolution = ConflictResolution.CONFLICT_EDITOR;
ConflictResolution conflictResolution = new ConflictResolution(conflictDescriptor, resolution);
conflictResolution.setApplyToAll(applyToAllButton.getSelection());
return conflictResolution;
}
Example #4
| Source File: AbstractJhlClientAdapter.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
public void addConflictResolutionCallback(ISVNConflictResolver callback) {
if (callback == null)
conflictResolver = null;
else
conflictResolver = new JhlConflictResolver(callback);
svnClient.setConflictResolver(conflictResolver);
}
Example #5
| Source File: DialogWizard.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
public boolean performFinish() {
if (type == FINISHED_EDITING) {
resolution = finishedEditingWizardPage.getResolution();
conflictResolved = resolution != ISVNConflictResolver.Choice.postpone;
}
if (type == CONFLICT_HANDLING) {
conflictResolution = conflictHandlingWizardPage.getConflictResolution();
}
if (type == PROPERTY_VALUE_SELECTION) {
conflictResolved = true;
valueToUse = propertyValueSelectionWizardPage.getValue();
}
return true;
}
Example #6
| Source File: FinishedEditingWizardPage.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
public int getResolution() {
if (yesButton.getSelection()) return ISVNConflictResolver.Choice.chooseMerged;
else {
if (chooseUserVersionButton.getSelection()) return ISVNConflictResolver.Choice.chooseMineFull;
else if (chooseIncomingVersionButton.getSelection()) return ISVNConflictResolver.Choice.chooseTheirsFull;
else if (chooseBaseVersionButton.getSelection()) return ISVNConflictResolver.Choice.chooseBase;
else if (chooseUserVersionForConflictsButton != null && chooseUserVersionForConflictsButton.getSelection()) return ISVNConflictResolver.Choice.chooseMine;
else if (chooseIncomingVersionForConflictsButton != null && chooseIncomingVersionForConflictsButton.getSelection()) return ISVNConflictResolver.Choice.chooseTheirs;
else return ISVNConflictResolver.Choice.postpone;
}
}
Example #7
| Source File: SvnWizardMarkResolvedPage.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
public boolean performFinish() {
resolution = ISVNConflictResolver.Choice.postpone;
if (markResolvedButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseMerged;
else if (chooseIncomingVersionButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseTheirsFull;
else if (chooseUserVersionButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseMineFull;
else if (chooseBaseVersionButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseBase;
else if (chooseUserVersionForConflictsButton != null && chooseUserVersionForConflictsButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseMine;
else if (chooseIncomingVersionForConflictsButton != null && chooseIncomingVersionForConflictsButton.getSelection()) resolution = ISVNConflictResolver.Choice.chooseTheirs;
return true;
}
Example #8
| Source File: BuiltInConflictsCompareInput.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
protected void handleInternalDispose() {
DialogWizard dialogWizard = new DialogWizard(DialogWizard.FINISHED_EDITING);
dialogWizard.setConflictDescriptor(conflictDescriptor);
ConflictWizardDialog dialog = new ConflictWizardDialog(Display.getDefault().getActiveShell(), dialogWizard);
dialog.open();
resolution = dialogWizard.getResolution();
resolved = resolution != ISVNConflictResolver.Choice.postpone;
finished = true;
}
Example #9
| Source File: BuiltInConflictsCompareInput.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
public void handleExternalDispose() {
DialogWizard dialogWizard = new DialogWizard(DialogWizard.FINISHED_EDITING);
dialogWizard.setConflictDescriptor(conflictDescriptor);
ConflictWizardDialog dialog = new ConflictWizardDialog(Display.getDefault().getActiveShell(), dialogWizard);
dialog.open();
resolution = dialogWizard.getResolution();
resolved = resolution != ISVNConflictResolver.Choice.postpone;
finished = true;
}
Example #10
| Source File: SVNConflictResolver.java From APICloud-Studio with GNU General Public License v3.0 | 5 votes |
|
public int getResolvedConflictCount(int conflictKind) {
if (textHandling == ISVNConflictResolver.Choice.postpone && binaryHandling == ISVNConflictResolver.Choice.postpone)
return 0;
int resolvedConflicts = 0;
Iterator<ConflictResolution> iter = conflictResolutions.iterator();
while (iter.hasNext()) {
ConflictResolution conflictResolution = iter.next();
if (conflictResolution.getResolution() != ISVNConflictResolver.Choice.postpone &&
conflictResolution.getConflictDescriptor().getConflictKind() == conflictKind)
resolvedConflicts++;
}
return resolvedConflicts;
}
Example #11
| Source File: ConflictResolution.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public boolean isResolved() {
return resolution != ISVNConflictResolver.Choice.postpone;
}
Example #12
| Source File: SVNUIPreferenceInitializer.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
/**
* This method is called by the preference initializer to initialize default
* preference values. Note that this method shouldn't be called by the
* clients; it will be called automatically by the preference
* initializer when the appropriate default preference node is accessed.
*/
public void initializeDefaultPreferences() {
IEclipsePreferences node = new DefaultScope().getNode(SVNUIPlugin.ID);
node.put(ISVNUIConstants.PREF_CONSOLE_COMMAND_COLOR,
StringConverter.asString(new RGB(0, 0, 0)));
node.put(ISVNUIConstants.PREF_CONSOLE_MESSAGE_COLOR,
StringConverter.asString(new RGB(0, 0, 255)));
node.put(ISVNUIConstants.PREF_CONSOLE_ERROR_COLOR,
StringConverter.asString(new RGB(255, 0, 0)));
node.putBoolean(ISVNUIConstants.PREF_SHOW_COMMENTS, true);
node.putBoolean(ISVNUIConstants.PREF_WRAP_COMMENTS, true);
node.putBoolean(ISVNUIConstants.PREF_SHOW_PATHS, true);
node.putInt(ISVNUIConstants.PREF_AFFECTED_PATHS_MODE, ISVNUIConstants.MODE_FLAT);
node.putInt(ISVNUIConstants.PREF_AFFECTED_PATHS_LAYOUT, ISVNUIConstants.LAYOUT_HORIZONTAL);
node.putBoolean(ISVNUIConstants.PREF_CONSOLE_SHOW_ON_MESSAGE, false);
node.putBoolean(ISVNUIConstants.PREF_CONSOLE_SHOW_ON_ERROR, true);
node.putBoolean(ISVNUIConstants.PREF_CONSOLE_LIMIT_OUTPUT, true);
node.putInt(ISVNUIConstants.PREF_CONSOLE_HIGH_WATER_MARK, 500000);
node.put(ISVNUIConstants.PREF_FILETEXT_DECORATION, SVNDecoratorConfiguration.DEFAULT_FILETEXTFORMAT);
node.put(ISVNUIConstants.PREF_FOLDERTEXT_DECORATION, SVNDecoratorConfiguration.DEFAULT_FOLDERTEXTFORMAT);
node.put(ISVNUIConstants.PREF_PROJECTTEXT_DECORATION, SVNDecoratorConfiguration.DEFAULT_PROJECTTEXTFORMAT);
node.put(ISVNUIConstants.PREF_ADDED_FLAG, SVNDecoratorConfiguration.DEFAULT_ADDED_FLAG);
node.put(ISVNUIConstants.PREF_DIRTY_FLAG, SVNDecoratorConfiguration.DEFAULT_DIRTY_FLAG);
node.put(ISVNUIConstants.PREF_EXTERNAL_FLAG, SVNDecoratorConfiguration.DEFAULT_EXTERNAL_FLAG);
node.putBoolean(ISVNUIConstants.PREF_SHOW_EXTERNAL_DECORATION, true);
node.putBoolean(ISVNUIConstants.PREF_SHOW_ADDED_DECORATION, true);
node.putBoolean(ISVNUIConstants.PREF_SHOW_HASREMOTE_DECORATION, true);
node.putBoolean(ISVNUIConstants.PREF_SHOW_DIRTY_DECORATION, true);
node.putBoolean(ISVNUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, true);
node.putBoolean(ISVNUIConstants.PREF_CALCULATE_DIRTY, true);
node.putBoolean(ISVNUIConstants.PREF_USE_FONT_DECORATORS, false);
node.putBoolean(ISVNUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT, false);
node.putBoolean(ISVNUIConstants.PREF_PROMPT_ON_MIXED_TAGS, true);
node.putBoolean(ISVNUIConstants.PREF_PROMPT_ON_SAVING_IN_SYNC, true);
node.putInt(ISVNUIConstants.PREF_SAVE_DIRTY_EDITORS, ISVNUIConstants.OPTION_PROMPT);
node.putBoolean(ISVNUIConstants.PREF_SHOW_COMPARE_REVISION_IN_DIALOG, false);
node.putBoolean(ISVNUIConstants.PREF_SHOW_UNADDED_RESOURCES_ON_COMMIT, true);
node.putBoolean(ISVNUIConstants.PREF_SELECT_UNADDED_RESOURCES_ON_COMMIT, true);
node.putBoolean(ISVNUIConstants.PREF_REMOVE_UNADDED_RESOURCES_ON_REPLACE, true);
node.putBoolean(ISVNUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, false);
node.put(ISVNUIConstants.PREF_ALLOW_COMMIT_WITH_WARNINGS, MessageDialogWithToggle.ALWAYS);
node.put(ISVNUIConstants.PREF_ALLOW_COMMIT_WITH_ERRORS, MessageDialogWithToggle.PROMPT);
node.putBoolean(ISVNUIConstants.PREF_UPDATE_TO_HEAD_IGNORE_EXTERNALS, false);
node.putBoolean(ISVNUIConstants.PREF_UPDATE_TO_HEAD_ALLOW_UNVERSIONED_OBSTRUCTIONS, true);
node.putInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TEXT_FILES, ISVNConflictResolver.Choice.postpone);
node.putInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_BINARY_FILES, ISVNConflictResolver.Choice.postpone);
node.putInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_PROPERTIES, ISVNConflictResolver.Choice.postpone);
node.putInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TREE_CONFLICTS, ISVNConflictResolver.Choice.postpone);
node.putBoolean(ISVNUIConstants.PREF_USE_JAVAHL_COMMIT_HACK, true);
node.put(ISVNUIConstants.PREF_SVNINTERFACE, "javahl"); //$NON-NLS-1$
node.put(ISVNUIConstants.PREF_SVNCONFIGDIR, ""); //$NON-NLS-1$
node.putBoolean(ISVNUIConstants.PREF_FETCH_CHANGE_PATH_ON_DEMAND, false);
node.putInt(ISVNUIConstants.PREF_LOG_ENTRIES_TO_FETCH, 25);
node.putBoolean(ISVNUIConstants.PREF_STOP_ON_COPY, false);
node.putBoolean(ISVNUIConstants.PREF_MERGE_USE_EXTERNAL, false);
node.putBoolean(ISVNUIConstants.PREF_SUGGEST_MERGE_SOURCES, true);
node.put(ISVNUIConstants.PREF_MERGE_PROGRAM_LOCATION,""); //$NON-NLS-1$
node.put(ISVNUIConstants.PREF_MERGE_PROGRAM_PARAMETERS,""); //$NON-NLS-1$
node.put(ISVNUIConstants.PREF_USE_QUICKDIFFANNOTATE, MessageDialogWithToggle.PROMPT);
node.putInt(ISVNUIConstants.PREF_MENU_ICON_SET, ISVNUIConstants.MENU_ICON_SET_DEFAULT);
node.putInt(ISVNUIConstants.PREF_COMMENTS_TO_SAVE, 10);
}
Example #13
| Source File: SwitchToUrlCommand.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public void setConflictResolver(ISVNConflictResolver conflictResolver) {
this.conflictResolver = conflictResolver;
}
Example #14
| Source File: UpdateResourcesCommand.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public void setConflictResolver(ISVNConflictResolver conflictResolver) {
this.conflictResolver = conflictResolver;
}
Example #15
| Source File: AbstractJhlClientAdapter.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public void resolved(File path) throws SVNClientException {
this.resolve(path, ISVNConflictResolver.Choice.chooseMerged);
}
Example #16
| Source File: AbstractJhlClientAdapter.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public void resolve(File path, int result) throws SVNClientException {
try {
notificationHandler.setCommand(ISVNNotifyListener.Command.RESOLVE);
String target = fileToSVNPath(path, true);
String commandLine = "resolve ";
ConflictResult.Choice choice = ConflictResult.Choice.chooseMerged;
switch (result) {
case ISVNConflictResolver.Choice.chooseMerged:
commandLine += "--accept=working ";
choice = ConflictResult.Choice.chooseMerged;
break;
case ISVNConflictResolver.Choice.chooseBase:
commandLine += "--accept=base ";
choice = ConflictResult.Choice.chooseBase;
break;
case ISVNConflictResolver.Choice.chooseTheirsFull:
commandLine += "--accept=theirs-full ";
choice = ConflictResult.Choice.chooseTheirsFull;
break;
case ISVNConflictResolver.Choice.chooseTheirs:
commandLine += "--accept=theirs-conflict ";
choice = ConflictResult.Choice.chooseTheirsConflict;
break;
case ISVNConflictResolver.Choice.chooseMineFull:
commandLine += "--accept=mine-full ";
choice = ConflictResult.Choice.chooseMineFull;
break;
case ISVNConflictResolver.Choice.chooseMine:
commandLine += "--accept=mine-conflict ";
choice = ConflictResult.Choice.chooseMineConflict;
break;
default:
choice = ConflictResult.Choice.chooseMerged;
break;
}
commandLine += target;
notificationHandler.logCommandLine(commandLine);
notificationHandler.setBaseDir(SVNBaseDir.getBaseDir(path));
svnClient.resolve(target, Depth.empty, choice);
} catch (SubversionException e) {
notificationHandler.logException(e);
throw new SVNClientException(e);
}
}
Example #17
| Source File: JhlConflictResolver.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public JhlConflictResolver(ISVNConflictResolver worker) {
super();
this.worker = worker;
}
Example #18
| Source File: CommandlineClient.java From netbeans with Apache License 2.0 | 4 votes |
|
@Override
public void addConflictResolutionCallback(ISVNConflictResolver arg0) {
throw new UnsupportedOperationException("Not supported yet.");
}
Example #19
| Source File: SvnWizardSwitchPage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getTreeConflictHandling() {
if (treeConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else if (treeConflictResolveButton.getSelection()) return ISVNConflictResolver.Choice.chooseMerged;
else if (treeConflictUserButton.getSelection()) return ISVNConflictResolver.Choice.chooseMine;
else return SVNConflictResolver.PROMPT;
}
Example #20
| Source File: SvnWizardSwitchPage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getPropertyConflictHandling() {
if (propertyConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else return ISVNConflictResolver.Choice.chooseMerged;
}
Example #21
| Source File: SvnWizardSwitchPage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getBinaryConflictHandling() {
if (binaryConflictIncomingButton.getSelection()) return ISVNConflictResolver.Choice.chooseTheirsFull;
else if (binaryConflictUserButton.getSelection()) return ISVNConflictResolver.Choice.chooseMineFull;
else if (binaryConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else return ISVNConflictResolver.Choice.chooseMerged;
}
Example #22
| Source File: SvnWizardSwitchPage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getTextConflictHandling() {
if (textConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else return ISVNConflictResolver.Choice.chooseMerged;
}
Example #23
| Source File: SvnWizardUpdatePage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getTreeConflictHandling() {
if (treeConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else if (treeConflictResolveButton.getSelection()) return ISVNConflictResolver.Choice.chooseMerged;
else if (treeConflictUserButton.getSelection()) return ISVNConflictResolver.Choice.chooseMine;
else return SVNConflictResolver.PROMPT;
}
Example #24
| Source File: SvnWizardUpdatePage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getPropertyConflictHandling() {
if (propertyConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else return ISVNConflictResolver.Choice.chooseMerged;
}
Example #25
| Source File: SvnWizardUpdatePage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getBinaryConflictHandling() {
if (binaryConflictIncomingButton.getSelection()) return ISVNConflictResolver.Choice.chooseTheirsFull;
else if (binaryConflictUserButton.getSelection()) return ISVNConflictResolver.Choice.chooseMineFull;
else if (binaryConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else return ISVNConflictResolver.Choice.chooseMerged;
}
Example #26
| Source File: SvnWizardUpdatePage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public int getTextConflictHandling() {
if (textConflictMarkButton.getSelection()) return ISVNConflictResolver.Choice.postpone;
else return ISVNConflictResolver.Choice.chooseMerged;
}
Example #27
| Source File: UpdateToHeadPreferencePage.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
private void initializeValues() {
ignoreExternalsButton.setSelection(store.getBoolean(ISVNUIConstants.PREF_UPDATE_TO_HEAD_IGNORE_EXTERNALS));
forceButton.setSelection(store.getBoolean(ISVNUIConstants.PREF_UPDATE_TO_HEAD_ALLOW_UNVERSIONED_OBSTRUCTIONS));
switch (store.getInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TEXT_FILES)) {
case ISVNConflictResolver.Choice.chooseMerged:
textConflictPromptButton.setSelection(true);
break;
default:
textConflictMarkButton.setSelection(true);
break;
}
switch (store.getInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_BINARY_FILES)) {
case ISVNConflictResolver.Choice.chooseMerged:
binaryConflictPromptButton.setSelection(true);
break;
case ISVNConflictResolver.Choice.chooseTheirsFull:
binaryConflictIncomingButton.setSelection(true);
break;
case ISVNConflictResolver.Choice.chooseMineFull:
binaryConflictUserButton.setSelection(true);
break;
default:
binaryConflictMarkButton.setSelection(true);
break;
}
switch (store.getInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_PROPERTIES)) {
case ISVNConflictResolver.Choice.chooseMerged:
propertyConflictPromptButton.setSelection(true);
break;
default:
propertyConflictMarkButton.setSelection(true);
break;
}
switch (store.getInt(ISVNUIConstants.PREF_UPDATE_TO_HEAD_CONFLICT_HANDLING_TREE_CONFLICTS)) {
case SVNConflictResolver.PROMPT:
binaryConflictPromptButton.setSelection(true);
break;
case ISVNConflictResolver.Choice.chooseMerged:
treeConflictResolveButton.setSelection(true);
break;
case ISVNConflictResolver.Choice.chooseMine:
treeConflictUserButton.setSelection(true);
break;
default:
treeConflictMarkButton.setSelection(true);
break;
}
}
Example #28
| Source File: SwitchOperation.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public void setConflictResolver(ISVNConflictResolver conflictResolver) {
this.conflictResolver = conflictResolver;
}
Example #29
| Source File: UpdateOperation.java From APICloud-Studio with GNU General Public License v3.0 | 4 votes |
|
public void setConflictResolver(ISVNConflictResolver conflictResolver) {
this.conflictResolver = conflictResolver;
}
