Attachment #20435 for bug #93061

Lines 688-693 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties (+1 lines)
688	UserLibraryPreferencePage.libraries.new.button=&New...	688	UserLibraryPreferencePage.libraries.new.button=&New...
689	UserLibraryPreferencePage.libraries.edit.button=&Edit...	689	UserLibraryPreferencePage.libraries.edit.button=&Edit...
690	UserLibraryPreferencePage.libraries.addjar.button=Add &JARs...	690	UserLibraryPreferencePage.libraries.addjar.button=Add &JARs...
		691	UserLibraryPreferencePage.libraries.addvar.button=Add &Variable...
691	UserLibraryPreferencePage.libraries.remove.button=&Remove...	692	UserLibraryPreferencePage.libraries.remove.button=&Remove...
692	UserLibraryPreferencePage.libraries.load.button=I&mport...	693	UserLibraryPreferencePage.libraries.load.button=I&mport...
693	UserLibraryPreferencePage.libraries.save.button=E&xport...	694	UserLibraryPreferencePage.libraries.save.button=E&xport...




import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;

import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;

import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.graphics.Point;

import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElementSorter;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListLabelProvider;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPUserLibraryElement;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.NewVariableEntryDialog;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.CheckedListDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.ITreeListAdapter;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.TreeListDialogField;

import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

public class UserLibraryPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {


		private static final String TAG_VERSION= "version"; //$NON-NLS-1$
		private static final String TAG_LIBRARY= "library"; //$NON-NLS-1$
		private static final String TAG_SOURCEATTACHMENT= "source"; //$NON-NLS-1$
        private static final String TAG_ARCHIVE_PATH= "path"; //$NON-NLS-1$
        private static final String TAG_ARCHIVE_TYPE= "type"; //$NON-NLS-1$
        private static final String TAG_TYPE_VAR= "var"; //$NON-NLS-1$
		private static final String TAG_ARCHIVE= "archive"; //$NON-NLS-1$
		private static final String TAG_SYSTEMLIBRARY= "systemlibrary"; //$NON-NLS-1$
		private static final String TAG_NAME= "name"; //$NON-NLS-1$

						
						Element childElement= document.createElement(TAG_ARCHIVE); 
						libraryElement.appendChild(childElement);
                        
                        if (child.getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
                            childElement.setAttribute(TAG_ARCHIVE_TYPE, TAG_TYPE_VAR);
                        }
						childElement.setAttribute(TAG_ARCHIVE_PATH, child.getPath().toPortableString());
						IPath sourceAttachment= (IPath) child.getAttribute(CPListElement.SOURCEATTACHMENT);
						if (sourceAttachment != null) {

					}
					Element archiveElement= (Element) archiveNode;
					
                    String type = archiveElement.getAttribute(TAG_ARCHIVE_TYPE);
                    int cetype = IClasspathEntry.CPE_LIBRARY;
                    if (TAG_TYPE_VAR.equals(type))
                    {
                        cetype = IClasspathEntry.CPE_VARIABLE;
                    }
					String path= archiveElement.getAttribute(TAG_ARCHIVE_PATH);
					CPListElement newArchive= new CPListElement(newLibrary, null, cetype, Path.fromPortableString(path), null);
					newLibrary.add(newArchive);
					
					if (archiveElement.hasAttribute(TAG_SOURCEATTACHMENT)) {

		
	private static final int IDX_NEW= 0;
	private static final int IDX_EDIT= 1;
    private static final int IDX_ADD= 2;
    private static final int IDX_ADDVAR= 3;
	private static final int IDX_REMOVE= 4;
	private static final int IDX_LOAD= 6;
	private static final int IDX_SAVE= 7;
	
	/**
	 * Constructor for ClasspathVariablesPreferencePage

		String[] buttonLabels= new String[] {
				PreferencesMessages.getString("UserLibraryPreferencePage.libraries.new.button"), //$NON-NLS-1$
				PreferencesMessages.getString("UserLibraryPreferencePage.libraries.edit.button"), //$NON-NLS-1$
                PreferencesMessages.getString("UserLibraryPreferencePage.libraries.addjar.button"), //$NON-NLS-1$
                PreferencesMessages.getString("UserLibraryPreferencePage.libraries.addvar.button"), //$NON-NLS-1$
				PreferencesMessages.getString("UserLibraryPreferencePage.libraries.remove.button"), //$NON-NLS-1$
				null,
				PreferencesMessages.getString("UserLibraryPreferencePage.libraries.load.button"), //$NON-NLS-1$

		List list= field.getSelectedElements();
		field.enableButton(IDX_REMOVE, canRemove(list));
		field.enableButton(IDX_EDIT, canEdit(list));
        field.enableButton(IDX_ADD, canAdd(list));
        field.enableButton(IDX_ADDVAR, canAdd(list));
		field.enableButton(IDX_SAVE, field.getSize() > 0);	
	}
	
	protected void doCustomButtonPressed(TreeListDialogField field, int index) {
		if (index == IDX_NEW) {
			editUserLibraryElement(null);
        } else if (index == IDX_ADD) {
            doAdd(field.getSelectedElements());
        } else if (index == IDX_ADDVAR) {
            doAddVar(field.getSelectedElements());
		} else if (index == IDX_REMOVE) {
			doRemove(field.getSelectedElements());
		} else if (index == IDX_EDIT) {

			} else if (curr instanceof CPUserLibraryElement) {
				editUserLibraryElement((CPUserLibraryElement) curr);
			} else if (curr instanceof CPListElement) {
				CPListElement elem= (CPListElement) curr;	
                if (elem.getEntryKind() == IClasspathEntry.CPE_VARIABLE)
                {
                    editVariableElement(elem, (CPUserLibraryElement) elem.getParentContainer());
                }
                else
                {
                    editArchiveElement(elem, (CPUserLibraryElement) elem.getParentContainer());
                }
			}
		}
	}

		}
	}
	
    private void editArchiveElement(CPListElement existingElement, CPUserLibraryElement parent) {
        CPListElement[] elements= openExtJarFileDialog(existingElement, parent);
        if (elements != null) {
            for (int i= 0; i < elements.length; i++) {
                if (existingElement != null) {
                    parent.replace(existingElement, elements[i]);
                } else {
                    parent.add(elements[i]);
                }
            }
            fLibraryList.refresh(parent);
            fLibraryList.expandElement(parent, AbstractTreeViewer.ALL_LEVELS);
            fLibraryList.selectElements(new StructuredSelection(parent));
        }
    }

    private void editVariableElement(CPListElement existingElement, CPUserLibraryElement parent) {
        CPListElement[] elements= openVariableDialog(existingElement, parent);
        if (elements != null) {
            for (int i= 0; i < elements.length; i++) {
                if (existingElement != null) {
                    parent.replace(existingElement, elements[i]);
                } else {
                    parent.add(elements[i]);
                }
            }
            fLibraryList.refresh(parent);
            fLibraryList.expandElement(parent, AbstractTreeViewer.ALL_LEVELS);
            fLibraryList.selectElements(new StructuredSelection(parent));
        }
    }

    private CPListElement[] openVariableDialog(CPListElement existing, Object parent) {
        NewVariableEntryDialog dialog= new NewVariableEntryDialog(getShell(), true);
        if (dialog.open() != Window.OK) {
            return null;
        }

        IPath[] varPaths = dialog.getResult();
        CPListElement[] elems= new CPListElement[varPaths.length];
        for (int i= 0; i < varPaths.length; i++) {
            CPListElement curr= new CPListElement(parent, null, IClasspathEntry.CPE_VARIABLE, varPaths[i], null);
            curr.setAttribute(CPListElement.SOURCEATTACHMENT, BuildPathSupport.guessSourceAttachment(curr));
            curr.setAttribute(CPListElement.JAVADOC, BuildPathSupport.guessJavadocLocation(curr));
            elems[i]= curr;
        }
        return elems;
    }

	private void doRemove(List selected) {
		Object selectionAfter= null;

		}
	}

    private void doAdd(List list) {
        if (canAdd(list)) {
            CPUserLibraryElement element= getSingleSelectedLibrary(list);
            editArchiveElement(null, element);
        }
    }
    
    private void doAddVar(List list) {
        if (canAdd(list)) {
            CPUserLibraryElement element= getSingleSelectedLibrary(list);
            editVariableElement(null, element);
        }
    }
    
	private void doLoad() {
		List existing= fLibraryList.getElements();
		LoadSaveDialog dialog= new LoadSaveDialog(getShell(), false, existing, fDialogSettings);

Lines 72-78 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPUserLibraryElement.java (-1 / +1 lines)
72	CPListElement[] res= new CPListElement[entries.length];	72	CPListElement[] res= new CPListElement[entries.length];
73	for (int i= 0; i < res.length; i++) {	73	for (int i= 0; i < res.length; i++) {
74	IClasspathEntry curr= entries[i];	74	IClasspathEntry curr= entries[i];
75	CPListElement elem= CPListElement.createFromExisting(curr, project);	75	CPListElement elem= CPListElement.createFromExisting(this, curr, project);
76	//elem.setAttribute(CPListElement.SOURCEATTACHMENT, curr.getSourceAttachmentPath());	76	//elem.setAttribute(CPListElement.SOURCEATTACHMENT, curr.getSourceAttachmentPath());
77	//elem.setAttribute(CPListElement.JAVADOC, JavaUI.getLibraryJavadocLocation(curr.getPath()));	77	//elem.setAttribute(CPListElement.JAVADOC, JavaUI.getLibraryJavadocLocation(curr.getPath()));
78	fChildren.add(elem);	78	fChildren.add(elem);

Lines 27-32 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java (-10 / +33 lines)
27	import org.eclipse.swt.widgets.Shell;	27	import org.eclipse.swt.widgets.Shell;
28		28
29	import org.eclipse.jface.dialogs.IDialogConstants;	29	import org.eclipse.jface.dialogs.IDialogConstants;
		30	import org.eclipse.jface.preference.IPreferenceNode;
		31	import org.eclipse.jface.preference.IPreferencePage;
		32	import org.eclipse.jface.preference.PreferenceDialog;
		33	import org.eclipse.jface.preference.PreferenceManager;
		34	import org.eclipse.jface.preference.PreferenceNode;
30	import org.eclipse.jface.viewers.Viewer;	35	import org.eclipse.jface.viewers.Viewer;
31	import org.eclipse.jface.viewers.ViewerSorter;	36	import org.eclipse.jface.viewers.ViewerSorter;
32	import org.eclipse.jface.window.Window;	37	import org.eclipse.jface.window.Window;
Lines 89-98 Link Here
89		94
90	private IPath[] fResultPaths;	95	private IPath[] fResultPaths;
91		96
		97	private boolean useDialogForConfig = false;
92	private SelectionButtonDialogField fConfigButton;	98	private SelectionButtonDialogField fConfigButton;
93		99
94	public NewVariableEntryDialog(Shell parent) {	100	public NewVariableEntryDialog(Shell parent) {
		101	this(parent, true);
		102	}
		103
		104	public NewVariableEntryDialog(Shell parent, boolean useDialogForConfig) {
95	super(parent);	105	super(parent);
		106	this.useDialogForConfig = useDialogForConfig;
96	setTitle(NewWizardMessages.getString("NewVariableEntryDialog.title")); //$NON-NLS-1$	107	setTitle(NewWizardMessages.getString("NewVariableEntryDialog.title")); //$NON-NLS-1$
97		108
98	int shellStyle= getShellStyle();	109	int shellStyle= getShellStyle();
Lines 122-133 Link Here
122	}	133	}
123	});	134	});
124		135
125		136	fConfigButton= new SelectionButtonDialogField(SWT.PUSH);
126	fConfigButton= new SelectionButtonDialogField(SWT.PUSH);	137	fConfigButton.setLabelText(NewWizardMessages.getString("NewVariableEntryDialog.configbutton.label")); //$NON-NLS-1$
127	fConfigButton.setLabelText(NewWizardMessages.getString("NewVariableEntryDialog.configbutton.label")); //$NON-NLS-1$	138	fConfigButton.setDialogFieldListener(adapter);
128	fConfigButton.setDialogFieldListener(adapter);	139	initializeElements();
129
130	initializeElements();
131		140
132	fCanExtend= false;	141	fCanExtend= false;
133	fIsValidSelection= false;	142	fIsValidSelection= false;
Lines 182-189 Link Here
182	layout.marginHeight= 0;	191	layout.marginHeight= 0;
183	layout.marginWidth= 0;	192	layout.marginWidth= 0;
184	lowerComposite.setLayout(layout);	193	lowerComposite.setLayout(layout);
185		194
186	fConfigButton.doFillIntoGrid(lowerComposite, 1);	195	fConfigButton.doFillIntoGrid(lowerComposite, 1);
187		196
188	applyDialogFont(composite);	197	applyDialogFont(composite);
189	return composite;	198	return composite;
Lines 277-283 Link Here
277		286
278	protected final void configButtonPressed() {	287	protected final void configButtonPressed() {
279	String id= ClasspathVariablesPreferencePage.ID;	288	String id= ClasspathVariablesPreferencePage.ID;
280	PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[] { id }, null).open();	289	if (useDialogForConfig)
		290	{
		291	IPreferencePage page = new ClasspathVariablesPreferencePage();
		292	IPreferenceNode targetNode = new PreferenceNode(id, page);
		293	PreferenceManager manager = new PreferenceManager();
		294	manager.addToRoot(targetNode);
		295	PreferenceDialog dialog = new PreferenceDialog(getShell(), manager);
		296	dialog.create();
		297	dialog.setMessage(targetNode.getLabelText());
		298	dialog.open();
		299	}
		300	else
		301	{
		302	PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[] { id }, null).open();
		303	}
281	initializeElements();	304	initializeElements();
282	}	305	}
283		306

Return to bug 93061

Lines 36-52 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/UserLibraryPreferencePage.java (-48 / +123 lines)
36	import javax.xml.transform.dom.DOMSource;	36	import javax.xml.transform.dom.DOMSource;
37	import javax.xml.transform.stream.StreamResult;	37	import javax.xml.transform.stream.StreamResult;
38		38
39	import org.w3c.dom.Document;
40	import org.w3c.dom.Element;
41	import org.w3c.dom.Node;
42	import org.w3c.dom.NodeList;
43	import org.xml.sax.InputSource;
44	import org.xml.sax.SAXException;
45
46	import org.eclipse.core.resources.IProject;
47	import org.eclipse.core.resources.IResource;
48	import org.eclipse.core.resources.IWorkspaceRoot;
49	import org.eclipse.core.resources.ResourcesPlugin;
50	import org.eclipse.core.runtime.CoreException;	39	import org.eclipse.core.runtime.CoreException;
51	import org.eclipse.core.runtime.IPath;	40	import org.eclipse.core.runtime.IPath;
52	import org.eclipse.core.runtime.IProgressMonitor;	41	import org.eclipse.core.runtime.IProgressMonitor;
Lines 55-60 Link Here
55	import org.eclipse.core.runtime.NullProgressMonitor;	44	import org.eclipse.core.runtime.NullProgressMonitor;
56	import org.eclipse.core.runtime.Path;	45	import org.eclipse.core.runtime.Path;
57		46
		47	import org.eclipse.core.resources.IProject;
		48	import org.eclipse.core.resources.IResource;
		49	import org.eclipse.core.resources.IWorkspaceRoot;
		50	import org.eclipse.core.resources.ResourcesPlugin;
		51
58	import org.eclipse.swt.SWT;	52	import org.eclipse.swt.SWT;
59	import org.eclipse.swt.events.KeyEvent;	53	import org.eclipse.swt.events.KeyEvent;
60	import org.eclipse.swt.graphics.Point;	54	import org.eclipse.swt.graphics.Point;
Lines 102-108 Link Here
102	import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElementSorter;	96	import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElementSorter;
103	import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListLabelProvider;	97	import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListLabelProvider;
104	import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPUserLibraryElement;	98	import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPUserLibraryElement;
105	import org.eclipse.jdt.internal.ui.wizards.dialogfields.*;	99	import org.eclipse.jdt.internal.ui.wizards.buildpaths.NewVariableEntryDialog;
		100	import org.eclipse.jdt.internal.ui.wizards.dialogfields.CheckedListDialogField;
		101	import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
		102	import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
		103	import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
		104	import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
		105	import org.eclipse.jdt.internal.ui.wizards.dialogfields.ITreeListAdapter;
		106	import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
		107	import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
		108	import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
		109	import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
		110	import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
		111	import org.eclipse.jdt.internal.ui.wizards.dialogfields.TreeListDialogField;
		112
		113	import org.w3c.dom.Document;
		114	import org.w3c.dom.Element;
		115	import org.w3c.dom.Node;
		116	import org.w3c.dom.NodeList;
		117	import org.xml.sax.InputSource;
		118	import org.xml.sax.SAXException;
106		119
107	public class UserLibraryPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {	120	public class UserLibraryPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
108		121
Lines 203-209 Link Here
203	private static final String TAG_VERSION= "version"; //$NON-NLS-1$	216	private static final String TAG_VERSION= "version"; //$NON-NLS-1$
204	private static final String TAG_LIBRARY= "library"; //$NON-NLS-1$	217	private static final String TAG_LIBRARY= "library"; //$NON-NLS-1$
205	private static final String TAG_SOURCEATTACHMENT= "source"; //$NON-NLS-1$	218	private static final String TAG_SOURCEATTACHMENT= "source"; //$NON-NLS-1$
206	private static final String TAG_ARCHIVE_PATH= "path"; //$NON-NLS-1$	219	private static final String TAG_ARCHIVE_PATH= "path"; //$NON-NLS-1$
		220	private static final String TAG_ARCHIVE_TYPE= "type"; //$NON-NLS-1$
		221	private static final String TAG_TYPE_VAR= "var"; //$NON-NLS-1$
207	private static final String TAG_ARCHIVE= "archive"; //$NON-NLS-1$	222	private static final String TAG_ARCHIVE= "archive"; //$NON-NLS-1$
208	private static final String TAG_SYSTEMLIBRARY= "systemlibrary"; //$NON-NLS-1$	223	private static final String TAG_SYSTEMLIBRARY= "systemlibrary"; //$NON-NLS-1$
209	private static final String TAG_NAME= "name"; //$NON-NLS-1$	224	private static final String TAG_NAME= "name"; //$NON-NLS-1$
Lines 528-534 Link Here
528		543
529	Element childElement= document.createElement(TAG_ARCHIVE);	544	Element childElement= document.createElement(TAG_ARCHIVE);
530	libraryElement.appendChild(childElement);	545	libraryElement.appendChild(childElement);
531		546
		547	if (child.getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
		548	childElement.setAttribute(TAG_ARCHIVE_TYPE, TAG_TYPE_VAR);
		549	}
532	childElement.setAttribute(TAG_ARCHIVE_PATH, child.getPath().toPortableString());	550	childElement.setAttribute(TAG_ARCHIVE_PATH, child.getPath().toPortableString());
533	IPath sourceAttachment= (IPath) child.getAttribute(CPListElement.SOURCEATTACHMENT);	551	IPath sourceAttachment= (IPath) child.getAttribute(CPListElement.SOURCEATTACHMENT);
534	if (sourceAttachment != null) {	552	if (sourceAttachment != null) {
Lines 609-616 Link Here
609	}	627	}
610	Element archiveElement= (Element) archiveNode;	628	Element archiveElement= (Element) archiveNode;
611		629
		630	String type = archiveElement.getAttribute(TAG_ARCHIVE_TYPE);
		631	int cetype = IClasspathEntry.CPE_LIBRARY;
		632	if (TAG_TYPE_VAR.equals(type))
		633	{
		634	cetype = IClasspathEntry.CPE_VARIABLE;
		635	}
612	String path= archiveElement.getAttribute(TAG_ARCHIVE_PATH);	636	String path= archiveElement.getAttribute(TAG_ARCHIVE_PATH);
613	CPListElement newArchive= new CPListElement(newLibrary, null, IClasspathEntry.CPE_LIBRARY, Path.fromPortableString(path), null);	637	CPListElement newArchive= new CPListElement(newLibrary, null, cetype, Path.fromPortableString(path), null);
614	newLibrary.add(newArchive);	638	newLibrary.add(newArchive);
615		639
616	if (archiveElement.hasAttribute(TAG_SOURCEATTACHMENT)) {	640	if (archiveElement.hasAttribute(TAG_SOURCEATTACHMENT)) {
Lines 637-646 Link Here
637		661
638	private static final int IDX_NEW= 0;	662	private static final int IDX_NEW= 0;
639	private static final int IDX_EDIT= 1;	663	private static final int IDX_EDIT= 1;
640	private static final int IDX_ADD= 2;	664	private static final int IDX_ADD= 2;
641	private static final int IDX_REMOVE= 3;	665	private static final int IDX_ADDVAR= 3;
642	private static final int IDX_LOAD= 5;	666	private static final int IDX_REMOVE= 4;
643	private static final int IDX_SAVE= 6;	667	private static final int IDX_LOAD= 6;
		668	private static final int IDX_SAVE= 7;
644		669
645	/**	670	/**
646	* Constructor for ClasspathVariablesPreferencePage	671	* Constructor for ClasspathVariablesPreferencePage
Lines 660-666 Link Here
660	String[] buttonLabels= new String[] {	685	String[] buttonLabels= new String[] {
661	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.new.button"), //$NON-NLS-1$	686	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.new.button"), //$NON-NLS-1$
662	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.edit.button"), //$NON-NLS-1$	687	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.edit.button"), //$NON-NLS-1$
663	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.addjar.button"), //$NON-NLS-1$	688	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.addjar.button"), //$NON-NLS-1$
		689	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.addvar.button"), //$NON-NLS-1$
664	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.remove.button"), //$NON-NLS-1$	690	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.remove.button"), //$NON-NLS-1$
665	null,	691	null,
666	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.load.button"), //$NON-NLS-1$	692	PreferencesMessages.getString("UserLibraryPreferencePage.libraries.load.button"), //$NON-NLS-1$
Lines 900-914 Link Here
900	List list= field.getSelectedElements();	926	List list= field.getSelectedElements();
901	field.enableButton(IDX_REMOVE, canRemove(list));	927	field.enableButton(IDX_REMOVE, canRemove(list));
902	field.enableButton(IDX_EDIT, canEdit(list));	928	field.enableButton(IDX_EDIT, canEdit(list));
903	field.enableButton(IDX_ADD, canAdd(list));	929	field.enableButton(IDX_ADD, canAdd(list));
		930	field.enableButton(IDX_ADDVAR, canAdd(list));
904	field.enableButton(IDX_SAVE, field.getSize() > 0);	931	field.enableButton(IDX_SAVE, field.getSize() > 0);
905	}	932	}
906		933
907	protected void doCustomButtonPressed(TreeListDialogField field, int index) {	934	protected void doCustomButtonPressed(TreeListDialogField field, int index) {
908	if (index == IDX_NEW) {	935	if (index == IDX_NEW) {
909	editUserLibraryElement(null);	936	editUserLibraryElement(null);
910	} else if (index == IDX_ADD) {	937	} else if (index == IDX_ADD) {
911	doAdd(field.getSelectedElements());	938	doAdd(field.getSelectedElements());
		939	} else if (index == IDX_ADDVAR) {
		940	doAddVar(field.getSelectedElements());
912	} else if (index == IDX_REMOVE) {	941	} else if (index == IDX_REMOVE) {
913	doRemove(field.getSelectedElements());	942	doRemove(field.getSelectedElements());
914	} else if (index == IDX_EDIT) {	943	} else if (index == IDX_EDIT) {
Lines 944-951 Link Here
944	} else if (curr instanceof CPUserLibraryElement) {	973	} else if (curr instanceof CPUserLibraryElement) {
945	editUserLibraryElement((CPUserLibraryElement) curr);	974	editUserLibraryElement((CPUserLibraryElement) curr);
946	} else if (curr instanceof CPListElement) {	975	} else if (curr instanceof CPListElement) {
947	CPListElement elem= (CPListElement) curr;	976	CPListElement elem= (CPListElement) curr;
948	editArchiveElement(elem, (CPUserLibraryElement) elem.getParentContainer());	977	if (elem.getEntryKind() == IClasspathEntry.CPE_VARIABLE)
		978	{
		979	editVariableElement(elem, (CPUserLibraryElement) elem.getParentContainer());
		980	}
		981	else
		982	{
		983	editArchiveElement(elem, (CPUserLibraryElement) elem.getParentContainer());
		984	}
949	}	985	}
950	}	986	}
951	}	987	}
Lines 964-985 Link Here
964	}	1000	}
965	}	1001	}
966		1002
967	private void editArchiveElement(CPListElement existingElement, CPUserLibraryElement parent) {	1003	private void editArchiveElement(CPListElement existingElement, CPUserLibraryElement parent) {
968	CPListElement[] elements= openExtJarFileDialog(existingElement, parent);	1004	CPListElement[] elements= openExtJarFileDialog(existingElement, parent);
969	if (elements != null) {	1005	if (elements != null) {
970	for (int i= 0; i < elements.length; i++) {	1006	for (int i= 0; i < elements.length; i++) {
971	if (existingElement != null) {	1007	if (existingElement != null) {
972	parent.replace(existingElement, elements[i]);	1008	parent.replace(existingElement, elements[i]);
973	} else {	1009	} else {
974	parent.add(elements[i]);	1010	parent.add(elements[i]);
975	}	1011	}
976	}	1012	}
977	fLibraryList.refresh(parent);	1013	fLibraryList.refresh(parent);
978	fLibraryList.expandElement(parent, AbstractTreeViewer.ALL_LEVELS);	1014	fLibraryList.expandElement(parent, AbstractTreeViewer.ALL_LEVELS);
979	fLibraryList.selectElements(new StructuredSelection(parent));	1015	fLibraryList.selectElements(new StructuredSelection(parent));
980	}	1016	}
981	}	1017	}
982		1018
		1019	private void editVariableElement(CPListElement existingElement, CPUserLibraryElement parent) {
		1020	CPListElement[] elements= openVariableDialog(existingElement, parent);
		1021	if (elements != null) {
		1022	for (int i= 0; i < elements.length; i++) {
		1023	if (existingElement != null) {
		1024	parent.replace(existingElement, elements[i]);
		1025	} else {
		1026	parent.add(elements[i]);
		1027	}
		1028	}
		1029	fLibraryList.refresh(parent);
		1030	fLibraryList.expandElement(parent, AbstractTreeViewer.ALL_LEVELS);
		1031	fLibraryList.selectElements(new StructuredSelection(parent));
		1032	}
		1033	}
		1034
		1035	private CPListElement[] openVariableDialog(CPListElement existing, Object parent) {
		1036	NewVariableEntryDialog dialog= new NewVariableEntryDialog(getShell(), true);
		1037	if (dialog.open() != Window.OK) {
		1038	return null;
		1039	}
		1040
		1041	IPath[] varPaths = dialog.getResult();
		1042	CPListElement[] elems= new CPListElement[varPaths.length];
		1043	for (int i= 0; i < varPaths.length; i++) {
		1044	CPListElement curr= new CPListElement(parent, null, IClasspathEntry.CPE_VARIABLE, varPaths[i], null);
		1045	curr.setAttribute(CPListElement.SOURCEATTACHMENT, BuildPathSupport.guessSourceAttachment(curr));
		1046	curr.setAttribute(CPListElement.JAVADOC, BuildPathSupport.guessJavadocLocation(curr));
		1047	elems[i]= curr;
		1048	}
		1049	return elems;
		1050	}
983		1051
984	private void doRemove(List selected) {	1052	private void doRemove(List selected) {
985	Object selectionAfter= null;	1053	Object selectionAfter= null;
Lines 1010-1022 Link Here
1010	}	1078	}
1011	}	1079	}
1012		1080
1013	private void doAdd(List list) {	1081	private void doAdd(List list) {
1014	if (canAdd(list)) {	1082	if (canAdd(list)) {
1015	CPUserLibraryElement element= getSingleSelectedLibrary(list);	1083	CPUserLibraryElement element= getSingleSelectedLibrary(list);
1016	editArchiveElement(null, element);	1084	editArchiveElement(null, element);
1017	}	1085	}
1018	}	1086	}
1019		1087
		1088	private void doAddVar(List list) {
		1089	if (canAdd(list)) {
		1090	CPUserLibraryElement element= getSingleSelectedLibrary(list);
		1091	editVariableElement(null, element);
		1092	}
		1093	}
		1094
1020	private void doLoad() {	1095	private void doLoad() {
1021	List existing= fLibraryList.getElements();	1096	List existing= fLibraryList.getElements();
1022	LoadSaveDialog dialog= new LoadSaveDialog(getShell(), false, existing, fDialogSettings);	1097	LoadSaveDialog dialog= new LoadSaveDialog(getShell(), false, existing, fDialogSettings);