JBoss Tools SVN: r27067 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-01 11:46:27 -0500 (Wed, 01 Dec 2010)
New Revision: 27067
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-12-01 16:35:52 UTC (rev 27066)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-12-01 16:46:27 UTC (rev 27067)
@@ -31,7 +31,7 @@
private DeltaCloud cloud;
private IImageFilter localFilter;
- private DeltaCloudImage[] images;
+ private DeltaCloudImage[] images = new DeltaCloudImage[]{};
public enum Column {
NAME(0, 20),
@@ -94,7 +94,7 @@
} catch (Exception e) {
ErrorUtils.handleError(
"Error",
- "Could not get images for cloud " + cloud.getName(),
+ "Could not display images for cloud " + cloud.getName(),
e, Display.getDefault().getActiveShell());
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-12-01 16:35:52 UTC (rev 27066)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-12-01 16:46:27 UTC (rev 27067)
@@ -33,7 +33,7 @@
ITableLabelProvider {
private DeltaCloud cloud;
- private DeltaCloudInstance[] instances;
+ private DeltaCloudInstance[] instances = new DeltaCloudInstance[]{};
public enum Column {
NAME(0, 20),
@@ -88,11 +88,8 @@
try {
instances = filter(cloud.getInstances());
} catch (Exception e) {
- if (instances == null) {
- instances = new DeltaCloudInstance[]{};
- }
// TODO internationalize strings
- ErrorUtils.handleError("Instance View Error", "Could not display instances for cloud " + cloud.getName(),
+ ErrorUtils.handleError("Error", "Could not display instances for cloud " + cloud.getName(),
e, Display.getDefault().getActiveShell());
}
}
13 years, 5 months
JBoss Tools SVN: r27066 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-01 11:35:52 -0500 (Wed, 01 Dec 2010)
New Revision: 27066
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
cleanup
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-01 16:34:04 UTC (rev 27065)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-01 16:35:52 UTC (rev 27066)
@@ -158,7 +158,6 @@
String rules = getInstanceFilter().toString();
instanceFilter = createInstanceFilter(ruleString);
if (!rules.equals(ruleString)) {
- // save();
// TODO: remove notification with all instances, replace by
// notifying the changed instance
notifyInstanceListListeners(instances.get());
@@ -188,7 +187,6 @@
String rules = getImageFilter().toString();
this.imageFilter = createImageFilter(ruleString);
if (!rules.equals(ruleString)) {
- // save();
notifyImageListListeners(getImages());
}
}
@@ -236,11 +234,6 @@
}
}
- // public void save() {
- // // Currently we have to save all clouds instead of just this one
- // DeltaCloudManager.getDefault().saveClouds();
- // }
-
public void addInstanceListListener(IInstanceListListener listener) {
instanceListeners.add(listener);
}
13 years, 5 months
JBoss Tools SVN: r27065 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-01 11:34:04 -0500 (Wed, 01 Dec 2010)
New Revision: 27065
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
Log:
added entries to changelog
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-01 16:33:42 UTC (rev 27064)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-01 16:34:04 UTC (rev 27065)
@@ -16,7 +16,7 @@
fixed NPE
2010-11-24 adietisheim <adietisheim@adietisheim-thinkpad>
-
+slide
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (.modifyText):
[JBIDE-7694] removed refresh(es) of tableViewer (setInput should be enough),
moved set of current cloud to central method with null-check,
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-12-01 16:33:42 UTC (rev 27064)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-12-01 16:34:04 UTC (rev 27065)
@@ -6,12 +6,12 @@
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearConfig" value="false"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Deltacloud Tools"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/>
+<booleanAttribute key="default" value="true"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.ui,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.tests,org.jboss.tools.usage.test,org.jboss.tools.deltacloud.test,com.jboss.jbds.usage.branding"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-deltacloud"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
@@ -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.swtbot.ant.optional.junit3@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.rse.services.telnet@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.app@default:default,org.eclipse.rse.efs.ui@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,javax.xml@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.rse.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.rse.connectorservice.dstore@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.emf.common@default:default,org.eclipse.swtbot.ant.optional.ju!
nit4@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.pde.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.jem.util@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.dstore.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.cdt.core.linux@default:false,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.forms@default:default,org.ecl!
ipse.help@default:default,org.eclipse.core.filebuffers@default!
:default
,org.eclipse.team.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.help.base@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,com.ibm.icu@default:default,javax.servlet@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.rs!
e.services.ssh@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.net@default:default,javax.wsdl*1.6.2.v201005080631@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.common.core@default:default,javax.xml.rpc@default:default,org.eclipse.emf.ecore@default:default,org.sat4j.core@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.xsd@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.jdt@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.rse.subsystems.file!
s.ftp@default:default,org.eclipse.equinox.p2.jarprocessor@defa!
ult:defa
ult,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.update.configurator@3:true,org.apache.commons.net@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.team.core@default:default,org.eclipse.dstore.extra@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.jcraft.jsch@default:default,org.eclipse.ant.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.expressions@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.emf!
@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.p2.publisher@default:default,javax.activation@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.edit@default:default,org.eclipse.rse@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.pde.build@default:default,org.eclipse.compare@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.editors@default:default,org.eclipse.rse.subsystems.files.dstore@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rse.ui@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.jobs@default:default,org.apache.lucene@default:default,org.eclipse.emf.ecore.xmi@default:defau!
lt,org.eclipse.jface@default:default,org.eclipse.jdt.ui@defaul!
t:defaul
t,org.eclipse.ui.cheatsheets@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.ide.application@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.common@2:true,org.eclipse.rse.processes.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.rse.services@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.apache.commons.discovery@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ui.!
workbench.texteditor@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.update.core@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.rse.subsystems.processes.local@default:default,org.apache.axis@default:default,org.hamcrest.core@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.mail@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.xerces@default:default,org.eclipse.ecf.identity@default:default,org.sat4j.pb@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.junit4@default:default,org.eclipse.rse.connectorservice.ssh@defa!
ult:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:!
default,
org.eclipse.wst.common.uriresolver@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.browser@default:default,org.apache.xml.serializer@default:default,org.apache.xml.resolver@default:default,org.eclipse.cdt.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.ide@default:default,org.uddi4j@default:default,org.apache.jasper@default:default,org.eclipse.wst.sse.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.emf.common.ui@default:default,org.apache.ant@default:default,org.eclipse.rse.doc.user@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.rse.connectorservice.local@default:de!
fault,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.rse.efs@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ui.console@default:default,javax.xml.soap@default:default,org.eclipse.equinox.security.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.databinding.beans@default:default,org.jboss.ide.eclipse.archives.core@default:default,javax.mail@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.eclipse.wst.common.emf@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,javax.xml@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.subsystems.terminals.core@default:default,org.jboss.tools.jmx.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.net.linux.x86_!
64@default:false,org.junit4@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.rse.efs.ui@default:default,org.eclipse.swt@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@default:default,org.eclipse.compare.core@default:default,org.eclipse.help.base@default:default,org.eclipse.osgi.util@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.rse.processes.ui@default:default,javax.activation@default:default,org.eclipse.equinox.common@2:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.apache.xml.resolver@default:default,org.eclipse.rse.efs@default:default,org.!
eclipse.core.net@default:default,org.eclipse.rse.subsystems.fi!
les.dsto
re@default:default,javax.servlet@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.compare@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.intro@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,org.apache.axis@default:default,org.eclipse.equinox.security.ui@default:default,org.uddi4j@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jface@default:default,org.eclipse.update.configurator@3:true,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.common.ui@default:default,org.apache.ant@default:default,org.eclipse.core.runtime!
.compatibility.auth@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.sat4j.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.common@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.xsd@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.p2.director@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.rse.core@default:default,javax.wsdl*1.6.2.v201005080631@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.r!
se.importexport@default:default,org.eclipse.equinox.http.servl!
et@defau
lt:default,org.eclipse.rse.subsystems.shells.dstore@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.rse.services.local@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.cdt.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.pde.core@default:default,org.eclipse.core.filesystem@default:default,javax.xml.soap@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.app@default:default,org.apache.lucene@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.security@default:default,org.apache.jasper@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.rse@default:default,org.eclipse.ui.view!
s.properties.tabbed@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ant.core@default:default,org.eclipse.help@default:default,org.eclipse.sdk@default:default,org.eclipse.team.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jem.util@default:default,org.jboss.tools.xul!
runner.initializer@default:false,org.eclipse.rse.connectorserv!
ice.dsto
re@default:default,org.eclipse.team.ui@default:default,org.apache.commons.net@default:default,org.eclipse.search@default:default,org.apache.commons.el@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.sat4j.pb@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jsch.core@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.rse.subsystems.files.ftp@default:default,org.eclipse.equinox.p2.di!
rector.app@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.rse.subsystems.processes.local@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.ui@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide.application@default:default,org.eclipse.cdt.core.linux@default:false,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.core.expressions@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.equin!
ox.p2.core@default:default,org.eclipse.rse.doc.user@default:de!
fault,or
g.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.core.jobs@default:default,javax.servlet.jsp@default:default,org.eclipse.jdt@default:default,org.mortbay.jetty.util@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.text@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.rse.connectorservice.local@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.browser@default:default,org.eclipse.dstore.core@default:default,com.jcraft.jsch@default:default,org.apache.commons.discovery@default:default,javax.xml.rpc@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.jdt.juni!
t@default:default,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.rse.useractions@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
13 years, 5 months
JBoss Tools SVN: r27064 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-01 11:33:42 -0500 (Wed, 01 Dec 2010)
New Revision: 27064
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties
Log:
corrected build.properties
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties 2010-12-01 16:33:15 UTC (rev 27063)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties 2010-12-01 16:33:42 UTC (rev 27064)
@@ -1,5 +1,4 @@
source.. = src/,\
- lib/
output.. = bin/
bin.includes = META-INF/,\
.,\
13 years, 5 months
JBoss Tools SVN: r27063 - 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: 2010-12-01 11:33:15 -0500 (Wed, 01 Dec 2010)
New Revision: 27063
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java
Log:
added trimming of image id, moved to ErrorUtil
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-12-01 16:31:48 UTC (rev 27062)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-12-01 16:33:15 UTC (rev 27063)
@@ -19,7 +19,6 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.core.model.IHost;
@@ -136,7 +135,7 @@
@Override
public boolean performFinish() {
- String imageId = mainPage.getImageId();
+ String imageId = mainPage.getImageId().trim();
String profileId = mainPage.getHardwareProfile();
String realmId = mainPage.getRealmId();
String memory = mainPage.getMemoryProperty();
@@ -151,6 +150,7 @@
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
boolean result = false;
+ Exception e = null;
String errorMessage = WizardMessages.getString(DEFAULT_REASON);
try {
DeltaCloudManager.getDefault().saveClouds();
@@ -184,16 +184,15 @@
job.setUser(true);
job.schedule();
}
- } catch (DeltaCloudException e) {
- errorMessage = e.getLocalizedMessage();
+ } catch (DeltaCloudException ex) {
+ errorMessage = ex.getLocalizedMessage();
+ e = ex;
}
if (!result) {
- ErrorDialog.openError(
- this.getShell(),
- WizardMessages.getString(CREATE_INSTANCE_FAILURE_TITLE),
- WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG, new String[] { name, imageId,
- realmId, profileId }),
- new Status(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage));
+ ErrorUtils.handleError(
+ WizardMessages.getString(CREATE_INSTANCE_FAILURE_TITLE),
+ WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG, new String[] { name, imageId, realmId, profileId }),
+ e, getShell());
}
return result;
}
13 years, 5 months
JBoss Tools SVN: r27062 - trunk/usage/plugins/org.jboss.tools.usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-01 11:31:48 -0500 (Wed, 01 Dec 2010)
New Revision: 27062
Modified:
trunk/usage/plugins/org.jboss.tools.usage/build.properties
Log:
corrected build.properties
Modified: trunk/usage/plugins/org.jboss.tools.usage/build.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-12-01 15:59:51 UTC (rev 27061)
+++ trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-12-01 16:31:48 UTC (rev 27062)
@@ -8,5 +8,6 @@
META-INF/,\
OSGI-INF/
src.includes = about.html,\
- pom.xml
+ pom.xml,\
+ OSGI-INF/
source.. = src/
13 years, 5 months
JBoss Tools SVN: r27061 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-12-01 10:59:51 -0500 (Wed, 01 Dec 2010)
New Revision: 27061
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
Log:
JBIDE-7561
https://jira.jboss.org/browse/JBIDE-7561
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-12-01 15:44:47 UTC (rev 27060)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-12-01 15:59:51 UTC (rev 27061)
@@ -28,6 +28,8 @@
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.kb,
org.jboss.tools.jsf,
- org.eclipse.jst.standard.schemas
+ org.eclipse.jst.standard.schemas,
+ org.jboss.tools.vpe.ui.palette,
+ org.eclipse.gef
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
13 years, 5 months
JBoss Tools SVN: r27060 - in trunk/modeshape: features/org.jboss.tools.modeshape.rest.sdk.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-12-01 10:44:47 -0500 (Wed, 01 Dec 2010)
New Revision: 27060
Modified:
trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties
trunk/modeshape/features/org.jboss.tools.modeshape.rest.sdk.feature/feature.properties
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties
Log:
JBIDE-7764 Wrong provider name, Modeshape: Changed provider to "JBoss by Red Hat" in 3 properties files.
Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties 2010-12-01 15:03:35 UTC (rev 27059)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.properties 2010-12-01 15:44:47 UTC (rev 27060)
@@ -11,7 +11,7 @@
#
featureName = ModeShape JCR REST Tools for Eclipse
-featureProvider = JBoss by Red Hat, Inc.
+featureProvider = JBoss by Red Hat
description = Provides a resource publishing and unpublishing capability to ModeShape repositories.
Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.sdk.feature/feature.properties
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.sdk.feature/feature.properties 2010-12-01 15:03:35 UTC (rev 27059)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.sdk.feature/feature.properties 2010-12-01 15:44:47 UTC (rev 27060)
@@ -11,7 +11,7 @@
#
featureName = ModeShape JCR REST Tools for Eclipse SDK
-featureProvider = JBoss by Red Hat, Inc.
+featureProvider = JBoss by Red Hat
# "updateSiteName" property - label for the update site
updateSiteName = JBossTools Update Site
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties 2010-12-01 15:03:35 UTC (rev 27059)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties 2010-12-01 15:44:47 UTC (rev 27060)
@@ -10,7 +10,7 @@
# individual contributors.
#
bundleName = ModeShape REST Eclipse Publishing Plug-in
-bundleVendor = Red Hat, Inc.
+bundleVendor = JBoss by Red Hat
contextMenu.label = ModeShape
decorator.description = Decorates objects in the ModeShape View
decorator.label = ModeShape View Decorator
13 years, 5 months
JBoss Tools SVN: r27059 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: wtp and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-12-01 10:03:35 -0500 (Wed, 01 Dec 2010)
New Revision: 27059
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
Log:
reorder tests a bit, added workaround for not yet fixed random issue (JBIDE-6731) and let the test do ws from wsdl in a package (due to JBIDE-7681)
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java 2010-12-01 15:02:40 UTC (rev 27058)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java 2010-12-01 15:03:35 UTC (rev 27059)
@@ -142,6 +142,12 @@
return scale(1).isEnabled();
}
+ //second panel
+ public WebServiceWizard setPackageName(String pkg) {
+ bot().textWithLabel("Package name").typeText(pkg);
+ return this;
+ }
+
private List<SWTBotHyperlinkExt> findLink(String text) {
List<? extends Hyperlink> widgets = bot().widgets(WidgetMatcherFactory.widgetOfType(Hyperlink.class));
List<SWTBotHyperlinkExt> ret = new ArrayList<SWTBotHyperlinkExt>();
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2010-12-01 15:02:40 UTC (rev 27058)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2010-12-01 15:03:35 UTC (rev 27059)
@@ -56,8 +56,8 @@
}
@Test
- public void testDevelopService() {
- setLevel(Slider_Level.DEVELOP);
+ public void testDeployService() {
+ setLevel(Slider_Level.DEPLOY);
bottomUpJbossWebService();
}
@@ -68,8 +68,8 @@
}
@Test
- public void testDeployService() {
- setLevel(Slider_Level.DEPLOY);
+ public void testDevelopService() {
+ setLevel(Slider_Level.DEVELOP);
bottomUpJbossWebService();
}
@@ -94,11 +94,9 @@
private void bottomUpJbossWebService() {
String s = readStream(BottomUpWSTest.class.getResourceAsStream("/resources/jbossws/ClassA.java.ws"));
String src = MessageFormat.format(s, getWsPackage(), getWsName());
- createService(Service_Type.BOTTOM_UP, getWsPackage() + "." + getWsName(), getLevel(), src);
-// runProject(getProjectName());
+ createService(Service_Type.BOTTOM_UP, getWsPackage() + "." + getWsName(), getLevel(), null, src);
switch (getLevel()) {
case DEVELOP:
- return;
case ASSEMBLE:
case DEPLOY:
runProject(getEarProjectName());
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2010-12-01 15:02:40 UTC (rev 27058)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/TopDownWSTest.java 2010-12-01 15:03:35 UTC (rev 27059)
@@ -56,6 +56,12 @@
*/
@Test
+ public void testDeployService() {
+ setLevel(Slider_Level.DEPLOY);
+ topDownWS();
+ }
+
+ @Test
public void testDevelopService() {
setLevel(Slider_Level.DEVELOP);
topDownWS();
@@ -68,12 +74,6 @@
}
@Test
- public void testDeployService() {
- setLevel(Slider_Level.DEPLOY);
- topDownWS();
- }
-
- @Test
public void testInstallService() {
setLevel(Slider_Level.INSTALL);
topDownWS();
@@ -101,8 +101,15 @@
}
sb.append(tns[0]);
String src = MessageFormat.format(s, sb.toString(), getWsName());
- createService(Service_Type.TOP_DOWN, "/" + getWsProjectName() + "/src/" + getWsName() + ".wsdl", getLevel(), src);
-// runProject(getProjectName());
+ String pkg = "ws." + getWsName().toLowerCase();
+ createService(Service_Type.TOP_DOWN, "/" + getWsProjectName() + "/src/" + getWsName() + ".wsdl", getLevel(), pkg, src);
+ switch (getLevel()) {
+ case DEVELOP:
+ case ASSEMBLE:
+ case DEPLOY:
+ runProject(getEarProjectName());
+ break;
+ }
assertServiceDeployed(getWSDLUrl());
// servers.removeAllProjectsFromServer(configuredState.getServer().name);
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2010-12-01 15:02:40 UTC (rev 27058)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2010-12-01 15:03:35 UTC (rev 27059)
@@ -24,6 +24,10 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
@@ -142,7 +146,7 @@
}
}
- protected void createService(Service_Type t, String source, Slider_Level level, String code) {
+ protected void createService(Service_Type t, String source, Slider_Level level, String pkg, String code) {
//create ws source - java class or wsdl
SWTBotEditor ed = null;
switch (t) {
@@ -159,6 +163,13 @@
st.selectRange(0, 0, st.getText().length());
st.setText(code);
ed.saveAndClose();
+ //refresh workspace - workaround for JBIDE-6731
+ try {
+ ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IWorkspaceRoot.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch (CoreException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ }
+ bot.sleep(500);
//create a web service
new NewFileWizardAction().run().selectTemplate("Web Services", "Web Service").next();
WebServiceWizard wsw = new WebServiceWizard();
@@ -172,6 +183,10 @@
if (wsw.isClientEnabled()) {
wsw.setClientSlider(Slider_Level.NO_CLIENT);
}
+ if (pkg != null && pkg.trim().length() > 0) {
+ wsw.next();
+ wsw.setPackageName(pkg);
+ }
wsw.finish();
util.waitForNonIgnoredJobs();
bot.sleep(1000);
13 years, 5 months
JBoss Tools SVN: r27058 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-12-01 10:02:40 -0500 (Wed, 01 Dec 2010)
New Revision: 27058
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
Log:
JBIDE-7266 - explore util fix
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2010-12-01 14:54:07 UTC (rev 27057)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2010-12-01 15:02:40 UTC (rev 27058)
@@ -147,11 +147,11 @@
}
public static IPath getDeployPath(IDeployableServer server,IModule[] moduleTree) {
- IPath p = PublishUtil.getDeployRootFolder(moduleTree, server);
+ IPath fullPath = PublishUtil.getDeployPath(moduleTree, server);
if( !PublishUtil.isBinaryObject(moduleTree)) {
- return PublishUtil.getDeployPath(moduleTree, server);
+ return fullPath;
}
- return p;
+ return fullPath.removeLastSegments(1);
}
}
13 years, 5 months