PY-17265 Move package "makeFunctionTopLevel" under "com.jetbrains.refactoring.move...

diff --git a/python/src/com/jetbrains/python/refactoring/classes/PyMembersRefactoringSupport.java b/python/src/com/jetbrains/python/refactoring/classes/PyMembersRefactoringSupport.java
index cfd67217134045a19e766f31e871ed4c299e9bde..3c6a4f5aa7e095cdbf572e44839027184644e93b 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/classes/PyMembersRefactoringSupport.java
+++ b/python/src/com/jetbrains/python/refactoring/classes/PyMembersRefactoringSupport.java
@@ -24,7 +24,7 @@ import com.jetbrains.python.psi.PyClass;
 import com.jetbrains.python.psi.PyElement;
 import com.jetbrains.python.psi.PyFile;
 import com.jetbrains.python.refactoring.classes.membersManager.PyMemberInfo;
-import com.jetbrains.python.refactoring.move.PyDependentModuleMembersCollector;
+import com.jetbrains.python.refactoring.move.moduleMembers.PyDependentModuleMembersCollector;
 
 /**
  * @author Dennis.Ushakov

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolDelegate.java b/python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolDelegate.java
index 5ceebe87d7cb88c20f6174ef69d7e708ae9a05d7..1fb9b8c77747e315d94a962b368f4f1b81bff3b0 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolDelegate.java
+++ b/python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolDelegate.java
@@ -41,9 +41,12 @@ import com.jetbrains.python.psi.impl.PyPsiUtils;
 import com.jetbrains.python.psi.search.PyOverridingMethodsSearch;
 import com.jetbrains.python.psi.search.PySuperMethodsSearch;
 import com.jetbrains.python.psi.types.TypeEvalContext;
-import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeFunctionTopLevelDialog;
-import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
-import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
+import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeFunctionTopLevelDialog;
+import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
+import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
+import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersDialog;
+import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersHelper;
+import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersProcessor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java
similarity index 99%
rename from python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java
rename to python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java
index 00d1ef3979b920a2aab9e5b6f71ca887fa497249..d5463514f004ff0bb22b4433ec13f8238090afad 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.refactoring.makeFunctionTopLevel;
+package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
 
 import com.intellij.codeInsight.controlflow.ControlFlow;
 import com.intellij.codeInsight.controlflow.Instruction;

diff --git a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java
similarity index 97%
rename from python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java
rename to python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java
index 84e164d5e68d96e0081aefb916dc6e15d949ff34..34e4b456aa5f52af59095d61f779c64f861724f0 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java
+++ b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.refactoring.makeFunctionTopLevel;
+package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;

diff --git a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java
similarity index 98%
rename from python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java
rename to python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java
index f1281effe0dfee3f901f0bdcb23809ddb85cf591..ab5f71e0c85bac6b0067e474335e777593e0598f 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.refactoring.makeFunctionTopLevel;
+package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
 
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;

diff --git a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java
similarity index 99%
rename from python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java
rename to python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java
index 6a2d65e70dca93f1a6b72f84bcd84ce0b592cc44..e518097ba1c384544b33c2960e9e49ce3792127b 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.refactoring.makeFunctionTopLevel;
+package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyDependentModuleMembersCollector.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyDependentModuleMembersCollector.java
similarity index 74%
rename from python/src/com/jetbrains/python/refactoring/move/PyDependentModuleMembersCollector.java
rename to python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyDependentModuleMembersCollector.java
index e987d93d5d114ed96d26821b99dd0dbeb8ebbda3..2d4005bd7c87261ea2ef27acbea28b371d8bdaca 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyDependentModuleMembersCollector.java
+++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyDependentModuleMembersCollector.java
@@ -1,4 +1,19 @@
-package com.jetbrains.python.refactoring.move;
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.refactoring.move.moduleMembers;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfo.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfo.java
similarity index 54%
rename from python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfo.java
rename to python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfo.java
index 44df0c75883759b8f31de3be14a0ffc6b2aadacf..0dae6e4cfbc9cc6a1c82284d33ce7c1414b8e7bc 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfo.java
+++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfo.java
@@ -1,4 +1,19 @@
-package com.jetbrains.python.refactoring.move;
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.refactoring.move.moduleMembers;
 
 import com.intellij.refactoring.classMembers.MemberInfoBase;
 import com.jetbrains.python.psi.PyElement;

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfoModel.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfoModel.java
similarity index 53%
rename from python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfoModel.java
rename to python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfoModel.java
index 85d898f8edbb5d40e8669bf33b9eb32006be3779..f09853241afeb9bd54c2fcee630abb52621475bd 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfoModel.java
+++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfoModel.java
@@ -1,4 +1,19 @@
-package com.jetbrains.python.refactoring.move;
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.refactoring.move.moduleMembers;
 
 import com.intellij.refactoring.classMembers.AbstractUsesDependencyMemberInfoModel;
 import com.jetbrains.python.psi.PyElement;

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersDialog.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersDialog.java
similarity index 98%
rename from python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersDialog.java
rename to python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersDialog.java
index cdba75637cc3eb408f54ff92f785e798585d5f77..4a97d1abdab0eda0cecaec9869e738a928cc4a7f 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersDialog.java
+++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersDialog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.refactoring.move;
+package com.jetbrains.python.refactoring.move.moduleMembers;
 
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.project.Project;
@@ -33,6 +33,7 @@ import com.jetbrains.python.psi.PyElement;
 import com.jetbrains.python.psi.PyFile;
 import com.jetbrains.python.psi.PyFunction;
 import com.jetbrains.python.psi.impl.PyPsiUtils;
+import com.jetbrains.python.refactoring.move.PyBaseMoveDialog;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersHelper.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersHelper.java
similarity index 86%
rename from python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersHelper.java
rename to python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersHelper.java
index d1b79393667731c2f946d1616e51c8c8a483c694..cbf726d5b03ce877c50a25d7af11de91d93b7540 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersHelper.java
+++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersHelper.java
@@ -1,4 +1,19 @@
-package com.jetbrains.python.refactoring.move;
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.refactoring.move.moduleMembers;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersProcessor.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersProcessor.java
similarity index 97%
rename from python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersProcessor.java
rename to python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersProcessor.java
index 1e1afcf741b9b851f814a2ee5115d94f41b3d0a2..1f4510c4c014a8bdf8dc6cb53456a638191d80ba 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.refactoring.move;
+package com.jetbrains.python.refactoring.move.moduleMembers;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
@@ -34,6 +34,7 @@ import com.intellij.util.containers.MultiMap;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.psi.*;
 import com.jetbrains.python.refactoring.PyRefactoringUtil;
+import com.jetbrains.python.refactoring.move.PyMoveRefactoringUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolProcessor.java b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java
similarity index 93%
rename from python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolProcessor.java
rename to python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java
index 54d9957995e1eecbec7c7a4b2607eed5f6bc496a..f1b9fa82f704ee2e682e7aad5cd8a7e87b9f2fc2 100644 (file)
--- a/python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java
@@ -1,4 +1,19 @@
-package com.jetbrains.python.refactoring.move;
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.refactoring.move.moduleMembers;
 
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.*;

diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
index 689766d3d2361a6e4cbeb2327c8db727730a2daf..b279c52f1b3b818362d609220039ea745973643d 100644 (file)
--- a/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
@@ -26,8 +26,8 @@ import com.jetbrains.python.fixtures.PyTestCase;
 import com.jetbrains.python.psi.LanguageLevel;
 import com.jetbrains.python.psi.PyFunction;
 import com.jetbrains.python.psi.impl.PyPsiUtils;
-import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
-import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
+import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
+import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java
index f9eb7cabf82553128490c29133c5cd96a5d24a27..6b53b1c7062ceea1803859d5e3ce8ff63ddf93af 100644 (file)
--- a/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java
@@ -33,8 +33,8 @@ import com.jetbrains.python.psi.*;
 import com.jetbrains.python.psi.stubs.PyClassNameIndex;
 import com.jetbrains.python.psi.stubs.PyFunctionNameIndex;
 import com.jetbrains.python.psi.stubs.PyVariableNameIndex;
-import com.jetbrains.python.refactoring.move.PyMoveModuleMembersHelper;
-import com.jetbrains.python.refactoring.move.PyMoveModuleMembersProcessor;
+import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersHelper;
+import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersProcessor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -42,7 +42,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
-import static com.jetbrains.python.refactoring.move.PyMoveModuleMembersHelper.isMovableModuleMember;
+import static com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersHelper.isMovableModuleMember;
 
 /**
  * @author vlan