JBoss Tools SVN: r27852 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-03 15:47:52 -0500 (Mon, 03 Jan 2011)
New Revision: 27852
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
Log:
update to add missing components
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-01-03 20:19:10 UTC (rev 27851)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-01-03 20:47:52 UTC (rev 27852)
@@ -7,12 +7,12 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1292656235000'/>
+<property name='p2.timestamp' value='1294074932000'/>
</properties>
-<children size='25'>
+<children size='34'>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
@@ -25,15 +25,25 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
@@ -41,5 +51,8 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2/all...'/>
+<!-- TO BE REMOVED WHEN NO LONGER NEEDED -->
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-01-03 20:19:10 UTC (rev 27851)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/trunk/comp... 2011-01-03 20:47:52 UTC (rev 27852)
@@ -7,12 +7,12 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1292656235000'/>
+<property name='p2.timestamp' value='1294074932000'/>
</properties>
-<children size='25'>
+<children size='34'>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
@@ -25,15 +25,25 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
-<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...'/>
@@ -41,5 +51,8 @@
<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...'/>
<child location='http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2/all...'/>
+<!-- TO BE REMOVED WHEN NO LONGER NEEDED -->
+<child location='http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk....'/>
+
</children>
</repository>
13 years, 4 months
JBoss Tools SVN: r27851 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-01-03 15:19:10 -0500 (Mon, 03 Jan 2011)
New Revision: 27851
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessProcessor.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java
Log:
JBIDE-7794
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessProcessor.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessProcessor.java 2011-01-03 19:07:36 UTC (rev 27850)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/MoveProcessProcessor.java 2011-01-03 20:19:10 UTC (rev 27851)
@@ -31,7 +31,7 @@
private IContainer destination;
public MoveProcessProcessor(IResource resource) {
- IResource jpdlResource = null, gpdResource = null;
+ IResource jpdlResource = null, gpdResource = null, jpgResource = null;
if (resource == null || !resource.exists()) {
throw new IllegalArgumentException("resource must not be null and must exist");
}
@@ -41,9 +41,14 @@
} else if (isGpdFile(resource)) {
jpdlResource = getJpdlResource(resource);
gpdResource = resource;
- }
+ }
if (jpdlResource != null && jpdlResource.exists() && gpdResource != null && gpdResource.exists()) {
- resourcesToMove = new IResource[] { jpdlResource, gpdResource };
+ jpgResource = getJpgResource(jpdlResource);
+ if (jpgResource != null && jpgResource.exists()) {
+ resourcesToMove = new IResource[] { jpdlResource, gpdResource, jpgResource };
+ } else {
+ resourcesToMove = new IResource[] { jpdlResource, gpdResource };
+ }
} else {
throw new IllegalArgumentException("both jpdlFile and gpdFile must not be null and must exist");
}
@@ -69,6 +74,13 @@
return name.startsWith(".") && name.endsWith(".gpd.xml");
}
+ private IResource getJpgResource(IResource resource) {
+ if (!resource.getName().endsWith(".jpdl.xml")) {
+ throw new IllegalArgumentException("jpg resource can only be obtained for a jpdl file");
+ }
+ return resource.getParent().getFile(new Path(getProcessName(resource) + ".jpg"));
+ }
+
private IResource getGpdResource(IResource resource) {
if (!resource.getName().endsWith(".jpdl.xml")) {
throw new IllegalArgumentException("gpd resource can only be obtained for a jpdl file");
@@ -111,13 +123,35 @@
MultiStatus multi = new MultiStatus(
ResourcesPlugin.PI_RESOURCES,
IResourceStatus.OUT_OF_SYNC_LOCAL,
- "both resources are out of sync with file system",
+ "the resources are out of sync with file system",
null);
multi.add(result);
multi.add(temp);
result = multi;
}
}
+ if (resourcesToMove.length == 3 && !resourcesToMove[2].isSynchronized(IResource.DEPTH_INFINITE)) {
+ IStatus temp = new Status (
+ IStatus.ERROR,
+ ResourcesPlugin.PI_RESOURCES,
+ IResourceStatus.OUT_OF_SYNC_LOCAL,
+ "Resource " + resourcesToMove[2].getName() + "is out of sync with file system",
+ null);
+ if (result == null) {
+ result = temp;
+ } else if (result instanceof MultiStatus) {
+ ((MultiStatus)result).add(temp);
+ } else {
+ MultiStatus multi = new MultiStatus(
+ ResourcesPlugin.PI_RESOURCES,
+ IResourceStatus.OUT_OF_SYNC_LOCAL,
+ "the resources are out of sync with file system",
+ null);
+ multi.add(result);
+ multi.add(temp);
+ result = multi;
+ }
+ }
if (result == null) {
result = Status.OK_STATUS;
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java 2011-01-03 19:07:36 UTC (rev 27850)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/refactoring/RenameProcessProcessor.java 2011-01-03 20:19:10 UTC (rev 27851)
@@ -27,6 +27,7 @@
private IResource jpdlResource;
private IResource gpdResource;
+ private IResource jpgResource;
private String newProcessName;
private boolean updateReferences;
@@ -45,6 +46,8 @@
if (jpdlResource != null && jpdlResource.exists() && gpdResource != null && gpdResource.exists()) {
+ jpgResource = getJpgResource(jpdlResource);
+
updateReferences= true;
String newName = jpdlResource.getName();
@@ -93,6 +96,10 @@
return resource.getParent().getFile(new Path(getProcessName(resource) + ".jpdl.xml"));
}
+ private IResource getJpgResource(IResource resource) {
+ return resource.getParent().getFile(new Path(getProcessName(resource) + ".jpg"));
+ }
+
public String getNewProcessName() {
return newProcessName;
}
@@ -133,13 +140,35 @@
MultiStatus multi = new MultiStatus(
ResourcesPlugin.PI_RESOURCES,
IResourceStatus.OUT_OF_SYNC_LOCAL,
- "both resources are out of sync with file system",
+ "the resources are out of sync with file system",
null);
multi.add(result);
multi.add(temp);
result = multi;
}
}
+ if (!jpgResource.isSynchronized(IResource.DEPTH_INFINITE)) {
+ IStatus temp = new Status (
+ IStatus.ERROR,
+ ResourcesPlugin.PI_RESOURCES,
+ IResourceStatus.OUT_OF_SYNC_LOCAL,
+ "Resource " + jpgResource.getName() + "is out of sync with file system",
+ null);
+ if (result == null) {
+ result = temp;
+ } else if (result instanceof MultiStatus){
+ ((MultiStatus)result).add(temp);
+ } else {
+ MultiStatus multi = new MultiStatus(
+ ResourcesPlugin.PI_RESOURCES,
+ IResourceStatus.OUT_OF_SYNC_LOCAL,
+ "the resources are out of sync with file system",
+ null);
+ multi.add(result);
+ multi.add(temp);
+ result = multi;
+ }
+ }
if (result == null) {
result = Status.OK_STATUS;
}
@@ -157,6 +186,11 @@
IPath newGpdPath= gpdResource.getFullPath().removeLastSegments(1).append("." + getNewProcessName() + ".gpd.xml");
deltaFactory.move(
gpdResource, newGpdPath);
+ if (jpgResource != null && jpgResource.exists()) {
+ IPath newJpgPath= jpgResource.getFullPath().removeLastSegments(1).append(getNewProcessName() + ".jpg");
+ deltaFactory.move(
+ jpgResource, newJpgPath);
+ }
return new RefactoringStatus();
} finally {
pm.done();
@@ -182,9 +216,11 @@
result.merge(RefactoringStatus.create(c.getWorkspace().validateName(newName, gpdResource.getType())));
}
if (!result.hasFatalError())
- result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(jpdlResource, newName), jpdlResource.getType())));
+ result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(jpdlResource, newName + ".jpdl.xml"), jpdlResource.getType())));
if (!result.hasFatalError())
- result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(gpdResource, newName), gpdResource.getType())));
+ result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(gpdResource, "." + newName + ".gpd.xml"), gpdResource.getType())));
+ if (!result.hasFatalError() && jpgResource != null && jpgResource.exists())
+ result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(jpgResource, newName + ".jpg"), jpgResource.getType())));
return result;
}
@@ -194,6 +230,9 @@
CompositeChange compositeChange = new CompositeChange("process rename");
compositeChange.add(new RenameResourceChange(jpdlResource.getFullPath(), getNewProcessName() + ".jpdl.xml"));
compositeChange.add(new RenameResourceChange(gpdResource.getFullPath(), "." + getNewProcessName() + ".gpd.xml"));
+ if (jpgResource != null && jpgResource.exists()) {
+ compositeChange.add(new RenameResourceChange(jpgResource.getFullPath(), getNewProcessName() + ".jpg"));
+ }
return compositeChange;
} finally {
pm.done();
@@ -205,7 +244,11 @@
}
public Object[] getElements() {
- return new Object[] { jpdlResource, gpdResource};
+ if (jpgResource != null && jpgResource.exists()) {
+ return new Object[] { jpdlResource, gpdResource, jpgResource };
+ } else {
+ return new Object[] { jpdlResource, gpdResource};
+ }
}
public String getIdentifier() {
13 years, 4 months
JBoss Tools SVN: r27850 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-01-03 14:07:36 -0500 (Mon, 03 Jan 2011)
New Revision: 27850
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java
Log:
JBIDE-7637
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2011-01-03 19:06:58 UTC (rev 27849)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2011-01-03 19:07:36 UTC (rev 27850)
@@ -189,8 +189,8 @@
}
private void checkPage() {
+ if (!checkContainerText()) return;
if (!checkProcessNameText()) return;
- if (!checkContainerText()) return;
}
private boolean checkContainerText() {
@@ -198,6 +198,10 @@
setMessage("Select the source folder or enter its name.");
setPageComplete(false);
return false;
+ } else if (!projectExists()) {
+ setMessage("The source folder needs to be contained in an existing project");
+ setPageComplete(false);
+ return false;
} else if (!containerExists()) {
setMessage("The source folder does not exist and will be created.");
setPageComplete(true);
@@ -209,6 +213,13 @@
}
}
+ private boolean projectExists() {
+ IPath path = new Path(containerText.getText());
+ String project = path.segment(0);
+ IResource resource = workspaceRoot.getProject(project);
+ return resource != null && resource.exists();
+ }
+
private boolean containerExists() {
IPath path = new Path(containerText.getText());
IResource resource = workspaceRoot.findMember(path);
@@ -246,6 +257,7 @@
}
IFile getProcessDefinitionFile() {
+
return workspaceRoot.getFile(getProcessDefinitionFilePath());
}
13 years, 4 months
JBoss Tools SVN: r27849 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-01-03 14:06:58 -0500 (Mon, 03 Jan 2011)
New Revision: 27849
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java
Log:
cleanup
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2011-01-03 18:02:36 UTC (rev 27848)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2011-01-03 19:06:58 UTC (rev 27849)
@@ -114,7 +114,7 @@
super.showPageRec(pageRec);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"rawtypes" })
public Object getAdapter(Class adapter) {
if (adapter == IPropertySheetPage.class && getCurrentPage() != null && getCurrentPage() instanceof DetailsPage)
return ((DetailsPage)getCurrentPage()).getContributingEditor().getAdapter(adapter);
13 years, 4 months
JBoss Tools SVN: r27847 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-03 12:00:59 -0500 (Mon, 03 Jan 2011)
New Revision: 27847
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java
Log:
[JBIDE-7294] implementing alias support
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java 2011-01-03 17:00:27 UTC (rev 27846)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java 2011-01-03 17:00:59 UTC (rev 27847)
@@ -33,8 +33,8 @@
public static String getLabel(DeltaCloudInstance instance) {
StringBuilder sb = new StringBuilder();
if (instance != null) {
- if (instance.getGivenName() != null) {
- sb.append(instance.getGivenName()).append(' ');
+ if (instance.getAlias() != null) {
+ sb.append(instance.getAlias()).append(' ');
}
if (instance.getName() != null) {
sb.append('[').append(instance.getName()).append(']');
13 years, 4 months
JBoss Tools SVN: r27846 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-03 12:00:27 -0500 (Mon, 03 Jan 2011)
New Revision: 27846
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.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
Log:
[JBIDE-7294] implementing alias support
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-03 16:47:02 UTC (rev 27845)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-03 17:00:27 UTC (rev 27846)
@@ -1,3 +1,11 @@
+2011-01-03 adietisheim <adietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (createInstance):
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
+ (getAlias):
+ (setAlias):
+ [JBIDE-7294] implementing alias support
+
2010-12-27 adietisheim <adietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (isValid):
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 2011-01-03 16:47:02 UTC (rev 27845)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-03 17:00:27 UTC (rev 27846)
@@ -554,20 +554,20 @@
}
}
- public DeltaCloudInstance createInstance(String name, String imageId, String realmId, String profileId,
+ public DeltaCloudInstance createInstance(String alias, String imageId, String realmId, String profileId,
String keyId, String memory, String storage) throws DeltaCloudException {
try {
Instance instance = null;
if (keyId != null) {
- instance = client.createInstance(imageId, profileId, realmId, name, keyId, memory, storage);
+ instance = client.createInstance(imageId, profileId, realmId, alias, keyId, memory, storage);
} else {
- instance = client.createInstance(imageId, profileId, realmId, name, memory, storage);
+ instance = client.createInstance(imageId, profileId, realmId, alias, memory, storage);
}
if (instance != null) {
DeltaCloudInstancesRepository repo = getInstancesRepository();
DeltaCloudInstance[] instances = repo.get();
DeltaCloudInstance deltaCloudInstance = repo.add(instance, this);
- deltaCloudInstance.setGivenName(name);
+ deltaCloudInstance.setAlias(alias);
// TODO: remove notification with all instanceRepo, replace by
// notifying the changed instance
firePropertyChange(PROP_INSTANCES, instances, repo.get());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-01-03 16:47:02 UTC (rev 27845)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-01-03 17:00:27 UTC (rev 27846)
@@ -74,7 +74,7 @@
}
private Instance instance;
- private String givenName;
+ private String alias;
public DeltaCloudInstance(DeltaCloud cloud, Instance instance) {
super(cloud);
@@ -85,12 +85,12 @@
return instance.getName();
}
- public String getGivenName() {
- return givenName;
+ public String getAlias() {
+ return alias;
}
- public void setGivenName(String name) {
- givenName = name;
+ public void setAlias(String alias) {
+ this.alias = alias;
}
public String getId() {
@@ -191,7 +191,7 @@
builder.append(" [");
appendActions(builder);
builder.append("id: ").append(getId())
- .append("givenName: ").append(givenName)
+ .append("givenName: ").append(alias)
.append("name: ").append(getName())
.append("hostName: ").append(getHostName())
.append("imageId: ").append(getImageId())
13 years, 4 months
JBoss Tools SVN: r27845 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-03 11:47:02 -0500 (Mon, 03 Jan 2011)
New Revision: 27845
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
added authors
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-03 16:44:28 UTC (rev 27844)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-03 16:47:02 UTC (rev 27845)
@@ -32,6 +32,10 @@
import org.jboss.tools.deltacloud.ui.INewInstanceWizardPage;
import org.osgi.service.prefs.Preferences;
+/**
+ * @author Jeff Johnston
+ * @author André Dieitsheim
+ */
public class NewInstanceWizard extends Wizard {
private final static String CREATE_INSTANCE_FAILURE_TITLE = "CreateInstanceError.title"; //$NON-NLS-1$
13 years, 4 months
JBoss Tools SVN: r27844 - trunk/maven/tests/org.jboss.tools.maven.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-03 11:44:28 -0500 (Mon, 03 Jan 2011)
New Revision: 27844
Modified:
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
Log:
should be eclipse-test-plugin, not eclipse-plugin https://issues.jboss.org/browse/JBIDE-7989
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2011-01-03 15:45:39 UTC (rev 27843)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2011-01-03 16:44:28 UTC (rev 27844)
@@ -9,7 +9,7 @@
<groupId>org.jboss.tools.maven.tests</groupId>
<artifactId>org.jboss.tools.maven.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+ <packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
<plugin>
13 years, 4 months
JBoss Tools SVN: r27843 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-03 10:45:39 -0500 (Mon, 03 Jan 2011)
New Revision: 27843
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
Log:
add arch=86 filter to macosx plugins https://issues.jboss.org/browse/JBIDE-8029
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2011-01-03 15:03:04 UTC (rev 27842)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2011-01-03 15:45:39 UTC (rev 27843)
@@ -28,6 +28,7 @@
id="org.mozilla.xulrunner.carbon.macosx"
os="macosx"
ws="carbon"
+ arch="x86"
download-size="0"
install-size="0"
version="0.0.0"/>
@@ -36,6 +37,7 @@
id="org.mozilla.xulrunner.cocoa.macosx"
os="macosx"
ws="cocoa"
+ arch="x86"
download-size="0"
install-size="0"
version="0.0.0"/>
13 years, 4 months