vcs: Moved several classes to [svn4idea]

Moved "CheckSamePattern", "MoreAction", "QuantitySelection",
"SmallMapSerializer"

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/persistent/SmallMapSerializer.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SmallMapSerializer.java
similarity index 95%
rename from platform/vcs-api/src/com/intellij/openapi/vcs/persistent/SmallMapSerializer.java
rename to plugins/svn4idea/src/org/jetbrains/idea/svn/SmallMapSerializer.java
index 436747a5df736196bf2a8ab83c5811d45a147566..2f2aca5181f45206719726d58874179b138037e7 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/persistent/SmallMapSerializer.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SmallMapSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vcs.persistent;
+package org.jetbrains.idea.svn;
 
 import com.intellij.openapi.Forceable;
 import com.intellij.openapi.diagnostic.Logger;
@@ -40,7 +40,7 @@ public class SmallMapSerializer<K,V> implements Forceable {
   private final KeyDescriptor<K> myKeyDescriptor;
   private final DataExternalizer<V> myValueExternalizer;
   private boolean myDirty;
-  private Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.persistent.SmallMapSerializer");
+  private Logger LOG = Logger.getInstance(SmallMapSerializer.class);
 
   public SmallMapSerializer(final File file, final KeyDescriptor<K> keyDescriptor, final DataExternalizer<V> valueExternalizer) {
     myFile = file;

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java
index 918c76a6060dd039054feb84593344c051dff347..6070fd62f65022c68e6cc08d45c2912a76d3d5e8 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnLoadedBranchesStorage.java
@@ -17,7 +17,7 @@ package org.jetbrains.idea.svn.branchConfig;
 
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.persistent.SmallMapSerializer;
+import org.jetbrains.idea.svn.SmallMapSerializer;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.DataExternalizer;

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/CheckSamePattern.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/CheckSamePattern.java
similarity index 92%
rename from platform/vcs-api/src/com/intellij/openapi/vcs/CheckSamePattern.java
rename to plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/CheckSamePattern.java
index ce531362eac4fd80857329ea4b8249de64e3bd2b..cfaf42622c1f909a48a3bae9c6a726eb1a32dc40 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/CheckSamePattern.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/CheckSamePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vcs;
+package org.jetbrains.idea.svn.integrate;
 
 public class CheckSamePattern<T> {
   private boolean mySame;

diff --git a/platform/vcs-impl/src/com/intellij/vcsUtil/MoreAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MoreAction.java
similarity index 98%
rename from platform/vcs-impl/src/com/intellij/vcsUtil/MoreAction.java
rename to plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MoreAction.java
index 4c5f424820cbdda36a66f6a1813a539d240940dd..40b2b2924180808db645c2ebfc3ceb50af8affc5 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/vcsUtil/MoreAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MoreAction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.vcsUtil;
+package org.jetbrains.idea.svn.integrate;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuantitySelection.java
similarity index 96%
rename from platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java
rename to plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuantitySelection.java
index ce07651866a804a00a6906ca02a6cee1c5971ca5..3b9a3ddef3b15b5ad4917480c4cf39531b4bb723 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuantitySelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vcs;
+package org.jetbrains.idea.svn.integrate;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectedChangeListsChecker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectedChangeListsChecker.java
index fb5a5835fbdba346ec8d0d3703e7a8f60b162b65..ec2a8a18843fc49c68f11f6c9788c55d0891e4e2 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectedChangeListsChecker.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectedChangeListsChecker.java
@@ -16,7 +16,6 @@
 package org.jetbrains.idea.svn.integrate;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.vcs.CheckSamePattern;
 import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.openapi.vcs.changes.ChangeList;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java
index e2f13b868dd8e729290b21b05c63e23b8ddf9a30..bac79556c69aab716080b81fee2d5607832849a7 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnBranchPointsCalculator.java
@@ -18,7 +18,7 @@ package org.jetbrains.idea.svn.integrate;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vcs.persistent.SmallMapSerializer;
+import org.jetbrains.idea.svn.SmallMapSerializer;
 import com.intellij.util.io.DataExternalizer;
 import com.intellij.util.io.EnumeratorStringDescriptor;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java
index 22cb13e84c37fd122b4a7fdb72ff89b19cac3be1..a042e575ce9434b5e4ebc90d781a1c0c5f9c2116 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java
@@ -27,7 +27,6 @@ import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.ui.popup.util.PopupUtil;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.vcs.QuantitySelection;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.committed.CommittedChangeListRenderer;
@@ -43,7 +42,6 @@ import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.ListTableModel;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.components.BorderLayoutPanel;
-import com.intellij.vcsUtil.MoreAction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.svn.history.SvnChangeList;
 import org.jetbrains.idea.svn.mergeinfo.ListMergeStatus;