From 7e1954a6808afd22582f3fbf62af037faf411dea Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Wed, 9 Nov 2016 15:25:28 +0300 Subject: [PATCH] vcs: Moved several classes to [svn4idea] Moved "CheckSamePattern", "MoreAction", "QuantitySelection", "SmallMapSerializer" --- .../src/org/jetbrains/idea/svn}/SmallMapSerializer.java | 6 +++--- .../idea/svn/branchConfig/SvnLoadedBranchesStorage.java | 2 +- .../org/jetbrains/idea/svn/integrate}/CheckSamePattern.java | 4 ++-- .../src/org/jetbrains/idea/svn/integrate}/MoreAction.java | 2 +- .../jetbrains/idea/svn/integrate}/QuantitySelection.java | 4 ++-- .../idea/svn/integrate/SelectedChangeListsChecker.java | 1 - .../idea/svn/integrate/SvnBranchPointsCalculator.java | 2 +- .../org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java | 2 -- 8 files changed, 10 insertions(+), 13 deletions(-) rename {platform/vcs-api/src/com/intellij/openapi/vcs/persistent => plugins/svn4idea/src/org/jetbrains/idea/svn}/SmallMapSerializer.java (95%) rename {platform/vcs-api/src/com/intellij/openapi/vcs => plugins/svn4idea/src/org/jetbrains/idea/svn/integrate}/CheckSamePattern.java (92%) rename {platform/vcs-impl/src/com/intellij/vcsUtil => plugins/svn4idea/src/org/jetbrains/idea/svn/integrate}/MoreAction.java (98%) rename {platform/vcs-api/src/com/intellij/openapi/vcs => plugins/svn4idea/src/org/jetbrains/idea/svn/integrate}/QuantitySelection.java (96%) 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 436747a5df73..2f2aca5181f4 100644 --- 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 implements Forceable { private final KeyDescriptor myKeyDescriptor; private final DataExternalizer 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 keyDescriptor, final DataExternalizer 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 918c76a6060d..6070fd62f650 100644 --- 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 ce531362eac4..cfaf42622c1f 100644 --- 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 { 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 4c5f424820cb..40b2b2924180 100644 --- 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 ce07651866a8..3b9a3ddef3b1 100644 --- 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 fb5a5835fbdb..ec2a8a18843f 100644 --- 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 e2f13b868dd8..bac79556c69a 100644 --- 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 22cb13e84c37..a042e575ce94 100644 --- 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;