Search in sources :

Example 1 with Entries

use of org.netbeans.lib.cvsclient.admin.Entries in project intellij-community by JetBrains.

the class CvsUtil method resolveConflict.

public static void resolveConflict(VirtualFile vFile) {
    File file = CvsVfsUtil.getFileFor(vFile);
    removeConflict(file);
    EntriesHandler handler = getEntriesHandlerIn(file.getParentFile());
    Entries entries = handler.getEntries();
    Entry entry = entries.getEntry(file.getName());
    if (entry == null)
        return;
    long timeStamp = vFile.getTimeStamp();
    final Date date = CvsStatusProvider.createDateDiffersTo(timeStamp);
    entry.parseConflictString(Entry.getLastModifiedDateFormatter().format(date));
    entries.addEntry(entry);
    try {
        handler.write(getLineSeparator(), CvsApplicationLevelConfiguration.getCharset());
    } catch (IOException e) {
        LOG.error(e);
    }
}
Also used : Entry(org.netbeans.lib.cvsclient.admin.Entry) Entries(org.netbeans.lib.cvsclient.admin.Entries) IOException(java.io.IOException) VirtualFile(com.intellij.openapi.vfs.VirtualFile) File(java.io.File) EntriesHandler(org.netbeans.lib.cvsclient.admin.EntriesHandler)

Example 2 with Entries

use of org.netbeans.lib.cvsclient.admin.Entries in project intellij-community by JetBrains.

the class CvsUtil method removeEntryFor.

public static void removeEntryFor(File file) {
    File entriesFile = file.getParentFile();
    EntriesHandler handler = new EntriesHandler(entriesFile);
    String charset = CvsApplicationLevelConfiguration.getCharset();
    try {
        handler.read(charset);
    } catch (IOException e) {
        return;
    }
    Entries entries = handler.getEntries();
    entries.removeEntry(file.getName());
    try {
        handler.write(getLineSeparator(), charset);
    } catch (IOException e) {
        LOG.error(e);
    }
    CvsEntriesManager.getInstance().removeEntryForFile(file.getParentFile(), file.getName());
}
Also used : IOException(java.io.IOException) Entries(org.netbeans.lib.cvsclient.admin.Entries) VirtualFile(com.intellij.openapi.vfs.VirtualFile) File(java.io.File) EntriesHandler(org.netbeans.lib.cvsclient.admin.EntriesHandler)

Aggregations

VirtualFile (com.intellij.openapi.vfs.VirtualFile)2 File (java.io.File)2 IOException (java.io.IOException)2 Entries (org.netbeans.lib.cvsclient.admin.Entries)2 EntriesHandler (org.netbeans.lib.cvsclient.admin.EntriesHandler)2 Entry (org.netbeans.lib.cvsclient.admin.Entry)1