2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
6 * The contents of this file are subject to the terms of either the GNU
7 * General Public License Version 2 only ("GPL") or the Common
8 * Development and Distribution License("CDDL") (collectively, the
9 * "License"). You may not use this file except in compliance with the
10 * License. You can obtain a copy of the License at
11 * http://www.netbeans.org/cddl-gplv2.html
12 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13 * specific language governing permissions and limitations under the
14 * License. When distributing the software, include this License Header
15 * Notice in each file and include the License file at
16 * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17 * particular file as subject to the "Classpath" exception as provided
18 * by Sun in the GPL Version 2 section of the License file that
19 * accompanied this code. If applicable, add the following below the
20 * License Header, with the fields enclosed by brackets [] replaced by
21 * your own identifying information:
22 * "Portions Copyrighted [year] [name of copyright owner]"
26 * The Original Software is NetBeans. The Initial Developer of the Original
27 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
28 * Microsystems, Inc. All Rights Reserved.
29 * Portions Copyright 2008 Alexander Coles (Ikonoklastik Productions).
31 * If you wish your version of this file to be governed by only the CDDL
32 * or only the GPL Version 2, indicate your decision by adding
33 * "[Contributor] elects to include this software in this distribution
34 * under the [CDDL or GPL Version 2] license." If you do not indicate a
35 * single choice of license, a recipient has the option to distribute
36 * your version of this file under either the CDDL, the GPL Version 2 or
37 * to extend the choice of license to its licensees as provided above.
38 * However, if you add GPL Version 2 code and therefore, elected the GPL
39 * Version 2 license, then the option applies only if the new code is
40 * made subject to such option by the copyright holder.
42 package org
.nbgit
.ui
.update
;
44 import java
.awt
.event
.ActionEvent
;
46 import org
.nbgit
.StatusInfo
;
47 import org
.nbgit
.StatusCache
;
49 import org
.nbgit
.ui
.ContextAction
;
50 import org
.netbeans
.modules
.versioning
.spi
.VCSContext
;
51 import org
.openide
.DialogDisplayer
;
52 import org
.openide
.NotifyDescriptor
;
55 * Show basic conflict resolver UI (provided by the diff module).
59 public class ResolveConflictsAction
extends ContextAction
{
61 public ResolveConflictsAction(String name
, VCSContext context
) {
65 public void performAction(ActionEvent e
) {
69 public static void resolve(VCSContext ctx
) {
70 StatusCache cache
= Git
.getInstance().getStatusCache();
71 File
[] files
= cache
.listFiles(ctx
, StatusInfo
.STATUS_VERSIONED_CONFLICT
);
73 resolveConflicts(files
);
79 public boolean isEnabled() {
80 StatusCache cache
= Git
.getInstance().getStatusCache();
81 return cache
.containsFileOfStatus(context
, StatusInfo
.STATUS_VERSIONED_CONFLICT
);
84 static void resolveConflicts(File
[] files
) {
85 if (files
.length
== 0) {
86 NotifyDescriptor nd
= new NotifyDescriptor
.Message(
87 org
.openide
.util
.NbBundle
.getMessage(
88 ResolveConflictsAction
.class, "MSG_NoConflictsFound")); // NOI18N
89 DialogDisplayer
.getDefault().notify(nd
);
91 for (int i
= 0; i
< files
.length
; i
++) {
93 ResolveConflictsExecutor executor
= new ResolveConflictsExecutor(file
);