Attachment #135508 for bug #230922

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 230922
Collapse All | Expand All




        <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>

Lines 2-8 Link Here

(-)a/refactoring.java/nbproject/project.properties (-1 / +1 lines)
2	javadoc.arch=${basedir}/arch.xml	2	javadoc.arch=${basedir}/arch.xml
3	javadoc.apichanges=${basedir}/apichanges.xml	3	javadoc.apichanges=${basedir}/apichanges.xml
4		4
5	spec.version.base=1.47.0	5	spec.version.base=1.48.0
6	#test configs	6	#test configs
7	test.config.find.includes=\	7	test.config.find.includes=\
8	**/FindUsagesSuite.class	8	**/FindUsagesSuite.class




 * 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.api;

import java.util.ArrayList;
import java.util.Collection;

 * @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 boolean alwaysUseAccessors;
    private boolean isGeneratePropertyChangeSupport;
    private boolean isGenerateVetoableSupport;

Lines 62-69 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/EncapsulateFieldsPlugin.java (-2 / +2 lines)
62	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.InsertPoint;	62	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.InsertPoint;
63	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.Javadoc;	63	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.Javadoc;
64	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.SortBy;	64	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldPanel.SortBy;
65	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring;	65	import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
66	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;	66	import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
67	import org.netbeans.modules.refactoring.spi.RefactoringElementsBag;	67	import org.netbeans.modules.refactoring.spi.RefactoringElementsBag;
68	import org.openide.filesystems.FileObject;	68	import org.openide.filesystems.FileObject;
69	import org.openide.util.NbBundle;	69	import org.openide.util.NbBundle;

Lines 52-58 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaRefactoringsFactory.java (-1 / +1 lines)
52	import org.netbeans.modules.refactoring.api.*;	52	import org.netbeans.modules.refactoring.api.*;
53	import org.netbeans.modules.refactoring.java.RefactoringUtils;	53	import org.netbeans.modules.refactoring.java.RefactoringUtils;
54	import org.netbeans.modules.refactoring.java.api.*;	54	import org.netbeans.modules.refactoring.java.api.*;
55	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring;	55	import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
56	import org.netbeans.modules.refactoring.spi.RefactoringPlugin;	56	import org.netbeans.modules.refactoring.spi.RefactoringPlugin;
57	import org.netbeans.modules.refactoring.spi.RefactoringPluginFactory;	57	import org.netbeans.modules.refactoring.spi.RefactoringPluginFactory;
58	import org.openide.ErrorManager;	58	import org.openide.ErrorManager;

Lines 66-72 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldPanel.java (-1 / +1 lines)
66	import org.netbeans.modules.refactoring.java.RefactoringUtils;	66	import org.netbeans.modules.refactoring.java.RefactoringUtils;
67	import org.netbeans.modules.refactoring.java.api.MemberInfo;	67	import org.netbeans.modules.refactoring.java.api.MemberInfo;
68	import org.netbeans.modules.refactoring.java.plugins.EncapsulateFieldRefactoringPlugin;	68	import org.netbeans.modules.refactoring.java.plugins.EncapsulateFieldRefactoringPlugin;
69	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;	69	import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring.EncapsulateFieldInfo;
70	import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel;	70	import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel;
71	import org.openide.util.Exceptions;	71	import org.openide.util.Exceptions;
72	import org.openide.util.NbBundle;	72	import org.openide.util.NbBundle;

Lines 43-48 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldUI.java (+1 lines)
43	*/	43	*/
44	package org.netbeans.modules.refactoring.java.ui;	44	package org.netbeans.modules.refactoring.java.ui;
45		45
		46	import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
46	import com.sun.source.tree.Tree;	47	import com.sun.source.tree.Tree;
47	import com.sun.source.util.SourcePositions;	48	import com.sun.source.util.SourcePositions;
48	import com.sun.source.util.TreePath;	49	import com.sun.source.util.TreePath;

Lines 60-66 Link Here

