JBoss Tools SVN: r28313 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools: deltacloud/ui/views/cloudelements and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-17 13:49:35 -0500 (Mon, 17 Jan 2011)
New Revision: 28313
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java
Log:
[JBIDE-8134][JBIDE-8135]
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.swt.graphics.Image;
+
+
+/**
+ * @author Jeff Johnston
+ * @author André Dietisheim
+ */
+public class Columns<MODEL> {
+
+ public abstract static class Column<MODEL> {
+
+ private String name;
+ private int weight;
+
+ public Column(String name, int weight) {
+ this.name = name;
+ this.weight = weight;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public abstract String getColumnText(MODEL model);
+
+ public Image getColumnImage(MODEL model) {
+ return null;
+ }
+ }
+
+ private Column<MODEL>[] columns;
+
+ public Columns(Column<MODEL>... columns) {
+ this.columns = columns;
+ }
+
+ public Column<MODEL>[] getColumns() {
+ return columns;
+ }
+
+ public Column<MODEL> getColumn(int columnIndex) {
+ if (columns == null || columnIndex < 0 || columnIndex >= columns.length) {
+ return null;
+ }
+ return columns[columnIndex];
+ }
+
+ public int getSize() {
+ if (columns == null) {
+ return 0;
+ }
+ return columns.length;
+ }
+}
\ No newline at end of file
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
+
+/**
+ * @author André Dietisheim
+ */
+public class DeltaCloudImageColumns extends Columns<DeltaCloudImage> {
+
+ @SuppressWarnings("unchecked")
+ public DeltaCloudImageColumns() {
+ super(
+ new Column<DeltaCloudImage>("NAME", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getName();
+ }
+ },
+ new Column<DeltaCloudImage>("ID", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getId();
+ }
+ },
+ new Column<DeltaCloudImage>("ARCH", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getArchitecture();
+ }
+ },
+ new Column<DeltaCloudImage>("DESC", 40) {
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getDescription();
+ }
+ });
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance.State;
+import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
+
+/**
+ * @author André Dietisheim
+ */
+public class DeltaCloudInstanceColumns extends Columns<DeltaCloudInstance> {
+
+ @SuppressWarnings("unchecked")
+ public DeltaCloudInstanceColumns() {
+ super(
+ new Column<DeltaCloudInstance>("NAME", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getName();
+ }
+ },
+ new Column<DeltaCloudInstance>("ALIAS", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getId();
+ }
+ },
+ new Column<DeltaCloudInstance>("STATUS", 20) {
+
+ @Override
+ public Image getColumnImage(DeltaCloudInstance instance) {
+ State state = instance.getState();
+ if (DeltaCloudInstance.State.STOPPED.equals(state)) {
+ return SWTImagesFactory.get(SWTImagesFactory.IMG_STOPPED);
+ } else if (DeltaCloudInstance.State.RUNNING.equals(state)) {
+ return SWTImagesFactory.get(SWTImagesFactory.IMG_RUNNING);
+ } else if (DeltaCloudInstance.State.BOGUS.equals(state)) {
+ return PlatformUI.getWorkbench().getSharedImages().
+ getImage(ISharedImages.IMG_DEC_FIELD_WARNING);
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getState().toString();
+ }
+ },
+ new Column<DeltaCloudInstance>("HOSTNAME", 40) {
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getHostName();
+ }
+ });
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -52,6 +52,8 @@
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
import org.jboss.tools.internal.deltacloud.ui.preferences.StringPreferenceValue;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
@@ -227,10 +229,10 @@
Table table = viewer.getTable();
table.setHeaderVisible(true);
table.setLinesVisible(true);
- ITableContentAndLabelProvider provider = getContentAndLabelProvider();
+ ITableContentAndLabelProvider<CLOUDELEMENT> provider = getContentAndLabelProvider();
viewer.setContentProvider(provider);
viewer.setLabelProvider(provider);
- createColumns(tableLayout, table);
+ createColumns(provider, tableLayout, table);
viewer.setComparator(new TableViewerColumnComparator());
table.setSortDirection(SWT.NONE);
@@ -238,8 +240,8 @@
return viewer;
}
- protected abstract ITableContentAndLabelProvider getContentAndLabelProvider();
-
+ protected abstract ITableContentAndLabelProvider<CLOUDELEMENT> getContentAndLabelProvider();
+
private void setViewerInput(DeltaCloud cloud) {
viewer.setInput(cloud);
}
@@ -304,15 +306,16 @@
return clouds[cloudIndex];
}
- private void createColumns(TableColumnLayout tableLayout, Table table) {
- for (int i = 0; i < InstanceViewLabelAndContentProvider.Column.getSize(); ++i) {
- InstanceViewLabelAndContentProvider.Column c =
- InstanceViewLabelAndContentProvider.Column.getColumn(i);
+ private void createColumns(ITableContentAndLabelProvider<CLOUDELEMENT> provider, TableColumnLayout tableLayout, Table table) {
+ Columns<CLOUDELEMENT> columns = provider.getColumns();
+
+ for (int i = 0; i < columns.getSize(); ++i) {
+ Column<CLOUDELEMENT> c = columns.getColumn(i);
TableColumn tc = new TableColumn(table, SWT.NONE);
if (i == 0) {
table.setSortColumn(tc);
}
- tc.setText(CVMessages.getString(c.name()));
+ tc.setText(CVMessages.getString(c.getName()));
tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
tc.addSelectionListener(new ColumnListener(i));
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -10,20 +10,11 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.ui.views.cloudelements;
-import java.beans.PropertyChangeListener;
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.BaseLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudException;
-import org.jboss.tools.deltacloud.core.ICloudElementFilter;
+import org.eclipse.swt.graphics.Image;
import org.jboss.tools.deltacloud.core.IDeltaCloudElement;
-import org.jboss.tools.deltacloud.ui.ErrorUtils;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
/**
* A common superclass for content- and label-providers that operate on
@@ -33,124 +24,40 @@
* @author Andre Dietisheim
*/
public abstract class AbstractCloudElementViewLabelAndContentProvider<CLOUDELEMENT extends IDeltaCloudElement> extends
- BaseLabelProvider implements ITableContentAndLabelProvider, PropertyChangeListener {
+ BaseLabelProvider implements ITableContentAndLabelProvider<CLOUDELEMENT> {
- private DeltaCloud currentCloud;
- private ICloudElementFilter<CLOUDELEMENT> localFilter;
- private TableViewer viewer;
+ private Columns<CLOUDELEMENT> columns;
- private AtomicReference<CLOUDELEMENT[]> elementsReference = new AtomicReference<CLOUDELEMENT[]>();
-
+ @SuppressWarnings("unchecked")
@Override
- public Object[] getElements(Object input) {
- try {
- return filter(getFilter(currentCloud), elementsReference.get());
- } catch (DeltaCloudException e) {
- ErrorUtils.handleError(
- "Error", MessageFormat.format(
- "Could not filter the elements for cloud \"{0}\"", currentCloud.getName()),
- e, viewer.getControl().getDisplay().getActiveShell());
- return new Object[] {};
+ public String getColumnText(Object element, int columnIndex) {
+ Columns<CLOUDELEMENT> columns = getColumns();
+ Column<CLOUDELEMENT> c = columns.getColumn(columnIndex);
+ if (c == null) {
+ return null;
}
+
+ return c.getColumnText((CLOUDELEMENT) element);
}
+ @SuppressWarnings("unchecked")
@Override
- public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
- if (!(newInput instanceof DeltaCloud)) {
- return;
+ public Image getColumnImage(Object element, int columnIndex) {
+ Columns<CLOUDELEMENT> columns = getColumns();
+ Column<CLOUDELEMENT> c = columns.getColumn(columnIndex);
+ if (c == null
+ || c == null) {
+ return null;
}
- Assert.isLegal(viewer instanceof TableViewer);
- this.viewer = (TableViewer) viewer;
- removeListener(currentCloud);
- this.currentCloud = (DeltaCloud) newInput;
- addPropertyChangeListener(currentCloud);
- asyncGetCloudElements(currentCloud);
+ return c.getColumnImage((CLOUDELEMENT) element);
}
- protected void setCloudElements(CLOUDELEMENT[] elements) {
- this.elementsReference.set(elements);
- refreshViewer();
- }
-
- private void refreshViewer() {
- viewer.getControl().getDisplay().asyncExec(new Runnable() {
-
- @Override
- public void run() {
- viewer.refresh();
- }
- });
- }
-
- protected boolean isCurrentCloud(final DeltaCloud cloud) {
- return cloud != null
- && currentCloud != null
- && cloud.getName().equals(currentCloud.getName());
- }
-
- // protected void addToViewer(final CLOUDELEMENT[] cloudElements) {
- // viewer.getControl().getDisplay().asyncExec(new Runnable() {
- //
- // @Override
- // public void run() {
- // try {
- // clearTableViewer();
- // Object[] elements = filter(getFilter(currentCloud), cloudElements);
- // viewer.add(elements);
- // } catch (DeltaCloudException e) {
- // // TODO: internationalize strings
- // ErrorUtils.handleError(
- // "Error", "Could not filter the elements for cloud " +
- // currentCloud.getName(),
- // e, Display.getDefault().getActiveShell());
- //
- // }
- // }
- // });
- // }
-
- public void setFilter(ICloudElementFilter<CLOUDELEMENT> filter) {
- this.localFilter = filter;
- }
-
- private ICloudElementFilter<CLOUDELEMENT> getFilter(DeltaCloud cloud) {
- if (localFilter != null) {
- return localFilter;
- } else {
- return getCloudFilter(cloud);
+ public Columns<CLOUDELEMENT> getColumns() {
+ if (columns == null) {
+ this.columns = createColumns();
}
+ return columns;
}
- protected Object[] filter(ICloudElementFilter<CLOUDELEMENT> filter, CLOUDELEMENT[] cloudElements)
- throws DeltaCloudException {
- if (cloudElements == null) {
- return new Object[] {};
- }
- if (filter == null) {
- return cloudElements;
- } else {
- return filter.filter(cloudElements).toArray();
- }
- }
-
- @Override
- public void dispose() {
- removeListener(currentCloud);
- }
-
- protected void removeListener(DeltaCloud cloud) {
- if (cloud != null) {
- cloud.removePropertyChangeListener(this);
- }
- }
-
- protected void clearTableViewer() {
- viewer.setInput(Collections.emptyList());
- }
-
- protected abstract ICloudElementFilter<CLOUDELEMENT> getCloudFilter(DeltaCloud cloud);
-
- protected abstract void asyncGetCloudElements(DeltaCloud cloud);
-
- protected abstract void addPropertyChangeListener(DeltaCloud cloud);
+ protected abstract Columns<CLOUDELEMENT> createColumns();
}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * 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:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views.cloudelements;
+
+import java.beans.PropertyChangeListener;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.deltacloud.core.ICloudElementFilter;
+import org.jboss.tools.deltacloud.core.IDeltaCloudElement;
+import org.jboss.tools.deltacloud.ui.ErrorUtils;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
+
+/**
+ * A common superclass for content- and label-providers that operate on
+ * IDeltaCloudElements (currently DeltaCloudImage and DeltaCloudInstance)
+ *
+ * @author Jeff Johnston
+ * @author Andre Dietisheim
+ */
+public abstract class AbstractSelectableCloudViewLabelAndContentProvider<CLOUDELEMENT extends IDeltaCloudElement> extends
+ AbstractCloudElementViewLabelAndContentProvider<CLOUDELEMENT> implements PropertyChangeListener {
+
+ private DeltaCloud currentCloud;
+ private ICloudElementFilter<CLOUDELEMENT> localFilter;
+ private TableViewer viewer;
+ private AtomicReference<CLOUDELEMENT[]> elementsReference = new AtomicReference<CLOUDELEMENT[]>();
+
+ @Override
+ public Object[] getElements(Object input) {
+ try {
+ return filter(getFilter(currentCloud), elementsReference.get());
+ } catch (DeltaCloudException e) {
+ ErrorUtils.handleError(
+ "Error", MessageFormat.format(
+ "Could not filter the elements for cloud \"{0}\"", currentCloud.getName()),
+ e, viewer.getControl().getDisplay().getActiveShell());
+ return new Object[] {};
+ }
+ }
+
+ @Override
+ public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
+ if (!(newInput instanceof DeltaCloud)) {
+ return;
+ }
+ Assert.isLegal(viewer instanceof TableViewer);
+ this.viewer = (TableViewer) viewer;
+ removeListener(currentCloud);
+ this.currentCloud = (DeltaCloud) newInput;
+ addPropertyChangeListener(currentCloud);
+ asyncGetCloudElements(currentCloud);
+ }
+
+ protected void setCloudElements(CLOUDELEMENT[] elements) {
+ this.elementsReference.set(elements);
+ refreshViewer();
+ }
+
+ private void refreshViewer() {
+ viewer.getControl().getDisplay().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ viewer.refresh();
+ }
+ });
+ }
+
+ protected boolean isCurrentCloud(final DeltaCloud cloud) {
+ return cloud != null
+ && currentCloud != null
+ && cloud.getName().equals(currentCloud.getName());
+ }
+
+ public void setFilter(ICloudElementFilter<CLOUDELEMENT> filter) {
+ this.localFilter = filter;
+ }
+
+ private ICloudElementFilter<CLOUDELEMENT> getFilter(DeltaCloud cloud) {
+ if (localFilter != null) {
+ return localFilter;
+ } else {
+ return getCloudFilter(cloud);
+ }
+ }
+
+ protected Object[] filter(ICloudElementFilter<CLOUDELEMENT> filter, CLOUDELEMENT[] cloudElements)
+ throws DeltaCloudException {
+ if (cloudElements == null) {
+ return new Object[] {};
+ }
+ if (filter == null) {
+ return cloudElements;
+ } else {
+ return filter.filter(cloudElements).toArray();
+ }
+ }
+
+ @Override
+ public void dispose() {
+ removeListener(currentCloud);
+ }
+
+ protected void removeListener(DeltaCloud cloud) {
+ if (cloud != null) {
+ cloud.removePropertyChangeListener(this);
+ }
+ }
+
+ protected void clearTableViewer() {
+ viewer.setInput(Collections.emptyList());
+ }
+
+ protected abstract ICloudElementFilter<CLOUDELEMENT> getCloudFilter(DeltaCloud cloud);
+
+ protected abstract void asyncGetCloudElements(DeltaCloud cloud);
+
+ protected abstract void addPropertyChangeListener(DeltaCloud cloud);
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public String getColumnText(Object element, int columnIndex) {
+ Columns<CLOUDELEMENT> columns = getColumns();
+ Column<CLOUDELEMENT> c = columns.getColumn(columnIndex);
+ if (c == null) {
+ return null;
+ }
+
+ return c.getColumnText((CLOUDELEMENT) element);
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -12,10 +12,13 @@
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.jboss.tools.deltacloud.ui.views.Columns;
/**
* @author Andre Dietisheim
*/
-public interface ITableContentAndLabelProvider extends IStructuredContentProvider, ITableLabelProvider{
+public interface ITableContentAndLabelProvider<MODEL> extends IStructuredContentProvider, ITableLabelProvider{
+ public Columns<MODEL> getColumns();
+
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -35,7 +35,7 @@
}
@Override
- protected ITableContentAndLabelProvider getContentAndLabelProvider() {
+ protected ITableContentAndLabelProvider<DeltaCloudImage> getContentAndLabelProvider() {
return new ImageViewLabelAndContentProvider();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -12,9 +12,6 @@
import java.beans.PropertyChangeEvent;
import java.text.MessageFormat;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -26,74 +23,26 @@
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.DeltaCloudImageColumns;
/**
* @author Jeff Johnston
* @author André Dietisheim
*/
-public class ImageViewLabelAndContentProvider extends AbstractCloudElementViewLabelAndContentProvider<DeltaCloudImage>
- implements ITableContentAndLabelProvider {
+public class ImageViewLabelAndContentProvider extends AbstractSelectableCloudViewLabelAndContentProvider<DeltaCloudImage>
+ implements ITableContentAndLabelProvider<DeltaCloudImage> {
- public enum Column {
- NAME(0, 20),
- ID(1, 20),
- ARCH(2, 20),
- DESC(3, 40);
-
- private int column;
- private int weight;
- private static final Map<Integer, Column> lookup = new HashMap<Integer, Column>();
-
- static {
- for (Column c : EnumSet.allOf(Column.class))
- lookup.put(c.getColumnNumber(), c);
- }
-
- private Column(int column, int weight) {
- this.column = column;
- this.weight = weight;
- }
-
- public int getColumnNumber() {
- return column;
- }
-
- public int getWeight() {
- return weight;
- }
-
- public static Column getColumn(int number) {
- return lookup.get(number);
- }
-
- public static int getSize() {
- return lookup.size();
- }
-
- };
-
@Override
+ public Columns<DeltaCloudImage> createColumns() {
+ return new DeltaCloudImageColumns();
+ }
+
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
- @Override
- public String getColumnText(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudImage i = (DeltaCloudImage) element;
- switch (c) {
- case NAME:
- return i.getName();
- case ID:
- return i.getId();
- case ARCH:
- return i.getArchitecture();
- case DESC:
- return i.getDescription();
- }
- return "";
- }
-
protected ICloudElementFilter<DeltaCloudImage> getCloudFilter(DeltaCloud cloud) {
return cloud.getImageFilter();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -36,7 +36,7 @@
}
@Override
- protected ITableContentAndLabelProvider getContentAndLabelProvider() {
+ protected ITableContentAndLabelProvider<DeltaCloudInstance> getContentAndLabelProvider() {
return new InstanceViewLabelAndContentProvider();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -12,113 +12,26 @@
import java.beans.PropertyChangeEvent;
import java.text.MessageFormat;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT;
-import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.DeltaCloudInstanceColumns;
/**
* @author Jeff Jonhston
* @author Andre Dietisheim
*/
public class InstanceViewLabelAndContentProvider extends
- AbstractCloudElementViewLabelAndContentProvider<DeltaCloudInstance> implements ITableContentAndLabelProvider {
+AbstractSelectableCloudViewLabelAndContentProvider<DeltaCloudInstance> implements ITableContentAndLabelProvider<DeltaCloudInstance> {
- public enum Column {
- NAME(0, 20),
- ID(1, 20),
- STATUS(2, 6),
- HOSTNAME(3, 40);
-
- private int column;
- private int weight;
- private static final Map<Integer, Column> lookup = new HashMap<Integer, Column>();
-
- static {
- for (Column c : EnumSet.allOf(Column.class))
- lookup.put(c.getColumnNumber(), c);
- }
-
- private Column(int column, int weight) {
- this.column = column;
- this.weight = weight;
- }
-
- public int getColumnNumber() {
- return column;
- }
-
- public int getWeight() {
- return weight;
- }
-
- public static Column getColumn(int number) {
- return lookup.get(number);
- }
-
- public static int getSize() {
- return lookup.size();
- }
-
- };
-
- @Override
- public Image getColumnImage(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudInstance i = (DeltaCloudInstance) element;
- switch (c) {
- case STATUS:
- return getStatusIcon(i.getState());
- default:
- return null;
- }
- }
-
- private Image getStatusIcon(DeltaCloudInstance.State status) {
- if (DeltaCloudInstance.State.STOPPED.equals(status)) {
- return SWTImagesFactory.get(SWTImagesFactory.IMG_STOPPED);
- } else if (DeltaCloudInstance.State.RUNNING.equals(status)) {
- return SWTImagesFactory.get(SWTImagesFactory.IMG_RUNNING);
- } else if (DeltaCloudInstance.State.BOGUS.equals(status)) {
- return PlatformUI.getWorkbench().getSharedImages().
- getImage(ISharedImages.IMG_DEC_FIELD_WARNING);
- } else {
- return null;
- }
- }
-
- @Override
- public String getColumnText(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudInstance i = (DeltaCloudInstance) element;
- if (i != null) {
- switch (c) {
- case NAME:
- return i.getName();
- case ID:
- return i.getId();
- case STATUS:
- return "";
- case HOSTNAME:
- return i.getHostName();
- }
- }
- return "";
- }
-
protected ICloudElementFilter<DeltaCloudInstance> getCloudFilter(DeltaCloud cloud) {
return cloud.getInstanceFilter();
}
@@ -164,4 +77,9 @@
currentCloud.addPropertyChangeListener(DeltaCloud.PROP_INSTANCES, this);
}
}
+
+ @Override
+ protected Columns<DeltaCloudInstance> createColumns() {
+ return new DeltaCloudInstanceColumns();
+ }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -47,6 +47,9 @@
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
+import org.jboss.tools.deltacloud.ui.views.cloudelements.ITableContentAndLabelProvider;
import org.jboss.tools.deltacloud.ui.views.cloudelements.TableViewerColumnComparator;
/**
@@ -216,22 +219,12 @@
Table table = viewer.getTable();
table.setHeaderVisible(true);
table.setLinesVisible(true);
- FindImagePageLabelAndContentProvider contentProvider = new FindImagePageLabelAndContentProvider();
- viewer.setContentProvider(contentProvider);
- viewer.setLabelProvider(contentProvider);
+ FindImagePageLabelAndContentProvider provider = new FindImagePageLabelAndContentProvider();
+ viewer.setContentProvider(provider);
+ viewer.setLabelProvider(provider);
TableViewerColumnComparator comparator = new TableViewerColumnComparator();
viewer.setComparator(comparator);
-
- for (int i = 0; i < FindImagePageLabelAndContentProvider.Column.getSize(); ++i) {
- FindImagePageLabelAndContentProvider.Column c =
- FindImagePageLabelAndContentProvider.Column.getColumn(i);
- TableColumn tc = new TableColumn(table, SWT.NONE);
- if (i == 0)
- table.setSortColumn(tc);
- tc.setText(CVMessages.getString(c.name()));
- tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
- tc.addSelectionListener(new ColumnListener(i, viewer));
- }
+ createColumns(provider, tableLayout, table);
table.setSortDirection(SWT.NONE);
Point p1 = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
@@ -300,6 +293,21 @@
validate();
}
+ private void createColumns(ITableContentAndLabelProvider<DeltaCloudImage> provider, TableColumnLayout tableLayout,
+ Table table) {
+ Columns<DeltaCloudImage> columns = provider.getColumns();
+ for (int i = 0; i < columns.getSize(); ++i) {
+ Column<DeltaCloudImage> c = columns.getColumn(i);
+ TableColumn tc = new TableColumn(table, SWT.NONE);
+ if (i == 0) {
+ table.setSortColumn(tc);
+ }
+ tc.setText(CVMessages.getString(c.getName()));
+ tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
+ tc.addSelectionListener(new ColumnListener(i, viewer));
+ }
+ }
+
private void hookSelection() {
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
@@ -342,4 +350,4 @@
}
});
}
-}
+}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java 2011-01-17 18:49:35 UTC (rev 28313)
@@ -10,85 +10,28 @@
*******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.wizards;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.DeltaCloudImageColumns;
+import org.jboss.tools.deltacloud.ui.views.cloudelements.AbstractCloudElementViewLabelAndContentProvider;
import org.jboss.tools.deltacloud.ui.views.cloudelements.ITableContentAndLabelProvider;
/**
* @author Jeff Johnston
* @author André Dietisheim
*/
-public class FindImagePageLabelAndContentProvider implements ITableContentAndLabelProvider {
+public class FindImagePageLabelAndContentProvider extends AbstractCloudElementViewLabelAndContentProvider<DeltaCloudImage> implements ITableContentAndLabelProvider<DeltaCloudImage> {
- public enum Column {
- NAME(0, 20),
- ID(1, 20),
- ARCH(2, 20),
- DESC(3, 40);
-
- private int column;
- private int weight;
- private static final Map<Integer, Column> lookup = new HashMap<Integer, Column>();
-
- static {
- for (Column c : EnumSet.allOf(Column.class))
- lookup.put(c.getColumnNumber(), c);
- }
-
- private Column(int column, int weight) {
- this.column = column;
- this.weight = weight;
- }
-
- public int getColumnNumber() {
- return column;
- }
-
- public int getWeight() {
- return weight;
- }
-
- public static Column getColumn(int number) {
- return lookup.get(number);
- }
-
- public static int getSize() {
- return lookup.size();
- }
-
- };
-
@Override
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
+ public Columns<DeltaCloudImage> createColumns() {
+ return new DeltaCloudImageColumns();
}
- @Override
- public String getColumnText(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudImage i = (DeltaCloudImage) element;
- switch (c) {
- case NAME:
- return i.getName();
- case ID:
- return i.getId();
- case ARCH:
- return i.getArchitecture();
- case DESC:
- return i.getDescription();
- }
- return "";
- }
-
protected ICloudElementFilter<DeltaCloudImage> getCloudFilter(DeltaCloud cloud) {
return cloud.getImageFilter();
}
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28312 - in branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-17 13:46:46 -0500 (Mon, 17 Jan 2011)
New Revision: 28312
Added:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java
Modified:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java
Log:
[JBIDE-8134][JBIDE-8135]
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-17 18:46:46 UTC (rev 28312)
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,javax.servlet@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.tm.terminal.telnet@default:default,org.apache.ant@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.sdk@default:de!
fault,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.resources@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jface.text@default:default,org.eclipse.jem.util@default:default,org.apache.lucene@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.equinox.registry@default:default!
,org.eclipse.equinox.p2.garbagecollector@default:default,org.a!
pache.ja
sper@default:default,org.eclipse.wst.common.modulecore@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.sat4j.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.codegen@default:default,org.apache.xerces@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.ui@default:default,org.!
eclipse.ui@default:default,org.mortbay.jetty.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.forms@default:default,org.eclipse.wst.server.ui@default:default,org.hamcrest.core@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.xml.resolver@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.sat4j.pb@default:default,org.eclipse.osgi@-1:true,org.eclipse.jdt@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.compare@default:default,org.eclipse.help.base@default:!
default,org.eclipse.ui.workbench@default:default,org.eclipse.e!
quinox.h
ttp.servlet@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jst.jee@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.jst.common.project.facet.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.pde.build@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse!
.update.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.wst.xml.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jface@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.core.contenttype@default:default,javax.xml@default:default,com.ibm.icu@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.search@default:default,org.junit4@default:default,org.eclipse.ui.browser@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jst.common.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.databinding.beans@default:default,org.apache.commons.net@default:default,org.eclipse.!
jem@default:default,org.eclipse.ui.views.properties.tabbed@def!
ault:def
ault,org.eclipse.core.databinding.observable@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.swt@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.intro@default:default,javax.servlet.jsp@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.team.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jem.workbench@default:defa!
ult,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.wst.web@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.jobs@default:default,org.apache.xml.serializer@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.rse.core@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.team.core@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.co!
mmon.emfworkbench.integration@default:default,org.apache.commo!
ns.httpc
lient*3.1.0.v201005080502@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.ui.ide@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.net@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.pde.core@default:default,org.eclipse.ui.views.log@default:d!
efault,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.wst.web.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.rse.core@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.intro@default:default,org.eclipse.help.ui@default:default,org.apache.jasper@default:default,org.sat4j.core@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.xml.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.rse.files.ui@default:default,org.sat4j.pb@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.jst.server.core@default:default,org.ecli!
pse.rse.subsystems.files.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.expressions@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.help.base@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.jdt@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.help@default:default,org.eclipse.rse.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.wst.server.ui.doc.user@default:default,com.jcraft.jsch@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.team.core@defa!
ult:default,org.eclipse.core.runtime.compatibility.auth@defaul!
t:defaul
t,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.ecore.xmi@default:default,org.apache.xml.resolver@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui.views.log@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.commons.net@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ui.views@default:default,org.mortbay.jetty.util@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.wst.common.frameworks@d!
efault:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.jem@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.apache.ant@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.resources@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.lucene@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.wst.validation@default:default,org.eclipse.wst.jsdt.ui@default:defau!
lt,org.eclipse.equinox.http.servlet@default:default,org.eclips!
e.jem.wo
rkbench@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jem.proxy@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.ui.ide@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclipse.compare@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.jsch.core@default:default,org.eclipse.text@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.hamcrest.core@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.jst.jee@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.filesystem@defa!
ult:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.jface@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.xerces@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jst.j2ee.web@default:default,org.junit4@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.editors@default:default,org.eclipse.debug.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.wst.common.core@default:default,org.eclips!
e.equinox.common@2:true,com.ibm.icu@default:default,org.eclips!
e.equino
x.p2.metadata.repository@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.core.contenttype@default:default,javax.servlet.jsp@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.mortbay.jetty.server@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ant.core@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.pde.core@default:default,org.eclipse.ui@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jem.util@default:defau!
lt,org.apache.xml.serializer@default:default,javax.servlet@default:default,org.eclipse.search@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.tm.terminal.telnet@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.browser@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.rse.services@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.team.ui@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.junit.runtime@default:default,org.ecl!
ipse.update.core@default:default,org.eclipse.jdt.debug@default!
:default
,org.eclipse.emf.ecore.edit@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.compare.core@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,javax.xml@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.wst.ht!
ml.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.wst.web@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.registry@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.tools.common@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.core@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2011-01-17 18:46:46 UTC (rev 28312)
@@ -76,6 +76,7 @@
CreateInstance.label=Launch Instance
NAME=Name
+ALIAS=Alias
ID=ID
HOSTNAME=Public Hostname
STATUS=State
Added: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java (rev 0)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.swt.graphics.Image;
+
+
+/**
+ * @author Jeff Johnston
+ * @author André Dietisheim
+ */
+public class Columns<MODEL> {
+
+ public abstract static class Column<MODEL> {
+
+ private String name;
+ private int weight;
+
+ public Column(String name, int weight) {
+ this.name = name;
+ this.weight = weight;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public abstract String getColumnText(MODEL model);
+
+ public Image getColumnImage(MODEL model) {
+ return null;
+ }
+ }
+
+ private Column<MODEL>[] columns;
+
+ public Columns(Column<MODEL>... columns) {
+ this.columns = columns;
+ }
+
+ public Column<MODEL>[] getColumns() {
+ return columns;
+ }
+
+ public Column<MODEL> getColumn(int columnIndex) {
+ if (columns == null || columnIndex < 0 || columnIndex >= columns.length) {
+ return null;
+ }
+ return columns[columnIndex];
+ }
+
+ public int getSize() {
+ if (columns == null) {
+ return 0;
+ }
+ return columns.length;
+ }
+}
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/Columns.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java (rev 0)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
+
+public class DeltaCloudImageColumns extends Columns<DeltaCloudImage> {
+
+ @SuppressWarnings("unchecked")
+ public DeltaCloudImageColumns() {
+ super(
+ new Column<DeltaCloudImage>("NAME", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getName();
+ }
+ },
+ new Column<DeltaCloudImage>("ID", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getId();
+ }
+ },
+ new Column<DeltaCloudImage>("ARCH", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getArchitecture();
+ }
+ },
+ new Column<DeltaCloudImage>("DESC", 40) {
+ @Override
+ public String getColumnText(DeltaCloudImage image) {
+ return image.getDescription();
+ }
+ });
+ }
+}
Property changes on: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudImageColumns.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java (rev 0)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance.State;
+import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
+
+/**
+ * @author André Dietisheim
+ */
+public class DeltaCloudInstanceColumns extends Columns<DeltaCloudInstance> {
+
+ @SuppressWarnings("unchecked")
+ public DeltaCloudInstanceColumns() {
+ super(
+ new Column<DeltaCloudInstance>("NAME", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getName();
+ }
+ },
+ new Column<DeltaCloudInstance>("ALIAS", 20) {
+
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getId();
+ }
+ },
+ new Column<DeltaCloudInstance>("STATUS", 20) {
+
+ @Override
+ public Image getColumnImage(DeltaCloudInstance instance) {
+ State state = instance.getState();
+ if (DeltaCloudInstance.State.STOPPED.equals(state)) {
+ return SWTImagesFactory.get(SWTImagesFactory.IMG_STOPPED);
+ } else if (DeltaCloudInstance.State.RUNNING.equals(state)) {
+ return SWTImagesFactory.get(SWTImagesFactory.IMG_RUNNING);
+ } else if (DeltaCloudInstance.State.BOGUS.equals(state)) {
+ return PlatformUI.getWorkbench().getSharedImages().
+ getImage(ISharedImages.IMG_DEC_FIELD_WARNING);
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getState().toString();
+ }
+ },
+ new Column<DeltaCloudInstance>("HOSTNAME", 40) {
+ @Override
+ public String getColumnText(DeltaCloudInstance image) {
+ return image.getHostName();
+ }
+ });
+ }
+}
Property changes on: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudInstanceColumns.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -52,6 +52,8 @@
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
import org.jboss.tools.internal.deltacloud.ui.preferences.StringPreferenceValue;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
@@ -227,10 +229,10 @@
Table table = viewer.getTable();
table.setHeaderVisible(true);
table.setLinesVisible(true);
- ITableContentAndLabelProvider provider = getContentAndLabelProvider();
+ ITableContentAndLabelProvider<CLOUDELEMENT> provider = getContentAndLabelProvider();
viewer.setContentProvider(provider);
viewer.setLabelProvider(provider);
- createColumns(tableLayout, table);
+ createColumns(provider, tableLayout, table);
viewer.setComparator(new TableViewerColumnComparator());
table.setSortDirection(SWT.NONE);
@@ -238,8 +240,8 @@
return viewer;
}
- protected abstract ITableContentAndLabelProvider getContentAndLabelProvider();
-
+ protected abstract ITableContentAndLabelProvider<CLOUDELEMENT> getContentAndLabelProvider();
+
private void setViewerInput(DeltaCloud cloud) {
viewer.setInput(cloud);
}
@@ -304,15 +306,16 @@
return clouds[cloudIndex];
}
- private void createColumns(TableColumnLayout tableLayout, Table table) {
- for (int i = 0; i < InstanceViewLabelAndContentProvider.Column.getSize(); ++i) {
- InstanceViewLabelAndContentProvider.Column c =
- InstanceViewLabelAndContentProvider.Column.getColumn(i);
+ private void createColumns(ITableContentAndLabelProvider<CLOUDELEMENT> provider, TableColumnLayout tableLayout, Table table) {
+ Columns<CLOUDELEMENT> columns = provider.getColumns();
+
+ for (int i = 0; i < columns.getSize(); ++i) {
+ Column<CLOUDELEMENT> c = columns.getColumn(i);
TableColumn tc = new TableColumn(table, SWT.NONE);
if (i == 0) {
table.setSortColumn(tc);
}
- tc.setText(CVMessages.getString(c.name()));
+ tc.setText(CVMessages.getString(c.getName()));
tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
tc.addSelectionListener(new ColumnListener(i));
}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -10,20 +10,11 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.ui.views.cloudelements;
-import java.beans.PropertyChangeListener;
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.BaseLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudException;
-import org.jboss.tools.deltacloud.core.ICloudElementFilter;
+import org.eclipse.swt.graphics.Image;
import org.jboss.tools.deltacloud.core.IDeltaCloudElement;
-import org.jboss.tools.deltacloud.ui.ErrorUtils;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
/**
* A common superclass for content- and label-providers that operate on
@@ -33,124 +24,40 @@
* @author Andre Dietisheim
*/
public abstract class AbstractCloudElementViewLabelAndContentProvider<CLOUDELEMENT extends IDeltaCloudElement> extends
- BaseLabelProvider implements ITableContentAndLabelProvider, PropertyChangeListener {
+ BaseLabelProvider implements ITableContentAndLabelProvider<CLOUDELEMENT> {
- private DeltaCloud currentCloud;
- private ICloudElementFilter<CLOUDELEMENT> localFilter;
- private TableViewer viewer;
+ private Columns<CLOUDELEMENT> columns;
- private AtomicReference<CLOUDELEMENT[]> elementsReference = new AtomicReference<CLOUDELEMENT[]>();
-
+ @SuppressWarnings("unchecked")
@Override
- public Object[] getElements(Object input) {
- try {
- return filter(getFilter(currentCloud), elementsReference.get());
- } catch (DeltaCloudException e) {
- ErrorUtils.handleError(
- "Error", MessageFormat.format(
- "Could not filter the elements for cloud \"{0}\"", currentCloud.getName()),
- e, viewer.getControl().getDisplay().getActiveShell());
- return new Object[] {};
+ public String getColumnText(Object element, int columnIndex) {
+ Columns<CLOUDELEMENT> columns = getColumns();
+ Column<CLOUDELEMENT> c = columns.getColumn(columnIndex);
+ if (c == null) {
+ return null;
}
+
+ return c.getColumnText((CLOUDELEMENT) element);
}
+ @SuppressWarnings("unchecked")
@Override
- public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
- if (!(newInput instanceof DeltaCloud)) {
- return;
+ public Image getColumnImage(Object element, int columnIndex) {
+ Columns<CLOUDELEMENT> columns = getColumns();
+ Column<CLOUDELEMENT> c = columns.getColumn(columnIndex);
+ if (c == null
+ || c == null) {
+ return null;
}
- Assert.isLegal(viewer instanceof TableViewer);
- this.viewer = (TableViewer) viewer;
- removeListener(currentCloud);
- this.currentCloud = (DeltaCloud) newInput;
- addPropertyChangeListener(currentCloud);
- asyncGetCloudElements(currentCloud);
+ return c.getColumnImage((CLOUDELEMENT) element);
}
- protected void setCloudElements(CLOUDELEMENT[] elements) {
- this.elementsReference.set(elements);
- refreshViewer();
- }
-
- private void refreshViewer() {
- viewer.getControl().getDisplay().asyncExec(new Runnable() {
-
- @Override
- public void run() {
- viewer.refresh();
- }
- });
- }
-
- protected boolean isCurrentCloud(final DeltaCloud cloud) {
- return cloud != null
- && currentCloud != null
- && cloud.getName().equals(currentCloud.getName());
- }
-
- // protected void addToViewer(final CLOUDELEMENT[] cloudElements) {
- // viewer.getControl().getDisplay().asyncExec(new Runnable() {
- //
- // @Override
- // public void run() {
- // try {
- // clearTableViewer();
- // Object[] elements = filter(getFilter(currentCloud), cloudElements);
- // viewer.add(elements);
- // } catch (DeltaCloudException e) {
- // // TODO: internationalize strings
- // ErrorUtils.handleError(
- // "Error", "Could not filter the elements for cloud " +
- // currentCloud.getName(),
- // e, Display.getDefault().getActiveShell());
- //
- // }
- // }
- // });
- // }
-
- public void setFilter(ICloudElementFilter<CLOUDELEMENT> filter) {
- this.localFilter = filter;
- }
-
- private ICloudElementFilter<CLOUDELEMENT> getFilter(DeltaCloud cloud) {
- if (localFilter != null) {
- return localFilter;
- } else {
- return getCloudFilter(cloud);
+ public Columns<CLOUDELEMENT> getColumns() {
+ if (columns == null) {
+ this.columns = createColumns();
}
+ return columns;
}
- protected Object[] filter(ICloudElementFilter<CLOUDELEMENT> filter, CLOUDELEMENT[] cloudElements)
- throws DeltaCloudException {
- if (cloudElements == null) {
- return new Object[] {};
- }
- if (filter == null) {
- return cloudElements;
- } else {
- return filter.filter(cloudElements).toArray();
- }
- }
-
- @Override
- public void dispose() {
- removeListener(currentCloud);
- }
-
- protected void removeListener(DeltaCloud cloud) {
- if (cloud != null) {
- cloud.removePropertyChangeListener(this);
- }
- }
-
- protected void clearTableViewer() {
- viewer.setInput(Collections.emptyList());
- }
-
- protected abstract ICloudElementFilter<CLOUDELEMENT> getCloudFilter(DeltaCloud cloud);
-
- protected abstract void asyncGetCloudElements(DeltaCloud cloud);
-
- protected abstract void addPropertyChangeListener(DeltaCloud cloud);
+ protected abstract Columns<CLOUDELEMENT> createColumns();
}
Added: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java (rev 0)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * 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:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.ui.views.cloudelements;
+
+import java.beans.PropertyChangeListener;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.deltacloud.core.ICloudElementFilter;
+import org.jboss.tools.deltacloud.core.IDeltaCloudElement;
+import org.jboss.tools.deltacloud.ui.ErrorUtils;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
+
+/**
+ * A common superclass for content- and label-providers that operate on
+ * IDeltaCloudElements (currently DeltaCloudImage and DeltaCloudInstance)
+ *
+ * @author Jeff Johnston
+ * @author Andre Dietisheim
+ */
+public abstract class AbstractSelectableCloudViewLabelAndContentProvider<CLOUDELEMENT extends IDeltaCloudElement> extends
+ AbstractCloudElementViewLabelAndContentProvider<CLOUDELEMENT> implements PropertyChangeListener {
+
+ private DeltaCloud currentCloud;
+ private ICloudElementFilter<CLOUDELEMENT> localFilter;
+ private TableViewer viewer;
+ private AtomicReference<CLOUDELEMENT[]> elementsReference = new AtomicReference<CLOUDELEMENT[]>();
+
+ @Override
+ public Object[] getElements(Object input) {
+ try {
+ return filter(getFilter(currentCloud), elementsReference.get());
+ } catch (DeltaCloudException e) {
+ ErrorUtils.handleError(
+ "Error", MessageFormat.format(
+ "Could not filter the elements for cloud \"{0}\"", currentCloud.getName()),
+ e, viewer.getControl().getDisplay().getActiveShell());
+ return new Object[] {};
+ }
+ }
+
+ @Override
+ public void inputChanged(final Viewer viewer, Object oldInput, Object newInput) {
+ if (!(newInput instanceof DeltaCloud)) {
+ return;
+ }
+ Assert.isLegal(viewer instanceof TableViewer);
+ this.viewer = (TableViewer) viewer;
+ removeListener(currentCloud);
+ this.currentCloud = (DeltaCloud) newInput;
+ addPropertyChangeListener(currentCloud);
+ asyncGetCloudElements(currentCloud);
+ }
+
+ protected void setCloudElements(CLOUDELEMENT[] elements) {
+ this.elementsReference.set(elements);
+ refreshViewer();
+ }
+
+ private void refreshViewer() {
+ viewer.getControl().getDisplay().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ viewer.refresh();
+ }
+ });
+ }
+
+ protected boolean isCurrentCloud(final DeltaCloud cloud) {
+ return cloud != null
+ && currentCloud != null
+ && cloud.getName().equals(currentCloud.getName());
+ }
+
+ public void setFilter(ICloudElementFilter<CLOUDELEMENT> filter) {
+ this.localFilter = filter;
+ }
+
+ private ICloudElementFilter<CLOUDELEMENT> getFilter(DeltaCloud cloud) {
+ if (localFilter != null) {
+ return localFilter;
+ } else {
+ return getCloudFilter(cloud);
+ }
+ }
+
+ protected Object[] filter(ICloudElementFilter<CLOUDELEMENT> filter, CLOUDELEMENT[] cloudElements)
+ throws DeltaCloudException {
+ if (cloudElements == null) {
+ return new Object[] {};
+ }
+ if (filter == null) {
+ return cloudElements;
+ } else {
+ return filter.filter(cloudElements).toArray();
+ }
+ }
+
+ @Override
+ public void dispose() {
+ removeListener(currentCloud);
+ }
+
+ protected void removeListener(DeltaCloud cloud) {
+ if (cloud != null) {
+ cloud.removePropertyChangeListener(this);
+ }
+ }
+
+ protected void clearTableViewer() {
+ viewer.setInput(Collections.emptyList());
+ }
+
+ protected abstract ICloudElementFilter<CLOUDELEMENT> getCloudFilter(DeltaCloud cloud);
+
+ protected abstract void asyncGetCloudElements(DeltaCloud cloud);
+
+ protected abstract void addPropertyChangeListener(DeltaCloud cloud);
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public String getColumnText(Object element, int columnIndex) {
+ Columns<CLOUDELEMENT> columns = getColumns();
+ Column<CLOUDELEMENT> c = columns.getColumn(columnIndex);
+ if (c == null) {
+ return null;
+ }
+
+ return c.getColumnText((CLOUDELEMENT) element);
+ }
+}
Property changes on: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractSelectableCloudViewLabelAndContentProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ITableContentAndLabelProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -12,10 +12,13 @@
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.jboss.tools.deltacloud.ui.views.Columns;
/**
* @author Andre Dietisheim
*/
-public interface ITableContentAndLabelProvider extends IStructuredContentProvider, ITableLabelProvider{
+public interface ITableContentAndLabelProvider<MODEL> extends IStructuredContentProvider, ITableLabelProvider{
+ public Columns<MODEL> getColumns();
+
}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageView.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -35,7 +35,7 @@
}
@Override
- protected ITableContentAndLabelProvider getContentAndLabelProvider() {
+ protected ITableContentAndLabelProvider<DeltaCloudImage> getContentAndLabelProvider() {
return new ImageViewLabelAndContentProvider();
}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -12,9 +12,6 @@
import java.beans.PropertyChangeEvent;
import java.text.MessageFormat;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -26,74 +23,26 @@
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.DeltaCloudImageColumns;
/**
* @author Jeff Johnston
* @author André Dietisheim
*/
-public class ImageViewLabelAndContentProvider extends AbstractCloudElementViewLabelAndContentProvider<DeltaCloudImage>
- implements ITableContentAndLabelProvider {
+public class ImageViewLabelAndContentProvider extends AbstractSelectableCloudViewLabelAndContentProvider<DeltaCloudImage>
+ implements ITableContentAndLabelProvider<DeltaCloudImage> {
- public enum Column {
- NAME(0, 20),
- ID(1, 20),
- ARCH(2, 20),
- DESC(3, 40);
-
- private int column;
- private int weight;
- private static final Map<Integer, Column> lookup = new HashMap<Integer, Column>();
-
- static {
- for (Column c : EnumSet.allOf(Column.class))
- lookup.put(c.getColumnNumber(), c);
- }
-
- private Column(int column, int weight) {
- this.column = column;
- this.weight = weight;
- }
-
- public int getColumnNumber() {
- return column;
- }
-
- public int getWeight() {
- return weight;
- }
-
- public static Column getColumn(int number) {
- return lookup.get(number);
- }
-
- public static int getSize() {
- return lookup.size();
- }
-
- };
-
@Override
+ public Columns<DeltaCloudImage> createColumns() {
+ return new DeltaCloudImageColumns();
+ }
+
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
- @Override
- public String getColumnText(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudImage i = (DeltaCloudImage) element;
- switch (c) {
- case NAME:
- return i.getName();
- case ID:
- return i.getId();
- case ARCH:
- return i.getArchitecture();
- case DESC:
- return i.getDescription();
- }
- return "";
- }
-
protected ICloudElementFilter<DeltaCloudImage> getCloudFilter(DeltaCloud cloud) {
return cloud.getImageFilter();
}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceView.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -36,7 +36,7 @@
}
@Override
- protected ITableContentAndLabelProvider getContentAndLabelProvider() {
+ protected ITableContentAndLabelProvider<DeltaCloudInstance> getContentAndLabelProvider() {
return new InstanceViewLabelAndContentProvider();
}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -12,113 +12,26 @@
import java.beans.PropertyChangeEvent;
import java.text.MessageFormat;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob;
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT;
-import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.DeltaCloudInstanceColumns;
/**
* @author Jeff Jonhston
* @author Andre Dietisheim
*/
public class InstanceViewLabelAndContentProvider extends
- AbstractCloudElementViewLabelAndContentProvider<DeltaCloudInstance> implements ITableContentAndLabelProvider {
+AbstractSelectableCloudViewLabelAndContentProvider<DeltaCloudInstance> implements ITableContentAndLabelProvider<DeltaCloudInstance> {
- public enum Column {
- NAME(0, 20),
- ID(1, 20),
- STATUS(2, 6),
- HOSTNAME(3, 40);
-
- private int column;
- private int weight;
- private static final Map<Integer, Column> lookup = new HashMap<Integer, Column>();
-
- static {
- for (Column c : EnumSet.allOf(Column.class))
- lookup.put(c.getColumnNumber(), c);
- }
-
- private Column(int column, int weight) {
- this.column = column;
- this.weight = weight;
- }
-
- public int getColumnNumber() {
- return column;
- }
-
- public int getWeight() {
- return weight;
- }
-
- public static Column getColumn(int number) {
- return lookup.get(number);
- }
-
- public static int getSize() {
- return lookup.size();
- }
-
- };
-
- @Override
- public Image getColumnImage(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudInstance i = (DeltaCloudInstance) element;
- switch (c) {
- case STATUS:
- return getStatusIcon(i.getState());
- default:
- return null;
- }
- }
-
- private Image getStatusIcon(DeltaCloudInstance.State status) {
- if (DeltaCloudInstance.State.STOPPED.equals(status)) {
- return SWTImagesFactory.get(SWTImagesFactory.IMG_STOPPED);
- } else if (DeltaCloudInstance.State.RUNNING.equals(status)) {
- return SWTImagesFactory.get(SWTImagesFactory.IMG_RUNNING);
- } else if (DeltaCloudInstance.State.BOGUS.equals(status)) {
- return PlatformUI.getWorkbench().getSharedImages().
- getImage(ISharedImages.IMG_DEC_FIELD_WARNING);
- } else {
- return null;
- }
- }
-
- @Override
- public String getColumnText(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudInstance i = (DeltaCloudInstance) element;
- if (i != null) {
- switch (c) {
- case NAME:
- return i.getName();
- case ID:
- return i.getId();
- case STATUS:
- return "";
- case HOSTNAME:
- return i.getHostName();
- }
- }
- return "";
- }
-
protected ICloudElementFilter<DeltaCloudInstance> getCloudFilter(DeltaCloud cloud) {
return cloud.getInstanceFilter();
}
@@ -164,4 +77,9 @@
currentCloud.addPropertyChangeListener(DeltaCloud.PROP_INSTANCES, this);
}
}
+
+ @Override
+ protected Columns<DeltaCloudInstance> createColumns() {
+ return new DeltaCloudInstanceColumns();
+ }
}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -47,6 +47,9 @@
import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.Columns.Column;
+import org.jboss.tools.deltacloud.ui.views.cloudelements.ITableContentAndLabelProvider;
import org.jboss.tools.deltacloud.ui.views.cloudelements.TableViewerColumnComparator;
/**
@@ -216,22 +219,12 @@
Table table = viewer.getTable();
table.setHeaderVisible(true);
table.setLinesVisible(true);
- FindImagePageLabelAndContentProvider contentProvider = new FindImagePageLabelAndContentProvider();
- viewer.setContentProvider(contentProvider);
- viewer.setLabelProvider(contentProvider);
+ FindImagePageLabelAndContentProvider provider = new FindImagePageLabelAndContentProvider();
+ viewer.setContentProvider(provider);
+ viewer.setLabelProvider(provider);
TableViewerColumnComparator comparator = new TableViewerColumnComparator();
viewer.setComparator(comparator);
-
- for (int i = 0; i < FindImagePageLabelAndContentProvider.Column.getSize(); ++i) {
- FindImagePageLabelAndContentProvider.Column c =
- FindImagePageLabelAndContentProvider.Column.getColumn(i);
- TableColumn tc = new TableColumn(table, SWT.NONE);
- if (i == 0)
- table.setSortColumn(tc);
- tc.setText(CVMessages.getString(c.name()));
- tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
- tc.addSelectionListener(new ColumnListener(i, viewer));
- }
+ createColumns(provider, tableLayout, table);
table.setSortDirection(SWT.NONE);
Point p1 = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
@@ -300,6 +293,21 @@
validate();
}
+ private void createColumns(ITableContentAndLabelProvider<DeltaCloudImage> provider, TableColumnLayout tableLayout,
+ Table table) {
+ Columns<DeltaCloudImage> columns = provider.getColumns();
+ for (int i = 0; i < columns.getSize(); ++i) {
+ Column<DeltaCloudImage> c = columns.getColumn(i);
+ TableColumn tc = new TableColumn(table, SWT.NONE);
+ if (i == 0) {
+ table.setSortColumn(tc);
+ }
+ tc.setText(CVMessages.getString(c.getName()));
+ tableLayout.setColumnData(tc, new ColumnWeightData(c.getWeight(), true));
+ tc.addSelectionListener(new ColumnListener(i, viewer));
+ }
+ }
+
private void hookSelection() {
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
@@ -342,4 +350,4 @@
}
});
}
-}
+}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java 2011-01-17 17:47:46 UTC (rev 28311)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePageLabelAndContentProvider.java 2011-01-17 18:46:46 UTC (rev 28312)
@@ -10,85 +10,28 @@
*******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.wizards;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
+import org.jboss.tools.deltacloud.ui.views.Columns;
+import org.jboss.tools.deltacloud.ui.views.DeltaCloudImageColumns;
+import org.jboss.tools.deltacloud.ui.views.cloudelements.AbstractCloudElementViewLabelAndContentProvider;
import org.jboss.tools.deltacloud.ui.views.cloudelements.ITableContentAndLabelProvider;
/**
* @author Jeff Johnston
* @author André Dietisheim
*/
-public class FindImagePageLabelAndContentProvider implements ITableContentAndLabelProvider {
+public class FindImagePageLabelAndContentProvider extends AbstractCloudElementViewLabelAndContentProvider<DeltaCloudImage> implements ITableContentAndLabelProvider<DeltaCloudImage> {
- public enum Column {
- NAME(0, 20),
- ID(1, 20),
- ARCH(2, 20),
- DESC(3, 40);
-
- private int column;
- private int weight;
- private static final Map<Integer, Column> lookup = new HashMap<Integer, Column>();
-
- static {
- for (Column c : EnumSet.allOf(Column.class))
- lookup.put(c.getColumnNumber(), c);
- }
-
- private Column(int column, int weight) {
- this.column = column;
- this.weight = weight;
- }
-
- public int getColumnNumber() {
- return column;
- }
-
- public int getWeight() {
- return weight;
- }
-
- public static Column getColumn(int number) {
- return lookup.get(number);
- }
-
- public static int getSize() {
- return lookup.size();
- }
-
- };
-
@Override
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
+ public Columns<DeltaCloudImage> createColumns() {
+ return new DeltaCloudImageColumns();
}
- @Override
- public String getColumnText(Object element, int columnIndex) {
- Column c = Column.getColumn(columnIndex);
- DeltaCloudImage i = (DeltaCloudImage) element;
- switch (c) {
- case NAME:
- return i.getName();
- case ID:
- return i.getId();
- case ARCH:
- return i.getArchitecture();
- case DESC:
- return i.getDescription();
- }
- return "";
- }
-
protected ICloudElementFilter<DeltaCloudImage> getCloudFilter(DeltaCloud cloud) {
return cloud.getImageFilter();
}
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28311 - in trunk/download.jboss.org/jbosstools/updates: target-platform and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-17 12:47:46 -0500 (Mon, 17 Jan 2011)
New Revision: 28311
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/README.txt
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/target-platform/index.html
trunk/download.jboss.org/jbosstools/updates/target-platform/latest/index....
Log:
fix HTML for latest target platform; set redirect from root into ./latest; redirect helios site to latest target platform
Modified: trunk/download.jboss.org/jbosstools/updates/helios/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/README.txt 2011-01-17 17:47:36 UTC (rev 28310)
+++ trunk/download.jboss.org/jbosstools/updates/helios/README.txt 2011-01-17 17:47:46 UTC (rev 28311)
@@ -1,14 +1,3 @@
-To rsync a mirror from eclipse.org to here, do the following:
+Instead of mirroring Helios, instead we're providing a target platform repo here:
-1. ssh to qa01, then sudo to hudson:
-
-$ ssh nboldt(a)qa01.qa.atl2.redhat.com
-$ sudo su - hudson
-
-2. rsync build.eclipse.org to reports.qa:
-
-$ rsync -aP --delete nickb@build.eclipse.org:~/downloads/releases/helios/* /qa/services/http/binaries/RHDS/updates/helios/
-
-3. rsync reports.qa to download.jboss.org:
-
-$ rsync -aP --delete /qa/services/http/binaries/RHDS/updates/helios/* jbossqa@filemgmt.jboss.org:/htdocs/jbosstools/updates/helios/
\ No newline at end of file
+http://download.jboss.org/jbosstools/updates/target-platform/latest/
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-01-17 17:47:36 UTC (rev 28310)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-01-17 17:47:46 UTC (rev 28311)
@@ -10,6 +10,6 @@
<property name='p2.timestamp' value='1295284436000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/'/>
+<child location='http://download.jboss.org/jbosstools/updates/target-platform/latest/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-01-17 17:47:36 UTC (rev 28310)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-01-17 17:47:46 UTC (rev 28311)
@@ -10,6 +10,6 @@
<property name='p2.timestamp' value='1295284436000'/>
</properties>
<children size='1'>
-<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/'/>
+<child location='http://download.jboss.org/jbosstools/updates/target-platform/latest/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/target-platform/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/target-platform/index.html 2011-01-17 17:47:36 UTC (rev 28310)
+++ trunk/download.jboss.org/jbosstools/updates/target-platform/index.html 2011-01-17 17:47:46 UTC (rev 28311)
@@ -1,72 +1,6 @@
<html>
<head>
-<title>JBoss Tools Build Target Platform Update Site</title>
-<style>
-@import url("../../web/site.css");
-</style>
+<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/target-platform/latest/">
</head>
-<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
-<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0">
- <tr>
- <td colspan="2"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
- </tr>
- <tr>
- <td>  </td>
- </tr>
- <tr>
- <td>  </td>
- <td>
- <h2 class="title">JBoss Tools Build Target Platform Update Site</h2>
- <table width="100%">
-
- <!-- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText"></p>
- </td>
- </tr> -->
-
- <tr class="dark-row" style="height: 30px">
- <td class="bodyText">
- <!-- <p class="bodyText"></p> -->
-
-<!-- to convert raw fish listing to links do this in vi
-
-:%s#^sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g
-
-Then sftp file into
-
-tools(a)filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/
-
-which becomes
-
-http://download.jboss.org/jbosstools/updates/requirements/
-
--->
- <br/>
- <ul>
-<li>Eclipse Helios 3.6 / Web Tools 3.2 / others (692M) - point Eclipse at this site and install the uncategorized features
-<ul>
-<li><a class=link href=latest>latest</a> - target platform update site</li>
-<li><a class=link href=e361-wtp322.target.zip>e361-wtp322.target.zip</a> - target platform update site zip</a></li>
-</ul>
- </ul>
- <br/>
- </td>
- </tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">Looking to download JBoss Tools? See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>. See also <a
- href="http://www.jboss.org/tools/download/installation">Installation
- methods</a>.</p>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
</html>
+
Modified: trunk/download.jboss.org/jbosstools/updates/target-platform/latest/index....
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/target-platform/latest/index.... 2011-01-17 17:47:36 UTC (rev 28310)
+++ trunk/download.jboss.org/jbosstools/updates/target-platform/latest/index.... 2011-01-17 17:47:46 UTC (rev 28311)
@@ -20,35 +20,17 @@
<td>
<h2 class="title">JBoss Tools Build Target Platform Update Site - Helios (Eclipse 3.6 / Web Tools 3.2)</h2>
<table width="100%">
-
- <!-- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText"></p>
- </td>
- </tr> -->
-
<tr class="dark-row" style="height: 30px">
<td class="bodyText">
- <!-- <p class="bodyText"></p> -->
-
-<!-- to convert raw fish listing to links do this in vi
-
-:%s#^sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g
-
-Then sftp file into
-
-tools(a)filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/
-
-which becomes
-
-http://download.jboss.org/jbosstools/updates/requirements/
-
--->
<br/>
<ul>
-<li><a class=link href=../latest>latest target platform build</a> - point Eclipse at this site and install the uncategorized features</li>
-<li><a class=link href=../e361-wtp322.target.zip>zip of latest target platform</a> (692M)</li>
+<li>Eclipse Helios 3.6 / Web Tools 3.2 / other dependencies
+<ul>
+<li><a class=link href=../latest>latest target platform build</a> - point Eclipse at this site and install the <b>uncategorized</b> features</li>
+<li><a class=link href=../e361-wtp322.target.zip>latest target platform zip</a> (<a class=link href=e361-wtp322.target.zip.MD5>MD5</a>) - approx. 1.2 Gb</li>
+</ul>
</ul>
+ </ul>
<br/>
</td>
</tr>
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28310 - in trunk/download.jboss.org/jbosstools/updates/target-platform: latest and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-17 12:47:36 -0500 (Mon, 17 Jan 2011)
New Revision: 28310
Added:
trunk/download.jboss.org/jbosstools/updates/target-platform/.gitignore
trunk/download.jboss.org/jbosstools/updates/target-platform/latest/.gitig...
Log:
fix HTML for latest target platform; set redirect from root into ./latest; redirect helios site to latest target platform
Added: trunk/download.jboss.org/jbosstools/updates/target-platform/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/target-platform/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/target-platform/.gitignore 2011-01-17 17:47:36 UTC (rev 28310)
@@ -0,0 +1 @@
+*~
Added: trunk/download.jboss.org/jbosstools/updates/target-platform/latest/.gitig...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/target-platform/latest/.gitig... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/target-platform/latest/.gitig... 2011-01-17 17:47:36 UTC (rev 28310)
@@ -0,0 +1 @@
+*~
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28309 - in trunk/download.jboss.org/jbosstools/updates: requirements/helios and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-17 12:31:22 -0500 (Mon, 17 Jan 2011)
New Revision: 28309
Added:
trunk/download.jboss.org/jbosstools/updates/helios/index.html
trunk/download.jboss.org/jbosstools/updates/requirements/helios/.gitignore
trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite...
trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite...
trunk/download.jboss.org/jbosstools/updates/requirements/helios/index.html
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/helios/README.txt
Log:
add redirect metadata to point at latest target platform
Added: trunk/download.jboss.org/jbosstools/updates/helios/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/index.html (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/helios/index.html 2011-01-17 17:31:22 UTC (rev 28309)
@@ -0,0 +1,6 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/target-platform/latest/">
+</head>
+</html>
+
Added: trunk/download.jboss.org/jbosstools/updates/requirements/helios/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/helios/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/helios/.gitignore 2011-01-17 17:31:22 UTC (rev 28309)
@@ -0,0 +1 @@
+*~
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/helios/README.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/helios/README.txt 2011-01-17 17:20:01 UTC (rev 28308)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/helios/README.txt 2011-01-17 17:31:22 UTC (rev 28309)
@@ -1,14 +1,3 @@
-To rsync a mirror from eclipse.org to here, do the following:
+Instead of mirroring Helios, instead we're providing a target platform repo here:
-1. ssh to qa01, then sudo to hudson:
-
-$ ssh nboldt(a)qa01.qa.atl2.redhat.com
-$ sudo su - hudson
-
-2. rsync build.eclipse.org to reports.qa:
-
-$ rsync -aP --delete nickb@build.eclipse.org:~/downloads/releases/helios/* /qa/services/http/binaries/RHDS/updates/requirements/helios/
-
-3. rsync reports.qa to download.jboss.org:
-
-$ rsync -aP --delete /qa/services/http/binaries/RHDS/updates/requirements/helios/* jbossqa@filemgmt.jboss.org:/htdocs/jbosstools/updates/requirements/helios/
+http://download.jboss.org/jbosstools/updates/target-platform/latest/
Added: trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite... 2011-01-17 17:31:22 UTC (rev 28309)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1295284436000'/>
+</properties>
+<children size='1'>
+<child location='http://download.jboss.org/jbosstools/updates/target-platform/latest/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/helios/composite... 2011-01-17 17:31:22 UTC (rev 28309)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1295284436000'/>
+</properties>
+<children size='1'>
+<child location='http://download.jboss.org/jbosstools/updates/target-platform/latest/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/helios/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/helios/index.html (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/helios/index.html 2011-01-17 17:31:22 UTC (rev 28309)
@@ -0,0 +1,6 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/target-platform/latest/">
+</head>
+</html>
+
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28308 - trunk/download.jboss.org/jbosstools/updates/helios.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-17 12:20:01 -0500 (Mon, 17 Jan 2011)
New Revision: 28308
Added:
trunk/download.jboss.org/jbosstools/updates/helios/.gitignore
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
Log:
add redirect for this obsolete folder
Added: trunk/download.jboss.org/jbosstools/updates/helios/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/.gitignore (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/helios/.gitignore 2011-01-17 17:20:01 UTC (rev 28308)
@@ -0,0 +1 @@
+*~
Added: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-01-17 17:20:01 UTC (rev 28308)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1295284436000'/>
+</properties>
+<children size='1'>
+<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-01-17 17:20:01 UTC (rev 28308)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1295284436000'/>
+</properties>
+<children size='1'>
+<child location='http://download.jboss.org/jbosstools/updates/requirements/helios/'/>
+</children>
+</repository>
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28307 - in branches/jbosstools-3.2.0.CR1/deltacloud/plugins: org.jboss.tools.deltacloud.ui/META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-17 10:55:47 -0500 (Mon, 17 Jan 2011)
New Revision: 28307
Added:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java
Removed:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java
Modified:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
moved INewInstanceWizardPage to package ui.wizard
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-17 15:54:34 UTC (rev 28306)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-17 15:55:47 UTC (rev 28307)
@@ -36,7 +36,7 @@
import org.jboss.tools.common.jobs.ChainedJob;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.integration.DeltaCloudIntegrationPlugin;
-import org.jboss.tools.deltacloud.ui.INewInstanceWizardPage;
+import org.jboss.tools.deltacloud.ui.wizard.INewInstanceWizardPage;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
import org.osgi.service.prefs.BackingStoreException;
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-01-17 15:54:34 UTC (rev 28306)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-01-17 15:55:47 UTC (rev 28307)
@@ -25,4 +25,5 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.deltacloud.ui,
+ org.jboss.tools.deltacloud.ui.wizard,
org.jboss.tools.internal.deltacloud.ui.utils
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java 2011-01-17 15:54:34 UTC (rev 28306)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java 2011-01-17 15:55:47 UTC (rev 28307)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.wizard.WizardPage;
+import org.jboss.tools.deltacloud.ui.wizard.INewInstanceWizardPage;
public class DeltacloudUIExtensionManager {
Deleted: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java 2011-01-17 15:54:34 UTC (rev 28306)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java 2011-01-17 15:55:47 UTC (rev 28307)
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * 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:
- * Red Hat Incorporated - initial API and implementation
- *******************************************************************************/
-package org.jboss.tools.deltacloud.ui;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.jboss.tools.common.jobs.ChainedJob;
-import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
-
-/**
- * @author Rob Stryker
- */
-public interface INewInstanceWizardPage extends IWizardPage {
-
- public static final String NEW_INSTANCE_FAMILY = "newInstanceFamily";
-
- public ChainedJob getPerformFinishJob(DeltaCloudInstance addedInstance);
-}
Copied: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java (from rev 28147, branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java)
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java (rev 0)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java 2011-01-17 15:55:47 UTC (rev 28307)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * 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:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.ui.wizard;
+
+import org.eclipse.jface.wizard.IWizardPage;
+import org.jboss.tools.common.jobs.ChainedJob;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+
+/**
+ * @author Rob Stryker
+ */
+public interface INewInstanceWizardPage extends IWizardPage {
+
+ public static final String NEW_INSTANCE_FAMILY = "newInstanceFamily";
+
+ public ChainedJob getPerformFinishJob(DeltaCloudInstance addedInstance);
+}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-17 15:54:34 UTC (rev 28306)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-17 15:55:47 UTC (rev 28307)
@@ -29,7 +29,7 @@
import org.jboss.tools.deltacloud.ui.DeltacloudUIExtensionManager;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
-import org.jboss.tools.deltacloud.ui.INewInstanceWizardPage;
+import org.jboss.tools.deltacloud.ui.wizard.INewInstanceWizardPage;
import org.osgi.service.prefs.Preferences;
/**
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28306 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui/META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-17 10:54:34 -0500 (Mon, 17 Jan 2011)
New Revision: 28306
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/schema/newInstanceWizardPage.exsd
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
moved INewInstanceWizardPage to package ui.wizard
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-17 15:34:11 UTC (rev 28305)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-17 15:54:34 UTC (rev 28306)
@@ -36,7 +36,7 @@
import org.jboss.tools.common.jobs.ChainedJob;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.integration.DeltaCloudIntegrationPlugin;
-import org.jboss.tools.deltacloud.ui.INewInstanceWizardPage;
+import org.jboss.tools.deltacloud.ui.wizard.INewInstanceWizardPage;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
import org.osgi.service.prefs.BackingStoreException;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-01-17 15:34:11 UTC (rev 28305)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-01-17 15:54:34 UTC (rev 28306)
@@ -25,4 +25,5 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.deltacloud.ui,
+ org.jboss.tools.deltacloud.ui.wizard,
org.jboss.tools.internal.deltacloud.ui.utils
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/schema/newInstanceWizardPage.exsd
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/schema/newInstanceWizardPage.exsd 2011-01-17 15:34:11 UTC (rev 28305)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/schema/newInstanceWizardPage.exsd 2011-01-17 15:54:34 UTC (rev 28306)
@@ -64,7 +64,7 @@
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.jboss.tools.deltacloud.ui.INewInstanceWizardPage"/>
+ <meta.attribute kind="java" basedOn=":org.jboss.tools.deltacloud.ui.wizard.INewInstanceWizardPage"/>
</appinfo>
</annotation>
</attribute>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java 2011-01-17 15:34:11 UTC (rev 28305)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltacloudUIExtensionManager.java 2011-01-17 15:54:34 UTC (rev 28306)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.wizard.WizardPage;
+import org.jboss.tools.deltacloud.ui.wizard.INewInstanceWizardPage;
public class DeltacloudUIExtensionManager {
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java 2011-01-17 15:34:11 UTC (rev 28305)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java 2011-01-17 15:54:34 UTC (rev 28306)
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * 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:
- * Red Hat Incorporated - initial API and implementation
- *******************************************************************************/
-package org.jboss.tools.deltacloud.ui;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.jboss.tools.common.jobs.ChainedJob;
-import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
-
-/**
- * @author Rob Stryker
- */
-public interface INewInstanceWizardPage extends IWizardPage {
-
- public static final String NEW_INSTANCE_FAMILY = "newInstanceFamily";
-
- public ChainedJob getPerformFinishJob(DeltaCloudInstance addedInstance);
-}
Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java (from rev 28119, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/INewInstanceWizardPage.java)
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/wizard/INewInstanceWizardPage.java 2011-01-17 15:54:34 UTC (rev 28306)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * 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:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.ui.wizard;
+
+import org.eclipse.jface.wizard.IWizardPage;
+import org.jboss.tools.common.jobs.ChainedJob;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+
+/**
+ * @author Rob Stryker
+ */
+public interface INewInstanceWizardPage extends IWizardPage {
+
+ public static final String NEW_INSTANCE_FAMILY = "newInstanceFamily";
+
+ public ChainedJob getPerformFinishJob(DeltaCloudInstance addedInstance);
+}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-17 15:34:11 UTC (rev 28305)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-17 15:54:34 UTC (rev 28306)
@@ -29,7 +29,7 @@
import org.jboss.tools.deltacloud.ui.DeltacloudUIExtensionManager;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
-import org.jboss.tools.deltacloud.ui.INewInstanceWizardPage;
+import org.jboss.tools.deltacloud.ui.wizard.INewInstanceWizardPage;
import org.osgi.service.prefs.Preferences;
/**
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28305 - in branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: loaders/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-17 10:34:11 -0500 (Mon, 17 Jan 2011)
New Revision: 28305
Modified:
branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/ModelEntityRecognizer.java
Log:
JBIDE-8067
https://issues.jboss.org/browse/JBIDE-8067
Modified: branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2011-01-17 14:50:08 UTC (rev 28304)
+++ branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2011-01-17 15:34:11 UTC (rev 28305)
@@ -49,9 +49,11 @@
import org.jboss.tools.common.model.impl.XModelImpl;
import org.jboss.tools.common.model.impl.XModelObjectImpl;
import org.jboss.tools.common.model.loaders.AuxiliaryLoader;
+import org.jboss.tools.common.model.loaders.EntityRecognizer;
import org.jboss.tools.common.model.loaders.EntityRecognizerContext;
import org.jboss.tools.common.model.loaders.Reloadable;
import org.jboss.tools.common.model.loaders.XObjectLoader;
+import org.jboss.tools.common.model.loaders.impl.ModelEntityRecognizer;
import org.jboss.tools.common.model.loaders.impl.PropertiesLoader;
import org.jboss.tools.common.model.markers.ResourceMarkers;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -231,20 +233,29 @@
parseFileName(p, f.getName());
String ext = p.getProperty(XModelObjectConstants.ATTR_NAME_EXTENSION);
String body = null;
- String entity = getModel().getEntityRecognizer().getEntityName(new EntityRecognizerContext(f.getName(), ext, body));
+ EntityRecognizer recognizer = getModel().getEntityRecognizer();
+ EntityRecognizerContext context = new EntityRecognizerContext(f.getName(), ext, body);
+ String entity = recognizer.getEntityName(context);
if("FileAny".equals(entity)) { //$NON-NLS-1$
boolean isText = XModelObjectLoaderUtil.isTextFile(f, 100);
if(f.length() > 100000 || !isText) entity = XModelObjectConstants.ENT_FILE_ANY_LONG;
else if(isText) entity = "FileTXT"; //$NON-NLS-1$
- } else /*if(entity == null)*/ {
+ } else if(isRecognizerNeedingBody(entity, recognizer, context)) {
body = getBodySource(f).get();
- entity = getModel().getEntityRecognizer().getEntityName(new EntityRecognizerContext(f.getName(), ext, body));
+ entity = recognizer.getEntityName(new EntityRecognizerContext(f.getName(), ext, body));
}
if(entity == null || getModel().getMetaData().getEntity(entity) == null) entity = "FileAny"; //$NON-NLS-1$
p.setProperty(XMetaDataConstants.ENTITY, entity);
if(body != null) p.setProperty(XModelObjectConstants.ATTR_NAME_BODY, body);
return p;
}
+
+ private boolean isRecognizerNeedingBody(String entityForNullBody, EntityRecognizer recognizer, EntityRecognizerContext context) {
+ if(recognizer instanceof ModelEntityRecognizer) {
+ return ((ModelEntityRecognizer)recognizer).isBodyRequired(context, entityForNullBody);
+ }
+ return true;
+ }
private XModelObject createFileObject(File f, boolean add) {
return createFileObject(f, getEntityProperties(f), add);
Modified: branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/ModelEntityRecognizer.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/ModelEntityRecognizer.java 2011-01-17 14:50:08 UTC (rev 28304)
+++ branches/jbosstools-3.2.0.CR1/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/ModelEntityRecognizer.java 2011-01-17 15:34:11 UTC (rev 28305)
@@ -19,6 +19,7 @@
public class ModelEntityRecognizer implements EntityRecognizer {
private XModelMetaData meta = null;
private HashMap<String,EntityRecognizer[]> recognizers = new HashMap<String,EntityRecognizer[]>();
+ private Set<String> umbiguousExtensions = new HashSet<String>();
public ModelEntityRecognizer() {}
@@ -42,6 +43,11 @@
return null;
}
+ public boolean isBodyRequired(EntityRecognizerContext context, String entityForNullBody) {
+ return entityForNullBody == null
+ || (context.getExtension() != null && umbiguousExtensions.contains(context.getExtension()));
+ }
+
private void load() {
XMapping m = meta.getMapping("Recognizers"); //$NON-NLS-1$
if(m == null) return;
@@ -77,6 +83,12 @@
recognizers.put(ks[i], rs);
}
}
+ for (String ext: recognizers.keySet()) {
+ EntityRecognizer[] rs = recognizers.get(ext);
+ if(rs != null && rs.length > 1) {
+ umbiguousExtensions.add(ext);
+ }
+ }
}
private EntityRecognizer find(String clsname) {
@@ -166,4 +178,3 @@
}
}
-
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r28304 - in branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui: wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-17 09:50:08 -0500 (Mon, 17 Jan 2011)
New Revision: 28304
Modified:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
Log:
[JBIDE-8126] close manage keys dialog on double click on a key
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java 2011-01-17 14:49:35 UTC (rev 28303)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java 2011-01-17 14:50:08 UTC (rev 28304)
@@ -18,7 +18,9 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jface.wizard.IWizardPage;
/**
* @author André Dietisheim
@@ -39,7 +41,7 @@
* the invocation target exception
* @throws InterruptedException
* the interrupted exception
- *
+ *
* @author André Dietisheim
*/
public static void runInWizard(final Job job, IWizardContainer container) throws InvocationTargetException,
@@ -62,4 +64,22 @@
}
});
}
+
+ /**
+ * Flips to the next wizard page or finishes the current wizard.
+ *
+ * @param wizardPage
+ * the wizard page this call is executed in
+ */
+ public static void nextPageOrFinish(IWizardPage wizardPage) {
+ IWizard wizard = wizardPage.getWizard();
+ if (wizardPage.canFlipToNextPage()) {
+ IWizardPage nextPage = wizard.getNextPage(wizardPage);
+ wizard.getContainer().showPage(nextPage);
+ } else if (wizard.canFinish()) {
+ if (wizard.performFinish()) {
+ wizard.getContainer().getShell().close();
+ }
+ }
+ }
}
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-01-17 14:49:35 UTC (rev 28303)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-01-17 14:50:08 UTC (rev 28304)
@@ -42,9 +42,11 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.common.log.StatusFactory;
@@ -266,6 +268,9 @@
BeanProperties.value(ManageKeysPageModel.PROP_SELECTED_KEY).observe(model),
new UpdateValueStrategy().setConverter(new Id2KeyConverter()),
new UpdateValueStrategy().setConverter(new Key2IdConverter()));
+
+ keyList.addListener(SWT.MouseDoubleClick, onKeyDoubleclick());
+
return keyList;
}
@@ -293,6 +298,16 @@
};
}
+ private Listener onKeyDoubleclick() {
+ return new Listener() {
+
+ @Override
+ public void handleEvent(Event event) {
+ WizardUtils.nextPageOrFinish(ManageKeysPage.this);
+ }
+ };
+ }
+
private void refreshKeys() {
Job job = new AbstractCloudElementJob("Get keys", model.getCloud(), CLOUDELEMENT.KEYS) {
15 years, 2 months
- 1
- 0