### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.ui
Index: plugin.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/plugin.xml,v
retrieving revision 1.742
diff -u -r1.742 plugin.xml
--- plugin.xml	23 May 2007 12:05:49 -0000	1.742
+++ plugin.xml	13 Jun 2007 01:06:26 -0000
@@ -3059,6 +3059,12 @@
             parentId="org.eclipse.ui.textEditorScope"
             id="org.eclipse.jdt.ui.javaEditorScope">
       </context>
+      <context
+            name="%context.editingPropertiesSource.name"
+            description="%context.editingPropertiesSource.description"
+            parentId="org.eclipse.ui.textEditorScope"
+            id="org.eclipse.jdt.ui.propertiesEditorScope">
+      </context>
    </extension>
 
    <extension
@@ -3982,6 +3988,21 @@
             contextId="org.eclipse.jdt.ui.javaEditorScope"
             commandId="org.eclipse.jdt.ui.edit.text.java.toggle.comment"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+M2+C"
+            contextId="org.eclipse.jdt.ui.propertiesEditorScope"
+            commandId="org.eclipse.jdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+7"
+            contextId="org.eclipse.jdt.ui.propertiesEditorScope"
+            commandId="org.eclipse.jdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            sequence="M1+/"
+            contextId="org.eclipse.jdt.ui.propertiesEditorScope"
+            commandId="org.eclipse.jdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
       <!-- alternative for some gtk input modes -->
       <key
             platform="gtk"
@@ -3991,6 +4012,12 @@
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
             
       <key
+            platform="gtk"
+            sequence="ESC CTRL+C"
+            contextId="org.eclipse.jdt.ui.propertiesEditorScope"
+            commandId="org.eclipse.jdt.ui.edit.text.java.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
             sequence="M1+M2+F"
             contextId="org.eclipse.jdt.ui.javaEditorScope"
             commandId="org.eclipse.jdt.ui.edit.text.java.format"
Index: plugin.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/plugin.properties,v
retrieving revision 1.459
diff -u -r1.459 plugin.properties
--- plugin.properties	23 May 2007 12:05:49 -0000	1.459
+++ plugin.properties	13 Jun 2007 01:06:19 -0000
@@ -559,6 +559,8 @@
 context.editingJavaSource.name= Editing Java Source
 context.editingJavaSource.description= Editing Java Source Context
 
+context.editingPropertiesSource.name= Editing Properties Files
+context.editingPropertiesSource.description= Editing Properties Files Context
 
 #--- Edit menu
 ActionDefinition.show.outline.name= Quick Outline
Index: ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileEditor.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileEditor.java,v
retrieving revision 1.20
diff -u -r1.20 PropertiesFileEditor.java
--- ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileEditor.java	28 Mar 2006 16:53:47 -0000	1.20
+++ ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileEditor.java	13 Jun 2007 01:06:26 -0000
@@ -12,13 +12,18 @@
 
 import org.eclipse.swt.SWT;
 
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
 
 import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.IShowInTargetList;
+import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 
 import org.eclipse.ui.editors.text.TextEditor;
 
@@ -27,7 +32,9 @@
 import org.eclipse.jdt.ui.actions.JdtActionConstants;
 import org.eclipse.jdt.ui.text.JavaTextTools;
 
+import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
 import org.eclipse.jdt.internal.ui.JavaPlugin;
