avoid synchronized methods of DataOutputStream

java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java

@@ -53,6 +53,7 @@ import com.intellij.util.containers.SLRUCache;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.indexing.IndexInfrastructure;
 import com.intellij.util.io.*;
+import com.intellij.util.io.DataOutputStream;
 import com.intellij.util.messages.MessageBusConnection;
 import gnu.trove.*;
 import org.jetbrains.annotations.NonNls;
@@ -599,7 +600,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
   }
 
   private static void saveSourceInfo(VirtualFile file, SourceFileInfo descriptor) {
-    final DataOutputStream out = ourSourceFileAttribute.writeAttribute(file);
+    final java.io.DataOutputStream out = ourSourceFileAttribute.writeAttribute(file);
     try {
       try {
         descriptor.save(out);
@@ -642,7 +643,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
   }
 
   private static void saveOutputInfo(VirtualFile file, OutputFileInfo descriptor) {
-    final DataOutputStream out = ourOutputFileAttribute.writeAttribute(file);
+    final java.io.DataOutputStream out = ourOutputFileAttribute.writeAttribute(file);
     try {
       try {
         descriptor.save(out);

platform/core-api/src/com/intellij/psi/stubs/StubOutputStream.java

@@ -17,10 +17,10 @@
 package com.intellij.psi.stubs;
 
 import com.intellij.util.io.DataInputOutputUtil;
+import com.intellij.util.io.DataOutputStream;
 import com.intellij.util.io.IOUtil;
 import com.intellij.util.io.PersistentStringEnumerator;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 

platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java

@@ -65,6 +65,7 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.io.*;
+import com.intellij.util.io.DataOutputStream;
 import com.intellij.util.io.storage.HeavyProcessLatch;
 import com.intellij.util.messages.MessageBus;
 import com.intellij.util.messages.MessageBusConnection;

platform/lang-impl/src/com/intellij/util/indexing/ValueContainerMap.java

@@ -1,10 +1,8 @@
 package com.intellij.util.indexing;
 
 import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
-import com.intellij.util.io.DataExternalizer;
-import com.intellij.util.io.DataInputOutputUtil;
-import com.intellij.util.io.KeyDescriptor;
-import com.intellij.util.io.PersistentHashMap;
+import com.intellij.util.io.*;
+import com.intellij.util.io.DataOutputStream;
 import gnu.trove.TIntHashSet;
 
 import java.io.*;

platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java

@@ -33,6 +33,7 @@ import com.intellij.util.containers.IntArrayList;
 import com.intellij.util.io.PagedFileStorage;
 import com.intellij.util.io.PersistentStringEnumerator;
 import com.intellij.util.io.ResizeableMappedFile;
+import com.intellij.util.io.DataOutputStream;
 import com.intellij.util.io.storage.AbstractStorage;
 import com.intellij.util.io.storage.HeavyProcessLatch;
 import com.intellij.util.io.storage.RefCountingStorage;

platform/util/src/com/intellij/util/io/DataOutputStream.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.util.io;
+
+import java.io.*;
+
+/* Unsync version of java.io.DataOutputStream */
+public class DataOutputStream extends java.io.DataOutputStream {
+  public DataOutputStream(OutputStream out) {
+    super(out);
+  }
+
+  @Override
+  public void write(int b) throws IOException {
+    out.write(b);
+    written ++;
+  }
+
+  @Override
+  public void write(byte[] b, int off, int len) throws IOException {
+    out.write(b, off, len);
+    written += len;
+  }
+}

platform/util/src/com/intellij/util/io/UnsyncByteArrayInputStream.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.util.io;
 
 import java.io.InputStream;

platform/util/src/com/intellij/util/io/storage/AbstractStorage.java

@@ -26,9 +26,8 @@ import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
 import com.intellij.openapi.util.io.ByteSequence;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.io.PagePool;
-import com.intellij.util.io.RecordDataOutput;
-import com.intellij.util.io.UnsyncByteArrayInputStream;
+import com.intellij.util.io.*;
+import com.intellij.util.io.DataOutputStream;
 import org.jetbrains.annotations.NonNls;
 
 import java.io.*;