Target Explorer: Added tree form part and tree form section

5 files changed, 407 insertions, 45 deletions

diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractPartWithButtons.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractPartWithButtons.java
index 7291e3c48..cd139262c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractPartWithButtons.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractPartWithButtons.java
@@ -82,45 +82,49 @@ public abstract class AbstractPartWithButtons extends AbstractPart {
 	 *

 	 * @param parent The parent composite. Must not be <code>null</code>.

 	 * @param toolkit The form toolkit or <code>null</code>.

+	 *

+	 * @return The buttons panel composite or <code>null</code>.

 	 */

-	protected void createButtonsPanel(Composite parent, FormToolkit toolkit) {

-		if (labels.length > 0) {

-			buttons = new Button[labels.length];

-

-			Composite panel = createComposite(parent, toolkit);

-			GridLayout layout = new GridLayout();

-			layout.marginHeight = 0; layout.marginWidth = 0;

-			panel.setLayout(layout);

-			GridData layoutData = new GridData(SWT.BEGINNING, SWT.FILL, false, true);

-			panel.setLayoutData(layoutData);

-

-			SelectionListener listener = new SelectionAdapter() {

-				@Override

-				public void widgetSelected(SelectionEvent e) {

-					AbstractPartWithButtons.this.onButtonSelected((Button) e.widget);

-				}

-			};

-

-			for (int i = 0; i < labels.length; i++) {

-				if (labels[i] != null) {

-					Button button = toolkit != null ? toolkit.createButton(panel, null, SWT.PUSH) : new Button(panel, SWT.PUSH);

-					Assert.isNotNull(button);

-

-					button.setFont(JFaceResources.getDialogFont());

-					button.setText(labels[i]);

-					button.setData(Integer.valueOf(i));

-					button.addSelectionListener(listener);

-

-					layoutData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);

-					layoutData.widthHint = Math.max(new PixelConverter(button).convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH), button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);

-					button.setLayoutData(layoutData);

-

-					buttons[i] = button;

-				} else {

-					createEmptySpace(parent, 1, toolkit);

-				}

+	protected Composite createButtonsPanel(Composite parent, FormToolkit toolkit) {

+		if (labels.length == 0) return null;

+

+		buttons = new Button[labels.length];

+

+		Composite panel = createComposite(parent, toolkit);

+		GridLayout layout = new GridLayout();

+		layout.marginHeight = 0; layout.marginWidth = 0;

+		panel.setLayout(layout);

+		GridData layoutData = new GridData(SWT.BEGINNING, SWT.FILL, false, true);

+		panel.setLayoutData(layoutData);

+

+		SelectionListener listener = new SelectionAdapter() {

+			@Override

+			public void widgetSelected(SelectionEvent e) {

+				AbstractPartWithButtons.this.onButtonSelected((Button) e.widget);

+			}

+		};

+

+		for (int i = 0; i < labels.length; i++) {

+			if (labels[i] != null) {

+				Button button = toolkit != null ? toolkit.createButton(panel, null, SWT.PUSH) : new Button(panel, SWT.PUSH);

+				Assert.isNotNull(button);

+

+				button.setFont(JFaceResources.getDialogFont());

+				button.setText(labels[i]);

+				button.setData(Integer.valueOf(i));

+				button.addSelectionListener(listener);

+

+				layoutData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);

+				layoutData.widthHint = Math.max(new PixelConverter(button).convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH), button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);

+				button.setLayoutData(layoutData);

+

+				buttons[i] = button;

+			} else {

+				createEmptySpace(parent, 1, toolkit);

 			}

 		}

+

+		return panel;

 	}

 

 	/**

diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java
index 85a6d7959..de84a2f7c 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractTableSection.java
@@ -9,10 +9,12 @@
  *******************************************************************************/

 package org.eclipse.tm.te.ui.forms.parts;

 

+import org.eclipse.core.runtime.Assert;

 import org.eclipse.jface.viewers.DoubleClickEvent;

 import org.eclipse.jface.viewers.IDoubleClickListener;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.swt.widgets.Button;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.forms.IManagedForm;

@@ -65,9 +67,27 @@ public abstract class AbstractTableSection extends AbstractStructuredViewerSecti
 		 * @see org.eclipse.tm.te.ui.forms.parts.AbstractPartWithButtons#createButtonsPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)

 		 */

 		@Override

