Added Bundle.properties text strings.
[nbgit.git] / src / org / netbeans / modules / git / ui / update / ResolveConflictsAction.java
blob46f4760ccb81a19b2be7e3723d97a2ad64260fcf
1 /*
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]"
24 * Contributor(s):
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.netbeans.modules.git.ui.update;
44 import java.awt.event.ActionEvent;
45 import java.io.File;
46 import javax.swing.Action;
47 import org.netbeans.modules.git.FileInformation;
48 import org.netbeans.modules.git.FileStatusCache;
49 import org.netbeans.modules.git.Git;
50 import org.netbeans.modules.git.ui.actions.ContextAction;
51 import org.netbeans.modules.versioning.spi.VCSContext;
52 import org.openide.DialogDisplayer;
53 import org.openide.NotifyDescriptor;
55 /**
56 * Show basic conflict resolver UI (provided by the diff module).
58 * @author Petr Kuzel
60 public class ResolveConflictsAction extends ContextAction {
62 private final VCSContext context;
64 public ResolveConflictsAction(String name, VCSContext context) {
65 this.context = context;
66 putValue(Action.NAME, name);
69 public void performAction(ActionEvent e) {
70 resolve(context);
73 public static void resolve(VCSContext ctx) {
74 FileStatusCache cache = Git.getInstance().getFileStatusCache();
75 File[] files = cache.listFiles(ctx, FileInformation.STATUS_VERSIONED_CONFLICT);
77 resolveConflicts(files);
79 return;
82 @Override
83 public boolean isEnabled() {
84 FileStatusCache cache = Git.getInstance().getFileStatusCache();
85 return cache.containsFileOfStatus(context, FileInformation.STATUS_VERSIONED_CONFLICT);
88 static void resolveConflicts(File[] files) {
89 if (files.length == 0) {
90 NotifyDescriptor nd = new NotifyDescriptor.Message(
91 org.openide.util.NbBundle.getMessage(
92 ResolveConflictsAction.class, "MSG_NoConflictsFound")); // NOI18N
93 DialogDisplayer.getDefault().notify(nd);
94 } else {
95 for (int i = 0; i<files.length; i++) {
96 File file = files[i];
97 ResolveConflictsExecutor executor = new ResolveConflictsExecutor(file);
98 executor.exec();