Author: koen.aers(a)jboss.com Date: 2011-03-01 15:40:23 -0500 (Tue, 01 Mar 2011) New Revision: 29415 Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/ForgePlugin.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesPreferencePage.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesUpdater.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/InstalledForgeRuntimesBlock.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/ForgeRuntime.java Removed: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF trunk/forge/plugins/org.jboss.tools.seam.forge/plugin.xml trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java Log: more runtime preferences stuff Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF 2011-03-01 15:42:11 UTC (rev 29414) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF 2011-03-01 20:40:23 UTC (rev 29415) @@ -15,6 +15,6 @@ org.maven.ide.eclipse.maven_embedder Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Bundle-Activator: org.jboss.tools.seam.forge.Activator +Bundle-Activator: org.jboss.tools.seam.forge.ForgePlugin Bundle-ClassPath: ., lib/jline.jar Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/plugin.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/plugin.xml 2011-03-01 15:42:11 UTC (rev 29414) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/plugin.xml 2011-03-01 20:40:23 UTC (rev 29415) @@ -53,7 +53,7 @@ <page name="Installed Forge Runtimes" category="org.jboss.tools.seam.forge" - class="org.jboss.tools.seam.forge.preferences.EmptyPreferencePage" + class="org.jboss.tools.seam.forge.preferences.ForgeRuntimesPreferencePage" id="org.jboss.tools.seam.forge.runtimes"> </page> </extension> Deleted: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java 2011-03-01 15:42:11 UTC (rev 29414) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -1,40 +0,0 @@ -package org.jboss.tools.seam.forge; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.jboss.tools.seam.forge.runtime.Manager; -import org.osgi.framework.BundleContext; - -public class Activator extends AbstractUIPlugin { - - public static final String PLUGIN_ID = "org.jboss.tools.seam.forge"; //$NON-NLS-1$ - - private static Activator plugin; - - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - public void stop(BundleContext context) throws Exception { - if (Manager.INSTANCE.isForgeRunning()) { - Manager.INSTANCE.stopForge(); - } - plugin = null; - super.stop(context); - } - - public static Activator getDefault() { - return plugin; - } - - public static void log(Throwable t) { - getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t)); - } - - private static IStatus newErrorStatus(String message, Throwable exception) { - return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception); - } - -} Copied: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/ForgePlugin.java (from rev 29382, trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/Activator.java) =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/ForgePlugin.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/ForgePlugin.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -0,0 +1,40 @@ +package org.jboss.tools.seam.forge; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.seam.forge.runtime.Manager; +import org.osgi.framework.BundleContext; + +public class ForgePlugin extends AbstractUIPlugin { + + public static final String PLUGIN_ID = "org.jboss.tools.seam.forge"; + + private static ForgePlugin plugin; + + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + public void stop(BundleContext context) throws Exception { + if (Manager.INSTANCE.isForgeRunning()) { + Manager.INSTANCE.stopForge(); + } + plugin = null; + super.stop(context); + } + + public static ForgePlugin getDefault() { + return plugin; + } + + public static void log(Throwable t) { + getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t)); + } + + private static IStatus newErrorStatus(String message, Throwable exception) { + return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception); + } + +} Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/ForgePlugin.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java 2011-03-01 15:42:11 UTC (rev 29414) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/InputReadJob.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -7,7 +7,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.model.IStreamsProxy; -import org.jboss.tools.seam.forge.Activator; +import org.jboss.tools.seam.forge.ForgePlugin; class InputReadJob extends Job { @@ -30,7 +30,7 @@ buffer.setLength(0); } } catch (IOException e) { - Activator.log(e); + ForgePlugin.log(e); } return Status.OK_STATUS; } Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java 2011-03-01 15:42:11 UTC (rev 29414) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/StreamListener.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -4,7 +4,7 @@ import org.eclipse.debug.core.IStreamListener; import org.eclipse.debug.core.model.IStreamMonitor; -import org.jboss.tools.seam.forge.Activator; +import org.jboss.tools.seam.forge.ForgePlugin; class StreamListener implements IStreamListener { @@ -32,7 +32,7 @@ buffer = new StringBuffer(); } } catch (IOException e) { - Activator.log(e); + ForgePlugin.log(e); } } Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesPreferencePage.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesPreferencePage.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesPreferencePage.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -0,0 +1,144 @@ +package org.jboss.tools.seam.forge.preferences; + + +import java.io.File; + +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jdt.launching.LibraryLocation; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.BusyIndicator; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.jboss.tools.seam.forge.ForgePlugin; + +public class ForgeRuntimesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { + + private InstalledForgeRuntimesBlock fJREBlock; + + public ForgeRuntimesPreferencePage() { + super("Installed Forge Runtimes"); + } + + public void init(IWorkbench workbench) { + } + + private void initDefaultVM() { + IVMInstall realDefault= JavaRuntime.getDefaultVMInstall(); + if (realDefault != null) { + IVMInstall[] vms= fJREBlock.getJREs(); + for (int i = 0; i < vms.length; i++) { + IVMInstall fakeVM= vms[i]; + if (fakeVM.equals(realDefault)) { + verifyDefaultVM(fakeVM); + break; + } + } + } + } + + protected Control createContents(Composite ancestor) { + initializeDialogUnits(ancestor); + noDefaultAndApplyButton(); + createLayout(ancestor); + createWrapLabel(ancestor); + createVerticalSpacer(ancestor); + createInstalledForgeRuntimesBlock(ancestor); + initDefaultVM(); + applyDialogFont(ancestor); + return ancestor; + } + + private void createInstalledForgeRuntimesBlock(Composite ancestor) { + fJREBlock = new InstalledForgeRuntimesBlock(); + fJREBlock.createControl(ancestor); + Control control = fJREBlock.getControl(); + GridData data = new GridData(GridData.FILL_BOTH); + data.horizontalSpan = 1; + control.setLayoutData(data); + fJREBlock.restoreColumnSettings( + ForgePlugin.getDefault().getDialogSettings(), + ForgePlugin.PLUGIN_ID + ".forge_runtimes_preference_page_context"); + + } + + private void createLayout(Composite ancestor) { + GridLayout layout= new GridLayout(); + layout.numColumns= 1; + layout.marginHeight = 0; + layout.marginWidth = 0; + ancestor.setLayout(layout); + } + + private Label createWrapLabel(Composite parent) { + Label l = new Label(parent, SWT.NONE | SWT.WRAP); + l.setFont(parent.getFont()); + l.setText("Add, remove or edit Forge runtimes. By default, the checked Forge runtime is used when launching Forge."); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.widthHint = 250; + l.setLayoutData(gd); + return l; + } + + private void createVerticalSpacer(Composite parent) { + Label lbl = new Label(parent, SWT.NONE); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = ((GridLayout)parent.getLayout()).numColumns; + lbl.setLayoutData(gd); + } + + public boolean performOk() { + final boolean[] canceled = new boolean[] {false}; + BusyIndicator.showWhile(null, new Runnable() { + public void run() { + IVMInstall defaultVM = getCurrentDefaultVM(); + IVMInstall[] vms = fJREBlock.getJREs(); + ForgeRuntimesUpdater updater = new ForgeRuntimesUpdater(); + if (!updater.updateJRESettings(vms, defaultVM)) { + canceled[0] = true; + } + } + }); + if(canceled[0]) { + return false; + } + fJREBlock.saveColumnSettings( + ForgePlugin.getDefault().getDialogSettings(), + ForgePlugin.PLUGIN_ID + ".forge_runtimes_preference_page_context"); + return super.performOk(); + } + + private void verifyDefaultVM(IVMInstall vm) { + if (vm != null) { + LibraryLocation[] locations= JavaRuntime.getLibraryLocations(vm); + boolean exist = true; + for (int i = 0; i < locations.length; i++) { + exist = exist && new File(locations[i].getSystemLibraryPath().toOSString()).exists(); + } + if (exist) { + fJREBlock.setCheckedJRE(vm); + } else { + fJREBlock.removeJREs(new IVMInstall[]{vm}); + IVMInstall def = JavaRuntime.getDefaultVMInstall(); + if (def == null) { + fJREBlock.setCheckedJRE(null); + } else { + fJREBlock.setCheckedJRE(def); + } + return; + } + } else { + fJREBlock.setCheckedJRE(null); + } + } + + private IVMInstall getCurrentDefaultVM() { + return fJREBlock.getCheckedJRE(); + } +} Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesPreferencePage.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesUpdater.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesUpdater.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesUpdater.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -0,0 +1,106 @@ +/******************************************************************************* + * Copyright (c) 2000, 2007 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.jboss.tools.seam.forge.preferences; + +import java.lang.reflect.InvocationTargetException; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jdt.internal.launching.VMDefinitionsContainer; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.IVMInstallType; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.jboss.tools.seam.forge.ForgePlugin; + +/** + * Processes add/removed/changed VMs. + */ +public class ForgeRuntimesUpdater { + + // the VMs defined when this updated is instantiated + private VMDefinitionsContainer fOriginalVMs; + + /** + * Contstructs a new VM updater to update VM install settings. + */ + public ForgeRuntimesUpdater() { + fOriginalVMs = new VMDefinitionsContainer(); + IVMInstall def = JavaRuntime.getDefaultVMInstall(); + if (def != null) { + fOriginalVMs.setDefaultVMInstallCompositeID(JavaRuntime.getCompositeIdFromVM(def)); + } + + IVMInstallType[] types = JavaRuntime.getVMInstallTypes(); + for (int i = 0; i < types.length; i++) { + IVMInstall[] vms = types[i].getVMInstalls(); + for (int j = 0; j < vms.length; j++) { + fOriginalVMs.addVM(vms[j]); + } + } + } + + /** + * Updates VM settings and returns whether the update was successful. + * + * @param jres new installed JREs + * @param defaultJRE new default VM + * @return whether the update was successful + */ + public boolean updateJRESettings(IVMInstall[] jres, IVMInstall defaultJRE) { + + // Create a VM definition container + VMDefinitionsContainer vmContainer = new VMDefinitionsContainer(); + + // Set the default VM Id on the container + String defaultVMId = JavaRuntime.getCompositeIdFromVM(defaultJRE); + vmContainer.setDefaultVMInstallCompositeID(defaultVMId); + + // Set the VMs on the container + for (int i = 0; i < jres.length; i++) { + vmContainer.addVM(jres[i]); + } + + + // Generate XML for the VM defs and save it as the new value of the VM preference + saveVMDefinitions(vmContainer); + + return true; + } + + private void saveVMDefinitions(final VMDefinitionsContainer container) { + IRunnableWithProgress runnable = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { + try { + monitor.beginTask("Save Forge Runtime Definitions", 100); + String vmDefXML = container.getAsXML(); + monitor.worked(40); + JavaRuntime.getPreferences().setValue(JavaRuntime.PREF_VM_XML, vmDefXML); + monitor.worked(30); + JavaRuntime.savePreferences(); + monitor.worked(30); + } catch (CoreException e) { +// JDIDebugUIPlugin.log(e); + } finally { + monitor.done(); + } + + } + }; + try { + ForgePlugin.getDefault().getWorkbench().getProgressService().busyCursorWhile(runnable); + } catch (InvocationTargetException e) { +// JDIDebugUIPlugin.log(e); + } catch (InterruptedException e) { +// JDIDebugUIPlugin.log(e); + } + } +} Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/ForgeRuntimesUpdater.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/InstalledForgeRuntimesBlock.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/InstalledForgeRuntimesBlock.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/InstalledForgeRuntimesBlock.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -0,0 +1,843 @@ +/******************************************************************************* + * Copyright (c) 2000, 2010 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.jboss.tools.seam.forge.preferences; + +import java.io.File; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.ListenerList; +import org.eclipse.debug.internal.ui.SWTFactory; +import org.eclipse.jdt.launching.AbstractVMInstall; +import org.eclipse.jdt.launching.AbstractVMInstallType; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.IVMInstallType; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jdt.launching.VMStandin; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.viewers.CheckStateChangedEvent; +import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.DoubleClickEvent; +import org.eclipse.jface.viewers.ICheckStateListener; +import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerComparator; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.KeyAdapter; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Cursor; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; + +public class InstalledForgeRuntimesBlock implements ISelectionProvider { + + private Composite fControl; + private List fVMs = new ArrayList(); + private CheckboxTableViewer fVMList; + private Button fAddButton; + private Button fRemoveButton; + private Button fEditButton; + private Button fSearchButton; + private int fSortColumn = 0; + private ListenerList fSelectionListeners = new ListenerList(); + private ISelection fPrevSelection = new StructuredSelection(); + private Table fTable; + private static String fgLastUsedID; + + class JREsContentProvider implements IStructuredContentProvider { + public Object[] getElements(Object input) { + return fVMs.toArray(); + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + public void dispose() { + } + } + + class VMLabelProvider extends LabelProvider implements ITableLabelProvider { + + public String getColumnText(Object element, int columnIndex) { + if (element instanceof IVMInstall) { + IVMInstall vm= (IVMInstall)element; + switch(columnIndex) { + case 0: + return vm.getName(); + case 1: + return vm.getInstallLocation().getAbsolutePath(); + case 2: + return vm.getVMInstallType().getName(); + } + } + return element.toString(); + } + + public Image getColumnImage(Object element, int columnIndex) { + return null; + } + + } + + public void addSelectionChangedListener(ISelectionChangedListener listener) { + fSelectionListeners.add(listener); + } + + public ISelection getSelection() { + return new StructuredSelection(fVMList.getCheckedElements()); + } + + public void removeSelectionChangedListener(ISelectionChangedListener listener) { + fSelectionListeners.remove(listener); + } + + public void setSelection(ISelection selection) { + if (selection instanceof IStructuredSelection) { + if (!selection.equals(fPrevSelection)) { + fPrevSelection = selection; + Object jre = ((IStructuredSelection)selection).getFirstElement(); + if (jre == null) { + fVMList.setCheckedElements(new Object[0]); + } else { + fVMList.setCheckedElements(new Object[]{jre}); + fVMList.reveal(jre); + } + fireSelectionChanged(); + } + } + } + + public void createControl(Composite ancestor) { + Font font = ancestor.getFont(); + Composite parent= SWTFactory.createComposite(ancestor, font, 2, 1, GridData.FILL_BOTH); + fControl = parent; + + SWTFactory.createLabel(parent, "Installed Forge Runtimes:", 2); + + fTable= new Table(parent, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION); + GridData gd = new GridData(GridData.FILL_BOTH); + gd.heightHint = 250; + gd.widthHint = 350; + fTable.setLayoutData(gd); + fTable.setFont(font); + fTable.setHeaderVisible(true); + fTable.setLinesVisible(true); + + TableColumn column = new TableColumn(fTable, SWT.NULL); + column.setText("Name"); + column.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + sortByName(); + } + }); + int defaultwidth = 350/3 +1; + column.setWidth(defaultwidth); + + column = new TableColumn(fTable, SWT.NULL); + column.setText("Location"); + column.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + sortByLocation(); + } + }); + column.setWidth(defaultwidth); + + column = new TableColumn(fTable, SWT.NULL); + column.setText("Type"); + column.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + sortByType(); + } + }); + column.setWidth(defaultwidth); + + fVMList = new CheckboxTableViewer(fTable); + fVMList.setLabelProvider(new VMLabelProvider()); + fVMList.setContentProvider(new JREsContentProvider()); + // by default, sort by name + sortByName(); + + fVMList.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent evt) { + enableButtons(); + } + }); + + fVMList.addCheckStateListener(new ICheckStateListener() { + public void checkStateChanged(CheckStateChangedEvent event) { + if (event.getChecked()) { + setCheckedJRE((IVMInstall)event.getElement()); + } else { + setCheckedJRE(null); + } + } + }); + + fVMList.addDoubleClickListener(new IDoubleClickListener() { + public void doubleClick(DoubleClickEvent e) { + if (!fVMList.getSelection().isEmpty()) { + editVM(); + } + } + }); + fTable.addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent event) { + if (event.character == SWT.DEL && event.stateMask == 0) { + if (fRemoveButton.isEnabled()){ + removeVMs(); + } + } + } + }); + + Composite buttons = SWTFactory.createComposite(parent, font, 1, 1, GridData.VERTICAL_ALIGN_BEGINNING, 0, 0); + + fAddButton = SWTFactory.createPushButton(buttons, "&Add...", null); + fAddButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event evt) { + addVM(); + } + }); + + fEditButton= SWTFactory.createPushButton(buttons, "&Edit...", null); + fEditButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event evt) { + editVM(); + } + }); + + fRemoveButton= SWTFactory.createPushButton(buttons, "&Remove", null); + fRemoveButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event evt) { + removeVMs(); + } + }); + + SWTFactory.createVerticalSpacer(parent, 1); + + fSearchButton = SWTFactory.createPushButton(buttons, "&Search...", null); + fSearchButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event evt) { + search(); + } + }); + + fillWithWorkspaceJREs(); + enableButtons(); + fAddButton.setEnabled(JavaRuntime.getVMInstallTypes().length > 0); + } + + public String generateName(String name){ + if (!isDuplicateName(name)) { + return name; + } + + if (name.matches(".*\\(\\d*\\)")) { //$NON-NLS-1$ + int start = name.lastIndexOf('('); + int end = name.lastIndexOf(')'); + String stringInt = name.substring(start+1, end); + int numericValue = Integer.parseInt(stringInt); + String newName = name.substring(0, start+1) + (numericValue+1) + ")"; //$NON-NLS-1$ + return generateName(newName); + } else { + return generateName(name + " (1)"); //$NON-NLS-1$ + } + } + + private void fireSelectionChanged() { + SelectionChangedEvent event = new SelectionChangedEvent(this, getSelection()); + Object[] listeners = fSelectionListeners.getListeners(); + for (int i = 0; i < listeners.length; i++) { + ISelectionChangedListener listener = (ISelectionChangedListener)listeners[i]; + listener.selectionChanged(event); + } + } + + private void sortByType() { + fVMList.setComparator(new ViewerComparator() { + public int compare(Viewer viewer, Object e1, Object e2) { + if ((e1 instanceof IVMInstall) && (e2 instanceof IVMInstall)) { + IVMInstall left= (IVMInstall)e1; + IVMInstall right= (IVMInstall)e2; + String leftType= left.getVMInstallType().getName(); + String rightType= right.getVMInstallType().getName(); + int res= leftType.compareToIgnoreCase(rightType); + if (res != 0) { + return res; + } + return left.getName().compareToIgnoreCase(right.getName()); + } + return super.compare(viewer, e1, e2); + } + + public boolean isSorterProperty(Object element, String property) { + return true; + } + }); + fSortColumn = 3; + } + + private void sortByName() { + fVMList.setComparator(new ViewerComparator() { + public int compare(Viewer viewer, Object e1, Object e2) { + if ((e1 instanceof IVMInstall) && (e2 instanceof IVMInstall)) { + IVMInstall left= (IVMInstall)e1; + IVMInstall right= (IVMInstall)e2; + return left.getName().compareToIgnoreCase(right.getName()); + } + return super.compare(viewer, e1, e2); + } + + public boolean isSorterProperty(Object element, String property) { + return true; + } + }); + fSortColumn = 1; + } + + /** + * Sorts by VM location. + */ + private void sortByLocation() { + fVMList.setComparator(new ViewerComparator() { + public int compare(Viewer viewer, Object e1, Object e2) { + if ((e1 instanceof IVMInstall) && (e2 instanceof IVMInstall)) { + IVMInstall left= (IVMInstall)e1; + IVMInstall right= (IVMInstall)e2; + return left.getInstallLocation().getAbsolutePath().compareToIgnoreCase(right.getInstallLocation().getAbsolutePath()); + } + return super.compare(viewer, e1, e2); + } + + public boolean isSorterProperty(Object element, String property) { + return true; + } + }); + fSortColumn = 2; + } + + /** + * Enables the buttons based on selected items counts in the viewer + */ + private void enableButtons() { + IStructuredSelection selection = (IStructuredSelection) fVMList.getSelection(); + int selectionCount= selection.size(); + fEditButton.setEnabled(selectionCount == 1); +// fCopyButton.setEnabled(selectionCount > 0); + if (selectionCount > 0 && selectionCount < fVMList.getTable().getItemCount()) { + Iterator iterator = selection.iterator(); + while (iterator.hasNext()) { + IVMInstall install = (IVMInstall)iterator.next(); + if (isContributed(install)) { + fRemoveButton.setEnabled(false); + return; + } + } + fRemoveButton.setEnabled(true); + } else { + fRemoveButton.setEnabled(false); + } + } + + /** + * Returns if the specified VM install has been contributed + * @param install + * @return true if the specified VM is contributed, false otherwise + */ + private boolean isContributed(IVMInstall install) { + return JavaRuntime.isContributedVMInstall(install.getId()); + } + + /** + * Returns this block's control + * + * @return control + */ + public Control getControl() { + return fControl; + } + + /** + * Sets the JREs to be displayed in this block + * + * @param vms JREs to be displayed + */ + protected void setJREs(IVMInstall[] vms) { + fVMs.clear(); + for (int i = 0; i < vms.length; i++) { + fVMs.add(vms[i]); + } + fVMList.setInput(fVMs); + fVMList.refresh(); + } + + /** + * Returns the JREs currently being displayed in this block + * + * @return JREs currently being displayed in this block + */ + public IVMInstall[] getJREs() { + return (IVMInstall[])fVMs.toArray(new IVMInstall[fVMs.size()]); + } + + /** + * Bring up a wizard that lets the user create a new VM definition. + */ + private void addVM() { +// AddVMInstallWizard wizard = new AddVMInstallWizard((IVMInstall[]) fVMs.toArray(new IVMInstall[fVMs.size()])); +// WizardDialog dialog = new WizardDialog(getShell(), wizard); +// if (dialog.open() == Window.OK) { +// VMStandin result = wizard.getResult(); +// if (result != null) { +// fVMs.add(result); +// fVMList.refresh(); +// fVMList.setSelection(new StructuredSelection(result)); +// } +// } + } + + /** + * @see IAddVMDialogRequestor#vmAdded(IVMInstall) + */ + public void vmAdded(IVMInstall vm) { + fVMs.add(vm); + fVMList.refresh(); + } + + /** + * @see IAddVMDialogRequestor#isDuplicateName(String) + */ + public boolean isDuplicateName(String name) { + for (int i= 0; i < fVMs.size(); i++) { + IVMInstall vm = (IVMInstall)fVMs.get(i); + if (vm.getName().equals(name)) { + return true; + } + } + return false; + } + + /** + * Performs the edit VM action when the Edit... button is pressed + */ + private void editVM() { + IStructuredSelection selection= (IStructuredSelection)fVMList.getSelection(); + VMStandin vm= (VMStandin)selection.getFirstElement(); + if (vm == null) { + return; + } +// if (isContributed(vm)) { +// VMDetailsDialog dialog= new VMDetailsDialog(getShell(), vm); +// dialog.open(); +// } else { +// EditVMInstallWizard wizard = new EditVMInstallWizard(vm, (IVMInstall[]) fVMs.toArray(new IVMInstall[fVMs.size()])); +// WizardDialog dialog = new WizardDialog(getShell(), wizard); +// if (dialog.open() == Window.OK) { +// VMStandin result = wizard.getResult(); +// if (result != null) { +// // replace with the edited VM +// int index = fVMs.indexOf(vm); +// fVMs.remove(index); +// fVMs.add(index, result); +// fVMList.refresh(); +// fVMList.setSelection(new StructuredSelection(result)); +// } +// } +// } + + + } + + /** + * Performs the remove VM(s) action when the Remove... button is pressed + */ + private void removeVMs() { + IStructuredSelection selection= (IStructuredSelection)fVMList.getSelection(); + IVMInstall[] vms = new IVMInstall[selection.size()]; + Iterator iter = selection.iterator(); + int i = 0; + while (iter.hasNext()) { + vms[i] = (IVMInstall)iter.next(); + i++; + } + removeJREs(vms); + } + + /** + * Removes the given VMs from the table. + * + * @param vms + */ + public void removeJREs(IVMInstall[] vms) { + IStructuredSelection prev = (IStructuredSelection) getSelection(); + for (int i = 0; i < vms.length; i++) { + fVMs.remove(vms[i]); + } + fVMList.refresh(); + IStructuredSelection curr = (IStructuredSelection) getSelection(); + if (!curr.equals(prev)) { + IVMInstall[] installs = getJREs(); + if (curr.size() == 0 && installs.length == 1) { + // pick a default VM automatically + setSelection(new StructuredSelection(installs[0])); + } else { + fireSelectionChanged(); + } + } + } + + /** + * Search for installed VMs in the file system + */ + protected void search() { +// if (Platform.OS_MACOSX.equals(Platform.getOS())) { +// doMacSearch(); +// return; +// } + // choose a root directory for the search + DirectoryDialog dialog = new DirectoryDialog(getShell()); + dialog.setMessage("Select a directory to search in:"); + dialog.setText("Directory Selection"); + String path = dialog.open(); + if (path == null) { + return; + } + + // ignore installed locations + final Set exstingLocations = new HashSet(); + Iterator iter = fVMs.iterator(); + while (iter.hasNext()) { + exstingLocations.add(((IVMInstall)iter.next()).getInstallLocation()); + } + + // search + final File rootDir = new File(path); + final List locations = new ArrayList(); + final List types = new ArrayList(); + + IRunnableWithProgress r = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) { + monitor.beginTask("Searching...", IProgressMonitor.UNKNOWN); + search(rootDir, locations, types, exstingLocations, monitor); + monitor.done(); + } + }; + + try { + ProgressMonitorDialog progress = new ProgressMonitorDialog(getShell()) { + /* + * Overridden createCancelButton to replace Cancel label with Stop label + * More accurately reflects action taken when button pressed. + * Bug [162902] + */ + protected void createCancelButton(Composite parent) { + cancel = createButton(parent, IDialogConstants.CANCEL_ID, + IDialogConstants.STOP_LABEL, true); + if (arrowCursor == null) { + arrowCursor = new Cursor(cancel.getDisplay(), SWT.CURSOR_ARROW); + } + cancel.setCursor(arrowCursor); + setOperationCancelButtonEnabled(enableCancelButton); + } + }; + progress.run(true, true, r); + } catch (InvocationTargetException e) { +// JDIDebugUIPlugin.log(e); + } catch (InterruptedException e) { + // canceled + return; + } + + if (locations.isEmpty()) { + String messagePath = path.replaceAll("&", "&&"); // @see bug 29855 //$NON-NLS-1$//$NON-NLS-2$ +// MessageDialog.openInformation(getShell(), JREMessages.InstalledJREsBlock_12, MessageFormat.format(JREMessages.InstalledJREsBlock_13, new String[]{messagePath})); // + } else { + iter = locations.iterator(); + Iterator iter2 = types.iterator(); + while (iter.hasNext()) { + File location = (File)iter.next(); + IVMInstallType type = (IVMInstallType)iter2.next(); + AbstractVMInstall vm = new VMStandin(type, createUniqueId(type)); + String name = location.getName(); + String nameCopy = new String(name); + int i = 1; + while (isDuplicateName(nameCopy)) { + nameCopy = name + '(' + i++ + ')'; + } + vm.setName(nameCopy); + vm.setInstallLocation(location); + if (type instanceof AbstractVMInstallType) { + //set default java doc location + AbstractVMInstallType abs = (AbstractVMInstallType)type; + vm.setJavadocLocation(abs.getDefaultJavadocLocation(location)); + vm.setVMArgs(abs.getDefaultVMArguments(location)); + } + vmAdded(vm); + } + } + + } + + /** + * Calls out to {@link MacVMSearch} to find all installed JREs in the standard + * Mac OS location + */ +// private void doMacSearch() { +// final List added = new ArrayList(); +// IRunnableWithProgress r = new IRunnableWithProgress() { +// public void run(IProgressMonitor monitor) { +// Set exists = new HashSet(); +// Iterator iterator = fVMs.iterator(); +// while (iterator.hasNext()) { +// IVMInstall vm = (IVMInstall) iterator.next(); +// exists.add(vm.getId()); +// } +// VMStandin[] standins = new MacVMSearch().search(monitor); +// for (int i = 0; i < standins.length; i++) { +// if (!exists.contains(standins[i].getId())) { +// added.add(standins[i]); +// } +// } +// monitor.done(); +// } +// }; +// +// try { +// ProgressMonitorDialog progress = new ProgressMonitorDialog(getShell()); +// progress.run(true, true, r); +// } catch (InvocationTargetException e) { +// JDIDebugUIPlugin.log(e); +// } catch (InterruptedException e) { +// // canceled +// return; +// } +// +// Iterator iterator = added.iterator(); +// while (iterator.hasNext()) { +// IVMInstall vm = (IVMInstall) iterator.next(); +// vmAdded(vm); +// } +// +// } + + protected Shell getShell() { + return getControl().getShell(); + } + + /** + * Find a unique VM id. Check existing 'real' VMs, as well as the last id used for + * a VMStandin. + */ + private String createUniqueId(IVMInstallType vmType) { + String id= null; + do { + id= String.valueOf(System.currentTimeMillis()); + } while (vmType.findVMInstall(id) != null || id.equals(fgLastUsedID)); + fgLastUsedID = id; + return id; + } + + /** + * Searches the specified directory recursively for installed VMs, adding each + * detected VM to the <code>found</code> list. Any directories specified in + * the <code>ignore</code> are not traversed. + * + * @param directory + * @param found + * @param types + * @param ignore + */ + protected void search(File directory, List found, List types, Set ignore, IProgressMonitor monitor) { + if (monitor.isCanceled()) { + return; + } + + String[] names = directory.list(); + if (names == null) { + return; + } + List subDirs = new ArrayList(); + for (int i = 0; i < names.length; i++) { + if (monitor.isCanceled()) { + return; + } + File file = new File(directory, names[i]); +// try { +// monitor.subTask(MessageFormat.format(JREMessages.InstalledJREsBlock_14, new String[]{Integer.toString(found.size()), +// file.getCanonicalPath().replaceAll("&", "&&")})); // @see bug 29855 //$NON-NLS-1$ //$NON-NLS-2$ +// } catch (IOException e) { +// } + IVMInstallType[] vmTypes = JavaRuntime.getVMInstallTypes(); + if (file.isDirectory()) { + if (!ignore.contains(file)) { + boolean validLocation = false; + + // Take the first VM install type that claims the location as a + // valid VM install. VM install types should be smart enough to not + // claim another type's VM, but just in case... + for (int j = 0; j < vmTypes.length; j++) { + if (monitor.isCanceled()) { + return; + } + IVMInstallType type = vmTypes[j]; + IStatus status = type.validateInstallLocation(file); + if (status.isOK()) { + found.add(file); + types.add(type); + validLocation = true; + break; + } + } + if (!validLocation) { + subDirs.add(file); + } + } + } + } + while (!subDirs.isEmpty()) { + File subDir = (File)subDirs.remove(0); + search(subDir, found, types, ignore, monitor); + if (monitor.isCanceled()) { + return; + } + } + + } + + /** + * Sets the checked JRE, possible <code>null</code> + * + * @param vm JRE or <code>null</code> + */ + public void setCheckedJRE(IVMInstall vm) { + if (vm == null) { + setSelection(new StructuredSelection()); + } else { + setSelection(new StructuredSelection(vm)); + } + } + + /** + * Returns the checked JRE or <code>null</code> if none. + * + * @return the checked JRE or <code>null</code> if none + */ + public IVMInstall getCheckedJRE() { + Object[] objects = fVMList.getCheckedElements(); + if (objects.length == 0) { + return null; + } + return (IVMInstall)objects[0]; + } + + /** + * Persist table settings into the give dialog store, prefixed + * with the given key. + * + * @param settings dialog store + * @param qualifier key qualifier + */ + public void saveColumnSettings(IDialogSettings settings, String qualifier) { + int columnCount = fTable.getColumnCount(); + for (int i = 0; i < columnCount; i++) { + settings.put(qualifier + ".columnWidth" + i, fTable.getColumn(i).getWidth()); //$NON-NLS-1$ + } + settings.put(qualifier + ".sortColumn", fSortColumn); //$NON-NLS-1$ + } + + /** + * Restore table settings from the given dialog store using the + * given key. + * + * @param settings dialog settings store + * @param qualifier key to restore settings from + */ + public void restoreColumnSettings(IDialogSettings settings, String qualifier) { + fVMList.getTable().layout(true); + restoreColumnWidths(settings, qualifier); + try { + fSortColumn = settings.getInt(qualifier + ".sortColumn"); //$NON-NLS-1$ + } catch (NumberFormatException e) { + fSortColumn = 1; + } + switch (fSortColumn) { + case 1: + sortByName(); + break; + case 2: + sortByLocation(); + break; + case 3: + sortByType(); + break; + } + } + + private void restoreColumnWidths(IDialogSettings settings, String qualifier) { + int columnCount = fTable.getColumnCount(); + for (int i = 0; i < columnCount; i++) { + int width = -1; + try { + width = settings.getInt(qualifier + ".columnWidth" + i); + } catch (NumberFormatException e) {} + + if ((width <= 0) || (i == fTable.getColumnCount() - 1)) { + fTable.getColumn(i).pack(); + } else { + fTable.getColumn(i).setWidth(width); + } + } + } + + protected void fillWithWorkspaceJREs() { + // fill with JREs + List standins = new ArrayList(); + IVMInstallType[] types = JavaRuntime.getVMInstallTypes(); + for (int i = 0; i < types.length; i++) { + IVMInstallType type = types[i]; + IVMInstall[] installs = type.getVMInstalls(); + for (int j = 0; j < installs.length; j++) { + IVMInstall install = installs[j]; + standins.add(new VMStandin(install)); + } + } + setJREs((IVMInstall[])standins.toArray(new IVMInstall[standins.size()])); + } + +} Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/preferences/InstalledForgeRuntimesBlock.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/ForgeRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/ForgeRuntime.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/ForgeRuntime.java 2011-03-01 20:40:23 UTC (rev 29415) @@ -0,0 +1,5 @@ +package org.jboss.tools.seam.forge.runtime; + +public class ForgeRuntime { + +} Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/runtime/ForgeRuntime.java ___________________________________________________________________ Added: svn:mime-type + text/plain