diff --git a/plugin/src/com/vectrace/MercurialEclipse/dialogs/CommitDialog.java b/plugin/src/com/vectrace/MercurialEclipse/dialogs/CommitDialog.java index 0fd07abc649c5287893e9125a00db1b09d75d357..7a8bc438192d8e01f3bc54e2ec972e5a11dc6399 100644 --- a/plugin/src/com/vectrace/MercurialEclipse/dialogs/CommitDialog.java +++ b/plugin/src/com/vectrace/MercurialEclipse/dialogs/CommitDialog.java @@ -103,9 +103,6 @@ public class CommitDialog extends BaseCommitDialog { public static final String FILE_DELETED = Messages.getString("CommitDialog.deletedInWorkspace"); //$NON-NLS-1$ public static final String FILE_CLEAN = Messages.getString("CommitDialog.clean"); //$NON-NLS-1$ -// private ISourceViewer commitTextBox; -// private final IDocument commitTextDocument; -// private SourceViewerDecorationSupport decorationSupport; protected CommitFilesChooser commitFilesList; private List<IResource> resourcesToAdd; private List<IResource> resourcesToCommit; @@ -152,7 +149,6 @@ public class CommitDialog extends BaseCommitDialog { setShellStyle(getShellStyle() | SWT.RESIZE | SWT.TITLE); setBlockOnOpen(false); inResources = resources; - //commitTextDocument = new Document(); } public List<IResource> getResourcesToCommit() { @@ -377,45 +373,6 @@ public class CommitDialog extends BaseCommitDialog { return HgCommitMessageManager.getDefaultCommitName(root); } -// @Override -// private void createCommitTextBox(Composite container) { -// if(!options.showCommitMessage){ -// return; -// } -// -// setMessage(Messages.getString("CommitDialog.commitTextLabel.text")); -// -// commitTextBox = new SourceViewer(container, null, SWT.V_SCROLL | SWT.MULTI | SWT.BORDER -// | SWT.WRAP); -// commitTextBox.setEditable(true); -// commitTextBox.getTextWidget().setLayoutData(SWTWidgetHelper.getFillGD(100)); -// -// // set up spell-check annotations -// decorationSupport = new SourceViewerDecorationSupport(commitTextBox, null, -// new DefaultMarkerAnnotationAccess(), EditorsUI.getSharedTextColors()); -// -// AnnotationPreference pref = EditorsUI.getAnnotationPreferenceLookup() -// .getAnnotationPreference(SpellingAnnotation.TYPE); -// -// decorationSupport.setAnnotationPreference(pref); -// decorationSupport.install(EditorsUI.getPreferenceStore()); -// -// commitTextBox.configure(new TextSourceViewerConfiguration(EditorsUI.getPreferenceStore())); -// AnnotationModel annotationModel = new AnnotationModel(); -// commitTextBox.setDocument(commitTextDocument, annotationModel); -// commitTextBox.getTextWidget().addDisposeListener(new DisposeListener() { -// public void widgetDisposed(DisposeEvent e) { -// decorationSupport.uninstall(); -// } -// }); -// -// commitTextBox.addTextListener(new ITextListener() { -// public void textChanged(TextEvent event) { -// validateControls(); -// } -// }); -// } - /** * Override the OK button pressed to capture the info we want first and then call super. */ diff --git a/plugin/src/com/vectrace/MercurialEclipse/preferences/SynchronizePreferencePage.java b/plugin/src/com/vectrace/MercurialEclipse/preferences/SynchronizePreferencePage.java index b54bba38df428db3e98058d71b433cb14ba7ecd9..82318044d605b63a8ac21958d2a3e1eb0cb9d222 100644 --- a/plugin/src/com/vectrace/MercurialEclipse/preferences/SynchronizePreferencePage.java +++ b/plugin/src/com/vectrace/MercurialEclipse/preferences/SynchronizePreferencePage.java @@ -8,7 +8,6 @@ * Contributors: * Andrei Loskutov - implementation * Soren Mathiasen - synchronize view options - * Amenel VOGLOZIN - Changeset context menu option *******************************************************************************/ package com.vectrace.MercurialEclipse.preferences; @@ -25,8 +24,6 @@ import com.vectrace.MercurialEclipse.MercurialEclipsePlugin; public class SynchronizePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - private BooleanFieldEditor enableChangesetsContextMenu; - public SynchronizePreferencePage() { super(GRID); setPreferenceStore(MercurialEclipsePlugin.getDefault().getPreferenceStore()); @@ -43,28 +40,10 @@ public class SynchronizePreferencePage extends FieldEditorPreferencePage Messages.getString("SynchronizePreferencePage.syncOnlyCurrentBranch"), //$NON-NLS-1$ getFieldEditorParent())); - // This field, upon being unchecked, will disable the context menu field. - final BooleanFieldEditor enableLocalChangesets = new BooleanFieldEditor( + addField(new BooleanFieldEditor( PREF_SYNC_ENABLE_LOCAL_CHANGESETS, Messages.getString("SynchronizePreferencePage.syncEnableLocalChangeSets"), //$NON-NLS-1$ - getFieldEditorParent()) { - @Override - protected void fireStateChanged(String property, boolean oldValue, boolean newValue) { - super.fireStateChanged(property, oldValue, newValue); - if (oldValue != newValue) { - enableChangesetsContextMenu.setEnabled(getBooleanValue(), - getFieldEditorParent()); - } - } - }; - addField(enableLocalChangesets); - - enableChangesetsContextMenu = new BooleanFieldEditor( - PREF_SYNC_ENABLE_LOCAL_CHANGESETS_CONTEXT_MENU, - Messages.getString( - "SynchronizePreferencePage.syncEnableLocalChangeSetsContextMenu"), //$NON-NLS-1$ - getFieldEditorParent()); - addField(enableChangesetsContextMenu); + getFieldEditorParent())); addField(new BooleanFieldEditor(PREF_SYNC_ALL_PROJECTS_IN_REPO, Messages.getString("SynchronizePreferencePage.syncAllProjectsInRepo"), //$NON-NLS-1$ diff --git a/plugin/src/com/vectrace/MercurialEclipse/preferences/messages.properties b/plugin/src/com/vectrace/MercurialEclipse/preferences/messages.properties index 4c81be9fc0885750857372f42e68b5ac4f697f56..f7b35db97359a9995cd77893aa782303309719b9 100644 --- a/plugin/src/com/vectrace/MercurialEclipse/preferences/messages.properties +++ b/plugin/src/com/vectrace/MercurialEclipse/preferences/messages.properties @@ -44,7 +44,6 @@ SynchronizePreferencePage.description=Preferences for the Mercurial Synchronize SynchronizePreferencePage.syncOnlyCurrentBranch=Synchronize only the current branch SynchronizePreferencePage.syncAllProjectsInRepo=Always synchronize all projects contained in the repository SynchronizePreferencePage.syncEnableLocalChangeSets=Enable local changesets (grouping of uncommitted changes) -SynchronizePreferencePage.syncEnableLocalChangeSetsContextMenu=Enable the context menu for managing local changesets MercurialPreferenceConstants.sigcheck.in.history=hg.gpg.sigcheck.history TimeoutPreferencePage.description=Configuration page for Mercurial timeouts TimeoutPreferencePage.field.clone=Clone timeout (ms): diff --git a/plugin/src/com/vectrace/MercurialEclipse/storage/HgRepositoryLocationManager.java b/plugin/src/com/vectrace/MercurialEclipse/storage/HgRepositoryLocationManager.java index d79b73de59ac55776de8db847d2aae58c8c00b61..12ec8ecf489866ec54110facb42635a6d6942b83 100644 --- a/plugin/src/com/vectrace/MercurialEclipse/storage/HgRepositoryLocationManager.java +++ b/plugin/src/com/vectrace/MercurialEclipse/storage/HgRepositoryLocationManager.java @@ -392,7 +392,7 @@ public class HgRepositoryLocationManager { internalAddRepoLocation(hgRoot, loc); } // - // Add the default repository to the .hg/hgrc file + // Add the default path to the .hg/hgrc file // hgRoot.setAndStoreDefaultPath(loc.getLocation()); }