Attachment #134094 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

(-)a/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




          <file name="org-netbeans-modules-diff-DiffAction.instance"/>
          <file name="org-netbeans-modules-diff-PatchAction.instance"/>
      </folder>
      <folder name="Diff">
          <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="UI">
      <folder name="ToolActions">

Return to bug 170769

Lines 51-56 Link Here

(-)a/diff/src/org/netbeans/modules/diff/mf-layer.xml (+23 lines)
51	<file name="org-netbeans-modules-diff-DiffAction.instance"/>	51	<file name="org-netbeans-modules-diff-DiffAction.instance"/>
52	<file name="org-netbeans-modules-diff-PatchAction.instance"/>	52	<file name="org-netbeans-modules-diff-PatchAction.instance"/>
53	</folder>	53	</folder>
		54	<folder name="Diff">
		55	<file name="toggle-ignore-case-diff-option.instance">
		56	<attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreCaseOptionAction" name="displayName"/>
		57	<attr name="Name" stringvalue="toggle-ignore-case-diff-option"/>
		58	<attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
		59	<attr name="preferencesKey" stringvalue="ignoreCase"/>
		60	<attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
		61	</file>
		62	<file name="toggle-ignore-inner-whitespace-diff-option.instance">
		63	<attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreInnerWhitespacesOptionAction" name="displayName"/>
		64	<attr name="Name" stringvalue="toggle-ignore-inner-whitespace-diff-option"/>
		65	<attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
		66	<attr name="preferencesKey" stringvalue="ignoreInnerWhitespace"/>
		67	<attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
		68	</file>
		69	<file name="toggle-ignore-whitespace-diff-option.instance">
		70	<attr bundlevalue="org.netbeans.modules.diff.Bundle#CTL_IgnoreWhitespacesOptionAction" name="displayName"/>
		71	<attr name="Name" stringvalue="toggle-ignore-whitespace-diff-option"/>
		72	<attr name="preferencesNode" stringvalue="/org/netbeans/modules/diff" />
		73	<attr name="preferencesKey" stringvalue="ignoreWhitespace"/>
		74	<attr name="instanceCreate" methodvalue="org.openide.awt.Actions.checkbox"/>
		75	</file>
		76	</folder>
54	</folder>	77	</folder>
55	<folder name="UI">	78	<folder name="UI">
56	<folder name="ToolActions">	79	<folder name="ToolActions">