Adding Git source, NetBeans project files, GPL v2 LICENSE, ant build file.
[nbgit.git] / src / org / netbeans / modules / git / ui / update / ConflictResolvedAction.java
blobb29b50e1d9da3ed1f9575316d3ea2ed467855400
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 java.util.logging.Level;
47 import javax.swing.Action;
48 import org.netbeans.modules.git.FileInformation;
49 import org.netbeans.modules.git.FileStatusCache;
50 import org.netbeans.modules.git.Git;
51 import org.netbeans.modules.git.GitProgressSupport;
52 import org.netbeans.modules.git.ui.actions.ContextAction;
53 import org.netbeans.modules.git.util.GitCommand;
54 import org.netbeans.modules.git.util.GitUtils;
55 import org.netbeans.modules.versioning.spi.VCSContext;
56 import org.openide.util.NbBundle;
57 import org.openide.util.RequestProcessor;
59 /**
60 * Allow files who have Conlfict Status to be manually resolved.
62 * @author Petr Kuzel
64 public class ConflictResolvedAction extends ContextAction {
66 private final VCSContext context;
68 public ConflictResolvedAction(String name, VCSContext context) {
69 this.context = context;
70 putValue(Action.NAME, name);
73 public void performAction(ActionEvent e) {
74 resolved(context);
77 public static void resolved(VCSContext ctx) {
78 FileStatusCache cache = Git.getInstance().getFileStatusCache();
79 File[] files = cache.listFiles(ctx, FileInformation.STATUS_VERSIONED_CONFLICT);
80 final File root = GitUtils.getRootFile(ctx);
81 if (root == null || files == null || files.length == 0) return;
83 conflictResolved(root, files);
85 return;
88 @Override
89 public boolean isEnabled() {
90 FileStatusCache cache = Git.getInstance().getFileStatusCache();
92 if(cache.listFiles(context, FileInformation.STATUS_VERSIONED_CONFLICT).length != 0)
93 return true;
95 return false;
98 public static void conflictResolved(File repository, final File[] files) {
99 if (repository == null || files == null || files.length == 0) return;
100 RequestProcessor rp = Git.getInstance().getRequestProcessor(repository);
101 GitProgressSupport support = new GitProgressSupport() {
103 public void perform() {
104 for (int i = 0; i < files.length; i++) {
105 if (isCanceled()) {
106 return;
108 File file = files[i];
109 ConflictResolvedAction.perform(file);
113 support.start(rp, repository.getAbsolutePath(), NbBundle.getMessage(ConflictResolvedAction.class, "MSG_ConflictResolved_Progress")); // NOI18N
116 private static void perform(File file) {
117 if (file == null) return;
118 FileStatusCache cache = Git.getInstance().getFileStatusCache();
120 GitCommand.deleteConflictFile(file.getAbsolutePath());
121 Git.LOG.log(Level.FINE, "ConflictResolvedAction.perform(): DELETE CONFLICT File: {0}", // NOI18N
122 new Object[] {file.getAbsolutePath() + GitCommand.GIT_STR_CONFLICT_EXT} );
123 cache.refresh(file, FileStatusCache.REPOSITORY_STATUS_UNKNOWN);
126 public static void resolved(File file) {
127 perform(file);