-		protected void createButtonsPanel(Composite parent, FormToolkit toolkit) {

-			super.createButtonsPanel(parent, toolkit);

+		protected Composite createButtonsPanel(Composite parent, FormToolkit toolkit) {

+			Composite panel = super.createButtonsPanel(parent, toolkit);

 			initializeButtonsEnablement();

+			return panel;

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.TablePart#createTableViewer(org.eclipse.swt.widgets.Composite, int)

+		 */

+		@Override

+		protected TableViewer createTableViewer(Composite parent, int style) {

+			return AbstractTableSection.this.createTableViewer(parent, style);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.TablePart#configureTableViewer(org.eclipse.jface.viewers.TableViewer)

+		 */

+		@Override

+		protected void configureTableViewer(TableViewer viewer) {

+			super.configureTableViewer(viewer);

+			AbstractTableSection.this.configureTableViewer(viewer);

 		}

 	}

 

@@ -114,6 +134,27 @@ public abstract class AbstractTableSection extends AbstractStructuredViewerSecti
 		return (TablePart)getViewerPart();

 	}

 

+	/**

+	 * Creates the table viewer instance.

+	 *

+	 * @param parent The parent composite. Must not be <code>null</code>.

+	 * @param style The viewer style.

+	 *

+	 * @return The table viewer instance.

+	 */

+	protected TableViewer createTableViewer(Composite parent, int style) {

+		return new TableViewer(parent, style);

+	}

+

+	/**

+	 * Configures the table viewer instance.

+	 *

+	 * @param viewer The table viewer instance. Must not be <code>null</code<.

+	 */

+	protected void configureTableViewer(TableViewer viewer) {

+		Assert.isNotNull(viewer);

+	}

+

 	/* (non-Javadoc)

 	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)

 	 */

diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java
new file mode 100644
index 000000000..ea5362c71
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/AbstractTreeSection.java
@@ -0,0 +1,182 @@
+/*******************************************************************************

+ * Copyright (c) 2011 Wind River Systems, Inc. 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:

+ * Wind River Systems - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.tm.te.ui.forms.parts;

+

+import org.eclipse.core.runtime.Assert;

+import org.eclipse.jface.viewers.DoubleClickEvent;

+import org.eclipse.jface.viewers.IDoubleClickListener;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.forms.IManagedForm;

+import org.eclipse.ui.forms.widgets.FormToolkit;

+

+/**

+ * Target Explorer: Abstract tree section implementation.

+ */

+public abstract class AbstractTreeSection extends AbstractStructuredViewerSection implements ISelectionChangedListener, IDoubleClickListener {

+

+	/**

+	 * Tree section tree part adapter implementation.

+	 */

+	protected class TreePartAdapter extends TreePart {

+

+		/**

+		 * Constructor.

+		 *

+		 * @param labels The list of label to apply to the created buttons in the given order. Must not be <code>null</code>.

+		 */

+		public TreePartAdapter(String[] labels) {

+			super(labels);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.TablePart#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)

+		 */

+		@Override

+		public void selectionChanged(SelectionChangedEvent event) {

+			AbstractTreeSection.this.selectionChanged(event);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.TablePart#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)

+		 */

+		@Override

+		public void doubleClick(DoubleClickEvent event) {

+			AbstractTreeSection.this.doubleClick(event);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.AbstractPartWithButtons#onButtonSelected(org.eclipse.swt.widgets.Button)

+		 */

+		@Override

+		protected void onButtonSelected(Button button) {

+			AbstractTreeSection.this.onButtonSelected(button);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.AbstractPartWithButtons#createButtonsPanel(org.eclipse.swt.widgets.Composite, org.eclipse.ui.forms.widgets.FormToolkit)

+		 */

+		@Override

+		protected Composite createButtonsPanel(Composite parent, FormToolkit toolkit) {

+			Composite panel = super.createButtonsPanel(parent, toolkit);

+			initializeButtonsEnablement();

+			if (parent.getData("filtered") != null) { //$NON-NLS-1$

+				GridLayout layout = (GridLayout) panel.getLayout();

+				layout.marginHeight = 28;

+			}

+			return panel;

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.TreePart#createTreeViewer(org.eclipse.swt.widgets.Composite, int)

+		 */

+		@Override

+		protected TreeViewer createTreeViewer(Composite parent, int style) {

+			return AbstractTreeSection.this.createTreeViewer(parent, style);

+		}

+

+		/* (non-Javadoc)

+		 * @see org.eclipse.tm.te.ui.forms.parts.TreePart#configureTreeViewer(org.eclipse.jface.viewers.TreeViewer)

+		 */

+		@Override

+		protected void configureTreeViewer(TreeViewer viewer) {

+			super.configureTreeViewer(viewer);

+			AbstractTreeSection.this.configureTreeViewer(viewer);

+		}

+	}

+

+	/**

+	 * Constructor.

+	 *

+	 * @param form The parent managed form. Must not be <code>null</code>.

+	 * @param parent The parent composite. Must not be <code>null</code>.

+	 * @param style The section style.

+	 * @param labels The list of label to apply to the created buttons in the given order. Must not be <code>null</code>.

+	 */

+	public AbstractTreeSection(IManagedForm form, Composite parent, int style, String[] labels) {

+		this(form, parent, style, true, labels);

+	}

+

+	/**

+	 * Constructor.

+	 *

+	 * @param form The parent managed form. Must not be <code>null</code>.

+	 * @param parent The parent composite. Must not be <code>null</code>.

+	 * @param style The section style.

+	 * @param titleBar If <code>true</code>, the title bar style bit is added to <code>style</code>.

+	 * @param labels The list of label to apply to the created buttons in the given order. Must not be <code>null</code>.

+	 */

+	public AbstractTreeSection(IManagedForm form, Composite parent, int style, boolean titleBar, String[] labels) {

+		super(form, parent, style, titleBar, labels);

+

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tm.te.ui.forms.parts.AbstractStructuredViewerSection#createViewerPart(java.lang.String[])

+	 */

+	@Override

+	protected AbstractStructuredViewerPart createViewerPart(String[] labels) {

+		return new TreePartAdapter(labels);

+	}

+

+	/**

+	 * Returns the tree part instance.

+	 *

+	 * @return The tree part instance.

+	 */

+	protected TreePart getTreePart() {

+		return (TreePart)getViewerPart();

+	}

+

+	/**

+	 * Creates the tree viewer instance.

+	 *

+	 * @param parent The parent composite. Must not be <code>null</code>.

+	 * @param style The viewer style.

+	 *

+	 * @return The tree viewer instance.

+	 */

+	protected TreeViewer createTreeViewer(Composite parent, int style) {

+		return new TreeViewer(parent, style);

+	}

+

+	/**

+	 * Configures the tree viewer instance.

+	 *

+	 * @param viewer The tree viewer instance. Must not be <code>null</code<.

+	 */

+	protected void configureTreeViewer(TreeViewer viewer) {

+		Assert.isNotNull(viewer);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)

+	 */

+	public void selectionChanged(SelectionChangedEvent event) {

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)

+	 */

+	public void doubleClick(DoubleClickEvent event) {

+	}

+

+	/**

+	 * Initialize the enablement of the buttons in the buttons bar.

+	 * <p>

+	 * Called from {@link TreePartAdapter#createButtonsPanel(Composite, FormToolkit)}.

+	 */

+	protected void initializeButtonsEnablement() {

+	}

+}

diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java
index f6594edfb..564f7e85a 100644
--- a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/TablePart.java
@@ -9,6 +9,7 @@
  *******************************************************************************/

 package org.eclipse.tm.te.ui.forms.parts;

 

+import org.eclipse.core.runtime.Assert;

 import org.eclipse.jface.viewers.DoubleClickEvent;

 import org.eclipse.jface.viewers.IDoubleClickListener;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

@@ -33,15 +34,26 @@ public class TablePart extends AbstractStructuredViewerPart implements ISelectio
 		super(labels);

 	}

 

-	/* (non-Javadoc)

-	 * @see org.eclipse.tm.te.ui.forms.parts.AbstractStructuredViewerPart#createStructuredViewer(org.eclipse.swt.widgets.Composite, int, org.eclipse.ui.forms.widgets.FormToolkit)

+	/**

+	 * Creates the table viewer instance.

+	 *

+	 * @param parent The parent composite. Must not be <code>null</code>.

+	 * @param style The viewer style.

+	 *

+	 * @return The table viewer instance.

 	 */

-	@Override

-	protected StructuredViewer createStructuredViewer(Composite parent, int style, FormToolkit toolkit) {

-		// Adjust the style bits

-		style |= SWT.H_SCROLL | SWT.V_SCROLL | (toolkit != null ? toolkit.getBorderStyle() : SWT.BORDER);

+	protected TableViewer createTableViewer(Composite parent, int style) {

+		return new TableViewer(parent, style);

+	}

+

+	/**

+	 * Configures the table viewer instance.

+	 *

+	 * @param viewer The table viewer instance. Must not be <code>null</code<.

+	 */

+	protected void configureTableViewer(TableViewer viewer) {

+		Assert.isNotNull(viewer);

 

-		TableViewer viewer = new TableViewer(parent, style);

 		viewer.addSelectionChangedListener(new ISelectionChangedListener() {

 			public void selectionChanged(SelectionChangedEvent e) {

 				TablePart.this.selectionChanged(e);

@@ -52,6 +64,21 @@ public class TablePart extends AbstractStructuredViewerPart implements ISelectio
 				TablePart.this.doubleClick(e);

 			}

 		});

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tm.te.ui.forms.parts.AbstractStructuredViewerPart#createStructuredViewer(org.eclipse.swt.widgets.Composite, int, org.eclipse.ui.forms.widgets.FormToolkit)

+	 */

+	@Override

+	protected StructuredViewer createStructuredViewer(Composite parent, int style, FormToolkit toolkit) {

+		Assert.isNotNull(parent);

+

+		// Adjust the style bits

+		style |= SWT.H_SCROLL | SWT.V_SCROLL | (toolkit != null ? toolkit.getBorderStyle() : SWT.BORDER);

+

+		TableViewer viewer = createTableViewer(parent, style);

+		Assert.isNotNull(viewer);

+		configureTableViewer(viewer);

 

 		return viewer;

 	}

diff --git a/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java
new file mode 100644
index 000000000..90569787b
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tm.te.ui/src/org/eclipse/tm/te/ui/forms/parts/TreePart.java
@@ -0,0 +1,108 @@
+/*******************************************************************************

+ * Copyright (c) 2011 Wind River Systems, Inc. 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:

+ * Wind River Systems - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.tm.te.ui.forms.parts;

+

+import org.eclipse.core.runtime.Assert;

+import org.eclipse.jface.viewers.DoubleClickEvent;

+import org.eclipse.jface.viewers.IDoubleClickListener;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.StructuredViewer;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.forms.widgets.FormToolkit;

+

+/**

+ * Target Explorer: Tree part implementation.

+ */

+public class TreePart extends AbstractStructuredViewerPart implements ISelectionChangedListener, IDoubleClickListener {

+

+	/**

+	 * Constructor.

+	 *

+	 * @param labels The list of label to apply to the created buttons in the given order. Must not be <code>null</code>.

+	 */

+	public TreePart(String[] labels) {

+		super(labels);

+

+	}

+

+	/**

+	 * Creates the tree viewer instance.

+	 *

+	 * @param parent The parent composite. Must not be <code>null</code>.

+	 * @param style The viewer style.

+	 *

+	 * @return The tree viewer instance.

+	 */

+	protected TreeViewer createTreeViewer(Composite parent, int style) {

+		return new TreeViewer(parent, style);

+	}

+

+	/**

+	 * Configures the tree viewer instance.

+	 *

+	 * @param viewer The tree viewer instance. Must not be <code>null</code<.

+	 */

+	protected void configureTreeViewer(TreeViewer viewer) {

+		Assert.isNotNull(viewer);

+

+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {

+			public void selectionChanged(SelectionChangedEvent e) {

+				TreePart.this.selectionChanged(e);

+			}

+		});

+		viewer.addDoubleClickListener(new IDoubleClickListener() {

+			public void doubleClick(DoubleClickEvent e) {

+				TreePart.this.doubleClick(e);

+			}

+		});

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tm.te.ui.forms.parts.AbstractStructuredViewerPart#createStructuredViewer(org.eclipse.swt.widgets.Composite, int, org.eclipse.ui.forms.widgets.FormToolkit)

+	 */

+	@Override

+	protected StructuredViewer createStructuredViewer(Composite parent, int style, FormToolkit toolkit) {

+		Assert.isNotNull(parent);

+

+		// Adjust the style bits

+		style |= SWT.H_SCROLL | SWT.V_SCROLL | (toolkit != null ? toolkit.getBorderStyle() : SWT.BORDER);

+

+		TreeViewer viewer = createTreeViewer(parent, style);

+		Assert.isNotNull(viewer);

+		configureTreeViewer(viewer);

+

+		return viewer;

+	}

+

+	/**

+	 * Returns the tree viewer instance.

+	 *

+	 * @return The tree viewer instance or <code>null</code>.

+	 */

+	protected TreeViewer getTreeViewer() {

+		return (TreeViewer)getViewer();

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)

+	 */

+	public void selectionChanged(SelectionChangedEvent event) {

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)

+	 */

+	public void doubleClick(DoubleClickEvent event) {

+	}

+

+}