mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
fix typo in class name
This commit is contained in:
+4
-4
@@ -30,16 +30,16 @@ import java.util.Collection;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
|
||||
public class CompoundShelfFileProcesor {
|
||||
public class CompoundShelfFileProcessor {
|
||||
private final String mySubdirName;
|
||||
private final StreamProvider[] myServerStreamProviders;
|
||||
private static final RoamingType PER_USER = RoamingType.PER_USER;
|
||||
private final String FILE_SPEC;
|
||||
private final String myShelfPath;
|
||||
|
||||
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.shelf.CompoundShelfFileProcesor");
|
||||
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.shelf.CompoundShelfFileProcessor");
|
||||
|
||||
public CompoundShelfFileProcesor(final String subdirName) {
|
||||
public CompoundShelfFileProcessor(final String subdirName) {
|
||||
mySubdirName = subdirName;
|
||||
myServerStreamProviders = ((ApplicationImpl)ApplicationManager.getApplication()).getStateStore().getStateStorageManager().getStreamProviders(PER_USER);
|
||||
|
||||
@@ -47,7 +47,7 @@ public class CompoundShelfFileProcesor {
|
||||
myShelfPath = PathManager.getConfigPath() + File.separator + mySubdirName;
|
||||
}
|
||||
|
||||
public CompoundShelfFileProcesor(final StreamProvider[] serverStreamProviders, final String shelfPath) {
|
||||
public CompoundShelfFileProcessor(final StreamProvider[] serverStreamProviders, final String shelfPath) {
|
||||
myServerStreamProviders = serverStreamProviders;
|
||||
myShelfPath = shelfPath;
|
||||
mySubdirName = new File(myShelfPath).getName();
|
||||
+3
-3
@@ -29,16 +29,16 @@ import java.util.*;
|
||||
|
||||
public class ShelfManagerConfigurationMerger implements XmlConfigurationMerger {
|
||||
private final String myConfigPath;
|
||||
private final CompoundShelfFileProcesor myFileProcessor;
|
||||
private final CompoundShelfFileProcessor myFileProcessor;
|
||||
|
||||
public ShelfManagerConfigurationMerger() {
|
||||
myConfigPath = PathManager.getConfigPath()+ "/shelf";
|
||||
myFileProcessor = new CompoundShelfFileProcesor("shelf");
|
||||
myFileProcessor = new CompoundShelfFileProcessor("shelf");
|
||||
}
|
||||
|
||||
public ShelfManagerConfigurationMerger(final String configPath, final StreamProvider[] streamProviders) {
|
||||
myConfigPath = configPath;
|
||||
myFileProcessor = new CompoundShelfFileProcesor(streamProviders, configPath);
|
||||
myFileProcessor = new CompoundShelfFileProcessor(streamProviders, configPath);
|
||||
}
|
||||
|
||||
public Element merge(final Element serverElement, final Element localElement) {
|
||||
|
||||
+4
-4
@@ -75,7 +75,7 @@ public class ShelveChangesManager implements ProjectComponent, JDOMExternalizabl
|
||||
private final List<ShelvedChangeList> myRecycledShelvedChangeLists = new ArrayList<ShelvedChangeList>();
|
||||
|
||||
@NonNls private static final String ATTRIBUTE_SHOW_RECYCLED = "show_recycled";
|
||||
private final CompoundShelfFileProcesor myFileProcessor;
|
||||
private final CompoundShelfFileProcessor myFileProcessor;
|
||||
|
||||
public static final Topic<ChangeListener> SHELF_TOPIC = new Topic<ChangeListener>("shelf updates", ChangeListener.class);
|
||||
private boolean myShowRecycled;
|
||||
@@ -84,10 +84,10 @@ public class ShelveChangesManager implements ProjectComponent, JDOMExternalizabl
|
||||
myProject = project;
|
||||
myBus = bus;
|
||||
if (!project.isDefault()) {
|
||||
myFileProcessor = new CompoundShelfFileProcesor("shelf");
|
||||
myFileProcessor = new CompoundShelfFileProcessor("shelf");
|
||||
}
|
||||
else {
|
||||
myFileProcessor = new CompoundShelfFileProcesor(new StreamProvider[]{}, PathManager.getConfigPath() + File.separator + "shelf");
|
||||
myFileProcessor = new CompoundShelfFileProcessor(new StreamProvider[]{}, PathManager.getConfigPath() + File.separator + "shelf");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ public class ShelveChangesManager implements ProjectComponent, JDOMExternalizabl
|
||||
}
|
||||
|
||||
myFileProcessor.savePathFile(
|
||||
new CompoundShelfFileProcesor.ContentProvider(){
|
||||
new CompoundShelfFileProcessor.ContentProvider(){
|
||||
public void writeContentTo(final Writer writer) throws IOException {
|
||||
UnifiedDiffWriter.write(patches, writer, "\n");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user