Attachment #126259 for bug #242445

Lines 1-4 Link Here

(-).refactorings/2009/2/8/refactorings.index (-4 / +9 lines)
1	1234836376917 Rename method 'addRepositoryToMenu'	1	1234830352822 Extract method 'createSection'
2	1234844595768 Extract constant 'LABEL_NEW_TASK'	2	1234831223727 Extract method 'initializeOldValues'
3	1234846034866 Rename method 'openNewTaskEditor'	3	1234835010398 Extract method 'addHttpAuthSection'
4	1234846256298 Extract method 'constructNewTaskData'	4	1234835037678 Extract method 'addAdvancedSection'
		5	1234835828998 Extract local variable 'layout'
		6	1234942894720 Rename method 'saveAndSetEnabledState'
		7	1234942930110 Rename method 'restoreEnabledState'
		8	1234943222649 Extract local variable 'savedValidateButtonState'
		9	1234943438033 Extract constant 'VALIDATE_BUTTON_KEY'

Lines 1-7 Link Here

(-).refactorings/2009/2/8/refactorings.history (-4 / +9 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<session version="1.0">	2	<session version="1.0">
3	<refactoring comment="Rename method 'org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction.addRepositoryToMenu(...)' to 'addRepositoryAction' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction.addRepositoryToMenu(...)' - Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction.addRepositoryAction(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'addRepositoryToMenu'" flags="589826" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.internal.tasks.ui.actions{NewTaskAction.java[NewTaskAction~addRepositoryToMenu~QTaskRepository;" name="addRepositoryAction" references="true" stamp="1234836376917" version="1.0"/>	3	<refactoring comment="Extract method 'protected ExpandableComposite createSection(final Composite parentControl,final AbstractTaskRepositoryPageContribution contribution)' from 'org.eclipse.mylyn.tasks.ui.wizards.AbstractTaskRepositoryPage.createContributionControls()' to 'org.eclipse.mylyn.tasks.ui.wizards.AbstractTaskRepositoryPage' - Original project: 'org.eclipse.mylyn.tasks.ui' - Method name: 'createSection' - Destination type: 'org.eclipse.mylyn.tasks.ui.wizards.AbstractTaskRepositoryPage' - Declared visibility: 'protected'" comments="false" description="Extract method 'createSection'" destination="0" exceptions="false" flags="786434" id="org.eclipse.jdt.ui.extract.method" input="/src<org.eclipse.mylyn.tasks.ui.wizards{AbstractTaskRepositoryPage.java" name="createSection" replace="false" selection="7365 610" stamp="1234830352822" version="1.0" visibility="4"/>
4	<refactoring comment="Extract constant 'LABEL_NEW_TASK' from expression '"New Task"' - Original project: 'org.eclipse.mylyn.tasks.ui' - Constant name: 'LABEL_NEW_TASK' - Constant expression: '"New Task"' - Declared visibility: 'private' - Replace occurrences of expression with constant" description="Extract constant 'LABEL_NEW_TASK'" flags="786432" id="org.eclipse.jdt.ui.extract.constant" input="/src<org.eclipse.mylyn.internal.tasks.ui.actions{NewTaskAction.java" name="LABEL_NEW_TASK" qualify="false" replace="true" selection="2210 10" stamp="1234844595768" version="1.0" visibility="2"/>	4	<refactoring comment="Extract method 'private void initializeOldValues()' from 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage.createSettingControls()' to 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage' - Original project: 'org.eclipse.mylyn.tasks.ui' - Method name: 'initializeOldValues' - Destination type: 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage' - Declared visibility: 'private'" comments="false" description="Extract method 'initializeOldValues'" destination="0" exceptions="false" flags="786434" id="org.eclipse.jdt.ui.extract.method" input="/src<org.eclipse.mylyn.tasks.ui.wizards{AbstractRepositorySettingsPage.java" name="initializeOldValues" replace="false" selection="7666 1516" stamp="1234831223727" version="1.0" visibility="2"/>
5	<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.ui.TasksUiUtil.openNewTaskEditor(...)' to 'openNewTaskEditorWizard' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.TasksUiUtil.openNewTaskEditor(...)' - Renamed element: 'org.eclipse.mylyn.tasks.ui.TasksUiUtil.openNewTaskEditorWizard(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'openNewTaskEditor'" flags="589826" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.ui{TasksUiUtil.java[TasksUiUtil~openNewTaskEditor~QShell;~QIWizard;~QITaskMapping;" name="openNewTaskEditorWizard" references="true" stamp="1234846034866" version="1.0"/>	5	<refactoring comment="Extract method 'private void addHttpAuthSection()' from 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage.createSettingControls()' to 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage' - Original project: 'org.eclipse.mylyn.tasks.ui' - Method name: 'addHttpAuthSection' - Destination type: 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage' - Declared visibility: 'private'" comments="false" description="Extract method 'addHttpAuthSection'" destination="0" exceptions="false" flags="786434" id="org.eclipse.jdt.ui.extract.method" input="/src<org.eclipse.mylyn.tasks.ui.wizards{AbstractRepositorySettingsPage.java" name="addHttpAuthSection" replace="false" selection="18218 3340" stamp="1234835010398" version="1.0" visibility="2"/>
6	<refactoring comment="Extract method 'private void constructNewTaskData(final TaskData[] taskData,final ITaskMapping initializationData,final ITaskMapping selectionData)' from 'org.eclipse.mylyn.tasks.ui.wizards.NewTaskWizard.performFinish()' to 'org.eclipse.mylyn.tasks.ui.wizards.NewTaskWizard' - Original project: 'org.eclipse.mylyn.tasks.ui' - Method name: 'constructNewTaskData' - Destination type: 'org.eclipse.mylyn.tasks.ui.wizards.NewTaskWizard' - Declared visibility: 'private'" comments="false" description="Extract method 'constructNewTaskData'" destination="0" exceptions="false" flags="786434" id="org.eclipse.jdt.ui.extract.method" input="/src<org.eclipse.mylyn.tasks.ui.wizards{NewTaskWizard.java" name="constructNewTaskData" replace="false" selection="2916 993" stamp="1234846256298" version="1.0" visibility="2"/>	6	<refactoring comment="Extract method 'private void addAdvancedSection()' from 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage.createSettingControls()' to 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage' - Original project: 'org.eclipse.mylyn.tasks.ui' - Method name: 'addAdvancedSection' - Destination type: 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage' - Declared visibility: 'private'" comments="false" description="Extract method 'addAdvancedSection'" destination="0" exceptions="false" flags="786434" id="org.eclipse.jdt.ui.extract.method" input="/src<org.eclipse.mylyn.tasks.ui.wizards{AbstractRepositorySettingsPage.java" name="addAdvancedSection" replace="false" selection="14093 4094" stamp="1234835037678" version="1.0" visibility="2"/>
		7	<refactoring comment="Extract local variable 'layout' from expression 'new GridLayout(1,true)' - Original project: 'org.eclipse.mylyn.tasks.ui' - Variable name: 'layout' - Destination method: 'org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorExtensionSettingsContribution.createControl()' - Variable expression: 'new GridLayout(1,true)' - Replace occurrences of expression with variable" description="Extract local variable 'layout'" final="false" id="org.eclipse.jdt.ui.extract.temp" input="/src<org.eclipse.mylyn.internal.tasks.ui.editors{TaskEditorExtensionSettingsContribution.java" name="layout" replace="true" selection="2801 23" stamp="1234835828998" version="1.0"/>
		8	<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.ui.wizards.TaskRepositoryWizardDialog.saveAndSetEnabledState()' to 'saveAndSetEnabledStateMylyn' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.wizards.TaskRepositoryWizardDialog.saveAndSetEnabledState()' - Renamed element: 'org.eclipse.mylyn.tasks.ui.wizards.TaskRepositoryWizardDialog.saveAndSetEnabledStateMylyn()' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'saveAndSetEnabledState'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.ui.wizards{TaskRepositoryWizardDialog.java[TaskRepositoryWizardDialog~saveAndSetEnabledState" name="saveAndSetEnabledStateMylyn" references="true" stamp="1234942894720" version="1.0"/>
		9	<refactoring comment="Rename method 'org.eclipse.mylyn.tasks.ui.wizards.TaskRepositoryWizardDialog.restoreEnabledState(...)' to 'restoreEnabledStateMylyn' - Original project: 'org.eclipse.mylyn.tasks.ui' - Original element: 'org.eclipse.mylyn.tasks.ui.wizards.TaskRepositoryWizardDialog.restoreEnabledState(...)' - Renamed element: 'org.eclipse.mylyn.tasks.ui.wizards.TaskRepositoryWizardDialog.restoreEnabledStateMylyn(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'restoreEnabledState'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.ui.wizards{TaskRepositoryWizardDialog.java[TaskRepositoryWizardDialog~restoreEnabledState~QHashMap\<QControl;QBoolean;>;" name="restoreEnabledStateMylyn" references="true" stamp="1234942930110" version="1.0"/>
		10	<refactoring comment="Extract local variable 'savedValidateButtonState' from expression 'savedEnabledState.get("validate")' - Original project: 'org.eclipse.mylyn.tasks.ui' - Variable name: 'savedValidateButtonState' - Destination method: 'org.eclipse.mylyn.tasks.ui.wizards.TaskRepositoryWizardDialog.restoreEnabledStateMylyn()' - Variable expression: 'savedEnabledState.get("validate")' - Replace occurrences of expression with variable" description="Extract local variable 'savedValidateButtonState'" final="false" id="org.eclipse.jdt.ui.extract.temp" input="/src<org.eclipse.mylyn.tasks.ui.wizards{TaskRepositoryWizardDialog.java" name="savedValidateButtonState" replace="true" selection="5768 33" stamp="1234943222649" version="1.0"/>
		11	<refactoring comment="Extract constant 'VALIDATE_BUTTON_KEY' from expression '"validate"' - Original project: 'org.eclipse.mylyn.tasks.ui' - Constant name: 'VALIDATE_BUTTON_KEY' - Constant expression: '"validate"' - Declared visibility: 'private' - Replace occurrences of expression with constant" description="Extract constant 'VALIDATE_BUTTON_KEY'" flags="786432" id="org.eclipse.jdt.ui.extract.constant" input="/src<org.eclipse.mylyn.tasks.ui.wizards{TaskRepositoryWizardDialog.java" name="VALIDATE_BUTTON_KEY" qualify="false" replace="true" selection="5638 10" stamp="1234943438033" version="1.0" visibility="2"/>
7	</session>	12	</session>

Lines 336-343 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java (-2 / +5 lines)
336		336
337	@Override	337	@Override
338	public int getNumberOfControls() {	338	public int getNumberOfControls() {
339	// if will have anonymous checkbox on same line, make this control only span 2 columns	339	// always 2 columns -- if no anonymous checkbox, just leave 3rd column empty
340	return needsAnonymousLogin() ? 2 : 3;	340	return 2;
341	}	341	}
342	};	342	};
343	if (needsAnonymousLogin()) {	343	if (needsAnonymousLogin()) {
Lines 353-358 Link Here
353	isPageComplete();	353	isPageComplete();
354	}	354	}
355	});	355	});
		356	} else {
		357	Label dummyLabel = new Label(compositeContainer, SWT.NONE); // dummy control to fill 3rd column when no anonymous login
		358	GridDataFactory.fillDefaults().applyTo(dummyLabel); // not really necessary, but to be on the safe side
356	}	359	}
357		360
358	repositoryPasswordEditor = new RepositoryStringFieldEditor("", LABEL_PASSWORD, StringFieldEditor.UNLIMITED, //$NON-NLS-1$	361	repositoryPasswordEditor = new RepositoryStringFieldEditor("", LABEL_PASSWORD, StringFieldEditor.UNLIMITED, //$NON-NLS-1$

Return to bug 242445