MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use slightly less memory in cvs

Browse Source
This commit is contained in:
Bas Leijdekkers
2014-06-25 19:08:02 +02:00
parent b89d94902c
commit 4d2fa4f46f
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class CvsEntriesManager extends VirtualFileAdapter {
@NotNull
private synchronized CvsInfo getInfoFor(VirtualFile parent) {
if (!myInfoByParentDirectoryPath.containsKey(parent)) {
CvsInfo cvsInfo = new CvsInfo(parent, this);
CvsInfo cvsInfo = new CvsInfo(parent);
myInfoByParentDirectoryPath.put(cvsInfo.getKey(), cvsInfo);
}
return myInfoByParentDirectoryPath.get(parent);
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsInfo.java
+7 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,14 +57,12 @@ public class CvsInfo {
private boolean myIsLoaded = false;
private final VirtualFile myParent;
private final CvsEntriesManager myCvsEntriesManager;
private static final VirtualFile DUMMY_ROOT = null;
private boolean myStickyTagIsLoaded = false;
public CvsInfo(VirtualFile parent, CvsEntriesManager cvsEntriesManager) {
public CvsInfo(VirtualFile parent) {
myParent = parent;
myCvsEntriesManager = cvsEntriesManager;
}
public synchronized CvsConnectionSettings getConnectionSettings() {
@@ -85,7 +83,7 @@ public class CvsInfo {
myRepository = CvsUtil.getRelativeRepositoryPath(myRepository, myConnectionSettings.REPOSITORY);
}
myCvsEntriesManager.watchForCvsAdminFiles(myParent);
CvsEntriesManager.getInstance().watchForCvsAdminFiles(myParent);
}
finally {
myIsLoaded = true;
@@ -107,11 +105,11 @@ public class CvsInfo {
myConnectionSettings = getAbsentSettings();
}
else {
myConnectionSettings = myCvsEntriesManager.createConnectionSettingsOn(cvsRoot);
myConnectionSettings = CvsEntriesManager.getInstance().createConnectionSettingsOn(cvsRoot);
}
}
catch (Exception ex) {
myConnectionSettings = new MyInvalidCvsConnectionSettings();
myConnectionSettings = getAbsentSettings();
}
}
@@ -125,7 +123,7 @@ public class CvsInfo {
if (myParent == null) {
myIgnoreFilter = IgnoredFilesInfo.IGNORE_NOTHING;
}
else if (myCvsEntriesManager.fileIsIgnored(myParent)) {
else if (CvsEntriesManager.getInstance().fileIsIgnored(myParent)) {
myIgnoreFilter = IgnoredFilesInfo.IGNORE_ALL;
}
else if (!CvsUtil.fileIsUnderCvs(myParent)) {
@@ -320,7 +318,7 @@ public class CvsInfo {
@SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
private static class DummyCvsInfo extends CvsInfo {
public DummyCvsInfo() {
super(null, null);
super(null);
}
@Override