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

revert to use encodeHexString (Guava also has difference, so, revert as before)

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-03-23 17:43:47 +01:00
parent 7041a9a83e
commit 99cbb28191
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java
+2 -2
View File
@@ -8,13 +8,13 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import org.apache.commons.codec.binary.Hex;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.List;
/**
@@ -76,7 +76,7 @@ public class RequiredLibrariesInfo {
md5.update(file.contentsToByteArray());
final byte[] digest = md5.digest();
return Base64.getEncoder().encodeToString(digest);
return new String(Hex.encodeHex(digest));
}
catch (Exception e) {
return null;
plugins/hg4idea/intellij.vcs.hg.iml
+1
View File
@@ -24,5 +24,6 @@
<orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
<orderEntry type="library" scope="TEST" name="XStream" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="library" name="commons-codec" level="project" />
</component>
</module>
plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java
+2 -1
View File
@@ -11,6 +11,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.Hash;
import com.intellij.vcs.log.VcsLogObjectsFactory;
import org.apache.commons.codec.binary.Hex;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.zmlx.hg4idea.HgNameWithHashInfo;
@@ -104,7 +105,7 @@ public class HgRepositoryReader {
public String readCurrentRevision() {
if (!isDirStateInfoAvailable()) return null;
try {
return Base64.getEncoder().encodeToString(readHashBytesFromFile(myDirStateFile));
return Hex.encodeHexString(readHashBytesFromFile(myDirStateFile));
}
catch (IOException e) {
// dirState exists if not fresh, if we could not load dirState info repository must be corrupted