Attachment #134065 for bug #170769

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 170769
Collapse All | Expand All

Lines 97-99 Link Here

(-)diff/src/org/netbeans/modules/diff/Bundle.properties (+4 lines)
97		97
98	# Options Export	98	# Options Export
99	Diff.Options.Export.displayName=Diff	99	Diff.Options.Export.displayName=Diff
		100
		101	CTL_IgnoreWhitespacesOptionAction=Ignore Leading And Trailing Whitespace
		102	CTL_IgnoreInnerWhitespacesOptionAction=Ignore Changes In Inner Whitespace
		103	CTL_IgnoreCaseOptionAction=Ignore Changes In Case




        </folder>
    </folder>
    
    <folder name="Menu">
        <folder name="View">
            <folder name="Diff">
                <file name="toggle-ignore-whitespace-diff-option.shadow">
                    <attr name="originalFile" stringvalue="Editors/Actions/toggle-ignore-whitespace-diff-option.instance"/>
                    <attr intvalue="10" name="position"/>
                </file>
                <file name="toggle-ignore-inner-whitespace-diff-option.shadow">
                    <attr name="originalFile" stringvalue="Editors/Actions/toggle-ignore-inner-whitespace-diff-option.instance"/>
                    <attr intvalue="15" name="position"/>
                </file>
                <file name="toggle-ignore-case-diff-option.shadow">
                    <attr name="originalFile" stringvalue="Editors/Actions/toggle-ignore-case-diff-option.instance"/>
                    <attr intvalue="20" name="position"/>
                </file>
            </folder>
        </folder>
    </folder>
    
    <folder name="Editors">
        <file name="org-netbeans-modules-diff-builtin-visualizer-editable-DiffHighlightsLayerFactory.instance"/>
        <file name="org-netbeans-modules-merge-builtin-visualizer-MergeHighlightsLayerFactory.instance">

                <attr name="instanceClass" stringvalue="org.netbeans.modules.diff.builtin.visualizer.editable.DiffMarkProviderCreator"/>                                                               
            </file>
        </folder>
        <folder name="Actions">
            <file name="toggle-ignore-case-diff-option.instance">
                <attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreCaseOptionAction" name="displayName"/>
                <attr name="Name" stringvalue="toggle-ignore-case-diff-option"/>
                <attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
                <attr name="preferencesKey" stringvalue="ignoreCase"/>
                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
            </file>
            <file name="toggle-ignore-inner-whitespace-diff-option.instance">
                <attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreInnerWhitespacesOptionAction" name="displayName"/>
                <attr name="Name" stringvalue="toggle-ignore-inner-whitespace-diff-option"/>
                <attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
                <attr name="preferencesKey" stringvalue="ignoreInnerWhitespace"/>
                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
            </file>
            <file name="toggle-ignore-whitespace-diff-option.instance">
                <attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreWhitespacesOptionAction" name="displayName"/>
                <attr name="Name" stringvalue="toggle-ignore-whitespace-diff-option"/>
                <attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
                <attr name="preferencesKey" stringvalue="ignoreWhitespace"/>
                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
            </file>
    </folder>
    </folder>

    <folder name="OptionsExport">
        <folder name="Advanced">

Return to bug 170769

Lines 80-85 Link Here

(-)diff/src/org/netbeans/modules/diff/mf-layer.xml (+42 lines)
80	</folder>	80	</folder>
81	</folder>	81	</folder>
82		82
		83	<folder name="Menu">
		84	<folder name="View">
		85	<folder name="Diff">
		86	<file name="toggle-ignore-whitespace-diff-option.shadow">
		87	<attr name="originalFile" stringvalue="Editors/Actions/toggle-ignore-whitespace-diff-option.instance"/>
		88	<attr intvalue="10" name="position"/>
		89	</file>
		90	<file name="toggle-ignore-inner-whitespace-diff-option.shadow">
		91	<attr name="originalFile" stringvalue="Editors/Actions/toggle-ignore-inner-whitespace-diff-option.instance"/>
		92	<attr intvalue="15" name="position"/>
		93	</file>
		94	<file name="toggle-ignore-case-diff-option.shadow">
		95	<attr name="originalFile" stringvalue="Editors/Actions/toggle-ignore-case-diff-option.instance"/>
		96	<attr intvalue="20" name="position"/>
		97	</file>
		98	</folder>
		99	</folder>
		100	</folder>
		101
83	<folder name="Editors">	102	<folder name="Editors">
84	<file name="org-netbeans-modules-diff-builtin-visualizer-editable-DiffHighlightsLayerFactory.instance"/>	103	<file name="org-netbeans-modules-diff-builtin-visualizer-editable-DiffHighlightsLayerFactory.instance"/>
85	<file name="org-netbeans-modules-merge-builtin-visualizer-MergeHighlightsLayerFactory.instance">	104	<file name="org-netbeans-modules-merge-builtin-visualizer-MergeHighlightsLayerFactory.instance">
Lines 96-102 Link Here
96	<attr name="instanceClass" stringvalue="org.netbeans.modules.diff.builtin.visualizer.editable.DiffMarkProviderCreator"/>	115	<attr name="instanceClass" stringvalue="org.netbeans.modules.diff.builtin.visualizer.editable.DiffMarkProviderCreator"/>
97	</file>	116	</file>
98	</folder>	117	</folder>
		118	<folder name="Actions">
		119	<file name="toggle-ignore-case-diff-option.instance">
		120	<attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreCaseOptionAction" name="displayName"/>
		121	<attr name="Name" stringvalue="toggle-ignore-case-diff-option"/>
		122	<attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
		123	<attr name="preferencesKey" stringvalue="ignoreCase"/>
		124	<attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
		125	</file>
		126	<file name="toggle-ignore-inner-whitespace-diff-option.instance">
		127	<attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreInnerWhitespacesOptionAction" name="displayName"/>
		128	<attr name="Name" stringvalue="toggle-ignore-inner-whitespace-diff-option"/>
		129	<attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
		130	<attr name="preferencesKey" stringvalue="ignoreInnerWhitespace"/>
		131	<attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
		132	</file>
		133	<file name="toggle-ignore-whitespace-diff-option.instance">
		134	<attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreWhitespacesOptionAction" name="displayName"/>
		135	<attr name="Name" stringvalue="toggle-ignore-whitespace-diff-option"/>
		136	<attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
		137	<attr name="preferencesKey" stringvalue="ignoreWhitespace"/>
		138	<attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
		139	</file>
99	</folder>	140	</folder>
		141	</folder>
100		142
101	<folder name="OptionsExport">	143	<folder name="OptionsExport">
102	<folder name="Advanced">	144	<folder name="Advanced">