# HG changeset patch
# User Vladimir Kvashin <vkvashin@netbeans.org>
# Date 1330097301 -10800
# Branch release701_fixes
# Node ID 1d25276612d816146059de324ee0723a0784fdb5
# Parent  af073fc076867fdbe33a384a23d12f7a496fbb17
fix for #208822 - It should be possible to change "Change Parameters" refactoring UI

diff --git a/cnd.refactoring/nbproject/project.xml b/cnd.refactoring/nbproject/project.xml
--- a/cnd.refactoring/nbproject/project.xml
+++ b/cnd.refactoring/nbproject/project.xml
@@ -329,6 +329,7 @@
                 <friend>com.sun.tools.tuxedo.source</friend>
                 <friend>org.netbeans.modules.cnd.classview</friend>
                 <friend>org.netbeans.modules.cnd.qnavigator</friend>
+                <package>org.netbeans.modules.cnd.refactoring.api</package>
                 <package>org.netbeans.modules.cnd.refactoring.api.ui</package>
                 <package>org.netbeans.modules.cnd.refactoring.spi</package>
             </friend-packages>
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/CsmRefactoringActionsProvider.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/CsmRefactoringActionsProvider.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/CsmRefactoringActionsProvider.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/CsmRefactoringActionsProvider.java
@@ -51,7 +51,7 @@
 import org.netbeans.modules.cnd.api.model.CsmObject;
 import org.netbeans.modules.cnd.api.model.util.CsmKindUtilities;
 import org.netbeans.modules.cnd.refactoring.hints.infrastructure.Utilities;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.spi.CsmActionsImplementationProvider;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.cnd.refactoring.ui.ChangeParametersUI;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/RefactoringActionsProvider.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/RefactoringActionsProvider.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/RefactoringActionsProvider.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/actions/RefactoringActionsProvider.java
@@ -58,7 +58,7 @@
 import org.netbeans.modules.cnd.modelutil.CsmUtilities;
 import org.netbeans.modules.cnd.refactoring.spi.CheckModificationHook;
 import org.netbeans.modules.cnd.refactoring.spi.CsmRenameExtraObjectsProvider;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.cnd.utils.ui.UIGesturesSupport;
 import org.netbeans.modules.refactoring.api.ui.ExplorerContext;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/ChangeParametersRefactoring.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/ChangeParametersRefactoring.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/ChangeParametersRefactoring.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/ChangeParametersRefactoring.java
@@ -45,7 +45,6 @@
 
 import org.netbeans.modules.cnd.api.model.CsmObject;
 import org.netbeans.modules.cnd.api.model.CsmVisibility;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
 import org.netbeans.modules.refactoring.api.AbstractRefactoring;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.Lookups;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/CsmContext.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/CsmContext.java
rename from cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/CsmContext.java
rename to cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/CsmContext.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/CsmContext.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/CsmContext.java
@@ -40,7 +40,7 @@
  * Portions Copyrighted 2009 Sun Microsystems, Inc.
  */
 
-package org.netbeans.modules.cnd.refactoring.support;
+package org.netbeans.modules.cnd.refactoring.api;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/EncapsulateFieldsRefactoring.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/EncapsulateFieldsRefactoring.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/EncapsulateFieldsRefactoring.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/api/EncapsulateFieldsRefactoring.java
@@ -52,7 +52,6 @@
 import org.netbeans.modules.cnd.api.model.CsmMethod;
 import org.netbeans.modules.cnd.api.model.CsmObject;
 import org.netbeans.modules.cnd.api.model.CsmVisibility;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
 import org.netbeans.modules.refactoring.api.AbstractRefactoring;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.Lookups;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ConstructorGenerator.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ConstructorGenerator.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ConstructorGenerator.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ConstructorGenerator.java
@@ -43,7 +43,7 @@
  */
 package org.netbeans.modules.cnd.refactoring.codegen;
 
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.api.model.CsmInheritance;
 import org.netbeans.modules.cnd.refactoring.support.GeneratorUtils;
 import java.awt.Dialog;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ContextProvider.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ContextProvider.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ContextProvider.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/ContextProvider.java
@@ -43,7 +43,7 @@
  */
 package org.netbeans.modules.cnd.refactoring.codegen;
 
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.spi.editor.codegen.CodeGeneratorContextProvider;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.Lookups;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/GetterSetterGenerator.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/GetterSetterGenerator.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/GetterSetterGenerator.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/codegen/GetterSetterGenerator.java
@@ -44,7 +44,7 @@
 package org.netbeans.modules.cnd.refactoring.codegen;
 
 import org.netbeans.modules.cnd.modelutil.ui.ElementNode.Description;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.GeneratorUtils;
 import java.awt.Dialog;
 import org.netbeans.modules.cnd.api.model.CsmObject;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/HintAction.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/HintAction.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/HintAction.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/HintAction.java
@@ -37,7 +37,7 @@
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.TextAction;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.cnd.utils.MIMENames;
 import org.openide.DialogDisplayer;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Utilities.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Utilities.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Utilities.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Utilities.java
