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

svn: Move several methods from "ShowPropertiesDiffAction" to "SvnLazyPropertyContentRevision"

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-11-21 17:09:45 +03:00
parent 240fa0f5cd
commit a74599ebab
4 changed files with 95 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
+1 -1
View File
@@ -31,7 +31,7 @@ import java.util.Map;
import static org.jetbrains.idea.svn.SvnUtil.append;
import static org.jetbrains.idea.svn.SvnUtil.getRelativePath;
import static org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction.getPropertyList;
import static org.jetbrains.idea.svn.history.SvnLazyPropertyContentRevision.getPropertyList;
class SvnChangeProviderContext implements StatusReceiver {
private static final Logger LOG = Logger.getInstance("org.jetbrains.idea.svn.SvnChangeProviderContext");
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffAction.java
+2 -88
View File
@@ -6,12 +6,10 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.progress.PerformInBackgroundOption;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.changes.Change;
@@ -24,22 +22,17 @@ import org.jetbrains.idea.svn.SvnBaseContentRevision;
import org.jetbrains.idea.svn.SvnBundle;
import org.jetbrains.idea.svn.SvnRevisionNumber;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.api.Depth;
import org.jetbrains.idea.svn.api.Revision;
import org.jetbrains.idea.svn.api.Target;
import org.jetbrains.idea.svn.api.Url;
import org.jetbrains.idea.svn.commandLine.SvnBindException;
import org.jetbrains.idea.svn.difftool.properties.SvnPropertiesDiffRequest;
import org.jetbrains.idea.svn.difftool.properties.SvnPropertiesDiffRequest.PropertyContent;
import org.jetbrains.idea.svn.history.SvnLazyPropertyContentRevision;
import org.jetbrains.idea.svn.history.SvnRepositoryContentRevision;
import org.jetbrains.idea.svn.properties.PropertyConsumer;
import org.jetbrains.idea.svn.properties.PropertyData;
import org.jetbrains.idea.svn.properties.PropertyValue;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import static com.intellij.openapi.actionSystem.CommonDataKeys.PROJECT;
@@ -193,8 +186,6 @@ public class ShowPropertiesDiffAction extends AnAction implements DumbAware {
return revision == null ? "not exists" : revision.toString();
}
private final static String ourPropertiesDelimiter = "\n";
@NotNull
private static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs,
@Nullable ContentRevision contentRevision,
@@ -212,83 +203,6 @@ public class ShowPropertiesDiffAction extends AnAction implements DumbAware {
target = Target.on(ioFile, revision);
}
return getPropertyList(vcs, target, revision);
}
@NotNull
public static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs, @NotNull Url url, @Nullable Revision revision)
throws SvnBindException {
return getPropertyList(vcs, Target.on(url, revision), revision);
}
@NotNull
public static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs, @NotNull File ioFile, @Nullable Revision revision)
throws SvnBindException {
return getPropertyList(vcs, Target.on(ioFile, revision), revision);
}
@NotNull
private static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs, @NotNull Target target, @Nullable Revision revision)
throws SvnBindException {
List<PropertyData> lines = new ArrayList<>();
PropertyConsumer propertyHandler = createHandler(revision, lines);
vcs.getFactory(target).createPropertyClient().list(target, revision, Depth.EMPTY, propertyHandler);
return lines;
}
@NotNull
private static PropertyConsumer createHandler(Revision revision, @NotNull List<? super PropertyData> lines) {
ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
if (indicator != null) {
indicator.checkCanceled();
indicator.setText(SvnBundle.message("show.properties.diff.progress.text.revision.information", revision.toString()));
}
return new PropertyConsumer() {
@Override
public void handleProperty(File path, PropertyData property) {
registerProperty(property);
}
@Override
public void handleProperty(Url url, PropertyData property) {
registerProperty(property);
}
@Override
public void handleProperty(long revision, PropertyData property) {
// revision properties here
}
private void registerProperty(@NotNull PropertyData property) {
if (indicator != null) {
indicator.checkCanceled();
indicator.setText2(SvnBundle.message("show.properties.diff.progress.text2.property.information", property.getName()));
}
lines.add(property);
}
};
}
@NotNull
public static String toSortedStringPresentation(@NotNull List<? extends PropertyData> lines) {
StringBuilder sb = new StringBuilder();
Collections.sort(lines, Comparator.comparing(PropertyData::getName));
for (PropertyData line : lines) {
addPropertyPresentation(line, sb);
}
return sb.toString();
}
private static void addPropertyPresentation(@NotNull PropertyData property, @NotNull StringBuilder sb) {
if (sb.length() != 0) {
sb.append(ourPropertiesDelimiter);
}
sb.append(property.getName()).append("=").append(StringUtil.notNullize(PropertyValue.toString(property.getValue())));
return SvnLazyPropertyContentRevision.getPropertyList(vcs, target, revision);
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SimplePropertyRevision.java
+1 -1
View File
@@ -10,7 +10,7 @@ import org.jetbrains.idea.svn.properties.PropertyData;
import java.util.List;
import static org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction.toSortedStringPresentation;
import static org.jetbrains.idea.svn.history.SvnLazyPropertyContentRevision.toSortedStringPresentation;
public class SimplePropertyRevision implements ContentRevision, PropertyRevision {
private final List<PropertyData> myProperty;
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnLazyPropertyContentRevision.java
+91 -4
View File
@@ -1,9 +1,11 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.idea.svn.history;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
@@ -13,15 +15,23 @@ import org.jetbrains.idea.svn.SvnBaseContentRevision;
import org.jetbrains.idea.svn.SvnBundle;
import org.jetbrains.idea.svn.SvnRevisionNumber;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.api.Depth;
import org.jetbrains.idea.svn.api.Revision;
import org.jetbrains.idea.svn.api.Target;
import org.jetbrains.idea.svn.api.Url;
import org.jetbrains.idea.svn.commandLine.SvnBindException;
import org.jetbrains.idea.svn.properties.PropertyConsumer;
import org.jetbrains.idea.svn.properties.PropertyData;
import org.jetbrains.idea.svn.properties.PropertyValue;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import static org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction.getPropertyList;
import static org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction.toSortedStringPresentation;
public class SvnLazyPropertyContentRevision extends SvnBaseContentRevision implements PropertyRevision {
private final static String ourPropertiesDelimiter = "\n";
private final VcsRevisionNumber myNumber;
private final Url myUrl;
private List<PropertyData> myContent;
@@ -77,4 +87,81 @@ public class SvnLazyPropertyContentRevision extends SvnBaseContentRevision imple
public VcsRevisionNumber getRevisionNumber() {
return myNumber;
}
@NotNull
public static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs, @NotNull Url url, @Nullable Revision revision)
throws SvnBindException {
return getPropertyList(vcs, Target.on(url, revision), revision);
}
@NotNull
public static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs, @NotNull File ioFile, @Nullable Revision revision)
throws SvnBindException {
return getPropertyList(vcs, Target.on(ioFile, revision), revision);
}
@NotNull
public static List<PropertyData> getPropertyList(@NotNull SvnVcs vcs, @NotNull Target target, @Nullable Revision revision)
throws SvnBindException {
List<PropertyData> lines = new ArrayList<>();
PropertyConsumer propertyHandler = createHandler(revision, lines);
vcs.getFactory(target).createPropertyClient().list(target, revision, Depth.EMPTY, propertyHandler);
return lines;
}
@NotNull
private static PropertyConsumer createHandler(Revision revision, @NotNull List<? super PropertyData> lines) {
ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
if (indicator != null) {
indicator.checkCanceled();
indicator.setText(SvnBundle.message("show.properties.diff.progress.text.revision.information", revision.toString()));
}
return new PropertyConsumer() {
@Override
public void handleProperty(File path, PropertyData property) {
registerProperty(property);
}
@Override
public void handleProperty(Url url, PropertyData property) {
registerProperty(property);
}
@Override
public void handleProperty(long revision, PropertyData property) {
// revision properties here
}
private void registerProperty(@NotNull PropertyData property) {
if (indicator != null) {
indicator.checkCanceled();
indicator.setText2(SvnBundle.message("show.properties.diff.progress.text2.property.information", property.getName()));
}
lines.add(property);
}
};
}
@NotNull
public static String toSortedStringPresentation(@NotNull List<? extends PropertyData> lines) {
StringBuilder sb = new StringBuilder();
Collections.sort(lines, Comparator.comparing(PropertyData::getName));
for (PropertyData line : lines) {
addPropertyPresentation(line, sb);
}
return sb.toString();
}
private static void addPropertyPresentation(@NotNull PropertyData property, @NotNull StringBuilder sb) {
if (sb.length() != 0) {
sb.append(ourPropertiesDelimiter);
}
sb.append(property.getName()).append("=").append(StringUtil.notNullize(PropertyValue.toString(property.getValue())));
}
}