Attachment 86026 Details for Bug 214148 – Patch

[patch] Patch

214148RemoveClasspath.patch (text/plain), 7.17 KB, created by Curtis Windatt

on 2008-01-02 16:26:59 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2008-01-02 16:26:59 EST

Size: 7.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/pderesources.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v
>retrieving revision 1.949
>diff -u -r1.949 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/pderesources.properties	2 Jan 2008 20:50:38 -0000	1.949
>+++ src/org/eclipse/pde/internal/ui/pderesources.properties	2 Jan 2008 21:26:39 -0000
>@@ -636,7 +636,6 @@
> ProjectNamesPage_emptyName=Project name cannot be empty.
> ProjectStructurePage_settings = Project Settings
> ProjectStructurePage_java = Create a &Java project
>-ProjectStructurePage_library = &Classpath:
> ProjectStructurePage_source = &Source folder:
> ProjectStructurePage_output = &Output folder:
> 
>Index: src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java,v
>retrieving revision 1.344
>diff -u -r1.344 PDEUIMessages.java
>--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java	2 Jan 2008 20:50:38 -0000	1.344
>+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java	2 Jan 2008 21:26:39 -0000
>@@ -1266,7 +1266,6 @@
> 	public static String ProjectNamesPage_emptyName;
> 	public static String ProjectStructurePage_settings;
> 	public static String ProjectStructurePage_java;
>-	public static String ProjectStructurePage_library;
> 	public static String ProjectStructurePage_source;
> 	public static String ProjectStructurePage_output;
> 
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java,v
>retrieving revision 1.24
>diff -u -r1.24 FragmentContentPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java	8 Jun 2007 16:37:10 -0000	1.24
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java	2 Jan 2008 21:26:40 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2007 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 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
>@@ -109,10 +109,6 @@
> 		label = new Label(propertiesGroup, SWT.NONE);
> 		label.setText(PDEUIMessages.ContentPage_fprovider); 
> 		fProviderText = createText(propertiesGroup, propertiesListener);
>-
>-		fLibraryLabel = new Label(propertiesGroup, SWT.NONE);
>-		fLibraryLabel.setText(PDEUIMessages.ProjectStructurePage_library); 
>-		fLibraryText = createText(propertiesGroup, propertiesListener);
> 	}
> 
> 	private void createParentPluginGroup(Composite container) {
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java,v
>retrieving revision 1.39
>diff -u -r1.39 ContentPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java	2 Jan 2008 20:50:38 -0000	1.39
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java	2 Jan 2008 21:26:40 -0000
>@@ -11,8 +11,6 @@
> 
> package org.eclipse.pde.internal.ui.wizards.plugin;
> 
>-import java.util.StringTokenizer;
>-
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.jface.wizard.IWizardPage;
> import org.eclipse.jface.wizard.WizardPage;
>@@ -28,7 +26,6 @@
> import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
> 
> public abstract class ContentPage extends WizardPage {
>@@ -38,8 +35,6 @@
> 	protected Text fVersionText;
> 	protected Text fNameText;
> 	protected Text fProviderText;
>-	protected Label fLibraryLabel;
>-	protected Text fLibraryText;
> 
> 	protected NewProjectCreationPage fMainPage;
> 	protected AbstractFieldData fData;
>@@ -169,10 +164,6 @@
> 	 */
> 	public void setVisible(boolean visible) {
> 		if (visible) {		
>-			// update the library field/label enabled state
>-			fLibraryLabel.setEnabled(!fData.isSimple());
>-			fLibraryText.setEnabled(!fData.isSimple());
>-
> 			String id = computeId();
> 			// properties group
> 			if ((fChangedGroups & PROPERTIES_GROUP) == 0) {
>@@ -181,7 +172,6 @@
> 				fVersionText.setText("1.0.0"); //$NON-NLS-1$
> 				fNameText.setText(IdUtil.getValidName(id, getNameFieldQualifier()));
> 				fProviderText.setText(IdUtil.getValidProvider(id));
>-				presetLibraryField(id);
> 				fChangedGroups = oldfChanged;
> 			}
> 			if (fInitialized)
>@@ -196,21 +186,6 @@
> 		return IdUtil.getValidId(fProjectProvider.getProjectName());
> 	}
> 
>-	private void presetLibraryField(String id){
>-		double version = Double.parseDouble(fData.getTargetVersion());
>-		if (version >= 3.1) {
>-			fLibraryText.setText(""); //$NON-NLS-1$
>-			return;
>-		}
>-		
>-		StringTokenizer tok = new StringTokenizer(id, "."); //$NON-NLS-1$
>-		while (tok.hasMoreTokens()) {
>-			String token = tok.nextToken();
>-			if (!tok.hasMoreTokens())
>-				fLibraryText.setText(token + ".jar"); //$NON-NLS-1$
>-		}
>-	}
>-	
> 	protected abstract String getNameFieldQualifier();
> 
> 	public void updateData() {
>@@ -218,16 +193,6 @@
> 		fData.setVersion(fVersionText.getText().trim());
> 		fData.setName(fNameText.getText().trim());
> 		fData.setProvider(fProviderText.getText().trim());
>-		if (!fData.isSimple()) {
>-			String library = fLibraryText.getText().trim();
>-			if (library.length() > 0) {			
>-				if (!library.endsWith(".jar") &&!library.endsWith("/") && !library.equals(".")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>-					library += "/"; //$NON-NLS-1$
>-				fData.setLibraryName(library);
>-			} else {
>-				fData.setLibraryName(null);
>-			}
>-		}
> 	}
> 
> 	public IFieldData getData() {
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java,v
>retrieving revision 1.36
>diff -u -r1.36 PluginContentPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java	2 Jan 2008 20:50:38 -0000	1.36
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java	2 Jan 2008 21:26:40 -0000
>@@ -121,10 +121,6 @@
> 		label = new Label(propertiesGroup, SWT.NONE);
> 		label.setText(PDEUIMessages.ContentPage_pprovider); 
> 		fProviderText = createText(propertiesGroup, propertiesListener, 2);
>-
>-		fLibraryLabel = new Label(propertiesGroup, SWT.NONE);
>-		fLibraryLabel.setText(PDEUIMessages.ProjectStructurePage_library); 
>-		fLibraryText = createText(propertiesGroup, propertiesListener, 2);
> 		
> 		createExecutionEnvironmentControls(propertiesGroup);
> 	}

Actions: View | Diff

Attachments on bug 214148: 86026 | 86034