@@ -53,7 +53,7 @@
 import org.netbeans.modules.cnd.api.model.util.CsmKindUtilities;
 import org.netbeans.modules.cnd.api.model.xref.CsmReference;
 import org.netbeans.modules.cnd.api.model.xref.CsmReferenceResolver;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 
 /**
  * based on org.netbeans.modules.java.hints.errors.Utilities
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceAction.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceAction.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceAction.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceAction.java
@@ -33,7 +33,7 @@
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.hints.infrastructure.HintAction;
 import org.netbeans.spi.editor.hints.Fix;
 import org.openide.DialogDisplayer;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceHint.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceHint.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceHint.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/introduce/IntroduceHint.java
@@ -64,7 +64,7 @@
 import org.netbeans.modules.cnd.api.model.CsmType;
 import org.netbeans.modules.cnd.api.model.CsmVisibility;
 import org.netbeans.modules.cnd.api.model.deep.CsmExpressionStatement;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.hints.infrastructure.Utilities;
 import org.netbeans.spi.editor.hints.ChangeInfo;
 import org.netbeans.spi.editor.hints.ErrorDescription;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/ChangeParametersPlugin.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/ChangeParametersPlugin.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/ChangeParametersPlugin.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/ChangeParametersPlugin.java
@@ -71,7 +71,7 @@
 import org.netbeans.modules.cnd.refactoring.api.ChangeParametersRefactoring;
 import org.netbeans.modules.cnd.refactoring.api.ChangeParametersRefactoring.ParameterInfo;
 import org.netbeans.modules.cnd.refactoring.spi.CsmChangeParametersExtraObjectsProvider;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.cnd.refactoring.support.ModificationResult;
 import org.netbeans.modules.cnd.refactoring.support.ModificationResult.Difference;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmModificationRefactoringPlugin.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmModificationRefactoringPlugin.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmModificationRefactoringPlugin.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmModificationRefactoringPlugin.java
@@ -48,7 +48,7 @@
 import org.netbeans.modules.cnd.api.model.CsmFile;
 import org.netbeans.modules.cnd.api.model.CsmObject;
 import org.netbeans.modules.cnd.refactoring.spi.CheckModificationHook;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.ModificationResult;
 import org.netbeans.modules.refactoring.api.AbstractRefactoring;
 import org.netbeans.modules.refactoring.api.Problem;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmRefactoringsFactory.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmRefactoringsFactory.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmRefactoringsFactory.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmRefactoringsFactory.java
@@ -48,7 +48,7 @@
 import org.netbeans.modules.cnd.refactoring.api.ChangeParametersRefactoring;
 import org.netbeans.modules.cnd.refactoring.api.EncapsulateFieldRefactoring;
 import org.netbeans.modules.cnd.refactoring.api.EncapsulateFieldsRefactoring;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.refactoring.api.*;
 import org.netbeans.modules.refactoring.spi.*;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/EncapsulateFieldsPlugin.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/EncapsulateFieldsPlugin.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/EncapsulateFieldsPlugin.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/EncapsulateFieldsPlugin.java
@@ -63,7 +63,7 @@
 import org.netbeans.modules.cnd.refactoring.api.EncapsulateFieldRefactoring;
 import org.netbeans.modules.cnd.refactoring.api.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
 import org.netbeans.modules.cnd.refactoring.hints.infrastructure.Utilities;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.cnd.refactoring.support.GeneratorUtils;
 import org.netbeans.modules.cnd.refactoring.support.ModificationResult;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/GeneratorUtils.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/GeneratorUtils.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/GeneratorUtils.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/GeneratorUtils.java
@@ -43,6 +43,7 @@
  */
 package org.netbeans.modules.cnd.refactoring.support;
 
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import java.awt.Toolkit;
 import java.io.File;
 import java.util.ArrayList;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersPanel.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersPanel.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersPanel.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersPanel.java
@@ -66,7 +66,7 @@
 import org.netbeans.modules.cnd.api.model.xref.CsmReference;
 import org.netbeans.modules.cnd.api.model.xref.CsmReferenceKind;
 import org.netbeans.modules.cnd.api.model.xref.CsmReferenceRepository;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel;
 import org.openide.util.NbBundle;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersUI.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersUI.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersUI.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/ChangeParametersUI.java
@@ -50,7 +50,7 @@
 import org.netbeans.modules.cnd.api.model.CsmVisibility;
 import org.netbeans.modules.cnd.api.model.util.CsmKindUtilities;
 import org.netbeans.modules.cnd.refactoring.api.ChangeParametersRefactoring;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.refactoring.api.AbstractRefactoring;
 import org.netbeans.modules.refactoring.api.Problem;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldPanel.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldPanel.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldPanel.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldPanel.java
@@ -82,7 +82,7 @@
 import org.netbeans.modules.cnd.refactoring.api.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
 import org.netbeans.modules.cnd.refactoring.hints.infrastructure.Utilities;
 import org.netbeans.modules.cnd.refactoring.plugins.EncapsulateFieldRefactoringPlugin;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.cnd.refactoring.support.CsmRefactoringUtils;
 import org.netbeans.modules.cnd.refactoring.support.DeclarationGenerator;
 import org.netbeans.modules.cnd.refactoring.support.GeneratorUtils;
diff --git a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldUI.java b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldUI.java
--- a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldUI.java
+++ b/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/ui/EncapsulateFieldUI.java
@@ -47,7 +47,7 @@
 import javax.swing.event.ChangeListener;
 import org.netbeans.modules.cnd.api.model.CsmObject;
 import org.netbeans.modules.cnd.refactoring.api.EncapsulateFieldsRefactoring;
-import org.netbeans.modules.cnd.refactoring.support.CsmContext;
+import org.netbeans.modules.cnd.refactoring.api.CsmContext;
 import org.netbeans.modules.refactoring.api.AbstractRefactoring;
 import org.netbeans.modules.refactoring.api.Problem;
 import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel;