diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java similarity index 96% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java rename to platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java index 98464e2ebde0..6ebfd3f56743 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java @@ -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(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java index 82355dcd585a..7597e6919bd5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java @@ -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) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java index 2af94743b01b..3aa710fa29b1 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java @@ -75,7 +75,7 @@ public class ShelveChangesManager implements ProjectComponent, JDOMExternalizabl private final List myRecycledShelvedChangeLists = new ArrayList(); @NonNls private static final String ATTRIBUTE_SHOW_RECYCLED = "show_recycled"; - private final CompoundShelfFileProcesor myFileProcessor; + private final CompoundShelfFileProcessor myFileProcessor; public static final Topic SHELF_TOPIC = new Topic("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"); }