Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 84346 Details for
Bug 210164
[Wizards] Remember repository type when sharing a project
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
First attemtpt at a patch
patch.txt (text/plain), 12.32 KB, created by
Robert Konigsberg
on 2007-12-03 13:50:53 EST
(
hide
)
Description:
First attemtpt at a patch
Filename:
MIME Type:
Creator:
Robert Konigsberg
Created:
2007-12-03 13:50:53 EST
Size:
12.32 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.team.ui >Index: src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java,v >retrieving revision 1.4 >diff -u -r1.4 ForwardingChangesSection.java >--- src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java 18 Apr 2006 15:16:02 -0000 1.4 >+++ src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java 3 Dec 2007 18:01:16 -0000 >@@ -83,7 +83,7 @@ > > protected Composite getEmptyChangesComposite(Composite parent) { > Composite composite = new Composite(parent, SWT.NONE); >- composite.setBackground(getBackgroundColor()); >+ composite.setBackground(getBackgroundColor2()); > GridLayout layout = new GridLayout(); > layout.numColumns = 2; > composite.setLayout(layout); >@@ -140,7 +140,7 @@ > data.widthHint = 100; > description.setLayoutData(data); > description.setText(text); >- description.setBackground(getBackgroundColor()); >+ description.setBackground(getBackgroundColor2()); > return description; > } > >Index: src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java,v >retrieving revision 1.4 >diff -u -r1.4 SyncInfoSetChangesSection.java >--- src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java 17 Apr 2006 17:05:29 -0000 1.4 >+++ src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java 3 Dec 2007 18:01:16 -0000 >@@ -179,7 +179,7 @@ > > private Composite getErrorComposite(Composite parent) { > Composite composite = new Composite(parent, SWT.NONE); >- composite.setBackground(getBackgroundColor()); >+ composite.setBackground(getBackgroundColor2()); > GridLayout layout = new GridLayout(); > layout.numColumns = 2; > composite.setLayout(layout); >@@ -194,7 +194,7 @@ > showErrors(); > } > }); >- link.setBackground(getBackgroundColor()); >+ link.setBackground(getBackgroundColor2()); > link.setUnderlined(true); > > link = new Hyperlink(composite, SWT.WRAP); >@@ -204,7 +204,7 @@ > getPage().reset(); > } > }); >- link.setBackground(getBackgroundColor()); >+ link.setBackground(getBackgroundColor2()); > link.setUnderlined(true); > > createDescriptionLabel(composite, NLS.bind(TeamUIMessages.ChangesSection_10, new String[] { Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, getConfiguration().getParticipant().getName()) })); >Index: src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java,v >retrieving revision 1.29 >diff -u -r1.29 ChangesSection.java >--- src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java 29 Mar 2006 17:14:56 -0000 1.29 >+++ src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java 3 Dec 2007 18:01:16 -0000 >@@ -68,9 +68,9 @@ > setLayoutData(data); > > forms = new FormToolkit(parent.getDisplay()); >- forms.setBackground(getBackgroundColor()); >+ forms.setBackground(getBackgroundColor2()); > HyperlinkGroup group = forms.getHyperlinkGroup(); >- group.setBackground(getBackgroundColor()); >+ group.setBackground(getBackgroundColor2()); > > changesSectionContainer = new PageBook(this, SWT.NONE); > data = new GridData(GridData.FILL_BOTH); >@@ -79,7 +79,8 @@ > changesSectionContainer.setLayoutData(data); > } > >- protected Color getBackgroundColor() { >+ /* Renamed from getBackgroundColor */ >+ protected Color getBackgroundColor2() { > return getShell().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND); > } > >Index: .settings/org.eclipse.jdt.ui.prefs >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/.settings/org.eclipse.jdt.ui.prefs,v >retrieving revision 1.2 >diff -u -r1.2 org.eclipse.jdt.ui.prefs >--- .settings/org.eclipse.jdt.ui.prefs 16 Mar 2006 02:48:19 -0000 1.2 >+++ .settings/org.eclipse.jdt.ui.prefs 3 Dec 2007 18:01:16 -0000 >@@ -1,6 +1,5 @@ >-#Wed Mar 15 17:11:22 EST 2006 >+#Thu Nov 29 00:33:17 PST 2007 > eclipse.preferences.version=1 >-internal.default.compliance=user > org.eclipse.jdt.ui.ignorelowercasenames=true > org.eclipse.jdt.ui.importorder=java;javax;org;com; > org.eclipse.jdt.ui.ondemandthreshold=3 >Index: .settings/org.eclipse.jdt.core.prefs >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/.settings/org.eclipse.jdt.core.prefs,v >retrieving revision 1.8 >diff -u -r1.8 org.eclipse.jdt.core.prefs >--- .settings/org.eclipse.jdt.core.prefs 19 Mar 2007 18:37:15 -0000 1.8 >+++ .settings/org.eclipse.jdt.core.prefs 3 Dec 2007 18:01:16 -0000 >@@ -1,4 +1,4 @@ >-#Mon Mar 19 14:34:03 EDT 2007 >+#Thu Nov 29 00:33:17 PST 2007 > eclipse.preferences.version=1 > org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled > org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 >Index: src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java,v >retrieving revision 1.17 >diff -u -r1.17 ConfigureProjectWizardMainPage.java >--- src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java 15 Sep 2006 14:35:16 -0000 1.17 >+++ src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java 3 Dec 2007 18:01:17 -0000 >@@ -53,7 +53,8 @@ > private String description; > > private IConfigurationWizard selectedWizard; >- >+ private String selectedWizardId; >+ > /** > * Create a new ConfigureProjectWizardMainPage > * >@@ -83,7 +84,15 @@ > this.disabledWizards = disabledWizards; > this.description = description; > } >- >+ >+ void setInitialWizardId(String id) { >+ this.selectedWizardId = id; >+ } >+ >+ String getSelectedWizardId() { >+ return selectedWizardId; >+ } >+ > public IConfigurationWizard getSelectedWizard() { > return selectedWizard; > } >@@ -125,17 +134,20 @@ > ISelection selection = event.getSelection(); > if (selection == null || !(selection instanceof IStructuredSelection)) { > selectedWizard = null; >+ selectedWizardId = null; > setPageComplete(false); > return; > } > IStructuredSelection ss = (IStructuredSelection)selection; > if (ss.size() != 1) { > selectedWizard = null; >+ selectedWizardId = null; > setPageComplete(false); > return; > } > ConfigurationWizardElement selectedElement = (ConfigurationWizardElement)ss.getFirstElement(); > try { >+ selectedWizardId = selectedElement.getID(); > selectedWizard = (IConfigurationWizard)selectedElement.createExecutableExtension(); > selectedWizard.init(workbench, project); > } catch (CoreException e) { >@@ -176,7 +188,7 @@ > } > }); > } >- >+ > if(wizards.size() == 0 && showAllToggle != null) { > showAllToggle.setSelection(true); > ArrayList all = new ArrayList(Arrays.asList(wizards.getChildren())); >@@ -185,8 +197,30 @@ > } else { > viewer.setInput(wizards); > } >+ >+ ConfigurationWizardElement e = findWizardById(((AdaptableList) viewer.getInput()).getChildren(), selectedWizardId); >+ if (e != null) { >+ viewer.setSelection(new StructuredSelection(e)); >+ } > Dialog.applyDialogFont(parent); > } >+ >+ private ConfigurationWizardElement findWizardById(Object[] children, String wizardId) { >+ if (children == null) { >+ return null; >+ } >+ for (int i = 0; i < children.length; i++) { >+ try { >+ ConfigurationWizardElement e = (ConfigurationWizardElement)children[i]; >+ if (e.getID().equals(wizardId)) { >+ return e; >+ } >+ } catch(ClassCastException e) { >+ } >+ } >+ return null; >+ } >+ > /** > * The <code>WizardSelectionPage</code> implementation of > * this <code>IWizardPage</code> method returns the first page >Index: src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java,v >retrieving revision 1.20 >diff -u -r1.20 ConfigureProjectWizard.java >--- src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java 5 Jul 2006 14:57:29 -0000 1.20 >+++ src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java 3 Dec 2007 18:01:17 -0000 >@@ -22,6 +22,7 @@ > import org.eclipse.ui.activities.IActivityManager; > import org.eclipse.ui.activities.IIdentifier; > import org.eclipse.ui.model.AdaptableList; >+import org.osgi.service.prefs.Preferences; > > /** > * The wizard for associating projects with team providers >@@ -41,6 +42,8 @@ > protected final static String ATT_CLASS = "class"; //$NON-NLS-1$ > protected final static String ATT_ICON = "icon"; //$NON-NLS-1$ > protected final static String ATT_ID = "id"; //$NON-NLS-1$ >+ protected final static String PREF_LAST_WIZARD_ID = "asdf"; //$NON-NLS-1$ >+ > > public ConfigureProjectWizard() { > setNeedsProgressMonitor(true); >@@ -94,6 +97,9 @@ > mainPage.setDescription(getWizardDescription()); > mainPage.setProject(project); > mainPage.setWorkbench(workbench); >+ Preferences preferences = TeamUIPlugin.getPlugin().getInstancePreferences(); >+ String initialWizardId = preferences.get(PREF_LAST_WIZARD_ID, null); >+ mainPage.setInitialWizardId(initialWizardId); > addPage(mainPage); > } > public IWizardPage getNextPage(IWizardPage page) { >@@ -113,6 +119,7 @@ > if (wizard != null) { > return wizard.canFinish(); > } >+ > return super.canFinish(); > } > /* >@@ -123,6 +130,8 @@ > if (wizard != null) { > return wizard.performFinish(); > } >+ Preferences preferences = TeamUIPlugin.getPlugin().getInstancePreferences(); >+ preferences.put(PREF_LAST_WIZARD_ID, mainPage.getSelectedWizardId()); > // If we are on the first page and the selected wizard has no pages then > // allow it to finish. > if (getContainer().getCurrentPage() == mainPage) { >Index: src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java,v >retrieving revision 1.27 >diff -u -r1.27 DiffTreeChangesSection.java >--- src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java 13 Oct 2006 15:32:11 -0000 1.27 >+++ src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java 3 Dec 2007 18:01:16 -0000 >@@ -291,7 +291,7 @@ > > private Composite createEnableParticipantModelProvidersPane(Composite parent) { > Composite composite = new Composite(parent, SWT.NONE); >- composite.setBackground(getBackgroundColor()); >+ composite.setBackground(getBackgroundColor2()); > GridLayout layout = new GridLayout(); > layout.numColumns = 2; > composite.setLayout(layout); >@@ -358,7 +358,7 @@ > > private Composite getInitializationPane(Composite parent) { > Composite composite = new Composite(parent, SWT.NONE); >- composite.setBackground(getBackgroundColor()); >+ composite.setBackground(getBackgroundColor2()); > GridLayout layout = new GridLayout(); > layout.numColumns = 2; > composite.setLayout(layout); >@@ -417,7 +417,7 @@ > > private Composite getInitializingMessagePane(Composite parent) { > Composite composite = new Composite(parent, SWT.NONE); >- composite.setBackground(getBackgroundColor()); >+ composite.setBackground(getBackgroundColor2()); > GridLayout layout = new GridLayout(); > layout.numColumns = 2; > composite.setLayout(layout); >@@ -442,7 +442,7 @@ > > private Composite getPointerToModel(Composite parent, final ModelProvider provider, String oldId) { > Composite composite = new Composite(parent, SWT.NONE); >- composite.setBackground(getBackgroundColor()); >+ composite.setBackground(getBackgroundColor2()); > GridLayout layout = new GridLayout(); > layout.numColumns = 2; > composite.setLayout(layout); >@@ -532,7 +532,7 @@ > > private Composite getErrorComposite(Composite parent) { > Composite composite = new Composite(parent, SWT.NONE); >- composite.setBackground(getBackgroundColor()); >+ composite.setBackground(getBackgroundColor2()); > GridLayout layout = new GridLayout(); > layout.numColumns = 2; > composite.setLayout(layout);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 210164
:
84346
|
84610
|
84741
|
84742