Author: rob.stryker(a)jboss.com Date: 2009-07-30 15:58:41 -0400 (Thu, 30 Jul 2009) New Revision: 16912 Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.classpath workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.project workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.settings/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.settings/org.eclipse.jdt.core.prefs workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/META-INF/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/JstCommonUIPlugin.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/Messages.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/ExternalJarReferenceWizardFragment.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$1.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$2.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$3.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/VariableReferenceWizardFragment.class workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/messages.properties workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/build.properties workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/icons/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/icons/jar_obj.gif workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/plugin.xml workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/JstCommonUIPlugin.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/Messages.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/ExternalJarReferenceWizardFragment.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/VariableReferenceWizardFragment.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/messages.properties Log: hate this, trying to reorg project properly Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.classpath =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.classpath (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.classpath 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.project =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.project (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.project 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.jst.common.ui</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/.settings/org.eclipse.jdt.core.prefs 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,8 @@ +#Thu Jul 30 14:13:32 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,17 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Ui +Bundle-SymbolicName: org.eclipse.jst.common.ui;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.eclipse.jst.common.ui.JstCommonUIPlugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.wst.server.ui;bundle-version="1.1.102", + org.eclipse.jdt.core;bundle-version="3.5.0", + org.eclipse.jdt.ui;bundle-version="3.5.0", + org.eclipse.wst.common.modulecore;bundle-version="1.1.300", + org.eclipse.wst.common.modulecore.ui;bundle-version="1.0.0", + org.eclipse.wst.server.core;bundle-version="1.1.101", + org.eclipse.core.resources;bundle-version="3.5.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/JstCommonUIPlugin.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/JstCommonUIPlugin.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/Messages.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/Messages.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/ExternalJarReferenceWizardFragment.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/ExternalJarReferenceWizardFragment.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$1.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$1.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$2.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$2.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$3.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment$3.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/VariableReferenceWizardFragment.class =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/assembly/wizard/VariableReferenceWizardFragment.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/messages.properties =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/messages.properties (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/bin/org/eclipse/jst/common/ui/messages.properties 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,7 @@ +JarTitle=Add a Jar Reference +JarDescription="Here you can reference a workspace Jar\nThis is not a suggested use-case, but is here for backwards compatability. +ExternalJarTitle=Add an External Jar Reference +ExternalJarDescription=Here you can reference a filesystem Jar\nThis is not a suggested use-case, but is here for backwards compatability. +Browse=Browse... +VariableReferenceTitle=Add a Variable Reference +VariableReferenceDescription="Here you can reference a variable which maps to a single jar.\nThis is not a suggested use-case, but is here for backwards compatability. \ No newline at end of file Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/build.properties =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/build.properties (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/build.properties 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + icons/ Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/icons/jar_obj.gif =================================================================== (Binary files differ) Property changes on: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/icons/jar_obj.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/plugin.xml =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/plugin.xml (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/plugin.xml 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + + <extension + point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment"> + <referenceFragment + class="org.eclipse.jst.common.ui.assembly.wizard.JarReferenceWizardFragment" + icon="icons/jar_obj.gif" + id="org.eclipse.jst.common.ui.jarReference" + name="Jar"> + </referenceFragment> + <referenceFragment + class="org.eclipse.jst.common.ui.assembly.wizard.ExternalJarReferenceWizardFragment" + icon="icons/jar_obj.gif" + id="org.eclipse.jst.common.ui.externalJarReference" + name="External Jar"> + </referenceFragment> + <referenceFragment + class="org.eclipse.jst.common.ui.assembly.wizard.VariableReferenceWizardFragment" + icon="icons/jar_obj.gif" + id="org.eclipse.jst.common.ui.variableReference" + name="Variable"> + </referenceFragment> + </extension> + +</plugin> Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/JstCommonUIPlugin.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/JstCommonUIPlugin.java (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/JstCommonUIPlugin.java 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,50 @@ +package org.eclipse.jst.common.ui; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class JstCommonUIPlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.jst.common.ui"; + + // The shared instance + private static JstCommonUIPlugin plugin; + + /** + * The constructor + */ + public JstCommonUIPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static JstCommonUIPlugin getDefault() { + return plugin; + } + +} Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/Messages.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/Messages.java (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/Messages.java 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,22 @@ +package org.eclipse.jst.common.ui; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.jst.common.ui.messages"; //$NON-NLS-1$ + public static String JarTitle; + public static String JarDescription; + public static String ExternalJarTitle; + public static String ExternalJarDescription; + public static String Browse; + public static String VariableReferenceTitle; + public static String VariableReferenceDescription; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/ExternalJarReferenceWizardFragment.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/ExternalJarReferenceWizardFragment.java (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/ExternalJarReferenceWizardFragment.java 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,62 @@ +/****************************************************************************** + * Copyright (c) 2009 Red Hat + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Rob Stryker - initial implementation and ongoing maintenance + ******************************************************************************/ +package org.eclipse.jst.common.ui.assembly.wizard; + +import java.util.ArrayList; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess; +import org.eclipse.jst.common.ui.Messages; +import org.eclipse.swt.widgets.Composite; +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.propertypage.IReferenceWizardConstants; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; + +public class ExternalJarReferenceWizardFragment extends JarReferenceWizardFragment { + public Composite createComposite(Composite parent, IWizardHandle handle) { + Composite c = super.createComposite(parent, handle); + handle.setTitle(Messages.ExternalJarTitle); + handle.setDescription(Messages.ExternalJarDescription); + return c; + } + + protected void buttonPressed() { + selected = BuildPathDialogAccess + .chooseExternalJAREntries(browse.getShell()); + viewer.refresh(); + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT); + if (selected != null && selected.length > 0) { + ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); + ArrayList<String> paths = new ArrayList<String>(); + for (int i = 0; i < selected.length; i++) { + // IPath fullPath = project.getFile(selected[i]).getFullPath(); + String type = VirtualArchiveComponent.LIBARCHIVETYPE + + IPath.SEPARATOR; + IVirtualComponent archive = ComponentCore + .createArchiveComponent(rootComponent.getProject(), + type + selected[i].toString()); + compList.add(archive); + paths.add(selected[i].lastSegment()); + } + IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); + String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); + getTaskModel().putObject(IReferenceWizardConstants.COMPONENT, components); + getTaskModel().putObject(IReferenceWizardConstants.COMPONENT_PATH, paths2); + } + } +} Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment.java (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/JarReferenceWizardFragment.java 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,160 @@ +/****************************************************************************** + * Copyright (c) 2009 Red Hat + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Rob Stryker - initial implementation and ongoing maintenance + ******************************************************************************/ +package org.eclipse.jst.common.ui.assembly.wizard; + +import java.util.ArrayList; + +import org.eclipse.core.resources.IProject; +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.jdt.ui.wizards.BuildPathDialogAccess; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +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.Button; +import org.eclipse.swt.widgets.Composite; +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.propertypage.IReferenceWizardConstants; +import org.eclipse.jst.common.ui.Messages; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; +import org.eclipse.wst.server.ui.wizard.WizardFragment; + +public class JarReferenceWizardFragment extends WizardFragment { + protected LabelProvider labelProvider = null; + protected ITreeContentProvider contentProvider = null; + protected TreeViewer viewer; + protected Button browse; + protected IPath[] paths; + protected IWizardHandle handle; + protected IPath[] selected = new IPath[]{}; + public boolean hasComposite() { + return true; + } + + public Composite createComposite(Composite parent, IWizardHandle handle) { + this.handle = handle; + handle.setTitle(Messages.JarTitle); + handle.setDescription(Messages.JarDescription); + + 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()); + + browse = new Button(c, SWT.NONE); + browse.setText(Messages.Browse); + FormData fd = new FormData(); + fd.left = new FormAttachment(0, 5); + fd.bottom = new FormAttachment(100, -5); + browse.setLayoutData(fd); + + 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(browse, -5); + viewer.getTree().setLayoutData(fd); + + browse.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + buttonPressed(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + return c; + } + + protected void buttonPressed() { + IProject project = (IProject)getTaskModel().getObject(IReferenceWizardConstants.PROJECT); + selected = BuildPathDialogAccess.chooseJAREntries( + browse.getShell(), + project.getLocation(), new IPath[0]); + viewer.refresh(); + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT); + if (selected != null && selected.length > 0) { + ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>(); + ArrayList<String> paths = new ArrayList<String>(); + for (int i = 0; i < selected.length; i++) { + // IPath fullPath = project.getFile(selected[i]).getFullPath(); + String type = VirtualArchiveComponent.LIBARCHIVETYPE + + IPath.SEPARATOR; + IVirtualComponent archive = ComponentCore + .createArchiveComponent(rootComponent.getProject(), + type + selected[i].makeRelative().toString()); + compList.add(archive); + paths.add(selected[i].lastSegment()); + } + IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); + String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); + getTaskModel().putObject(IReferenceWizardConstants.COMPONENT, components); + getTaskModel().putObject(IReferenceWizardConstants.COMPONENT_PATH, paths2); + } + } + + protected LabelProvider getLabelProvider() { + if (labelProvider == null) { + labelProvider = new LabelProvider() { + public Image getImage(Object element) { + return null; + } + + public String getText(Object element) { + return element == null ? "" : element.toString();//$NON-NLS-1$ + } + }; + } + return labelProvider; + } + + protected ITreeContentProvider getContentProvider() { + if (contentProvider == null) { + contentProvider = new ITreeContentProvider() { + public Object[] getElements(Object inputElement) { + return selected == null ? new Object[]{} : selected; + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + public void dispose() { + } + public boolean hasChildren(Object element) { + return false; + } + public Object getParent(Object element) { + return null; + } + public Object[] getChildren(Object parentElement) { + return null; + } + }; + } + return contentProvider; + } +} Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/VariableReferenceWizardFragment.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/VariableReferenceWizardFragment.java (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/assembly/wizard/VariableReferenceWizardFragment.java 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,67 @@ +/****************************************************************************** + * Copyright (c) 2009 Red Hat + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Rob Stryker - initial implementation and ongoing maintenance + ******************************************************************************/ +package org.eclipse.jst.common.ui.assembly.wizard; + +import java.util.ArrayList; + +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.jst.common.ui.Messages; +import org.eclipse.swt.widgets.Composite; +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.propertypage.IReferenceWizardConstants; +import org.eclipse.wst.server.ui.wizard.IWizardHandle; + +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; + } + + protected void buttonPressed() { + selected = BuildPathDialogAccess.chooseVariableEntries( + browse.getShell(), new Path[0]); + viewer.refresh(); + } + + public void performFinish(IProgressMonitor monitor) throws CoreException { + IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT); + if (selected != null && selected.length > 0) { + 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]); + 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()); + compList.add(archive); + paths.add(resolvedPath.lastSegment()); + } + } + IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]); + String[] paths2 = (String[]) paths.toArray(new String[paths.size()]); + getTaskModel().putObject(IReferenceWizardConstants.COMPONENT, components); + getTaskModel().putObject(IReferenceWizardConstants.COMPONENT_PATH, paths2); + } + } +} Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/messages.properties =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/messages.properties (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/messages.properties 2009-07-30 19:58:41 UTC (rev 16912) @@ -0,0 +1,7 @@ +JarTitle=Add a Jar Reference +JarDescription="Here you can reference a workspace Jar\nThis is not a suggested use-case, but is here for backwards compatability. +ExternalJarTitle=Add an External Jar Reference +ExternalJarDescription=Here you can reference a filesystem Jar\nThis is not a suggested use-case, but is here for backwards compatability. +Browse=Browse... +VariableReferenceTitle=Add a Variable Reference +VariableReferenceDescription="Here you can reference a variable which maps to a single jar.\nThis is not a suggested use-case, but is here for backwards compatability. \ No newline at end of file