JBoss Tools SVN: r27278 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 09:30:23 -0500 (Thu, 09 Dec 2010)
New Revision: 27278
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetImagesCommand.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetInstancesCommand.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.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/ImageViewLabelAndContentProvider.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
Log:
[JBIDE-7848] separated the usecases: actively getting images/instances and passive updates. You now get the images and dont need to trigger getting and get the update of it.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-12-09 14:30:23 UTC (rev 27278)
@@ -1,5 +1,11 @@
2010-12-09 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java
+ (loadImages):
+ (loadInstances):
+ (getInstances):
+ (getImages):
+ [JBIDE-7848] separated the usecases: actively getting images/instances and passive updates. You now get the images and dont need to trigger getting and get the update of it.
* src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java:
[JBIDE-7849] removed shadowing instance variable to DeltaCloud
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -347,6 +347,7 @@
private void loadInstances() throws DeltaCloudException {
try {
getInstancesRepository().add(client.listInstances(), this);
+ notifyImageListListeners(images.get());
} catch (DeltaCloudClientException e) {
throw new DeltaCloudException(MessageFormat.format("Could not load instances of cloud {0}: {1}",
getName(), e.getMessage()), e);
@@ -380,11 +381,11 @@
*
* @throws DeltaCloudException
*/
- protected void asyncGetInstances() throws DeltaCloudException {
+ public DeltaCloudInstance[] getInstances() throws DeltaCloudException {
if (instances == null) {
loadInstances();
}
- notifyInstanceListListeners(instances.get());
+ return instances.get();
}
private DeltaCloudImagesRepository getImagesRepository() {
@@ -394,13 +395,11 @@
return images;
}
- protected void asyncGetImages() throws DeltaCloudException {
+ public DeltaCloudImage[] getImages() throws DeltaCloudException {
if (images == null) {
loadImages();
}
- // TODO: remove notification with all instances, replace by
- // notifying the changed instance
- notifyImageListListeners(getImagesRepository().get());
+ return images.get();
}
/**
@@ -537,6 +536,7 @@
private void loadImages() throws DeltaCloudException {
try {
getImagesRepository().add(client.listImages(), this);
+ notifyImageListListeners(images.get());
} catch (DeltaCloudClientException e) {
clearImages();
throw new DeltaCloudException(MessageFormat.format("Could not load images of cloud {0}: {1}",
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetImagesCommand.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetImagesCommand.java 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetImagesCommand.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * 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.core;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
-
-/**
- * @author Andre Dietisheim
- */
-public class GetImagesCommand extends AbstractDeltaCloudCommand {
-
- public GetImagesCommand(DeltaCloud cloud) {
- super(cloud);
- }
-
- public void execute() {
- // TODO: internationalize strings
- new AbstractCloudJob(
- MessageFormat.format("Get images from cloud {0}", getCloud().getName()), getCloud()) {
-
- @Override
- protected IStatus doRun(IProgressMonitor monitor) throws DeltaCloudException {
- asyncGetImages();
- return Status.OK_STATUS;
- }
-
-
- }.schedule();
- }
-
- protected void asyncGetImages() throws DeltaCloudException {
- getCloud().asyncGetImages();
- }
-}
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetInstancesCommand.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetInstancesCommand.java 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/GetInstancesCommand.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * 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.core;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
-
-/**
- * @author Andre Dietisheim
- */
-public class GetInstancesCommand extends AbstractDeltaCloudCommand {
-
- public GetInstancesCommand(DeltaCloud cloud) {
- super(cloud);
- }
-
- public void execute() {
- // TODO: internationalize strings
- new AbstractCloudJob(
- MessageFormat.format("Get instances from cloud {0}", getCloud().getName()), getCloud()) {
-
- @Override
- protected IStatus doRun(IProgressMonitor monitor) throws DeltaCloudException {
- asyncGetInstances();
- return Status.OK_STATUS;
- }
-
-
- }.schedule();
- }
-
- protected void asyncGetInstances() throws DeltaCloudException {
- getCloud().asyncGetInstances();
- }
-}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-09 14:30:23 UTC (rev 27278)
@@ -1,5 +1,16 @@
2010-12-09 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
+ (.modifyText):
+ (asyncSetImagesToViewer):
+ * src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java (asyncAddCloudElements):
+ * src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java (asyncAddCloudElements):
+ * src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java (asyncAddCloudElements):
+ * src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java (asyncAddCloudElements):
+ * src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java
+ (getChildren):
+ (asyncAddCloudElements):
+ [JBIDE-7848] separated the usecases: actively getting images/instances and passive updates. You now get the images and dont need to trigger getting and get the update of it.
* src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java (.selectionChanged):
[JBIDE-7849] only change selected cloud if a new cloud has been selected
* src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java (dispose):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -34,8 +34,7 @@
@Override
public Object[] getChildren() {
if (!initialized.get()) {
-// setLoadingIndicator();
- asyncGetCloudElements();
+ asyncAddCloudElements();
initialized.set(true);
}
return super.getChildren();
@@ -45,7 +44,7 @@
children.add(new LoadingItem(this, viewer));
}
- protected abstract void asyncGetCloudElements();
+ protected abstract void asyncAddCloudElements();
protected void addChildren(Object[] modelElements) {
if (modelElements.length > NumericFoldingItem.FOLDING_SIZE) {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -12,13 +12,16 @@
import java.text.MessageFormat;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.viewers.TreeViewer;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
-import org.jboss.tools.deltacloud.core.GetImagesCommand;
import org.jboss.tools.deltacloud.core.IImageFilter;
import org.jboss.tools.deltacloud.core.IImageListListener;
+import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
@@ -39,21 +42,25 @@
}
@Override
- protected void asyncGetCloudElements() {
+ protected void asyncAddCloudElements() {
setLoadingIndicator();
- new GetImagesCommand(getCloud()){
+ new AbstractCloudJob(
+ MessageFormat.format("Get images from cloud {0}", getCloud().getName()), getCloud()) {
@Override
- protected void asyncGetImages() throws DeltaCloudException {
+ protected IStatus doRun(IProgressMonitor monitor) throws DeltaCloudException {
try {
- super.asyncGetImages();
+ DeltaCloudImage[] images = getCloud().getImages();
+ clearChildren();
+ addChildren(images);
+ expand();
+ return Status.OK_STATUS;
} catch(DeltaCloudException e) {
clearChildren();
throw e;
}
}
-
- }.execute();
+ }.schedule();
}
@Override
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -12,13 +12,16 @@
import java.text.MessageFormat;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.viewers.TreeViewer;
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.GetInstancesCommand;
import org.jboss.tools.deltacloud.core.IInstanceFilter;
import org.jboss.tools.deltacloud.core.IInstanceListListener;
+import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
@@ -39,21 +42,26 @@
}
@Override
- protected void asyncGetCloudElements() {
+ protected void asyncAddCloudElements() {
setLoadingIndicator();
- new GetInstancesCommand(getCloud()){
+ new AbstractCloudJob(
+ MessageFormat.format("Get instances from cloud {0}", getCloud().getName()), getCloud()) {
@Override
- protected void asyncGetInstances() throws DeltaCloudException {
+ protected IStatus doRun(IProgressMonitor monitor) throws DeltaCloudException {
try {
- super.asyncGetInstances();
+ DeltaCloudInstance[] instances = getCloud().getInstances();
+ clearChildren();
+ addChildren(instances);
+ expand();
+ return Status.OK_STATUS;
} catch(DeltaCloudException e) {
clearChildren();
throw e;
}
}
+ }.schedule();
- }.execute();
}
@Override
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 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -54,7 +54,7 @@
removeListener(currentCloud);
this.currentCloud = (DeltaCloud) newInput;
addListener(currentCloud);
- asyncGetCloudElements(currentCloud);
+ asyncAddCloudElements(currentCloud);
}
public void listChanged(final DeltaCloud cloud, final CLOUDELEMENT[] cloudElements) {
@@ -69,14 +69,13 @@
&& cloud.getName().equals(currentCloud.getName());
}
- private void addToViewer(final CLOUDELEMENT[] cloudElements) {
+ protected void addToViewer(final CLOUDELEMENT[] cloudElements) {
viewer.getControl().getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
try {
Object[] elements = filter(getFilter(currentCloud), cloudElements);
-// viewer.getTable().clearAll();
viewer.add(elements);
} catch (DeltaCloudException e) {
// TODO: internationalize strings
@@ -121,5 +120,5 @@
protected abstract ICloudElementFilter<CLOUDELEMENT> getCloudFilter(DeltaCloud cloud);
- protected abstract void asyncGetCloudElements(DeltaCloud cloud);
+ protected abstract void asyncAddCloudElements(DeltaCloud cloud);
}
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 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/ImageViewLabelAndContentProvider.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -10,16 +10,21 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.ui.views.cloudelements;
+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.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
-import org.jboss.tools.deltacloud.core.GetImagesCommand;
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
import org.jboss.tools.deltacloud.core.IImageListListener;
+import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
/**
* @author Jeff Johnston
@@ -93,8 +98,20 @@
}
@Override
- protected void asyncGetCloudElements(DeltaCloud cloud) {
- new GetImagesCommand(cloud).execute();
+ protected void asyncAddCloudElements(final DeltaCloud cloud) {
+ new AbstractCloudJob(
+ MessageFormat.format("Get images from cloud {0}", cloud.getName()), cloud) {
+
+ @Override
+ protected IStatus doRun(IProgressMonitor monitor) throws DeltaCloudException {
+ try {
+ addToViewer(cloud.getImages());;
+ return Status.OK_STATUS;
+ } catch(DeltaCloudException e) {
+ throw e;
+ }
+ }
+ }.schedule();
}
@Override
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 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/InstanceViewLabelAndContentProvider.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -10,18 +10,23 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.ui.views.cloudelements;
+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.GetInstancesCommand;
import org.jboss.tools.deltacloud.core.ICloudElementFilter;
import org.jboss.tools.deltacloud.core.IInstanceListListener;
+import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
/**
@@ -122,8 +127,20 @@
}
@Override
- protected void asyncGetCloudElements(DeltaCloud cloud) {
- new GetInstancesCommand(cloud).execute();
+ protected void asyncAddCloudElements(final DeltaCloud cloud) {
+ new AbstractCloudJob(
+ MessageFormat.format("Get instances from cloud {0}", cloud.getName()), cloud) {
+
+ @Override
+ protected IStatus doRun(IProgressMonitor monitor) throws DeltaCloudException {
+ try {
+ addToViewer(cloud.getInstances());;
+ return Status.OK_STATUS;
+ } catch(DeltaCloudException e) {
+ throw e;
+ }
+ }
+ }.schedule();
}
@Override
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 2010-12-09 14:28:38 UTC (rev 27277)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2010-12-09 14:30:23 UTC (rev 27278)
@@ -1,5 +1,10 @@
package org.jboss.tools.internal.deltacloud.ui.wizards;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.layout.TableColumnLayout;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -23,17 +28,17 @@
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.deltacloud.core.AllImageFilter;
import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
-import org.jboss.tools.deltacloud.core.GetImagesCommand;
import org.jboss.tools.deltacloud.core.IImageFilter;
-import org.jboss.tools.deltacloud.core.IImageListListener;
import org.jboss.tools.deltacloud.core.ImageFilter;
+import org.jboss.tools.deltacloud.core.job.AbstractCloudJob;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
import org.jboss.tools.deltacloud.ui.views.cloudelements.ImageViewLabelAndContentProvider;
import org.jboss.tools.deltacloud.ui.views.cloudelements.TableViewerColumnComparator;
-public class FindImagePage extends WizardPage implements IImageListListener {
+public class FindImagePage extends WizardPage {
private final static String NAME = "FindImage.name"; //$NON-NLS-1$
private final static String TITLE = "FindImage.title"; //$NON-NLS-1$
@@ -135,7 +140,7 @@
filter = new ImageFilter(cloud);
filter.setRules(newRules);
oldRules = newRules;
- new GetImagesCommand(cloud).execute();
+ asyncSetImagesToViewer();
}
}
setPageComplete(isComplete && !hasError);
@@ -295,14 +300,30 @@
validate();
}
- @Override
- public void listChanged(DeltaCloud cloud, final DeltaCloudImage[] images) {
+ private void asyncSetImagesToViewer() {
+ new AbstractCloudJob(
+ MessageFormat.format("Get images from cloud {0}", cloud.getName()), cloud) {
+
+ @Override
+ protected IStatus doRun(IProgressMonitor monitor) throws DeltaCloudException {
+ try {
+ setViewerInput(cloud.getImages());
+ return Status.OK_STATUS;
+ } catch (DeltaCloudException e) {
+ setViewerInput(new DeltaCloudImage[] {});
+ throw e;
+ }
+ }
+ }.schedule();
+ }
+
+ private void setViewerInput(final DeltaCloudImage[] images) {
viewer.getControl().getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
viewer.setInput(images);
- }});
+ }
+ });
}
-
}
14 years
JBoss Tools SVN: r27277 - trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-12-09 09:28:38 -0500 (Thu, 09 Dec 2010)
New Revision: 27277
Modified:
trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java
Log:
add siblings in property page
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java 2010-12-09 14:14:48 UTC (rev 27276)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java 2010-12-09 14:28:38 UTC (rev 27277)
@@ -4,6 +4,7 @@
import java.util.Collection;
import org.eclipse.bpmn2.Artifact;
+import org.eclipse.bpmn2.BaseElement;
import org.eclipse.bpmn2.FlowElement;
import org.eclipse.bpmn2.provider.Bpmn2ItemProviderAdapterFactory;
import org.eclipse.core.commands.operations.OperationHistoryFactory;
@@ -17,6 +18,7 @@
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.gef.EditPart;
@@ -195,7 +197,7 @@
if (descriptor instanceof CommandParameter) {
CommandParameter commandParameter = (CommandParameter)descriptor;
Object value = commandParameter.getValue();
- if (value instanceof FlowElement || value instanceof Artifact) continue;
+ if (value instanceof FlowElement || value instanceof Artifact || !(value instanceof BaseElement)) continue;
actions.add(new CreateChildAction(editor.getEditingDomain(), treeViewer.getSelection(), descriptor));
}
}
@@ -220,15 +222,42 @@
addSiblingMenuItem.setMenu(addSiblingSubmenu);
if (!canEnableAddSibling()) {
addSiblingMenuItem.setEnabled(false);
+ } else {
+ Object obj = getTreeViewerSelectionUnwrapped();
+ Collection<?> descriptors = editor.getEditingDomain().getNewChildDescriptors(null, obj);
+ ArrayList<IAction> actions = new ArrayList<IAction>();
+ for (Object descriptor : descriptors) {
+ if (descriptor instanceof CommandParameter) {
+ CommandParameter commandParameter = (CommandParameter)descriptor;
+ Object value = commandParameter.getValue();
+ if (value instanceof FlowElement || value instanceof Artifact || !(value instanceof BaseElement)) continue;
+ actions.add(new CreateSiblingAction(editor.getEditingDomain(), treeViewer.getSelection(), descriptor));
+ }
+ }
+ addSiblingMenuItem.setEnabled(!actions.isEmpty());
+ for (final IAction action : actions) {
+ MenuItem menuItem = new MenuItem(addSiblingSubmenu, SWT.PUSH);
+ menuItem.setText(action.getText());
+ menuItem.setImage(action.getImageDescriptor().createImage());
+ menuItem.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ action.run();
+ }
+ });
+ }
}
}
private boolean canEnableAddSibling() {
ISelection selection = treeViewer.getSelection();
if (selection instanceof IStructuredSelection) {
- return ((IStructuredSelection)selection).getFirstElement() == treeViewer.getInput();
+ Object object = ((IStructuredSelection)selection).getFirstElement();
+ if (object != null && object instanceof EObject) {
+ return ((EObject)object).eContainer() != treeViewer.getInput();
+ }
}
- return true;
+ return false;
}
private void depopulatePopupMenu() {
14 years
JBoss Tools SVN: r27276 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 09:14:48 -0500 (Thu, 09 Dec 2010)
New Revision: 27276
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF
Log:
corrected version to 0.0.1.qualifier (from 0.1.0.qualifier) to match version in pom (0.0.1-SHAPSHOT)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF 2010-12-09 12:53:55 UTC (rev 27275)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF 2010-12-09 14:14:48 UTC (rev 27276)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: DeltaCloud Core (Experimental)
Bundle-SymbolicName: org.jboss.tools.deltacloud.as
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.0.1.qualifier
Bundle-Vendor: Red Hat Inc.
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
14 years
JBoss Tools SVN: r27275 - trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-12-09 07:53:55 -0500 (Thu, 09 Dec 2010)
New Revision: 27275
Modified:
trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java
Log:
adding children in properties view
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java 2010-12-09 12:27:26 UTC (rev 27274)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src-custom/org/jboss/tools/bpmn2/process/diagram/sheet/Bpmn2PropertySheetPage.java 2010-12-09 12:53:55 UTC (rev 27275)
@@ -7,9 +7,15 @@
import org.eclipse.bpmn2.FlowElement;
import org.eclipse.bpmn2.provider.Bpmn2ItemProviderAdapterFactory;
import org.eclipse.core.commands.operations.OperationHistoryFactory;
+import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.command.CommandParameter;
+import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.ui.action.CreateChildAction;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
@@ -18,7 +24,9 @@
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
@@ -45,7 +53,8 @@
public class Bpmn2PropertySheetPage implements IPropertySheetPage {
- private EObject selectedObject = null;
+ private EObject selectedEditorObject = null;
+ private EObject selectedTreeObject = null;
private Bpmn2DiagramEditor editor;
private Composite mainControl, masterArea, detailsArea;
private TreeViewer treeViewer;
@@ -87,8 +96,33 @@
treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
treeViewer.setFilters(new ViewerFilter[] { new RootFilter(), new FlowElementFilter() });
+ treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleTreeViewerSelectionChanged(event);
+ }
+ });
}
+ private void handleTreeViewerSelectionChanged(SelectionChangedEvent event) {
+ propertySheetPage.selectionChanged(null, event.getSelection());
+ EObject object = unwrapTreeViewerSelection(event.getSelection());
+ if (object != selectedTreeObject) {
+ selectedTreeObject = object;
+ }
+ }
+
+ private EObject unwrapTreeViewerSelection(ISelection selection) {
+ EObject result = null;
+ if (selection instanceof IStructuredSelection) {
+ Object object = ((IStructuredSelection)selection).getFirstElement();
+ if (object != null && object instanceof EObject) {
+ result = (EObject)object;
+ }
+ }
+ return result;
+ }
+
private FormData createMasterAreaLayoutData() {
FormData data = new FormData();
data.left = new FormAttachment(0, 0);
@@ -243,14 +277,27 @@
@Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- selectedObject = unwrapSelection(selection);
- treeViewer.setInput(selectedObject.eContainer());
- StructuredSelection sel = new StructuredSelection(selectedObject);
- treeViewer.setSelection(sel);
- propertySheetPage.selectionChanged(part, sel);
+ if (part == editor) {
+ EObject object = unwrapEditorSelection(selection);
+ if (object != selectedEditorObject) {
+ if (selectedEditorObject != null) {
+ selectedEditorObject.eAdapters().remove(selectedElementObserver);
+ }
+ selectedEditorObject = object;
+ if (selectedEditorObject != null) {
+ selectedEditorObject.eAdapters().add(selectedElementObserver);
+ treeViewer.setInput(selectedEditorObject.eContainer());
+ treeViewer.setSelection(new StructuredSelection(selectedEditorObject));
+ } else {
+ treeViewer.setInput(null);
+ treeViewer.setSelection(null);
+ }
+
+ }
+ }
}
- private EObject unwrapSelection(ISelection selection) {
+ private EObject unwrapEditorSelection(ISelection selection) {
if (!(selection instanceof StructuredSelection)) {
return null;
}
@@ -267,7 +314,7 @@
class RootFilter extends ViewerFilter {
public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (parentElement == selectedObject.eContainer() && element != selectedObject) {
+ if (parentElement == selectedEditorObject.eContainer() && element != selectedEditorObject) {
return false;
}
return true;
@@ -276,11 +323,49 @@
class FlowElementFilter extends ViewerFilter {
public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (parentElement != selectedObject.eContainer() && element instanceof FlowElement) {
+ if (parentElement != selectedEditorObject.eContainer() && (element instanceof FlowElement || element instanceof Artifact)) {
return false;
}
return true;
}
}
+ private SelectedElementObserver selectedElementObserver = new SelectedElementObserver();
+ class SelectedElementObserver extends EContentAdapter {
+ public void notifyChanged(Notification notification) {
+ super.notifyChanged(notification);
+ handleSelectedElementChanged(notification);
+ }
+ }
+
+ private void handleSelectedElementChanged(Notification notification) {
+ int eventType = notification.getEventType();
+ if (eventType == Notification.ADD || eventType == Notification.SET) {
+ Object object = notification.getNewValue();
+ if (object instanceof EObject) {
+ setIdIfNotSet((EObject)object);
+ updateTreeSelection(object);
+ }
+ }
+ }
+
+ private void updateTreeSelection(final Object object) {
+ getControl().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ treeViewer.setSelection(new StructuredSelection(object));
+ }
+ });
+ }
+
+ protected void setIdIfNotSet(EObject obj) {
+ if (obj.eClass() != null) {
+ EStructuralFeature idAttr = obj.eClass().getEIDAttribute();
+ if (idAttr != null && !obj.eIsSet(idAttr)) {
+ CommandParameter commandParameter = new CommandParameter(obj, idAttr, EcoreUtil.generateUUID(), CommandParameter.NO_INDEX);
+ Command command = editor.getEditingDomain().createCommand(SetCommand.class, commandParameter);
+ editor.getEditingDomain().getCommandStack().execute(command);
+ }
+ }
+ }
}
14 years
JBoss Tools SVN: r27274 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views/cloudelements and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 07:27:26 -0500 (Thu, 09 Dec 2010)
New Revision: 27274
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
Log:
[JBIDE-7853] removing workbench selection listener on dispose
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-09 12:19:57 UTC (rev 27273)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-09 12:27:26 UTC (rev 27274)
@@ -2,6 +2,8 @@
* src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java (.selectionChanged):
[JBIDE-7849] only change selected cloud if a new cloud has been selected
+ * src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java (dispose):
+ [JBIDE-7853] removing workbench selection listener on dispose
2010-12-08 André Dietisheim <adietish(a)redhat.com>
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 2010-12-09 12:19:57 UTC (rev 27273)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2010-12-09 12:27:26 UTC (rev 27274)
@@ -150,12 +150,6 @@
protected abstract String getSelectedCloudPrefsKey();
@Override
- public void dispose() {
- DeltaCloudManager.getDefault().removeCloudManagerListener(this);
- super.dispose();
- }
-
- @Override
public void createPartControl(Composite parent) {
Composite container = new Composite(parent, SWT.NULL);
FormLayout layout = new FormLayout();
@@ -395,4 +389,12 @@
public void setFocus() {
viewer.getControl().setFocus();
}
+
+ @Override
+ public void dispose() {
+ getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(workbenchSelectionListener);
+ DeltaCloudManager.getDefault().removeCloudManagerListener(this);
+ super.dispose();
+ }
+
}
14 years
JBoss Tools SVN: r27273 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 07:19:57 -0500 (Thu, 09 Dec 2010)
New Revision: 27273
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java
Log:
removed erroneous comment
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 2010-12-09 12:14:38 UTC (rev 27272)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementViewLabelAndContentProvider.java 2010-12-09 12:19:57 UTC (rev 27273)
@@ -54,7 +54,6 @@
removeListener(currentCloud);
this.currentCloud = (DeltaCloud) newInput;
addListener(currentCloud);
- // TODO internationalize strings
asyncGetCloudElements(currentCloud);
}
14 years
JBoss Tools SVN: r27272 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 07:14:38 -0500 (Thu, 09 Dec 2010)
New Revision: 27272
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
Log:
corrected missing exported package
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-12-09 11:43:19 UTC (rev 27271)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-12-09 12:14:38 UTC (rev 27272)
@@ -10,10 +10,10 @@
org.eclipse.equinox.security;bundle-version="[1.0.100,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Export-Package: org.apache.http.client.methods;x-friends:="org.jboss.tools.deltacloud.test",
- org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test",
+Export-Package: org.jboss.tools.deltacloud.core;x-friends:="org.jboss.tools.deltacloud.ui,org.jboss.tools.deltacloud.test",
org.jboss.tools.deltacloud.core.client;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.ui",
- org.jboss.tools.deltacloud.core.client.request;x-friends:="org.jboss.tools.deltacloud.test"
+ org.jboss.tools.deltacloud.core.client.request;x-friends:="org.jboss.tools.deltacloud.test",
+ org.jboss.tools.deltacloud.core.job
Bundle-ClassPath: .,
lib/apache-mime4j-0.6.jar,
lib/commons-codec-1.3.jar,
14 years
JBoss Tools SVN: r27271 - trunk/deltacloud/features/org.jboss.tools.deltacloud.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 06:43:19 -0500 (Thu, 09 Dec 2010)
New Revision: 27271
Modified:
trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/ChangeLog
trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml
trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/pom.xml
Log:
updated to include org.jboss.tools.deltacloud.as
Modified: trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/ChangeLog
===================================================================
--- trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/ChangeLog 2010-12-09 11:42:17 UTC (rev 27270)
+++ trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/ChangeLog 2010-12-09 11:43:19 UTC (rev 27271)
@@ -1,3 +1,7 @@
+2010-10-12 André Dietisheim <adietishn(a)redhat.com>
+
+ * feature.xml: Added org.jboss.tools.deltacloud.as
+
2010-10-12 Jeff Johnston <jjohnstn(a)redhat.com>
* feature.xml: Fix warning regarding docs plugin id not being found by
@@ -11,4 +15,4 @@
* .project: New file.
* build.properties: New file.
- * feature.xml: New file.
\ No newline at end of file
+ * feature.xml: New file.
Modified: trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml
===================================================================
--- trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml 2010-12-09 11:42:17 UTC (rev 27270)
+++ trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/feature.xml 2010-12-09 11:43:19 UTC (rev 27271)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.deltacloud.feature"
label="%featureName"
- version="0.0.2.qualifier"
+ version="0.1.0.qualifier"
provider-name="%providerName">
<description>
@@ -36,7 +36,28 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.deltacloud.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
<plugin
+ id="org.jboss.tools.deltacloud.as"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.deltacloud.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.jboss.tools.deltacloud.docs"
download-size="0"
install-size="0"
Modified: trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/pom.xml
===================================================================
--- trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/pom.xml 2010-12-09 11:42:17 UTC (rev 27270)
+++ trunk/deltacloud/features/org.jboss.tools.deltacloud.feature/pom.xml 2010-12-09 11:43:19 UTC (rev 27271)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.deltacloud.features</groupId>
<artifactId>org.jboss.tools.deltacloud.feature</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
14 years
JBoss Tools SVN: r27270 - trunk/deltacloud/features.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 06:42:17 -0500 (Thu, 09 Dec 2010)
New Revision: 27270
Modified:
trunk/deltacloud/features/pom.xml
Log:
updated to include org.jboss.tools.deltacloud.as
Modified: trunk/deltacloud/features/pom.xml
===================================================================
--- trunk/deltacloud/features/pom.xml 2010-12-09 11:33:35 UTC (rev 27269)
+++ trunk/deltacloud/features/pom.xml 2010-12-09 11:42:17 UTC (rev 27270)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools.deltacloud</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>deltacloud.features</name>
<modules>
14 years
JBoss Tools SVN: r27269 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-09 06:33:35 -0500 (Thu, 09 Dec 2010)
New Revision: 27269
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF
Log:
adding erroneously missing MANIFEST.MF - blame eclipse subversive
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.as/META-INF/MANIFEST.MF 2010-12-09 11:33:35 UTC (rev 27269)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DeltaCloud Core (Experimental)
+Bundle-SymbolicName: org.jboss.tools.deltacloud.as
+Bundle-Version: 0.1.0.qualifier
+Bundle-Vendor: Red Hat Inc.
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
14 years