You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2010/08/09 10:47:14 UTC
svn commit: r983555 -
/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/PackageContentsSection.java
Author: dsavage
Date: Mon Aug 9 08:47:14 2010
New Revision: 983555
URL: http://svn.apache.org/viewvc?rev=983555&view=rev
Log:
start work on view for -contents details
Added:
felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/PackageContentsSection.java
Added: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/PackageContentsSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/PackageContentsSection.java?rev=983555&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/PackageContentsSection.java (added)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/editors/project/PackageContentsSection.java Mon Aug 9 08:47:14 2010
@@ -0,0 +1,280 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.ui.internal.editors.project;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
+import org.apache.felix.sigil.eclipse.ui.internal.form.SigilPage;
+import org.apache.felix.sigil.eclipse.ui.internal.form.SigilSection;
+import org.apache.felix.sigil.eclipse.ui.util.BackgroundLoadingSelectionDialog;
+import org.apache.felix.sigil.eclipse.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.eclipse.ui.util.IElementDescriptor;
+import org.apache.felix.sigil.eclipse.ui.util.IFilter;
+import org.apache.felix.sigil.eclipse.ui.util.ModelLabelProvider;
+import org.apache.felix.sigil.eclipse.ui.util.SelectionDialog;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.forms.widgets.TableWrapData;
+import org.eclipse.ui.forms.widgets.TableWrapLayout;
+
+public class PackageContentsSection extends SigilSection
+{
+
+ private ProjectTableViewer viewer;
+// private final Comparator<IClasspathEntry> CLASSPATH_COMPARATOR = new Comparator<IClasspathEntry>()
+// {
+// public int compare(IClasspathEntry o1, IClasspathEntry o2)
+// {
+// return compareClasspaths(o1, o2);
+// }
+// };
+
+ public PackageContentsSection(SigilPage page, Composite parent, ISigilProjectModel project) throws CoreException
+ {
+ super(page, parent, project);
+ }
+
+ @Override
+ protected void createSection(Section section, FormToolkit toolkit)
+ {
+ setTitle("Packages");
+
+ Composite body = createGridBody(2, false, toolkit);
+
+ Label label = toolkit.createLabel(body,
+ "Specify which packages should be included in this bundle.");
+ label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, true, 2, 1));
+
+ Table bundleTable = toolkit.createTable(body, SWT.MULTI | SWT.FULL_SELECTION
+ | SWT.VIRTUAL | SWT.BORDER);
+ GridData tableLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+ tableLayoutData.heightHint = 150;
+ bundleTable.setLayoutData(tableLayoutData);
+
+ createButtons(body, toolkit);
+ createViewer(bundleTable);
+ }
+
+ private void createButtons(Composite body, FormToolkit toolkit)
+ {
+ Composite buttons = toolkit.createComposite(body);
+ TableWrapLayout layout = new TableWrapLayout();
+ layout.numColumns = 1;
+ layout.topMargin = 0;
+ layout.leftMargin = 0;
+ layout.rightMargin = 0;
+ layout.bottomMargin = 0;
+ buttons.setLayout(layout);
+
+ Button add = toolkit.createButton(buttons, "Add", SWT.NULL);
+ add.setLayoutData(new TableWrapData(TableWrapData.FILL));
+ add.addSelectionListener(new SelectionAdapter()
+ {
+ public void widgetSelected(SelectionEvent e)
+ {
+ handleAdd();
+ }
+ });
+
+ Button remove = toolkit.createButton(buttons, "Remove", SWT.NULL);
+ remove.setLayoutData(new TableWrapData(TableWrapData.FILL));
+ remove.addSelectionListener(new SelectionAdapter()
+ {
+ public void widgetSelected(SelectionEvent e)
+ {
+ handleRemoved();
+ }
+ });
+ }
+
+ private void createViewer(Table bundleTable)
+ {
+ viewer = new ProjectTableViewer(bundleTable);
+ viewer.setContentProvider(new DefaultTableProvider()
+ {
+ public Object[] getElements(Object inputElement)
+ {
+ // TODO sort?
+ return getBundle().getPackages().toArray(new String[0]);
+ }
+ });
+// viewer.setComparator(new ViewerComparator()
+// {
+// @Override
+// public int category(Object element)
+// {
+// return index((IClasspathEntry) element);
+// }
+// });
+ }
+
+ protected ISigilBundle getBundle()
+ {
+ return getProjectModel().getBundle();
+ }
+
+ private void handleAdd()
+ {
+// try
+// {
+// SelectionDialog<E> dialog = new BackgroundLoadingSelectionDialog<IClasspathEntry>(
+// getSection().getShell(), "Classpath Entry:", true);
+//
+// dialog.setDescriptor(new IElementDescriptor<IClasspathEntry>()
+// {
+// public String getName(IClasspathEntry element)
+// {
+// return element.getPath().toString();
+// }
+//
+// public String getLabel(IClasspathEntry element)
+// {
+// return getName(element);
+// }
+// });
+//
+// dialog.setLabelProvider(new ModelLabelProvider());
+//
+// dialog.setFilter(new IFilter<IClasspathEntry>()
+// {
+// public boolean select(IClasspathEntry cp)
+// {
+// switch (cp.getEntryKind())
+// {
+// case IClasspathEntry.CPE_LIBRARY:
+// case IClasspathEntry.CPE_VARIABLE:
+// case IClasspathEntry.CPE_SOURCE:
+// return !getBundle().getClasspathEntrys().contains(encode(cp));
+// default:
+// return false;
+// }
+// }
+// });
+//
+// dialog.setComparator(CLASSPATH_COMPARATOR);
+//
+// IClasspathEntry[] classpath = getProjectModel().getJavaModel().getRawClasspath();
+// dialog.addElements(Arrays.asList(classpath));
+// if (dialog.open() == Window.OK)
+// {
+// List<IClasspathEntry> selectedElements = dialog.getSelectedElements();
+//
+// Object[] added = selectedElements.toArray();
+// for (IClasspathEntry entry : selectedElements)
+// {
+// getBundle().addClasspathEntry(encode(entry));
+// }
+// viewer.add(added);
+// viewer.refresh();
+// markDirty();
+// }
+// }
+// catch (JavaModelException e)
+// {
+// ErrorDialog.openError(getSection().getShell(), "Error", null, e.getStatus());
+// }
+ }
+
+// private int compareClasspaths(IClasspathEntry o1, IClasspathEntry o2)
+// {
+// if (o1.getEntryKind() == o2.getEntryKind())
+// {
+// ModelLabelProvider mlp = viewer.getLabelProvider();
+// return mlp.getText(o1).compareTo(mlp.getText(o2));
+// }
+// else
+// {
+// int i1 = index(o1);
+// int i2 = index(o2);
+//
+// if (i1 < i2)
+// {
+// return -1;
+// }
+// else
+// {
+// return 1;
+// }
+// }
+// }
+
+// private static int index(IClasspathEntry o1)
+// {
+// switch (o1.getEntryKind())
+// {
+// case IClasspathEntry.CPE_SOURCE:
+// return 0;
+// case IClasspathEntry.CPE_PROJECT:
+// return 1;
+// case IClasspathEntry.CPE_LIBRARY:
+// return 2;
+// case IClasspathEntry.CPE_VARIABLE:
+// return 3;
+// case IClasspathEntry.CPE_CONTAINER:
+// return 4;
+// default:
+// throw new IllegalStateException("Unknown classpath entry type " + o1);
+// }
+// }
+
+// private String encode(IClasspathEntry cp)
+// {
+// return getProjectModel().getJavaModel().encodeClasspathEntry(cp).trim();
+// }
+
+ @SuppressWarnings("unchecked")
+ private void handleRemoved()
+ {
+ IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+
+ if (!selection.isEmpty())
+ {
+ for (Iterator<String> i = selection.iterator(); i.hasNext();)
+ {
+ getBundle().removePackage(i.next());
+ }
+ viewer.remove(selection.toArray());
+ markDirty();
+ }
+ }
+}