svn: Renamed "AbstractShowPropertiesDiffAction" to "ShowPropertiesDiffAction"

"action.Subversion.properties.diff.name" key is not necessary - title
is taken from "action.PropertiesDiff.text" (default key for action)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
index 902b1a5297013f71527d20f8b78e9e5b7bd4b69d..d00dfa5568131380e4a65778837591204b9c9c45 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
@@ -597,7 +597,6 @@ action.working.copies.map.correct.roots.button.text=Correct &Roots
 action.working.copies.map.correct.warning.text=Some folders marked in 'Project Settings | Version Control' as under Subversion control,\n\
 are unversioned (Versioned folders may be under them).\n\
 You can use 'Correct Roots' button to perform auto correction.
-action.Subversion.properties.diff.name=Properties Diff
 action.Subversion.properties.difference.diff.title=Subversion properties difference: {0}
 action.Subversion.properties.difference.diff.for.move.title=Subversion properties difference: {0} -> {1}
 message.Subversion.files.can.not.be.added.to.subversion.are.not.under.working.copy.text=File(s) {0} can not be added to Subversion control since they are not under working copy.

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
index b4363e3482bd88f627d73c103a71ef6aae6c39b1..450c4c3794c868a1969404bd2c5021e6e449b9cc 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
@@ -30,12 +30,10 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.idea.svn.actions.AbstractShowPropertiesDiffAction;
 import org.jetbrains.idea.svn.api.NodeKind;
 import org.jetbrains.idea.svn.branchConfig.SvnBranchConfigurationManager;
 import org.jetbrains.idea.svn.history.SimplePropertyRevision;
 import org.jetbrains.idea.svn.info.Info;
-import org.jetbrains.idea.svn.properties.PropertyData;
 import org.jetbrains.idea.svn.status.Status;
 import org.jetbrains.idea.svn.status.StatusType;
 import org.tmatesoft.svn.core.SVNException;
@@ -46,6 +44,8 @@ import java.io.File;
 import java.util.List;
 import java.util.Map;
 
+import static org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction.getPropertyList;
+
 class SvnChangeProviderContext implements StatusReceiver {
   private static final Logger LOG = Logger.getInstance("org.jetbrains.idea.svn.SvnChangeProviderContext");
 
@@ -380,7 +380,7 @@ class SvnChangeProviderContext implements StatusReceiver {
     ContentRevision contentRevision = isBeforeRevision ? change.getBeforeRevision() : change.getAfterRevision();
     SVNRevision revision = isBeforeRevision ? SVNRevision.BASE : SVNRevision.WORKING;
 
-    return new SimplePropertyRevision(getProperties(file, revision), path, getRevisionNumber(contentRevision));
+    return new SimplePropertyRevision(getPropertyList(myVcs, file, revision), path, getRevisionNumber(contentRevision));
   }
 
   @Nullable
@@ -389,11 +389,6 @@ class SvnChangeProviderContext implements StatusReceiver {
   }
 
   @NotNull
-  private List<PropertyData> getProperties(@NotNull File file, @NotNull SVNRevision revision) throws SVNException {
-    return AbstractShowPropertiesDiffAction.getPropertyList(myVcs, file, revision);
-  }
-
-  @NotNull
   private ConflictState getState(@Nullable Status svnStatus) {
     ConflictState result = svnStatus != null ? ConflictState.from(svnStatus) : ConflictState.none;
 

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffAction.java
similarity index 98%
rename from plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java
rename to plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffAction.java
index 640dd5256ec9f8a347169f31e3c0be0a8ac803b6..e9d981f0d4f49b66d1a669607e3c03df7e7e0956 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffAction.java
@@ -58,10 +58,7 @@ import java.util.List;
 import static com.intellij.util.ObjectUtils.notNull;
 import static com.intellij.util.containers.ContainerUtil.exists;
 
-public abstract class AbstractShowPropertiesDiffAction extends AnAction implements DumbAware {
-  protected AbstractShowPropertiesDiffAction(String name) {
-    super(name);
-  }
+public class ShowPropertiesDiffAction extends AnAction implements DumbAware {
 
   @Override
   public void update(@NotNull AnActionEvent e) {

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SimplePropertyRevision.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SimplePropertyRevision.java
index 881984cb1fb62036aee2dd8fc4db7e85dc5433f1..4be53aabd294a262d224b89796dd724b1ffdaa7c 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SimplePropertyRevision.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SimplePropertyRevision.java
@@ -6,11 +6,12 @@ import com.intellij.openapi.vcs.changes.ContentRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.idea.svn.actions.AbstractShowPropertiesDiffAction;
 import org.jetbrains.idea.svn.properties.PropertyData;
 
 import java.util.List;
 
+import static org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction.toSortedStringPresentation;
+
 public class SimplePropertyRevision implements ContentRevision, PropertyRevision {
   private final List<PropertyData> myProperty;
   private final FilePath myNewFilePath;
@@ -30,7 +31,7 @@ public class SimplePropertyRevision implements ContentRevision, PropertyRevision
 
   @Nullable
   public String getContent() {
-    return AbstractShowPropertiesDiffAction.toSortedStringPresentation(myProperty);
+    return toSortedStringPresentation(myProperty);
   }
 
   @NotNull

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnLazyPropertyContentRevision.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnLazyPropertyContentRevision.java
index 3c6966d3b5972c6ba2d3288b7819bc3a87bc59fb..77934e2330625d81d3238dce9d12a73d2dfa9659 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnLazyPropertyContentRevision.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnLazyPropertyContentRevision.java
@@ -29,12 +29,14 @@ 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.actions.AbstractShowPropertiesDiffAction;
 import org.jetbrains.idea.svn.properties.PropertyData;
 import org.tmatesoft.svn.core.SVNURL;
 
 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 MarkerVcsContentRevision, PropertyRevision {
   private final VcsRevisionNumber myNumber;
   private final SVNURL myUrl;
@@ -57,7 +59,7 @@ public class SvnLazyPropertyContentRevision extends SvnBaseContentRevision imple
 
   @Override
   public String getContent() throws VcsException {
-    return AbstractShowPropertiesDiffAction.toSortedStringPresentation(getProperties());
+    return toSortedStringPresentation(getProperties());
   }
 
   private List<PropertyData> loadContent() throws VcsException {
@@ -65,7 +67,7 @@ public class SvnLazyPropertyContentRevision extends SvnBaseContentRevision imple
     final Ref<VcsException> exceptionRef = new Ref<>();
     final Runnable runnable = () -> {
       try {
-        ref.set(AbstractShowPropertiesDiffAction.getPropertyList(myVcs, myUrl, ((SvnRevisionNumber)myNumber).getRevision()));
+        ref.set(getPropertyList(myVcs, myUrl, ((SvnRevisionNumber)myNumber).getRevision()));
       }
       catch (VcsException e) {
         exceptionRef.set(e);