+import org.eclipse.jdt.internal.ui.javaeditor.ToggleCommentAction;
 
 /**
  * Properties file editor.
@@ -52,6 +59,12 @@
 		setSourceViewerConfiguration(new PropertiesFileSourceViewerConfiguration(textTools.getColorManager(), store, this, IPropertiesFilePartitions.PROPERTIES_FILE_PARTITIONING));
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeKeyBindingScopes()
+	 */
+	protected void initializeKeyBindingScopes() {
+		setKeyBindingScopes(new String[] { "org.eclipse.jdt.ui.propertiesEditorScope" });  //$NON-NLS-1$
+	}
 
 	/*
 	 * @see org.eclipse.ui.editors.text.TextEditor#createActions()
@@ -59,11 +72,27 @@
 	protected void createActions() {
 		super.createActions();
 
+		IAction action= new ToggleCommentAction(PropertiesFileEditorMessages.getBundleForConstructedKeys(), "ToggleComment.", this); //$NON-NLS-1$
+		action.setActionDefinitionId(IJavaEditorActionDefinitionIds.TOGGLE_COMMENT);
+		setAction(IJavaEditorActionDefinitionIds.TOGGLE_COMMENT, action);
+		markAsStateDependentAction(IJavaEditorActionDefinitionIds.TOGGLE_COMMENT, true);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(action, IJavaHelpContextIds.TOGGLE_COMMENT_ACTION);
+		configureToggleCommentAction();
+		
 		fOpenAction= new OpenAction(this);
 		fOpenAction.setActionDefinitionId(IJavaEditorActionDefinitionIds.OPEN_EDITOR);
 		setAction(JdtActionConstants.OPEN, fOpenAction);
 	}
 
+	private void configureToggleCommentAction() {
+		IAction action= getAction(IJavaEditorActionDefinitionIds.TOGGLE_COMMENT);
+		if (action instanceof ToggleCommentAction) {
+			ISourceViewer sourceViewer= getSourceViewer();
+			SourceViewerConfiguration configuration= getSourceViewerConfiguration();
+			((ToggleCommentAction)action).configure(sourceViewer, configuration);
+		}
+	}
+	
 	/*
 	 * @see AbstractTextEditor#handlePreferenceStoreChanged(PropertyChangeEvent)
 	 */
@@ -142,4 +171,13 @@
 		System.arraycopy(ids, 0, more, 1, ids.length);
 		return more;
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.editors.text.TextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
+	 */
+	protected void editorContextMenuAboutToShow(IMenuManager menu) {
+		super.editorContextMenuAboutToShow(menu);
+		
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, IJavaEditorActionDefinitionIds.TOGGLE_COMMENT);
+	}
 }
Index: ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/ConstructedPropertiesFileEditorMessages.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/ConstructedPropertiesFileEditorMessages.properties,v
retrieving revision 1.1
diff -u -r1.1 ConstructedPropertiesFileEditorMessages.properties
--- ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/ConstructedPropertiesFileEditorMessages.properties	19 Apr 2005 09:02:08 -0000	1.1
+++ ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/ConstructedPropertiesFileEditorMessages.properties	13 Jun 2007 01:06:26 -0000
@@ -12,3 +12,7 @@
 CorrectionAssistProposal.label=&Quick Fix
 CorrectionAssistProposal.tooltip=Quick Fix
 CorrectionAssistProposal.description=Quick Fix
+
+ToggleComment.label=Togg&le Comment
+ToggleComment.tooltip=Toggle Comment For the Selected Lines
+ToggleComment.description=Toggle comment for the selected lines
\ No newline at end of file
Index: ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileSourceViewerConfiguration.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileSourceViewerConfiguration.java,v
retrieving revision 1.24
diff -u -r1.24 PropertiesFileSourceViewerConfiguration.java
--- ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileSourceViewerConfiguration.java	26 Jan 2007 10:02:40 -0000	1.24
+++ ui/org/eclipse/jdt/internal/ui/propertiesfileeditor/PropertiesFileSourceViewerConfiguration.java	13 Jun 2007 01:06:27 -0000
@@ -312,4 +312,10 @@
 		return reconciler;
 	}	
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getDefaultPrefixes(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
+	 */
+	public String[] getDefaultPrefixes(ISourceViewer sourceViewer, String contentType) {
+		return new String[] {"#", ""}; //$NON-NLS-1$ //$NON-NLS-2$
+	}
 }