(-)a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/EncapsulateFieldsTest.java (-1 / +1 lines)
60	import org.netbeans.modules.java.source.save.DiffContext;	60	import org.netbeans.modules.java.source.save.DiffContext;
61	import org.netbeans.modules.refactoring.api.Problem;	61	import org.netbeans.modules.refactoring.api.Problem;
62	import org.netbeans.modules.refactoring.api.RefactoringSession;	62	import org.netbeans.modules.refactoring.api.RefactoringSession;
63	import org.netbeans.modules.refactoring.java.ui.EncapsulateFieldsRefactoring;	63	import org.netbeans.modules.refactoring.java.api.EncapsulateFieldsRefactoring;
64	import org.openide.filesystems.FileObject;	64	import org.openide.filesystems.FileObject;
65		65
66	/**	66	/**

Return to bug 230922

Lines 49-54 Link Here

(-)a/refactoring.java/apichanges.xml (+15 lines)
49	<apidef name="JavaRefactoringAPI">Java Refactoring API</apidef>	49	<apidef name="JavaRefactoringAPI">Java Refactoring API</apidef>
50	</apidefs>	50	</apidefs>
51	<changes>	51	<changes>
		52	<change id="EncapsulateFieldsRefactoring">
		53	<api name="JavaRefactoringAPI"/>
		54	<summary>Moved EncapsulateFieldsRefactoring to api package.</summary>
		55	<version major="1" minor="48"/>
		56	<date day="14" month="06" year="2013"/>
		57	<author login="ralphbenjamin"/>
		58	<compatibility addition="yes"/>
		59	<description>
		60	<p>
		61	Moved EncapsulateFieldsRefactoring, a composed refactoring (uses instances of EncapsulateFieldRefactoring to encapsulate several fields at once), to api package.
		62	</p>
		63	</description>
		64	<class package="org.netbeans.modules.refactoring.java.api" name="EncapsulateFieldsRefactoring"/>
		65	<issue number="230922"/>
		66	</change>
52	<change id="DocTrees">	67	<change id="DocTrees">
53	<api name="JavaRefactoringAPI"/>	68	<api name="JavaRefactoringAPI"/>
54	<summary>RefactoringVisitor has support for visiting DocTrees</summary>	69	<summary>RefactoringVisitor has support for visiting DocTrees</summary>

Lines 41-47 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldsRefactoring.java (-2 / +3 lines)
41	* Version 2 license, then the option applies only if the new code is	41	* Version 2 license, then the option applies only if the new code is
42	* made subject to such option by the copyright holder.	42	* made subject to such option by the copyright holder.
43	*/	43	*/
44	package org.netbeans.modules.refactoring.java.ui;	44	package org.netbeans.modules.refactoring.java.api;
45		45
46	import java.util.ArrayList;	46	import java.util.ArrayList;
47	import java.util.Collection;	47	import java.util.Collection;
Lines 58-69 Link Here
58	* @author Pavel Flaska	58	* @author Pavel Flaska
59	* @author Jan Becicka	59	* @author Jan Becicka
60	* @author Jan Pokorsky	60	* @author Jan Pokorsky
		61	* @since 1.48
61	*/	62	*/
62	public final class EncapsulateFieldsRefactoring extends AbstractRefactoring {	63	public final class EncapsulateFieldsRefactoring extends AbstractRefactoring {
63		64
64	private Collection<EncapsulateFieldInfo> refactorFields = Collections.emptyList();	65	private Collection<EncapsulateFieldInfo> refactorFields = Collections.emptyList();
65	private Set<Modifier> methodModifiers = Collections.emptySet();	66	private Set<Modifier> methodModifiers = Collections.emptySet();
66	private Set<Modifier> fieldModifiers = Collections.emptySet();;	67	private Set<Modifier> fieldModifiers = Collections.emptySet();
67	private boolean alwaysUseAccessors;	68	private boolean alwaysUseAccessors;
68	private boolean isGeneratePropertyChangeSupport;	69	private boolean isGeneratePropertyChangeSupport;
69	private boolean isGenerateVetoableSupport;	70	private boolean isGenerateVetoableSupport;