Bug 390999: 'Convert Line Delimiters To > ...' action names confusing for Mac

Reverted to simpler names (Windows, Unix) and removed Mac OS 9.

7 files changed, 6 insertions, 55 deletions

diff --git a/org.eclipse.ui.editors/META-INF/MANIFEST.MF b/org.eclipse.ui.editors/META-INF/MANIFEST.MF
index 748e2f413e6..5b8ff8c6926 100644
--- a/org.eclipse.ui.editors/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.editors/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true
-Bundle-Version: 3.8.0.qualifier
+Bundle-Version: 3.8.100.qualifier
 Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.ui.editors/plugin.properties b/org.eclipse.ui.editors/plugin.properties
index d7f3535888a..23d7f1e32e1 100644
--- a/org.eclipse.ui.editors/plugin.properties
+++ b/org.eclipse.ui.editors/plugin.properties
@@ -22,13 +22,9 @@ convertDelimiters.Windows.name= Convert Line Delimiters to Windows (CRLF, \\r\\n
 convertDelimiters.Windows.label= &Windows (CRLF, \\r\\n, 0D0A, \u00A4\u00B6)
 convertDelimiters.Windows.description= Converts the line delimiters to Windows (CRLF, \\r\\n, 0D0A, \u00A4\u00B6)
 
-convertDelimiters.Unix.name= Convert Line Delimiters to Unix / Linux / Mac OS X (LF, \\n, 0A, \u00B6)
-convertDelimiters.Unix.label= &Unix / Linux / Mac OS X  (LF, \\n, 0A, \u00B6)
-convertDelimiters.Unix.description= Converts the line delimiters to Unix / Linux / Mac OS X (LF, \\n, 0A, \u00B6)
-
-convertDelimiters.MacOS9.name= Convert Line Delimiters to Classic Mac OS [obsolete] (CR, \\r, 0D, \u00A4)
-convertDelimiters.MacOS9.label= Classic &Mac OS [obsolete]  (CR, \\r, 0D, \u00A4)
-convertDelimiters.MacOS9.description= Converts the line delimiters to Classic Mac OS [obsolete] (CR, \\r, 0D, \u00A4)
+convertDelimiters.Unix.name= Convert Line Delimiters to Unix (LF, \\n, 0A, \u00B6)
+convertDelimiters.Unix.label= &Unix (LF, \\n, 0A, \u00B6)
+convertDelimiters.Unix.description= Converts the line delimiters to Unix (LF, \\n, 0A, \u00B6)
 
 removeTrailingWhitespace.name= Remove Trailing Whitespace
 removeTrailingWhitespace.description= Removes the trailing whitespace of each line
diff --git a/org.eclipse.ui.editors/plugin.xml b/org.eclipse.ui.editors/plugin.xml
index b253b7e5b82..09a2abc557e 100644
--- a/org.eclipse.ui.editors/plugin.xml
+++ b/org.eclipse.ui.editors/plugin.xml
@@ -40,12 +40,6 @@
             id="org.eclipse.ui.edit.text.delimiter.unix">
       </command>
       <command
-            name="%convertDelimiters.MacOS9.name"
-            description="%convertDelimiters.MacOS9.description"
-            categoryId="org.eclipse.ui.category.file"
-            id="org.eclipse.ui.edit.text.delimiter.macOS9">
-      </command>
-      <command
             name="%removeTrailingWhitespace.name"
             description="%removeTrailingWhitespace.description"
             categoryId="org.eclipse.ui.category.file"
@@ -470,14 +464,6 @@
             <separator name="encoding"/>
          </menu>
          <action
-	       definitionId="org.eclipse.ui.edit.text.delimiter.macOS9"
-	       label="%convertDelimiters.MacOS9.label"
-	       class="org.eclipse.ui.internal.editors.text.ConvertLineDelimitersToMacOS9"
-	       tooltip="%convertDelimiters.MacOS9.description"
-	       menubarPath="file/converstLineDelimitersTo/lineDelimitersConversion"
-	       id="org.eclipse.ui.edit.text.delimiter.macOS9">
-	 	 </action>
-         <action
 	       definitionId="org.eclipse.ui.edit.text.delimiter.unix"
 	       label="%convertDelimiters.Unix.label"
 	       class="org.eclipse.ui.internal.editors.text.ConvertLineDelimitersToUnix"
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ConstructedTextEditorMessages.properties b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ConstructedTextEditorMessages.properties
index 7e8950469f2..e0db96fbfd4 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ConstructedTextEditorMessages.properties
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/ConstructedTextEditorMessages.properties
@@ -19,11 +19,6 @@ Editor.ConvertToUNIX.tooltip=Converts Line Delimiters to Unix (LF, \\n, 0A, \u00
 Editor.ConvertToUNIX.image=
 Editor.ConvertToUNIX.description=Converts line delimiters to Unix (LF, \\n, 0A, \u00B6)
 
-Editor.ConvertToMac.label=&MacOS 9 (CR, \\r, 0D, \u00A4)
-Editor.ConvertToMac.tooltip=Converts line delimiters to MacOS 9 (CR, \\r, 0D, \u00A4)
-Editor.ConvertToMac.image=
-Editor.ConvertToMac.description=Converts line delimiters to MacOS 9 (CR, \\r, 0D, \u00A4)
-
 Editor.ChangeEncodingAction.label= Set Encodin&g...
 Editor.ChangeEncodingAction.tooltip= Set Encoding
 Editor.ChangeEncodingAction.image=
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersToMacOS9.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersToMacOS9.java
deleted file mode 100644
index 16801eb8eba..00000000000
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersToMacOS9.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.internal.editors.text;
-
-/**
- * A file buffer operation action that changes the line delimiters to a MacOS9
- * line delimiter.
- *
- * @since 3.1
- */
-public class ConvertLineDelimitersToMacOS9 extends ConvertLineDelimitersAction {
-
-	public ConvertLineDelimitersToMacOS9(){
-		super("\r", TextEditorMessages.ConvertLineDelimitersToMacOS9_label); //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.java
index b8dc451b5d9..5db0fe15de8 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.java
@@ -95,7 +95,6 @@ final class TextEditorMessages extends NLS {
 	public static String SelectResourcesDialog_nFilesSelected;
 	public static String ConvertLineDelimitersAction_default_label;
 	public static String ConvertLineDelimitersAction_dialog_title;
-	public static String ConvertLineDelimitersToMacOS9_label;
 	public static String ConvertLineDelimitersToWindows_label;
 	public static String ConvertLineDelimitersToUnix_label;
 	public static String ConvertLineDelimitersAction_dialog_description;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties
index c2689c8b878..fe80a68fc49 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/TextEditorMessages.properties
@@ -123,9 +123,8 @@ SelectResourcesDialog_nFilesSelected= {0} files selected.
 
 ConvertLineDelimitersAction_default_label=\ [default]
 ConvertLineDelimitersAction_dialog_title=Convert Line Delimiters to {0}
-ConvertLineDelimitersToMacOS9_label=Classic &Mac OS [obsolete]  (CR, \\r, 0D, \u00A4)
-ConvertLineDelimitersToWindows_label=&Windows  (CRLF, \\r\\n, 0D0A, \u00A4\u00B6)
-ConvertLineDelimitersToUnix_label=&Unix / Linux / Mac OS X  (LF, \\n, 0A, \u00B6)
+ConvertLineDelimitersToWindows_label=&Windows (CRLF, \\r\\n, 0D0A, \u00A4\u00B6)
+ConvertLineDelimitersToUnix_label=&Unix (LF, \\n, 0A, \u00B6)
 ConvertLineDelimitersAction_dialog_description=Select files to convert:
 RemoveTrailingWhitespaceHandler_dialog_title=Remove Trailing Whitespace
 RemoveTrailingWhitespaceHandler_dialog_description=Select files: