[Bug 305650] Dropped in to head
diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/VariableReferenceWizardFragment.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/VariableReferenceWizardFragment.java
index 171ec29..8de12ea 100644
--- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/VariableReferenceWizardFragment.java
+++ b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/VariableReferenceWizardFragment.java
@@ -12,56 +12,235 @@
import java.util.ArrayList;
+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.Path;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPVariableElement;
+import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPVariableElementLabelProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jst.common.ui.internal.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
+import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-public class VariableReferenceWizardFragment extends JarReferenceWizardFragment {
- public Composite createComposite(Composite parent, IWizardHandle handle) {
- Composite c = super.createComposite(parent, handle);
- handle.setTitle(Messages.VariableReferenceTitle);
- handle.setDescription(Messages.VariableReferenceDescription);
- return c;
+public class VariableReferenceWizardFragment extends WizardFragment {
+ protected LabelProvider labelProvider = null;
+ protected ITreeContentProvider contentProvider = null;
+ protected TreeViewer viewer;
+ protected IPath[] paths;
+ protected IWizardHandle handle;
+ protected Object selected = null;
+ boolean isComplete = false;
+
+ public boolean isComplete() {
+ return isComplete;
+ }
+
+ public boolean hasComposite() {
+ return true;
}
- protected void buttonPressed() {
- selected = BuildPathDialogAccess.chooseVariableEntries(
- browse.getShell(), new Path[0]);
- viewer.refresh();
+ @Override
+ public Composite createComposite(Composite parent, IWizardHandle handle) {
+ this.handle = handle;
+ handle.setTitle(Messages.VariableReferenceTitle);
+ handle.setDescription(Messages.VariableReferenceDescription);
+
+ Composite c = new Composite(parent, SWT.NONE);
+ c.setLayout(new FormLayout());
+ viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER);
+ viewer.setContentProvider(getContentProvider());
+ viewer.setLabelProvider(getLabelProvider());
+ viewer.setInput(ResourcesPlugin.getWorkspace());
+ viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleNewSelection();
+ }
+ });
+ FormData fd = new FormData();
+ fd.left = new FormAttachment(0, 5);
+ fd.top = new FormAttachment(0, 5);
+ fd.right = new FormAttachment(100, -5);
+ fd.bottom = new FormAttachment(100, -5);
+ viewer.getTree().setLayoutData(fd);
+ return c;
+ }
+
+ protected void handleNewSelection() {
+ isComplete = true;
+ IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
+ Object o = sel.getFirstElement();
+ if( o == null ) {
+ isComplete = false;
+ selected = null;
+ } else {
+ selected = o;
+ IPath p = null;
+ if( o instanceof CPVariableElement) {
+ p = ((CPVariableElement)o).getPath();
+ } else if( o instanceof ExtendedVariable) {
+ p = ((ExtendedVariable)o).element.getPath().append(((ExtendedVariable)o).pathAfterElement);
+ }
+ if( p.toFile().isDirectory()) {
+ isComplete = false;
+ }
+ }
+ handle.update();
+ }
+
+ protected LabelProvider getLabelProvider() {
+ if (labelProvider == null) {
+ labelProvider= new VariablesLabelProvider();
+ }
+ return labelProvider;
+ }
+
+ public static class VariablesLabelProvider extends LabelProvider {
+ private CPVariableElementLabelProvider delegate = new CPVariableElementLabelProvider(false);
+ public Image getImage(Object element) {
+ if( element instanceof CPVariableElement)
+ return delegate.getImage(element);
+ if( element instanceof ExtendedVariable) {
+ if(((ExtendedVariable)element).isFolder())
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
+ }
+ return null;
+ }
+ public String getText(Object element) {
+ if( element instanceof CPVariableElement)
+ return delegate.getText(element);
+ if( element instanceof ExtendedVariable)
+ return ((ExtendedVariable)element).pathAfterElement.lastSegment();
+ return element == null ? "" : element.toString();//$NON-NLS-1$
+ }
+ }
+
+ public static class ExtendedVariable {
+ public CPVariableElement element;
+ public IPath pathAfterElement;
+ public ExtendedVariable(CPVariableElement e, IPath p) {
+ element = e;
+ pathAfterElement = p;
+ }
+ public boolean isFolder() {
+ return element.getPath().append(pathAfterElement).toFile().isDirectory();
+ }
+ }
+
+ private CPVariableElement[] elements;
+ private CPVariableElement[] initializeElements() {
+ String[] entries= JavaCore.getClasspathVariableNames();
+ ArrayList elements= new ArrayList(entries.length);
+ for (int i= 0; i < entries.length; i++) {
+ String name= entries[i];
+ IPath entryPath= JavaCore.getClasspathVariable(name);
+ if (entryPath != null) {
+ elements.add(new CPVariableElement(name, entryPath));
+ }
+ }
+ return (CPVariableElement[]) elements.toArray(new CPVariableElement[elements.size()]);
+ }
+
+
+ protected ITreeContentProvider getContentProvider() {
+ if (contentProvider == null) {
+ contentProvider = new ITreeContentProvider() {
+ public Object[] getElements(Object inputElement) {
+ if( elements == null )
+ elements = initializeElements();
+ return elements;
+ }
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+ public void dispose() {
+ }
+ public boolean hasChildren(Object element) {
+ return getChildren(element).length > 0;
+ }
+ public Object getParent(Object element) {
+ return null;
+ }
+ public Object[] getChildren(Object parentElement) {
+ if( parentElement instanceof CPVariableElement) {
+ if(((CPVariableElement)parentElement).getPath().toFile().isDirectory()) {
+ String[] names = ((CPVariableElement)parentElement).getPath().toFile().list();
+ ExtendedVariable[] extensions = new ExtendedVariable[names.length];
+ for( int i = 0; i < extensions.length; i++ )
+ extensions[i] = new ExtendedVariable((CPVariableElement)parentElement, new Path(names[i]));
+ return extensions;
+ }
+ }
+ if( parentElement instanceof ExtendedVariable) {
+ ExtendedVariable p1 = (ExtendedVariable)parentElement;
+ IPath parentLoc = p1.element.getPath();
+ parentLoc = parentLoc.append(p1.pathAfterElement);
+ String[] names = parentLoc.toFile().list();
+ if( names != null ) {
+ ExtendedVariable[] extensions = new ExtendedVariable[names.length];
+ for( int i = 0; i < extensions.length; i++ )
+ extensions[i] = new ExtendedVariable(p1.element, p1.pathAfterElement.append(names[i]));
+ return extensions;
+ }
+ }
+ return new Object[]{};
+ }
+ };
+ }
+ return contentProvider;
}
public void performFinish(IProgressMonitor monitor) throws CoreException {
IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT);
- if (selected != null && selected.length > 0) {
+ if (selected != null ) {
ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>();
ArrayList<String> paths = new ArrayList<String>();
- for (int i = 0; i < selected.length; i++) {
- IPath resolvedPath = JavaCore.getResolvedVariablePath(selected[i]);
+// for (int i = 0; i < selected.length; i++) {
+ IPath variablePath = getVariablePath(selected);
+ IPath resolvedPath = JavaCore.getResolvedVariablePath(variablePath);
java.io.File file = new java.io.File(resolvedPath.toOSString());
if (file.isFile() && file.exists()) {
String type = VirtualArchiveComponent.VARARCHIVETYPE
+ IPath.SEPARATOR;
IVirtualComponent archive = ComponentCore
.createArchiveComponent(rootComponent.getProject(),
- type + selected[i].toString());
+ type + variablePath.toString());
compList.add(archive);
paths.add(resolvedPath.lastSegment());
}
- }
+// }
IVirtualComponent[] components = compList.toArray(new IVirtualComponent[compList.size()]);
String[] paths2 = paths.toArray(new String[paths.size()]);
getTaskModel().putObject(IReferenceWizardConstants.COMPONENT, components);
getTaskModel().putObject(IReferenceWizardConstants.COMPONENT_PATH, paths2);
}
}
+
+ private IPath getVariablePath(Object selected) {
+ if( selected instanceof ExtendedVariable) {
+ ExtendedVariable s1 = (ExtendedVariable)selected;
+ return new Path(s1.element.getName()).append(s1.pathAfterElement);
+ }
+ return new Path(((CPVariableElement)selected).getName());
+ }
}
