# HG changeset patch
# Parent 5896c73dd1ad494dc1c154eae526fcd452d3812e
# User Ralph Benjamin Ruijs <ralphbenjamin@netbeans.org>
#230922 - Move EncapsulateFieldsRefactoring to api

diff --git a/refactoring.java/apichanges.xml b/refactoring.java/apichanges.xml
--- a/refactoring.java/apichanges.xml
+++ b/refactoring.java/apichanges.xml
@@ -49,6 +49,21 @@
         <apidef name="JavaRefactoringAPI">Java Refactoring API</apidef>
     </apidefs>
     <changes>
+        <change id="EncapsulateFieldsRefactoring">
+            <api name="JavaRefactoringAPI"/>
+            <summary>Moved EncapsulateFieldsRefactoring to api package.</summary>
+            <version major="1" minor="48"/>
+            <date day="14" month="06" year="2013"/>
+            <author login="ralphbenjamin"/>
+            <compatibility addition="yes"/>
+            <description>
+                <p>
+                    Moved EncapsulateFieldsRefactoring, a composed refactoring (uses instances of EncapsulateFieldRefactoring to encapsulate several fields at once), to api package.
+                </p>    
+            </description>
+            <class package="org.netbeans.modules.refactoring.java.api" name="EncapsulateFieldsRefactoring"/>
+            <issue number="230922"/>
+        </change>
         <change id="DocTrees">
             <api name="JavaRefactoringAPI"/>
             <summary>RefactoringVisitor has support for visiting DocTrees</summary>
diff --git a/refactoring.java/nbproject/project.properties b/refactoring.java/nbproject/project.properties
--- a/refactoring.java/nbproject/project.properties
+++ b/refactoring.java/nbproject/project.properties
@@ -2,7 +2,7 @@
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
 
-spec.version.base=1.47.0
+spec.version.base=1.48.0
 #test configs
 test.config.find.includes=\
     **/FindUsagesSuite.class
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldsRefactoring.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/api/EncapsulateFieldsRefactoring.java
rename from refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldsRefactoring.java
rename to refactoring.java/src/org/netbeans/modules/refactoring/java/api/EncapsulateFieldsRefactoring.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldsRefactoring.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/api/EncapsulateFieldsRefactoring.java
@@ -41,7 +41,7 @@
  * Version 2 license, then the option applies only if the new code is
  * made subject to such option by the copyright holder.
  */
-package org.netbeans.modules.refactoring.java.ui;
+package org.netbeans.modules.refactoring.java.api;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -58,12 +58,13 @@
  * @author Pavel Flaska
  * @author Jan Becicka
  * @author Jan Pokorsky
+ * @since 1.48
  */
 public final class EncapsulateFieldsRefactoring extends AbstractRefactoring {
     
     private Collection<EncapsulateFieldInfo> refactorFields = Collections.emptyList();
     private Set<Modifier> methodModifiers = Collections.emptySet();
-    private Set<Modifier> fieldModifiers = Collections.emptySet();;
+    private Set<Modifier> fieldModifiers = Collections.emptySet();
     private boolean alwaysUseAccessors;
     private boolean isGeneratePropertyChangeSupport;
     private boolean isGenerateVetoableSupport;
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldsPlugin.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldsPlugin.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldsPlugin.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldsPlugin.java
@@ -62,8 +62,8 @@
 import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.InsertPoint;
 import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.Javadoc;
 import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.SortBy;
-import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring;
-import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
+import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
+import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
 import org.netbeans.modules.refactoring.spi.RefactoringElementsBag;
 import org.openide.filesystems.FileObject;
 import org.openide.util.NbBundle;
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaRefactoringsFactory.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaRefactoringsFactory.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaRefactoringsFactory.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaRefactoringsFactory.java
@@ -52,7 +52,7 @@
 import org.netbeans.modules.refactoring.api.*;
 import org.netbeans.modules.refactoring.java.RefactoringUtils;
 import org.netbeans.modules.refactoring.java.api.*;
-import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring;
+import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
 import org.netbeans.modules.refactoring.spi.RefactoringPlugin;
 import org.netbeans.modules.refactoring.spi.RefactoringPluginFactory;
 import org.openide.ErrorManager;
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldPanel.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldPanel.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldPanel.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldPanel.java
@@ -66,7 +66,7 @@
 import org.netbeans.modules.refactoring.java.RefactoringUtils;
 import org.netbeans.modules.refactoring.java.api.MemberInfo;
 import org.netbeans.modules.refactoring.java.plugins.EncapsulateFieldRefactoringPlugin;
-import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
+import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
 import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel;
 import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldUI.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldUI.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldUI.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldUI.java
@@ -43,6 +43,7 @@
  */
 package org.netbeans.modules.refactoring.java.ui;
 
+import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
 import com.sun.source.tree.Tree;
 import com.sun.source.util.SourcePositions;
 import com.sun.source.util.TreePath;
diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/EncapsulateFieldsTest.java b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/EncapsulateFieldsTest.java
--- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/EncapsulateFieldsTest.java
+++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/EncapsulateFieldsTest.java
@@ -60,7 +60,7 @@
 import org.netbeans.modules.java.source.save.DiffContext;
 import org.netbeans.modules.refactoring.api.Problem;
 import org.netbeans.modules.refactoring.api.RefactoringSession;
-import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring;
+import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
 import org.openide.filesystems.FileObject;
 
 /**